diff options
Diffstat (limited to 'storage')
| -rw-r--r-- | storage/csv/ha_tina.cc | 7 | ||||
| -rw-r--r-- | storage/maria/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | storage/myisam/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | storage/mysql_storage_engine.cmake | 2 | ||||
| -rw-r--r-- | storage/xtradb/handler/ha_innodb.cc | 10 | ||||
| -rw-r--r-- | storage/xtradb/include/univ.i | 2 |
6 files changed, 21 insertions, 5 deletions
diff --git a/storage/csv/ha_tina.cc b/storage/csv/ha_tina.cc index ffc59140629..4ca3e029cbc 100644 --- a/storage/csv/ha_tina.cc +++ b/storage/csv/ha_tina.cc @@ -489,6 +489,13 @@ int ha_tina::encode_quote(uchar *buf) ptr= attribute.ptr(); end_ptr= attribute.length() + ptr; + /* + Ensure that buffer is big enough. This will also speed things up + as we don't have to do any new allocation in the loop below + */ + if (buffer.realloc(buffer.length() + attribute.length()*2+2)) + return 0; // Failure + buffer.append('"'); while (ptr < end_ptr) diff --git a/storage/maria/CMakeLists.txt b/storage/maria/CMakeLists.txt index 9e8424ba97f..12bd3d063b5 100644 --- a/storage/maria/CMakeLists.txt +++ b/storage/maria/CMakeLists.txt @@ -91,4 +91,7 @@ IF(EMBED_MANIFESTS) MYSQL_EMBED_MANIFEST("maria_pack" "asInvoker") ENDIF(EMBED_MANIFESTS) +INSTALL(TARGETS maria_ftdump maria_chk maria_read_log maria_pack maria_dump_log + DESTINATION bin COMPONENT runtime) + ENDIF(NOT SOURCE_SUBLIBS) diff --git a/storage/myisam/CMakeLists.txt b/storage/myisam/CMakeLists.txt index 1a667e271af..7744f4337ef 100644 --- a/storage/myisam/CMakeLists.txt +++ b/storage/myisam/CMakeLists.txt @@ -70,4 +70,6 @@ IF(NOT SOURCE_SUBLIBS) MYSQL_EMBED_MANIFEST("myisampack" "asInvoker") ENDIF(EMBED_MANIFESTS) + INSTALL(TARGETS myisam_ftdump myisamchk myisamlog myisampack DESTINATION bin COMPONENT runtime) + ENDIF(NOT SOURCE_SUBLIBS) diff --git a/storage/mysql_storage_engine.cmake b/storage/mysql_storage_engine.cmake index b920f16452b..5424beca33a 100644 --- a/storage/mysql_storage_engine.cmake +++ b/storage/mysql_storage_engine.cmake @@ -38,6 +38,8 @@ IF(NOT SOURCE_SUBLIBS) IF(${engine}_LIBS) TARGET_LINK_LIBRARIES(${dyn_libname} ${${engine}_LIBS}) ENDIF(${engine}_LIBS) + # Install the plugin + INSTALL(TARGETS ${dyn_libname} DESTINATION lib/plugin COMPONENT runtime) MESSAGE("build ${engine} as DLL") ENDIF(${ENGINE_BUILD_TYPE} STREQUAL "STATIC") ENDIF(NOT SOURCE_SUBLIBS) diff --git a/storage/xtradb/handler/ha_innodb.cc b/storage/xtradb/handler/ha_innodb.cc index 40efa3e2c5c..8c439f65720 100644 --- a/storage/xtradb/handler/ha_innodb.cc +++ b/storage/xtradb/handler/ha_innodb.cc @@ -10404,7 +10404,7 @@ static MYSQL_SYSVAR_BOOL(recovery_stats, innobase_recovery_stats, "Output statistics of recovery process after it.", NULL, NULL, FALSE); -static MYSQL_SYSVAR_ULONG(use_purge_thread, srv_use_purge_thread, +static MYSQL_SYSVAR_ULINT(use_purge_thread, srv_use_purge_thread, PLUGIN_VAR_RQCMDARG | PLUGIN_VAR_READONLY, "Number of purge devoted threads. #### over 1 is EXPERIMENTAL ####", NULL, NULL, 1, 0, 64, 0); @@ -10559,7 +10559,7 @@ static MYSQL_SYSVAR_ULONG(stats_auto_update, srv_stats_auto_update, "(except for ANALYZE TABLE command) 0:disable 1:enable", NULL, NULL, 1, 0, 1, 0); -static MYSQL_SYSVAR_ULONG(stats_update_need_lock, srv_stats_update_need_lock, +static MYSQL_SYSVAR_ULINT(stats_update_need_lock, srv_stats_update_need_lock, PLUGIN_VAR_RQCMDARG, "Enable/Disable InnoDB's update statistics which needs to lock dictionary. " "e.g. Data_free.", @@ -10739,7 +10739,7 @@ static MYSQL_SYSVAR_ULONG(ibuf_accel_rate, srv_ibuf_accel_rate, "Tunes amount of insert buffer processing of background, in addition to innodb_io_capacity. (in percentage)", NULL, NULL, 100, 100, 999999999, 0); -static MYSQL_SYSVAR_ULONG(checkpoint_age_target, srv_checkpoint_age_target, +static MYSQL_SYSVAR_ULINT(checkpoint_age_target, srv_checkpoint_age_target, PLUGIN_VAR_RQCMDARG, "Control soft limit of checkpoint age. (0 : not control)", NULL, NULL, 0, 0, ~0UL, 0); @@ -10833,12 +10833,12 @@ static MYSQL_SYSVAR_ULONG(dict_size_limit, srv_dict_size_limit, "Limit the allocated memory for dictionary cache. (0: unlimited)", NULL, NULL, 0, 0, LONG_MAX, 0); -static MYSQL_SYSVAR_ULONG(relax_table_creation, srv_relax_table_creation, +static MYSQL_SYSVAR_ULINT(relax_table_creation, srv_relax_table_creation, PLUGIN_VAR_RQCMDARG, "Relax limitation of column size at table creation as builtin InnoDB.", NULL, NULL, 0, 0, 1, 0); -static MYSQL_SYSVAR_ULONG(pass_corrupt_table, srv_pass_corrupt_table, +static MYSQL_SYSVAR_ULINT(pass_corrupt_table, srv_pass_corrupt_table, PLUGIN_VAR_RQCMDARG, "Pass corruptions of user tables as 'corrupt table' instead of not crashing itself, " "when used with file_per_table. " diff --git a/storage/xtradb/include/univ.i b/storage/xtradb/include/univ.i index 0d9417fab38..09b28ce72dd 100644 --- a/storage/xtradb/include/univ.i +++ b/storage/xtradb/include/univ.i @@ -326,10 +326,12 @@ macro ULINTPF. */ typedef unsigned __int64 ulint; #define ULINTPF "%I64u" typedef __int64 lint; +#define MYSQL_SYSVAR_ULINT MYSQL_SYSVAR_ULONGLONG #else typedef unsigned long int ulint; #define ULINTPF "%lu" typedef long int lint; +#define MYSQL_SYSVAR_ULINT MYSQL_SYSVAR_ULONG #endif #ifdef __WIN__ |