Skip to content
Permalink
Browse files

Merge branch 'master' of github.com:sequelpro/sequelpro

  • Loading branch information...
stuconnolly committed Jun 10, 2018
2 parents 47f6ce1 + 89f756e commit e12c3b08fbdfe978935a9a24247feebfbde3da67
Showing with 21,660 additions and 21,895 deletions.
  1. +9 −2 Frameworks/PSMTabBar/Styles/PSMSequelProTabStyle.m
  2. +50 −52 Frameworks/PostgresKit/Source/PGPostgresConnection.m
  3. +22 −24 Frameworks/PostgresKit/Source/PGPostgresConnectionParameters.m
  4. +21 −0 Frameworks/SPMySQLFramework/MySQL Client Libraries/Patches/001-cpp-dependency.diff
  5. +24 −0 Frameworks/SPMySQLFramework/MySQL Client Libraries/Patches/002-new-types.diff
  6. +9 −2 Frameworks/SPMySQLFramework/MySQL Client Libraries/include/mysql.h
  7. +2 −1 Frameworks/SPMySQLFramework/MySQL Client Libraries/include/mysql_com.h
  8. +2 −2 Frameworks/SPMySQLFramework/MySQL Client Libraries/include/mysql_version.h
  9. BIN Frameworks/SPMySQLFramework/MySQL Client Libraries/lib/libmysqlclient.a
  10. +0 −75 Frameworks/SPMySQLFramework/SPMySQLDataTypes.h
  11. +0 −77 Frameworks/SPMySQLFramework/SPMySQLDataTypes.m
  12. +4 −4 Frameworks/SPMySQLFramework/SPMySQLFramework.xcodeproj/project.pbxproj
  13. +20 −0 Frameworks/SPMySQLFramework/Source/SPMySQLArrayAdditions.h
  14. +15 −1 Frameworks/SPMySQLFramework/Source/SPMySQLConnection Categories/Conversion.h
  15. +10 −8 Frameworks/SPMySQLFramework/Source/SPMySQLConnection Categories/Conversion.m
  16. +0 −8 Frameworks/SPMySQLFramework/Source/SPMySQLConnection Categories/Databases & Tables.m
  17. +1 −5 Frameworks/SPMySQLFramework/Source/SPMySQLConnection Categories/Encoding.m
  18. +28 −27 Frameworks/SPMySQLFramework/Source/SPMySQLConnection Categories/Locking.m
  19. +2 −6 Frameworks/SPMySQLFramework/Source/SPMySQLConnection Categories/Max Packet Size.m
  20. +0 −7 Frameworks/SPMySQLFramework/Source/SPMySQLConnection Categories/Ping & KeepAlive.h
  21. +72 −46 Frameworks/SPMySQLFramework/Source/SPMySQLConnection Categories/Ping & KeepAlive.m
  22. +8 −10 Frameworks/SPMySQLFramework/Source/SPMySQLConnection Categories/Querying & Preparation.m
  23. +13 −0 Frameworks/SPMySQLFramework/Source/SPMySQLConnection Categories/Server Info.h
  24. +32 −1 Frameworks/SPMySQLFramework/Source/SPMySQLConnection Categories/Server Info.m
  25. +240 −207 Frameworks/SPMySQLFramework/Source/SPMySQLConnection.m
  26. +19 −0 Frameworks/SPMySQLFramework/Source/SPMySQLConstants.h
  27. +75 −0 Frameworks/SPMySQLFramework/Source/SPMySQLDataTypes.h
  28. +77 −0 Frameworks/SPMySQLFramework/Source/SPMySQLDataTypes.m
  29. 0 Frameworks/SPMySQLFramework/{ → Source}/SPMySQLEmptyResult.h
  30. +1 −8 Frameworks/SPMySQLFramework/{ → Source}/SPMySQLEmptyResult.m
  31. +66 −75 Frameworks/SPMySQLFramework/Source/SPMySQLFastStreamingResult.m
  32. +3 −3 Frameworks/SPMySQLFramework/Source/SPMySQLGeometryData.h
  33. +15 −22 Frameworks/SPMySQLFramework/Source/SPMySQLGeometryData.m
  34. +3 −1 Frameworks/SPMySQLFramework/Source/SPMySQLKeepAliveTimer.h
  35. +5 −8 Frameworks/SPMySQLFramework/Source/SPMySQLKeepAliveTimer.m
  36. +3 −4 Frameworks/SPMySQLFramework/Source/SPMySQLResult Categories/Data Conversion.m
  37. +68 −62 Frameworks/SPMySQLFramework/Source/SPMySQLResult Categories/Field Definitions.m
  38. +1 −1 Frameworks/SPMySQLFramework/Source/SPMySQLResult.h
  39. +2 −5 Frameworks/SPMySQLFramework/Source/SPMySQLResult.m
  40. +2 −1 Frameworks/SPMySQLFramework/Source/SPMySQLStreamingResult.h
  41. +4 −7 Frameworks/SPMySQLFramework/Source/SPMySQLStreamingResult.m
  42. +5 −6 Frameworks/SPMySQLFramework/Source/SPMySQLStreamingResultStore.h
  43. +125 −140 Frameworks/SPMySQLFramework/Source/SPMySQLStreamingResultStore.m
  44. +7 −7 Frameworks/SPMySQLFramework/Source/SPMySQLStringAdditions.m
  45. +1 −1 Frameworks/SPMySQLFramework/Source/SPMySQLUtilities.h
  46. +9 −3 Frameworks/SPMySQLFramework/build-mysql-client.sh
  47. +5 −5 Interfaces/English.lproj/ConnectionView.xib
  48. +9 −28 Interfaces/English.lproj/ContentPaginationView.xib
  49. +272 −867 Interfaces/English.lproj/DBView.xib
  50. +337 −0 Interfaces/English.lproj/FilterTableWindow.xib
  51. +213 −0 Interfaces/English.lproj/HelpViewer.xib
  52. BIN Resources/English.lproj/ConnectionView.strings
  53. BIN Resources/English.lproj/Console.strings
  54. BIN Resources/English.lproj/ExportDialog.strings
  55. BIN Resources/English.lproj/Localizable.strings
  56. BIN Resources/Images/button_filter.png
  57. BIN Resources/Images/button_filter@2x.png
  58. BIN Resources/Images/button_filter_active.png
  59. BIN Resources/Images/button_filter_active@2x.png
  60. +14 −5 Resources/Templates/SPMySQLHelpTemplate.html
  61. +95 −81 Source/GeneratePreviewForURL.m
  62. +38 −41 Source/GenerateThumbnailForURL.m
  63. +1 −1 Source/MGTemplateEngine.m
  64. +1 −1 Source/NoodleLineNumberView.m
  65. +2 −4 Source/SPActivityTextFieldCell.m
  66. +22 −0 Source/SPAppController.h
  67. +560 −290 Source/SPAppController.m
  68. +0 −41 Source/SPAppleScriptSupport.h
  69. +0 −128 Source/SPAppleScriptSupport.m
  70. +37 −28 Source/SPBundleEditorController.m
  71. +3 −3 Source/SPBundleHTMLOutputController.m
  72. +2 −2 Source/SPCSVExporter.m
  73. +0 −124 Source/SPCSVExporterDelegate.m
  74. +1 −1 Source/SPCSVParser.m
  75. +1 −1 Source/SPCharsetCollationHelper.m
  76. +2 −2 Source/SPColorSelectorView.h
  77. +2 −2 Source/SPColorSelectorView.m
  78. +0 −4 Source/SPComboPopupButton.h
  79. +5 −11 Source/SPComboPopupButton.m
  80. +30 −2 Source/SPConnectionController.h
  81. +1,835 −224 Source/SPConnectionController.m
  82. +0 −42 Source/SPConnectionControllerDataSource.h
  83. +0 −121 Source/SPConnectionControllerDataSource.m
  84. +0 −47 Source/SPConnectionControllerDelegate.h
  85. +0 −756 Source/SPConnectionControllerDelegate.m
  86. +4 −2 Source/SPConnectionControllerDelegateProtocol.h
  87. +0 −49 Source/SPConnectionControllerInitializer.h
  88. +0 −417 Source/SPConnectionControllerInitializer.m
  89. +0 −42 Source/SPConnectionDelegate.h
  90. +0 −209 Source/SPConnectionDelegate.m
  91. +0 −53 Source/SPConnectionHandler.h
  92. +0 −538 Source/SPConnectionHandler.m
  93. +10 −4 Source/SPConstants.h
  94. +15 −11 Source/SPConstants.m
  95. +2 −8 Source/SPContentFilterManager.h
  96. +62 −62 Source/SPContentFilterManager.m
  97. +268 −244 Source/SPCopyTable.m
  98. +3 −48 Source/SPCustomQuery.h
  99. +383 −870 Source/SPCustomQuery.m
  100. +1 −0 Source/SPDataAdditions.h
  101. +134 −0 Source/SPDataAdditions.m
  102. +20 −29 Source/SPDataImport.h
  103. +239 −183 Source/SPDataImport.m
  104. +7 −0 Source/SPDataStorage.h
  105. +117 −60 Source/SPDataStorage.m
  106. +58 −18 Source/SPDatabaseDocument.h
  107. +1,966 −892 Source/SPDatabaseDocument.m
  108. +236 −240 Source/SPDatabaseStructure.m
  109. +0 −65 Source/SPDatabaseViewController.h
  110. +0 −637 Source/SPDatabaseViewController.m
  111. +0 −43 Source/SPDotExporterDelegate.h
  112. +0 −78 Source/SPDotExporterDelegate.m
  113. +184 −139 Source/SPEditorPreferencePane.m
  114. +0 −36 Source/SPExportController+SharedPrivateAPI.h
  115. +62 −0 Source/SPExportController.h
  116. +2,763 −77 Source/SPExportController.m
  117. +0 −42 Source/SPExportControllerDelegate.h
  118. +0 −359 Source/SPExportControllerDelegate.m
  119. +0 −49 Source/SPExportFileUtilities.h
  120. +0 −373 Source/SPExportFileUtilities.m
  121. +0 −51 Source/SPExportFilenameUtilities.h
  122. +0 −328 Source/SPExportFilenameUtilities.m
  123. +0 −54 Source/SPExportInitializer.h
  124. +0 −611 Source/SPExportInitializer.m
  125. +0 −42 Source/SPExportInterfaceController.h
  126. +0 −150 Source/SPExportInterfaceController.m
  127. +0 −64 Source/SPExportSettingsPersistence.h
  128. +0 −803 Source/SPExportSettingsPersistence.m
  129. +7 −11 Source/SPExporter.m
  130. +5 −3 Source/SPExtendedTableInfo.m
  131. +80 −94 Source/SPFavoritesController.m
  132. +33 −38 Source/SPFavoritesExporter.m
  133. +23 −26 Source/SPFavoritesImporter.m
  134. +3 −3 Source/SPFavoritesOutlineView.m
  135. +7 −0 Source/SPFieldEditorController.h
  136. +23 −17 Source/SPFieldEditorController.m
  137. +2 −2 Source/SPFieldMapperController.m
  138. +2 −2 Source/SPFileHandle.h
  139. +85 −73 Source/SPFileHandle.m
  140. +25 −1 Source/SPFileManagerAdditions.m
  141. +15 −11 Source/{SPCSVExporterDelegate.h → SPFillView.h}
  142. +24 −12 Source/{SPPDFExporterDelegate.m → SPFillView.m}
  143. +129 −0 Source/SPFilterTableController.h
  144. +706 −0 Source/SPFilterTableController.m
  145. +6 −0 Source/SPFunctions.h
  146. +6 −0 Source/SPFunctions.m
  147. +2 −6 Source/SPGeometryDataView.m
  148. +1 −1 Source/SPGotoDatabaseController.m
  149. +0 −43 Source/SPHTMLExporterDelegate.h
  150. +0 −49 Source/SPHTMLExporterDelegate.m
  151. +66 −0 Source/SPHelpViewerClient.h
  152. +262 −0 Source/SPHelpViewerClient.m
  153. +99 −0 Source/SPHelpViewerController.h
  154. +415 −0 Source/SPHelpViewerController.m
  155. +0 −2 Source/SPHistoryController.h
  156. +130 −152 Source/SPHistoryController.m
  157. +2 −2 Source/SPImageView.h
  158. +2 −2 Source/SPImageView.m
  159. +199 −157 Source/SPIndexesController.m
  160. +1 −1 Source/SPMainThreadTrampoline.h
  161. +29 −22 Source/SPNarrowDownCompletion.h
  162. +328 −319 Source/SPNarrowDownCompletion.m
  163. +6 −8 Source/SPNavigatorController.m
  164. +1 −1 Source/SPNetworkPreferencePane.m
  165. +0 −43 Source/SPPDFExporterDelegate.h
  166. +98 −1 Source/SPPreferenceController.m
  167. +0 −42 Source/SPPreferenceControllerDelegate.h
  168. +0 −131 Source/SPPreferenceControllerDelegate.m
  169. +10 −13 Source/SPPreferencesUpgrade.m
  170. +0 −42 Source/SPPrintController.h
  171. +0 −461 Source/SPPrintController.m
  172. +140 −58 Source/SPProcessListController.m
  173. +0 −33 Source/SPProcessListControllerDataSource.h
  174. +0 −96 Source/SPProcessListControllerDataSource.m
  175. +0 −35 Source/SPQueryConsoleDataSource.h
  176. +0 −111 Source/SPQueryConsoleDataSource.m
  177. +32 −0 Source/SPQueryController.h
  178. +564 −1 Source/SPQueryController.m
  179. +0 −37 Source/SPQueryControllerInitializer.h
  180. +0 −145 Source/SPQueryControllerInitializer.m
  181. +0 −61 Source/SPQueryDocumentsController.h
  182. +0 −415 Source/SPQueryDocumentsController.m
  183. +0 −6 Source/SPQueryFavoriteManager.h
  184. +34 −27 Source/SPQueryFavoriteManager.m
  185. +165 −0 Source/SPRuleFilterController.h
  186. +1,579 −0 Source/SPRuleFilterController.m
  187. +190 −153 Source/SPSQLExporter.m
  188. +0 −43 Source/SPSQLExporterDelegate.h
  189. +0 −82 Source/SPSQLExporterDelegate.m
  190. +22 −10 Source/SPSQLParser.h
  191. +101 −82 Source/SPSQLParser.m
  192. +301 −291 Source/SPSSHTunnel.m
  193. +1 −5 Source/SPSplitView.m
  194. +74 −95 Source/SPTableContent.h
  195. +1,544 −1,092 Source/SPTableContent.m
  196. +0 −35 Source/SPTableContentDataSource.h
  197. +0 −243 Source/SPTableContentDataSource.m
  198. +0 −35 Source/SPTableContentDelegate.h
  199. +0 −824 Source/SPTableContentDelegate.m
  200. +0 −37 Source/SPTableContentFilter.h
  201. +0 −246 Source/SPTableContentFilter.m
  202. +0 −21 Source/SPTableContentFilterController.h
  203. +0 −5 Source/SPTableContentFilterController.m
  204. +113 −101 Source/SPTableData.m
  205. +2 −3 Source/SPTableFilterParser.m
  206. +1 −1 Source/SPTableInfo.m
  207. +51 −0 Source/SPTableRelations.m
  208. +0 −35 Source/SPTableRelationsDelegate.h
  209. +0 −87 Source/SPTableRelationsDelegate.m
  210. +6 −0 Source/SPTableStructure.h
  211. +1,184 −45 Source/SPTableStructure.m
  212. +0 −44 Source/SPTableStructureDelegate.h
  213. +0 −868 Source/SPTableStructureDelegate.m
  214. +0 −44 Source/SPTableStructureLoading.h
  215. +0 −368 Source/SPTableStructureLoading.m
  216. +59 −0 Source/SPTableTriggers.m
  217. +0 −33 Source/SPTableTriggersDelegate.h
  218. +0 −100 Source/SPTableTriggersDelegate.m
  219. +3 −3 Source/SPTableView.m
  220. +96 −88 Source/SPTablesList.m
  221. +109 −88 Source/SPTextView.m
  222. +218 −216 Source/SPTextViewAdditions.m
  223. +1 −1 Source/SPTooltip.m
  224. +359 −54 Source/SPUserManager.m
  225. +0 −35 Source/SPUserManagerDataSource.h
  226. +0 −51 Source/SPUserManagerDataSource.m
  227. +0 −35 Source/SPUserManagerDelegate.h
  228. +0 −335 Source/SPUserManagerDelegate.m
  229. +415 −6 Source/SPWindowController.m
  230. +0 −39 Source/SPWindowControllerDelegate.h
  231. +0 −448 Source/SPWindowControllerDelegate.m
  232. +0 −55 Source/SPWindowManagement.h
  233. +0 −182 Source/SPWindowManagement.m
  234. +0 −43 Source/SPXMLExporterDelegate.h
  235. +0 −134 Source/SPXMLExporterDelegate.m
  236. +140 −162 Source/SequelProTunnelAssistant.m
  237. +1 −1 Source/YRKSpinningProgressIndicator.m
  238. +47 −47 Source/xibLocalizationPostprocessor.m
  239. +76 −0 UnitTests/SPDataAdditionsTests.m
  240. +8 −1 readme.md
  241. +96 −266 sequel-pro.xcodeproj/project.pbxproj
@@ -473,7 +473,11 @@ - (void)drawBackgroundInRect:(NSRect)rect
}

// Fill in background of tab bar
[[NSColor colorWithCalibratedWhite:backgroundCalibratedWhite alpha:1.0f] set];
if (tabBar.cells.count != 1) { // multiple tabs - fill with background color
[[NSColor colorWithCalibratedWhite:backgroundCalibratedWhite alpha:1.0f] set];
} else { // When there's only one tab, the tabs are probably hidden, so use the selected cell's highlight colour as our background colour
[[self fillColorForCell:selectedCell] set];
}
NSRectFill(NSMakeRect(rect.origin.x, rect.origin.y, rect.size.width, rect.size.height));

// Draw horizontal line across the top edge
@@ -626,6 +630,9 @@ - (NSColor *)fillColorForCell:(PSMTabBarCell *)cell
if([cell backgroundColor]) {
//should be a slightly darker variant of the color
fillColor = [[cell backgroundColor] shadowWithLevel:0.15];

// also desaturate the color
fillColor = [NSColor colorWithCalibratedHue:fillColor.hueComponent saturation:fillColor.saturationComponent * 0.4 brightness:fillColor.brightnessComponent alpha:1.0f];
}
}
} else {
@@ -647,7 +654,7 @@ - (NSColor *)fillColorForCell:(PSMTabBarCell *)cell
//make it dark first, then desaturate
if (cell.backgroundColor) {
NSColor *dark = [[cell backgroundColor] shadowWithLevel:0.15];
fillColor = [NSColor colorWithCalibratedHue:dark.hueComponent saturation:dark.saturationComponent brightness:(dark.brightnessComponent * 1.28) alpha:1.0f];
fillColor = [NSColor colorWithCalibratedHue:dark.hueComponent saturation:dark.saturationComponent * 0.15 brightness:(dark.brightnessComponent * 1.28) alpha:1.0f];
}
}
}
@@ -297,64 +297,62 @@ - (BOOL)cancelCurrentQuery:(NSError **)error
*/
- (void)_pollConnection:(NSNumber *)isReset
{
NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];

BOOL reset = isReset && [isReset boolValue];

int sock = PQsocket(_connection);

if (sock == -1) {
[pool release];
return;
}

struct pollfd fdinfo[1];

fdinfo[0].fd = sock;
fdinfo[0].events = POLLIN|POLLOUT;

PostgresPollingStatusType status;

do
{
status = reset ? PQresetPoll(_connection) : PQconnectPoll(_connection);

if (status == PGRES_POLLING_READING || status == PGRES_POLLING_WRITING) {
if (poll(fdinfo, 1, -1) < 0) break;
}
}
while (status != PGRES_POLLING_OK && status != PGRES_POLLING_FAILED);

if (status == PGRES_POLLING_OK && [self isConnected]) {

// Increase error verbosity
PQsetErrorVerbosity(_connection, PQERRORS_VERBOSE);

// Set notice processor
PQsetNoticeProcessor(_connection, _PGPostgresConnectionNoticeProcessor, self);

// Register or clear type extensions
NSInteger success = reset ? PQclearTypes(_connection) : PQinitTypes(_connection);

if (!success) {
NSLog(@"PostgresKit: Error: Failed to initialise or clear type extensions. Connection might return unexpected results!");
@autoreleasepool {
BOOL reset = isReset && [isReset boolValue];

int sock = PQsocket(_connection);

if (sock == -1) {
[pool release];
return;
}

[self _loadDatabaseParameters];

if (reset) {
if (_delegate && [_delegate respondsToSelector:@selector(connectionReset:)]) {
[_delegate performSelectorOnMainThread:@selector(connectionReset:) withObject:self waitUntilDone:NO];

struct pollfd fdinfo[1];

fdinfo[0].fd = sock;
fdinfo[0].events = POLLIN|POLLOUT;

PostgresPollingStatusType status;

do
{
status = reset ? PQresetPoll(_connection) : PQconnectPoll(_connection);

if (status == PGRES_POLLING_READING || status == PGRES_POLLING_WRITING) {
if (poll(fdinfo, 1, -1) < 0) break;
}
}
else {
if (_delegate && [_delegate respondsToSelector:@selector(connectionEstablished:)]) {
[_delegate performSelectorOnMainThread:@selector(connectionEstablished:) withObject:self waitUntilDone:NO];
while (status != PGRES_POLLING_OK && status != PGRES_POLLING_FAILED);

if (status == PGRES_POLLING_OK && [self isConnected]) {

// Increase error verbosity
PQsetErrorVerbosity(_connection, PQERRORS_VERBOSE);

// Set notice processor
PQsetNoticeProcessor(_connection, _PGPostgresConnectionNoticeProcessor, self);

// Register or clear type extensions
NSInteger success = reset ? PQclearTypes(_connection) : PQinitTypes(_connection);

if (!success) {
NSLog(@"PostgresKit: Error: Failed to initialise or clear type extensions. Connection might return unexpected results!");
}

[self _loadDatabaseParameters];

if (reset) {
if (_delegate && [_delegate respondsToSelector:@selector(connectionReset:)]) {
[_delegate performSelectorOnMainThread:@selector(connectionReset:) withObject:self waitUntilDone:NO];
}
}
else {
if (_delegate && [_delegate respondsToSelector:@selector(connectionEstablished:)]) {
[_delegate performSelectorOnMainThread:@selector(connectionEstablished:) withObject:self waitUntilDone:NO];
}
}
}
}

[pool release];
}

/**
@@ -138,32 +138,30 @@ - (id)valueForParameter:(NSString *)parameter
*/
- (void)_loadParameters:(id)object
{
NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];

pthread_mutex_lock(&_readLock);

NSArray *parameters = (NSArray *)object;

if (!_parameters) {
_parameters = [[NSMutableDictionary alloc] initWithCapacity:[parameters count]];
}

for (NSString *parameter in parameters)
{
const char *value = PQparameterStatus([_connection postgresConnection], [parameter UTF8String]);

if (!value) continue;

NSString *stringValue = [NSString stringWithUTF8String:value];
@autoreleasepool {
pthread_mutex_lock(&_readLock);

id paramObject = [self _isBooleanParameterValue:stringValue] ? (id)[NSNumber numberWithBool:[self _booleanForParameterValue:stringValue]] : stringValue;

[_parameters setObject:paramObject forKey:parameter];
NSArray *parameters = (NSArray *)object;

if (!_parameters) {
_parameters = [[NSMutableDictionary alloc] initWithCapacity:[parameters count]];
}

for (NSString *parameter in parameters)
{
const char *value = PQparameterStatus([_connection postgresConnection], [parameter UTF8String]);

if (!value) continue;

NSString *stringValue = [NSString stringWithUTF8String:value];

id paramObject = [self _isBooleanParameterValue:stringValue] ? (id)[NSNumber numberWithBool:[self _booleanForParameterValue:stringValue]] : stringValue;

[_parameters setObject:paramObject forKey:parameter];
}

pthread_mutex_unlock(&_readLock);
}

pthread_mutex_unlock(&_readLock);

[pool release];
}

/**
@@ -0,0 +1,21 @@
This patch is neccesary to remove a linker error when trying to link SPMySQL with libmysqlclient.a.

To apply:
cd mysql-source-root
patch -p1 < this-file

(patch created with `diff -Naur`)

--- mysql-5.5.56-dist/extra/yassl/taocrypt/include/runtime.hpp 2017-04-27 09:12:30.000000000 +0200
+++ mysql-5.5.56/extra/yassl/taocrypt/include/runtime.hpp 2017-05-20 23:27:14.000000000 +0200
@@ -53,8 +53,8 @@
#endif

/* Disallow inline __cxa_pure_virtual() */
-static int __cxa_pure_virtual() __attribute__((noinline, used));
-static int __cxa_pure_virtual()
+int __cxa_pure_virtual() __attribute__((noinline, used));
+int __cxa_pure_virtual()
{
// oops, pure virtual called!
return 0;
@@ -0,0 +1,24 @@
This patch backports field types that were added after MySQL 5.5,
but are technically still compatible to the old client libs.

To apply:
cd mysql-source-root
patch -p1 < this-file

(patch created with `diff -Naur`)

--- mysql-5.5.56-dist/include/mysql_com.h 2017-04-27 09:12:30.000000000 +0200
+++ mysql-5.5.56/include/mysql_com.h 2017-05-21 01:46:44.000000000 +0200
@@ -349,7 +349,11 @@
MYSQL_TYPE_DATETIME, MYSQL_TYPE_YEAR,
MYSQL_TYPE_NEWDATE, MYSQL_TYPE_VARCHAR,
MYSQL_TYPE_BIT,
- MYSQL_TYPE_NEWDECIMAL=246,
+ MYSQL_TYPE_TIMESTAMP2,
+ MYSQL_TYPE_DATETIME2,
+ MYSQL_TYPE_TIME2,
+ MYSQL_TYPE_JSON=245,
+ MYSQL_TYPE_NEWDECIMAL=246,
MYSQL_TYPE_ENUM=247,
MYSQL_TYPE_SET=248,
MYSQL_TYPE_TINY_BLOB=249,
@@ -1,4 +1,4 @@
/* Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
/* Copyright (c) 2000, 2017, Oracle and/or its affiliates. All rights reserved.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -167,7 +167,9 @@ enum mysql_option
MYSQL_OPT_GUESS_CONNECTION, MYSQL_SET_CLIENT_IP, MYSQL_SECURE_AUTH,
MYSQL_REPORT_DATA_TRUNCATION, MYSQL_OPT_RECONNECT,
MYSQL_OPT_SSL_VERIFY_SERVER_CERT, MYSQL_PLUGIN_DIR, MYSQL_DEFAULT_AUTH,
MYSQL_ENABLE_CLEARTEXT_PLUGIN
MYSQL_ENABLE_CLEARTEXT_PLUGIN,
/* Set MYSQL_OPT_SSL_MODE to be the same as in 5.6 (ABI compatibility). */
MYSQL_OPT_SSL_MODE= 38
};

/**
@@ -224,6 +226,11 @@ enum mysql_protocol_type
MYSQL_PROTOCOL_PIPE, MYSQL_PROTOCOL_MEMORY
};

enum mysql_ssl_mode
{
SSL_MODE_REQUIRED= 3
};

typedef struct character_set
{
unsigned int number; /* character set number */
@@ -1,4 +1,4 @@
/* Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
/* Copyright (c) 2000, 2016, Oracle and/or its affiliates. All rights reserved.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -26,6 +26,7 @@
#define USERNAME_CHAR_LENGTH 16
#define NAME_LEN (NAME_CHAR_LEN*SYSTEM_CHARSET_MBMAXLEN)
#define USERNAME_LENGTH (USERNAME_CHAR_LENGTH*SYSTEM_CHARSET_MBMAXLEN)
#define CONNECT_STRING_MAXLEN 1024

#define MYSQL_AUTODETECT_CHARSET_NAME "auto"

@@ -11,11 +11,11 @@
#include <custom_conf.h>
#else
#define PROTOCOL_VERSION 10
#define MYSQL_SERVER_VERSION "5.5.42"
#define MYSQL_SERVER_VERSION "5.5.56"
#define MYSQL_BASE_VERSION "mysqld-5.5"
#define MYSQL_SERVER_SUFFIX_DEF ""
#define FRM_VER 6
#define MYSQL_VERSION_ID 50542
#define MYSQL_VERSION_ID 50556
#define MYSQL_PORT 3306
#define MYSQL_PORT_DEFAULT 0
#define MYSQL_UNIX_ADDR "/tmp/mysql.sock"
Binary file not shown.

This file was deleted.

Oops, something went wrong.
Oops, something went wrong.

0 comments on commit e12c3b0

Please sign in to comment.
You can’t perform that action at this time.