Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

WL#4738 streamline/simplify @@variable creation process

Bug#16565 mysqld --help --verbose does not order variablesBug#20413 sql_slave_skip_counter is not shown in show variables
Bug#20415 Output of mysqld --help --verbose is incomplete
Bug#25430 variable not found in SELECT @@global.ft_max_word_len;
Bug#32902 plugin variables don't know their names
Bug#34599 MySQLD Option and Variable Reference need to be consistent in formatting!
Bug#34829 No default value for variable and setting default does not raise error
Bug#34834 ? Is accepted as a valid sql mode
Bug#34878 Few variables have default value according to documentation but error occurs  
Bug#34883 ft_boolean_syntax cant be assigned from user variable to global var.
Bug#37187 `INFORMATION_SCHEMA`.`GLOBAL_VARIABLES`: inconsistent status
Bug#40988 log_output_basic.test succeeded though syntactically false.
Bug#41010 enum-style command-line options are not honoured (maria.maria-recover fails)
Bug#42103 Setting key_buffer_size to a negative value may lead to very large allocations 
Bug#44691 Some plugins configured as MYSQL_PLUGIN_MANDATORY in can be disabled
Bug#44797 plugins w/o command-line options have no disabling option in --help
Bug#46314 string system variables don't support expressions
Bug#46470 sys_vars.max_binlog_cache_size_basic_32 is broken
Bug#46586 When using the plugin interface the type "set" for options caused a crash.
Bug#47212 Crash in DBUG_PRINT in mysqltest.cc when trying to print octal number
Bug#48758 mysqltest crashes on sys_vars.collation_server_basic in gcov builds
Bug#49417 some complaints about mysqld --help --verbose output
Bug#49540 DEFAULT value of binlog_format isn't the default value
Bug#49640 ambiguous option '--skip-skip-myisam' (double skip prefix)
Bug#49644 init_connect and \0
Bug#49645 init_slave and multi-byte characters
Bug#49646 mysql --show-warnings crashes when server dies

--BZR--
revision-id: serg@mysql.com-20091222093556-8aocy9n92pdp0rwr
property-branch-nick: next-mr
property-file-info: ld7:file_id67:sp1f-cmakelists.txt-20060831175236-433hkm7nrqfjbwios4ancgytabw354nr7:message78:Bug#44691 Some plugins configured as MYSQL_PLUGIN_MANDATORY in can be disabled4:path14:CMakeLists.txted7:file_id61:sp1f-mysql.cc-19700101030959-5sipizk7ehvbsi3tywrkdords5qy5zdl7:message49:don't crash with --show-warnings when mysqld dies4:path15:client/mysql.cced7:file_id63:sp1f-plugins.m4-20060413204924-cltp6uagmyygsgdno6od3mamfizdhk3m7:message78:Bug#44691 Some plugins configured as MYSQL_PLUGIN_MANDATORY in can be disabled4:path27:config/ac-macros/plugins.m4ed7:file_id64:sp1f-my_getopt.h-20020125212018-wxrgonczg7uaw6w5ohby34eicbbwehct7:message8:comments4:path19:include/my_getopt.hed7:file_id65:sp1f-my_pthread.h-19700101030959-z4yp3kljwx5fgmhlyvumtwxuw73xgrjn7:message18:fix double #define4:path20:include/my_pthread.hed7:file_id68:sp1f-mysqltestrun.pl-20041230152716-xjnn5ndv4rr4by6ijmj5a4ysubxc7qh37:message139:run sys_vars suite by default
property-file-info: properly recognize envirinment variables (e.g. MTR_MAX_SAVE_CORE) set to 0
property-file-info: escape gdb command line arguments
property-file-info: 4:path28:mysql-test/mysql-test-run.pled7:file_id73:sp1f-rpl_init_slave_func.-20080410131339-djufckm4jdu5xgujdb5qzuy3ivizgxb57:message19:init_slave+utf8 bug4:path54:mysql-test/suite/sys_vars/r/rpl_init_slave_func.resulted7:file_id73:sp1f-rpl_init_slave_func.-20080410131404-csmwductd27vdj4dvuwfrskzeygtmcjm7:message19:init_slave+utf8 bug4:path52:mysql-test/suite/sys_vars/t/rpl_init_slave_func.tested7:file_id64:sp1f-my_getopt.c-20020125212008-5ppwsdqmfhny46gxkjxph22zh3phetir7:message241:Bug#34599 MySQLD Option and Variable Reference need to be consistent in formatting!
property-file-info: Bug#46586 When using the plugin interface the type "set" for options caused a crash.
property-file-info: Bug#49640 ambiguous option '--skip-skip-myisam' (double skip prefix)
property-file-info: 
property-file-info: 
property-file-info: 
property-file-info: 4:path17:mysys/my_getopt.ced7:file_id62:sp1f-typelib.c-19700101030959-yks6u7xso4ru4dpd6v7uq7ynmxg6wsgt7:message19:support for flagset4:path15:mysys/typelib.ced7:file_id69:sp1f-ha_ndbcluster.cc-20040414175836-rvqnoxrkqexyhfu3d62s4t345ip7rez27:message24:backport from telco tree4:path20:sql/ha_ndbcluster.cced7:file_id65:sp1f-item_func.cc-19700101030959-3wmsx76yvc25sroqpfrx2n77kqdxxn3y7:message76:Bug#49644 init_connect and \0
property-file-info: Bug#49645 init_slave and multi-byte characters4:path16:sql/item_func.cced7:file_id70:sp1f-sql_builtin.cc.in-20060413204924-2uqxqmqkyuh3wtmodadlo23ag3lchfp67:message78:Bug#44691 Some plugins configured as MYSQL_PLUGIN_MANDATORY in can be disabled4:path21:sql/sql_builtin.cc.ined7:file_id66:sp1f-sql_plugin.cc-20051105112032-hrm64p6xfjq33ud6zy3uivpo7azm75a27:message206:Bug#44691 Some plugins configured as MYSQL_PLUGIN_MANDATORY in can be disabled
property-file-info: Bug#32902 plugin variables don't know their names
property-file-info: Bug#44797 plugins w/o command-line options have no disabling option in --help4:path17:sql/sql_plugin.cced7:file_id48:set_var_new.cc-20090803110928-jyk836zs40b2z8e3-17:message37:all server variables are defined here4:path15:sql/sys_vars.cced7:file_id64:sp1f-ft_parser.c-19700101030959-goim35zn24ujo7rbznobwhhw5r3lemab7:message41:remove unnecessary updates of param->quot4:path26:storage/myisam/ft_parser.ced7:file_id65:sp1f-ha_myisam.cc-19700101030959-7xzssylbn7zfz3nupnsw43wws6xlltsu7:message30:myisam_* variables belong here4:path27:storage/myisam/ha_myisam.cced7:file_id67:sp1f-my_vsnprintf.c-19700101030959-tpt7gim7wclzegsmsqqysncmxhlmjrhp7:message11:%o and %llx4:path22:strings/my_vsnprintf.ced7:file_id49:my_vsnprintft.c-20091103211307-yk0d3oji7urlqwij-17:message17:%o and %llx tests4:path31:unittest/mysys/my_vsnprintf-t.ced7:file_id63:sp1f-viotcpip.c-20010520120437-u3pbzbt3fdfbclbmusalnzmuqh2y4nav7:message74:bugfix: fix @@wait_timeout to work with socket timeouts (vs. alarm thread)4:path15:vio/viosocket.cee
testament3-sha1: 64feb1d92f8cf79db094ba97cef901d82ad6bdc0
  • Loading branch information...
commit c0d8d3d853505af0ca9ca330f26be5c08160acf2 1 parent 4dbc004
Sergei Golubchik authored
Showing with 4,534 additions and 2,795 deletions.
  1. BIN  .bzrfileids
  2. +2 −0  .bzrignore
  3. +7 −3 CMakeLists.txt
  4. +0 −4 Makefile.am
  5. +2 −2 client/mysql.cc
  6. +5 −2 client/mysqltest.cc
  7. +5 −1 config/ac-macros/plugins.m4
  8. +3 −3 configure.in
  9. +1 −1  include/config-netware.h
  10. +2 −4 include/config-win.h
  11. +3 −1 include/ft_global.h
  12. +4 −4 include/keycache.h
  13. +10 −2 include/m_string.h
  14. +0 −11 include/my_base.h
  15. +35 −16 include/my_getopt.h
  16. +32 −7 include/my_global.h
  17. +1 −2  include/my_pthread.h
  18. +3 −3 include/my_time.h
  19. +1 −1  include/myisam.h
  20. +4 −0 include/mysql.h.pp
  21. +1 −0  include/mysql/plugin.h
  22. +1 −0  include/mysql/plugin.h.pp
  23. +1 −1  include/mysql/service_my_snprintf.h
  24. +3 −3 include/sslopt-longopts.h
  25. +5 −0 include/typelib.h
  26. +2 −1  libmysqld/CMakeLists.txt
  27. +2 −2 libmysqld/Makefile.am
  28. +4 −1 libmysqld/lib_sql.cc
  29. +2 −1  mysql-test/Makefile.am
  30. +1 −1  mysql-test/collections/mysql-next-mr.push
  31. +1 −3 mysql-test/extra/rpl_tests/rpl_charset.test
  32. +1 −0  mysql-test/include/diff_tables.inc
  33. +10 −0 mysql-test/include/have_thread_concurrency.inc
  34. +1 −1  mysql-test/include/index_merge1.inc
  35. +39 −0 mysql-test/include/mysqld--help.inc
  36. +1 −1  mysql-test/include/query_cache.inc
  37. +5 −5 mysql-test/include/query_cache_sql_prepare.inc
  38. +1 −1  mysql-test/include/show_slave_status2.inc
  39. +36 −16 mysql-test/mysql-test-run.pl
  40. +1 −1  mysql-test/r/archive.result
  41. +2 −0  mysql-test/r/bug46080.result
  42. +1 −1  mysql-test/r/cache_innodb.result
  43. +1 −1  mysql-test/r/change_user.result
  44. +0 −65 mysql-test/r/date_formats.result
  45. +4 −4 mysql-test/r/errors.result
  46. +0 −6 mysql-test/r/events_2.result
  47. +5 −6 mysql-test/r/events_bugs.result
  48. +1 −1  mysql-test/r/have_profiling.require
  49. +1 −4 mysql-test/r/index_merge_myisam.result
  50. +2 −2 mysql-test/r/innodb.result
  51. +2 −2 mysql-test/r/innodb_bug42101-nonzero.result
  52. +2 −2 mysql-test/r/innodb_bug42101.result
  53. +19 −2 mysql-test/r/key_cache.result
  54. +947 −0 mysql-test/r/mysqld--help-notwin.result
  55. +953 −0 mysql-test/r/mysqld--help-win.result
  56. +1 −3 mysql-test/r/partition_key_cache.result
  57. +3 −3 mysql-test/r/plugin.result
  58. +0 −2  mysql-test/r/profiling.result
  59. +7 −5 mysql-test/r/query_cache.result
  60. +5 −5 mysql-test/r/query_cache_ps_no_prot.result
  61. +5 −5 mysql-test/r/query_cache_ps_ps_prot.result
  62. +2 −2 mysql-test/r/select_safe.result
  63. +3 −6 mysql-test/r/sp.result
  64. +0 −2  mysql-test/r/subselect.result
  65. +2 −0  mysql-test/r/union.result
  66. +1 −1  mysql-test/r/user_limits.result
  67. +0 −2  mysql-test/r/user_var.result
  68. +52 −47 mysql-test/r/variables.result
  69. +0 −4 mysql-test/suite/binlog/r/binlog_grant.result
  70. +0 −4 mysql-test/suite/binlog/t/binlog_grant.test
  71. +6 −6 mysql-test/suite/innodb/r/innodb-zip.result
  72. +4 −4 mysql-test/suite/innodb/r/innodb_bug47167.result
  73. +6 −6 mysql-test/suite/innodb/r/innodb_file_format.result
  74. +6 −6 mysql-test/suite/innodb/t/innodb-zip.test
  75. +4 −4 mysql-test/suite/innodb/t/innodb_bug47167.test
  76. +6 −6 mysql-test/suite/innodb/t/innodb_file_format.test
  77. +4 −0 mysql-test/suite/ndb/r/ndb_basic.result
  78. +1 −0  mysql-test/suite/ndb/r/ndb_dd_ddl.result
  79. +1 −0  mysql-test/suite/ndb/t/ndb_dd_ddl.test
  80. +1 −2  mysql-test/suite/rpl/r/rpl_charset.result
  81. +1 −1  mysql-test/suite/rpl/r/rpl_heartbeat.result
  82. +1 −1  mysql-test/suite/rpl/r/rpl_heartbeat_basic.result
  83. +1 −1  mysql-test/suite/rpl/r/rpl_idempotency.result
  84. +2 −0  mysql-test/suite/rpl/r/rpl_row_max_relay_size.result
  85. +2 −0  mysql-test/suite/rpl/r/rpl_stm_max_relay_size.result
  86. +1 −1  mysql-test/suite/rpl/r/rpl_switch_stm_row_mixed.result
  87. +0 −5 mysql-test/suite/rpl/r/rpl_variables_stm.result
  88. +1 −1  mysql-test/suite/rpl/t/rpl_idempotency.test
  89. +1 −1  mysql-test/suite/rpl/t/rpl_sp_effects-master.opt
  90. +1 −1  mysql-test/suite/rpl/t/rpl_sp_effects-slave.opt
  91. +0 −5 mysql-test/suite/rpl/t/rpl_variables_stm.test
  92. +1 −0  mysql-test/suite/rpl_ndb/r/rpl_ndb_2innodb.result
  93. +1 −0  mysql-test/suite/rpl_ndb/r/rpl_ndb_2myisam.result
  94. +1 −0  mysql-test/suite/rpl_ndb/t/rpl_ndb_2innodb.test
  95. +1 −0  mysql-test/suite/rpl_ndb/t/rpl_ndb_2myisam.test
  96. +0 −3  mysql-test/suite/sys_vars/README
  97. +0 −1  mysql-test/suite/sys_vars/inc/bulk_insert_buffer_size_basic.inc
  98. +0 −1  mysql-test/suite/sys_vars/inc/delayed_insert_limit_basic.inc
  99. +0 −1  mysql-test/suite/sys_vars/inc/delayed_queue_size_basic.inc
  100. +16 −43 mysql-test/suite/sys_vars/inc/join_buffer_size_basic.inc
  101. +0 −7 mysql-test/suite/sys_vars/inc/key_cache_age_threshold_basic.inc
  102. +4 −5 mysql-test/suite/sys_vars/inc/log_warnings_basic.inc
  103. +0 −4 mysql-test/suite/sys_vars/inc/max_connect_errors_basic.inc
  104. +4 −5 mysql-test/suite/sys_vars/inc/max_seeks_for_key_basic.inc
  105. +4 −4 mysql-test/suite/sys_vars/inc/max_tmp_tables_basic.inc
  106. +2 −2 mysql-test/suite/sys_vars/inc/max_write_lock_count_basic.inc
  107. +4 −5 mysql-test/suite/sys_vars/inc/min_examined_row_limit_basic.inc
  108. +2 −7 mysql-test/suite/sys_vars/inc/myisam_max_sort_file_size_basic.inc
  109. +4 −5 mysql-test/suite/sys_vars/inc/myisam_repair_threads_basic.inc
  110. +4 −5 mysql-test/suite/sys_vars/inc/myisam_sort_buffer_size_basic.inc
  111. +4 −6 mysql-test/suite/sys_vars/inc/net_retry_count_basic.inc
  112. +6 −11 mysql-test/suite/sys_vars/inc/query_alloc_block_size_basic.inc
  113. +0 −1  mysql-test/suite/sys_vars/inc/query_cache_limit_basic.inc
  114. +0 −3  mysql-test/suite/sys_vars/inc/query_cache_min_res_unit_basic.inc
  115. +0 −4 mysql-test/suite/sys_vars/inc/query_cache_size_basic.inc
  116. +4 −7 mysql-test/suite/sys_vars/inc/range_alloc_block_size_basic.inc
  117. +2 −2 mysql-test/suite/sys_vars/inc/rpl_recovery_rank_basic.inc
  118. +2 −4 mysql-test/suite/sys_vars/inc/slave_transaction_retries_basic.inc
  119. +19 −25 mysql-test/suite/sys_vars/inc/sort_buffer_size_basic.inc
  120. +0 −6 mysql-test/suite/sys_vars/inc/transaction_alloc_block_size_basic.inc
  121. +0 −4 mysql-test/suite/sys_vars/inc/transaction_prealloc_size_basic.inc
  122. +12 −0 mysql-test/suite/sys_vars/r/all_vars.result
  123. +4 −5 mysql-test/suite/sys_vars/r/auto_increment_increment_basic.result
  124. +0 −3  mysql-test/suite/sys_vars/r/auto_increment_increment_func.result
  125. +0 −1  mysql-test/suite/sys_vars/r/auto_increment_offset_basic.result
  126. +0 −6 mysql-test/suite/sys_vars/r/auto_increment_offset_func.result
  127. +8 −9 mysql-test/suite/sys_vars/r/{auto_commit_basic.result → autocommit_basic.result}
  128. +0 −1  mysql-test/suite/sys_vars/r/autocommit_func.result
  129. +0 −1  mysql-test/suite/sys_vars/r/automatic_sp_privileges_basic.result
  130. +21 −0 mysql-test/suite/sys_vars/r/back_log_basic.result
  131. +5 −6 mysql-test/suite/sys_vars/r/big_tables_basic.result
  132. +6 −0 mysql-test/suite/sys_vars/r/binlog_cache_size_basic_32.result
  133. +8 −0 mysql-test/suite/sys_vars/r/binlog_cache_size_basic_64.result
  134. +0 −1  mysql-test/suite/sys_vars/r/bulk_insert_buffer_size_basic_32.result
  135. +0 −1  mysql-test/suite/sys_vars/r/bulk_insert_buffer_size_basic_64.result
  136. +2 −8 mysql-test/suite/sys_vars/r/character_set_client_basic.result
  137. +6 −7 mysql-test/suite/sys_vars/r/character_set_client_func.result
  138. +0 −3  mysql-test/suite/sys_vars/r/character_set_connection_basic.result
  139. +0 −2  mysql-test/suite/sys_vars/r/character_set_database_basic.result
  140. +0 −3  mysql-test/suite/sys_vars/r/character_set_database_func.result
  141. +0 −2  mysql-test/suite/sys_vars/r/character_set_filesystem_basic.result
  142. BIN  mysql-test/suite/sys_vars/r/character_set_results_basic.result
  143. +2 −7 mysql-test/suite/sys_vars/r/character_set_server_basic.result
  144. +21 −0 mysql-test/suite/sys_vars/r/character_sets_dir_basic.result
  145. +4 −1 mysql-test/suite/sys_vars/r/collation_database_basic.result
  146. +0 −2  mysql-test/suite/sys_vars/r/collation_database_func.result
  147. +43 −26 mysql-test/suite/sys_vars/r/completion_type_basic.result
  148. +38 −33 mysql-test/suite/sys_vars/r/concurrent_insert_basic.result
  149. +1 −1  mysql-test/suite/sys_vars/r/concurrent_insert_func.result
  150. +0 −1  mysql-test/suite/sys_vars/r/connect_timeout_basic.result
  151. +21 −0 mysql-test/suite/sys_vars/r/date_format_basic.result
  152. +21 −0 mysql-test/suite/sys_vars/r/datetime_format_basic.result
  153. +25 −0 mysql-test/suite/sys_vars/r/debug_basic.result
  154. +21 −0 mysql-test/suite/sys_vars/r/debug_sync_basic.result
  155. +117 −0 mysql-test/suite/sys_vars/r/default_storage_engine_basic.result
  156. +0 −1  mysql-test/suite/sys_vars/r/default_week_format_basic.result
  157. +2 −8 mysql-test/suite/sys_vars/r/delay_key_write_basic.result
  158. +0 −1  mysql-test/suite/sys_vars/r/delayed_insert_limit_basic_32.result
  159. +0 −1  mysql-test/suite/sys_vars/r/delayed_insert_limit_basic_64.result
  160. +0 −1  mysql-test/suite/sys_vars/r/delayed_insert_timeout_basic.result
  161. +0 −1  mysql-test/suite/sys_vars/r/delayed_queue_size_basic_32.result
  162. +0 −1  mysql-test/suite/sys_vars/r/delayed_queue_size_basic_64.result
  163. +0 −1  mysql-test/suite/sys_vars/r/div_precision_increment_basic.result
  164. +3 −4 mysql-test/suite/sys_vars/r/div_precision_increment_func.result
  165. +9 −15 mysql-test/suite/sys_vars/r/engine_condition_pushdown_basic.result
  166. +3 −2 mysql-test/suite/sys_vars/r/event_scheduler_basic.result
  167. +0 −1  mysql-test/suite/sys_vars/r/expire_logs_days_basic.result
  168. +1 −3 mysql-test/suite/sys_vars/r/flush_basic.result
  169. +41 −0 mysql-test/suite/sys_vars/r/flush_time_basic.result
  170. +10 −13 mysql-test/suite/sys_vars/r/foreign_key_checks_basic.result
  171. +0 −3  mysql-test/suite/sys_vars/r/foreign_key_checks_func.result
  172. +0 −3  mysql-test/suite/sys_vars/r/ft_boolean_syntax_basic.result
  173. +3 −4 mysql-test/suite/sys_vars/r/ft_boolean_syntax_func.result
  174. +21 −0 mysql-test/suite/sys_vars/r/ft_max_word_len_basic.result
  175. +21 −0 mysql-test/suite/sys_vars/r/ft_min_word_len_basic.result
  176. +21 −0 mysql-test/suite/sys_vars/r/ft_query_expansion_limit_basic.result
  177. +21 −0 mysql-test/suite/sys_vars/r/ft_stopword_file_basic.result
  178. +4 −3 mysql-test/suite/sys_vars/r/general_log_file_basic.result
  179. +8 −5 mysql-test/suite/sys_vars/r/general_log_func.result
  180. +4 −5 mysql-test/suite/sys_vars/r/group_concat_max_len_basic.result
  181. +21 −0 mysql-test/suite/sys_vars/r/have_profiling_basic.result
  182. +6 −3 mysql-test/suite/sys_vars/r/identity_basic.result
  183. +21 −0 mysql-test/suite/sys_vars/r/ignore_builtin_innodb_basic.result
  184. BIN  mysql-test/suite/sys_vars/r/init_connect_basic.result
  185. +21 −0 mysql-test/suite/sys_vars/r/init_file_basic.result
  186. +10 −10 mysql-test/suite/sys_vars/r/innodb_autoextend_increment_basic.result
  187. +7 −36 mysql-test/suite/sys_vars/r/innodb_commit_concurrency_basic.result
  188. +8 −6 ...uite/sys_vars/r/{innodb_concurrency_tickets_basic_64.result → innodb_concurrency_tickets_basic.result}
  189. +0 −100 mysql-test/suite/sys_vars/r/innodb_concurrency_tickets_basic_32.result
  190. +13 −13 mysql-test/suite/sys_vars/r/innodb_fast_shutdown_basic.result
  191. +5 −5 mysql-test/suite/sys_vars/r/innodb_flush_log_at_trx_commit_basic.result
  192. +5 −5 mysql-test/suite/sys_vars/r/innodb_max_dirty_pages_pct_basic.result
  193. +5 −3 mysql-test/suite/sys_vars/r/{innodb_max_purge_lag_basic_64.result → innodb_max_purge_lag_basic.result}
  194. +0 −94 mysql-test/suite/sys_vars/r/innodb_max_purge_lag_basic_32.result
  195. +13 −15 mysql-test/suite/sys_vars/r/innodb_support_xa_basic.result
  196. +5 −3 ...l-test/suite/sys_vars/r/{innodb_sync_spin_loops_basic_64.result → innodb_sync_spin_loops_basic.result}
  197. +0 −94 mysql-test/suite/sys_vars/r/innodb_sync_spin_loops_basic_32.result
  198. +11 −13 mysql-test/suite/sys_vars/r/innodb_table_locks_basic.result
  199. +5 −5 mysql-test/suite/sys_vars/r/innodb_thread_concurrency_basic.result
  200. +6 −3 mysql-test/suite/sys_vars/r/insert_id_basic.result
  201. +4 −5 mysql-test/suite/sys_vars/r/interactive_timeout_basic.result
  202. +45 −70 mysql-test/suite/sys_vars/r/join_buffer_size_basic_32.result
  203. +53 −70 mysql-test/suite/sys_vars/r/join_buffer_size_basic_64.result
  204. +4 −7 mysql-test/suite/sys_vars/r/keep_files_on_create_basic.result
  205. +17 −42 mysql-test/suite/sys_vars/r/{key_buffer_size_basic_32.result → key_buffer_size_basic.result}
  206. +0 −100 mysql-test/suite/sys_vars/r/key_buffer_size_basic_64.result
  207. +1 −2  mysql-test/suite/sys_vars/r/key_buffer_size_func.result
  208. +11 −12 mysql-test/suite/sys_vars/r/key_cache_age_threshold_basic_32.result
  209. +15 −10 mysql-test/suite/sys_vars/r/key_cache_age_threshold_basic_64.result
  210. +9 −10 mysql-test/suite/sys_vars/r/{key_cache_block_size_basic_64.result → key_cache_block_size_basic.result}
  211. +0 −142 mysql-test/suite/sys_vars/r/key_cache_block_size_basic_32.result
  212. +5 −9 ...st/suite/sys_vars/r/{key_cache_division_limit_basic_64.result → key_cache_division_limit_basic.result}
  213. +0 −139 mysql-test/suite/sys_vars/r/key_cache_division_limit_basic_32.result
  214. +21 −0 mysql-test/suite/sys_vars/r/large_files_support_basic.result
  215. +21 −0 mysql-test/suite/sys_vars/r/large_page_size_basic.result
  216. +21 −0 mysql-test/suite/sys_vars/r/large_pages_basic.result
  217. +27 −0 mysql-test/suite/sys_vars/r/last_insert_id_basic.result
  218. +46 −0 mysql-test/suite/sys_vars/r/lc_messages_basic.result
  219. +21 −0 mysql-test/suite/sys_vars/r/lc_messages_dir_basic.result
  220. +19 −3 mysql-test/suite/sys_vars/r/lc_time_names_basic.result
  221. +21 −0 mysql-test/suite/sys_vars/r/locked_in_memory_basic.result
  222. +6 −4 mysql-test/suite/sys_vars/r/log_basic.result
  223. +21 −0 mysql-test/suite/sys_vars/r/log_bin_basic.result
  224. +2 −6 mysql-test/suite/sys_vars/r/log_bin_trust_function_creators_basic.result
  225. +0 −121 mysql-test/suite/sys_vars/r/log_bin_trust_routine_creators_basic.result
  226. +21 −0 mysql-test/suite/sys_vars/r/log_error_basic.result
  227. +3 −31 mysql-test/suite/sys_vars/r/log_output_basic.result
  228. +1 −32 mysql-test/suite/sys_vars/r/log_queries_not_using_indexes_basic.result
  229. +21 −0 mysql-test/suite/sys_vars/r/log_slave_updates_basic.result
  230. +112 −0 mysql-test/suite/sys_vars/r/log_slow_queries_basic.result
  231. +4 −5 mysql-test/suite/sys_vars/r/log_warnings_basic_32.result
  232. +4 −5 mysql-test/suite/sys_vars/r/log_warnings_basic_64.result
  233. +16 −8 mysql-test/suite/sys_vars/r/long_query_time_basic.result
  234. +4 −8 mysql-test/suite/sys_vars/r/low_priority_updates_basic.result
  235. +21 −0 mysql-test/suite/sys_vars/r/lower_case_file_system_basic.result
  236. +21 −0 mysql-test/suite/sys_vars/r/lower_case_table_names_basic.result
  237. +9 −7 mysql-test/suite/sys_vars/r/max_allowed_packet_basic.result
  238. +18 −11 mysql-test/suite/sys_vars/r/{max_binlog_cache_size_basic_32.result → max_binlog_cache_size_basic.result}
  239. +0 −141 mysql-test/suite/sys_vars/r/max_binlog_cache_size_basic_64.result
  240. +10 −3 mysql-test/suite/sys_vars/r/max_binlog_size_basic.result
  241. +0 −3  mysql-test/suite/sys_vars/r/max_connect_errors_basic_32.result
  242. +0 −3  mysql-test/suite/sys_vars/r/max_connect_errors_basic_64.result
  243. +0 −3  mysql-test/suite/sys_vars/r/max_connections_basic.result
  244. +18 −16 mysql-test/suite/sys_vars/r/max_delayed_threads_basic.result
  245. +4 −6 mysql-test/suite/sys_vars/r/max_error_count_basic.result
  246. +26 −17 mysql-test/suite/sys_vars/r/{max_heap_table_size_basic_32.result → max_heap_table_size_basic.result}
  247. +0 −196 mysql-test/suite/sys_vars/r/max_heap_table_size_basic_64.result
  248. +36 −35 mysql-test/suite/sys_vars/r/max_insert_delayed_threads_basic.result
  249. +51 −0 mysql-test/suite/sys_vars/r/max_join_size_basic.result
  250. +4 −4 mysql-test/suite/sys_vars/r/max_length_for_sort_data_basic.result
  251. +0 −1  mysql-test/suite/sys_vars/r/max_prepared_stmt_count_basic.result
  252. +12 −3 mysql-test/suite/sys_vars/r/max_relay_log_size_basic.result
  253. +4 −5 mysql-test/suite/sys_vars/r/max_seeks_for_key_basic_32.result
  254. +4 −5 mysql-test/suite/sys_vars/r/max_seeks_for_key_basic_64.result
  255. +4 −4 mysql-test/suite/sys_vars/r/max_sort_length_basic.result
  256. +4 −4 mysql-test/suite/sys_vars/r/max_sp_recursion_depth_basic.result
  257. +4 −4 mysql-test/suite/sys_vars/r/max_tmp_tables_basic_32.result
  258. +4 −4 mysql-test/suite/sys_vars/r/max_tmp_tables_basic_64.result
  259. +21 −19 mysql-test/suite/sys_vars/r/max_user_connections_basic.result
  260. +2 −2 mysql-test/suite/sys_vars/r/max_write_lock_count_basic_32.result
  261. +2 −2 mysql-test/suite/sys_vars/r/max_write_lock_count_basic_64.result
  262. +18 −0 mysql-test/suite/sys_vars/r/maximum_basic.result
  263. +4 −5 mysql-test/suite/sys_vars/r/min_examined_row_limit_basic_32.result
  264. +4 −5 mysql-test/suite/sys_vars/r/min_examined_row_limit_basic_64.result
  265. +2 −3 mysql-test/suite/sys_vars/r/myisam_data_pointer_size_basic.result
  266. +1 −0  mysql-test/suite/sys_vars/r/myisam_data_pointer_size_func.result
  267. +16 −4 mysql-test/suite/sys_vars/r/myisam_max_sort_file_size_basic_32.result
  268. +16 −4 mysql-test/suite/sys_vars/r/myisam_max_sort_file_size_basic_64.result
  269. +21 −0 mysql-test/suite/sys_vars/r/myisam_mmap_size_basic.result
  270. +21 −0 mysql-test/suite/sys_vars/r/myisam_recover_options_basic.result
  271. +4 −4 mysql-test/suite/sys_vars/r/myisam_repair_threads_basic_32.result
  272. +4 −4 mysql-test/suite/sys_vars/r/myisam_repair_threads_basic_64.result
  273. +0 −184 mysql-test/suite/sys_vars/r/myisam_sort_buffer_size_basic.result
  274. +4 −4 mysql-test/suite/sys_vars/r/myisam_sort_buffer_size_basic_32.result
  275. +4 −4 mysql-test/suite/sys_vars/r/myisam_sort_buffer_size_basic_64.result
  276. +1 −29 mysql-test/suite/sys_vars/r/myisam_stats_method_basic.result
  277. +21 −0 mysql-test/suite/sys_vars/r/named_pipe_basic.result
  278. +11 −5 mysql-test/suite/sys_vars/r/net_buffer_length_basic.result
  279. +4 −5 mysql-test/suite/sys_vars/r/net_read_timeout_basic.result
  280. +4 −5 mysql-test/suite/sys_vars/r/net_retry_count_basic_32.result
  281. +4 −5 mysql-test/suite/sys_vars/r/net_retry_count_basic_64.result
  282. +4 −5 mysql-test/suite/sys_vars/r/net_write_timeout_basic.result
  283. +4 −7 mysql-test/suite/sys_vars/r/new_basic.result
  284. +40 −0 mysql-test/suite/sys_vars/r/old_alter_table_basic.result
  285. +21 −0 mysql-test/suite/sys_vars/r/old_basic.result
  286. +4 −7 mysql-test/suite/sys_vars/r/old_passwords_basic.result
  287. +21 −0 mysql-test/suite/sys_vars/r/open_files_limit_basic.result
  288. +2 −3 mysql-test/suite/sys_vars/r/optimizer_prune_level_basic.result
  289. +4 −5 mysql-test/suite/sys_vars/r/optimizer_search_depth_basic.result
  290. +54 −0 mysql-test/suite/sys_vars/r/optimizer_switch_basic.result
  291. +21 −0 mysql-test/suite/sys_vars/r/pid_file_basic.result
  292. +21 −0 mysql-test/suite/sys_vars/r/plugin_dir_basic.result
  293. +21 −0 mysql-test/suite/sys_vars/r/port_basic.result
  294. +4 −5 mysql-test/suite/sys_vars/r/preload_buffer_size_basic.result
  295. +40 −0 mysql-test/suite/sys_vars/r/profiling_basic.result
  296. +50 −0 mysql-test/suite/sys_vars/r/profiling_history_size_basic.result
  297. +21 −0 mysql-test/suite/sys_vars/r/protocol_version_basic.result
  298. +27 −0 mysql-test/suite/sys_vars/r/pseudo_thread_id_basic.result
  299. +17 −14 mysql-test/suite/sys_vars/r/query_alloc_block_size_basic_32.result
  300. +25 −12 mysql-test/suite/sys_vars/r/query_alloc_block_size_basic_64.result
Sorry, we could not display the entire diff because too many files (759) changed.
View
BIN  .bzrfileids
Binary file not shown
View
2  .bzrignore
@@ -3070,3 +3070,5 @@ libmysqld/rpl_handler.cc
libmysqld/debug_sync.cc
libmysqld/rpl_handler.cc
dbug/tests
+libmysqld/sys_vars.cc
+libmysqld/keycaches.cc
View
10 CMakeLists.txt
@@ -255,7 +255,11 @@ FOREACH(SUBDIR ${STORAGE_SUBDIRS})
SET(ENGINE_BUILD_TYPE "NONE")
ENDIF(WITH_${ENGINE}_STORAGE_ENGINE AND MYSQL_PLUGIN_STATIC)
IF (ENGINE_BUILD_TYPE STREQUAL "STATIC")
- SET (mysql_plugin_defs "${mysql_plugin_defs},builtin_${ENGINE_LOWER}_plugin")
+ IF(MYSQL_PLUGIN_MANDATORY)
+ SET (mysql_mandatory_plugins "${mysql_mandatory_plugins}builtin_${ENGINE_LOWER}_plugin,")
+ ELSE(MYSQL_PLUGIN_MANDATORY)
+ SET (mysql_optional_plugins "${mysql_optional_plugins}builtin_${ENGINE_LOWER}_plugin,")
+ ENDIF(MYSQL_PLUGIN_MANDATORY)
SET (MYSQLD_STATIC_ENGINE_LIBS ${MYSQLD_STATIC_ENGINE_LIBS} ${ENGINE_LOWER})
SET (STORAGE_ENGINE_DEFS "${STORAGE_ENGINE_DEFS} -DWITH_${ENGINE}_STORAGE_ENGINE")
SET (WITH_${ENGINE}_STORAGE_ENGINE TRUE)
@@ -274,12 +278,12 @@ ENDFOREACH(SUBDIR ${STORAGE_SUBDIRS})
# Special handling for partition(not really pluggable)
IF(NOT WITHOUT_PARTITION_STORAGE_ENGINE)
SET (STORAGE_ENGINE_DEFS "${STORAGE_ENGINE_DEFS} -DWITH_PARTITION_STORAGE_ENGINE")
- SET (mysql_plugin_defs "${mysql_plugin_defs},builtin_partition_plugin")
+ SET (mysql_optional_plugins "${mysql_optional_plugins}builtin_partition_plugin,")
ENDIF(NOT WITHOUT_PARTITION_STORAGE_ENGINE)
ADD_DEFINITIONS(${STORAGE_ENGINE_DEFS})
-# Now write out our mysql_plugin_defs struct
+# Now write out our mysql_mandatory_plugins/mysql_optional_plugins structs
CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/sql/sql_builtin.cc.in
${CMAKE_SOURCE_DIR}/sql/sql_builtin.cc @ONLY)
View
4 Makefile.am
@@ -204,10 +204,6 @@ test-bt-debug:
@PERL@ ./mysql-test-run.pl --comment=debug --force --timer \
--skip-ndbcluster --skip-rpl --report-features $(EXP)
-test-bt-debug-fast:
-
-test-bt-debug-fast:
-
# Keep these for a while
test-pl: test
test-full-pl: test-full
View
4 client/mysql.cc
@@ -100,7 +100,7 @@ extern "C" {
#define vidattr(A) {} // Can't get this to work
#endif
-#ifdef FN_NO_CASE_SENCE
+#ifdef FN_NO_CASE_SENSE
#define cmp_database(cs,A,B) my_strcasecmp((cs), (A), (B))
#else
#define cmp_database(cs,A,B) strcmp((A),(B))
@@ -3652,7 +3652,7 @@ static void print_warnings()
mysql_store_result_for_lazy(&result);
/* Bail out when no warnings */
- if (!(num_rows= mysql_num_rows(result)))
+ if (!result || !(num_rows= mysql_num_rows(result)))
goto end;
cur= mysql_fetch_row(result);
View
7 client/mysqltest.cc
@@ -2227,7 +2227,7 @@ do_result_format_version(struct st_command *command)
long version;
static DYNAMIC_STRING ds_version;
const struct command_arg result_format_args[] = {
- "version", ARG_STRING, TRUE, &ds_version, "Version to use",
+ {"version", ARG_STRING, TRUE, &ds_version, "Version to use"}
};
DBUG_ENTER("do_result_format_version");
@@ -6154,6 +6154,8 @@ void init_win_path_patterns()
"$MYSQL_TMP_DIR",
"$MYSQLTEST_VARDIR",
"$MASTER_MYSOCK",
+ "$MYSQL_SHAREDIR",
+ "$MYSQL_LIBDIR",
"./test/" };
int num_paths= sizeof(paths)/sizeof(char*);
int i;
@@ -7102,7 +7104,7 @@ int util_query(MYSQL* org_mysql, const char* query){
cur_con->util_mysql= mysql;
}
- return mysql_query(mysql, query);
+ DBUG_RETURN(mysql_query(mysql, query));
}
@@ -7740,6 +7742,7 @@ int main(int argc, char **argv)
cur_file->file_name= my_strdup("<stdin>", MYF(MY_WME));
cur_file->lineno= 1;
}
+ var_set_string("MYSQLTEST_FILE", cur_file->file_name);
init_re();
ps_protocol_enabled= ps_protocol;
sp_protocol_enabled= sp_protocol;
View
6 config/ac-macros/plugins.m4
@@ -460,7 +460,11 @@ dnl Although this is "pretty", it breaks libmysqld build
])
])
])
- mysql_plugin_defs="$mysql_plugin_defs, [builtin_]$2[_plugin]"
+ m4_ifdef([$9],[
+ mysql_mandatory_plugins="$mysql_mandatory_plugins [builtin_]$2[_plugin],"
+ ],[
+ mysql_optional_plugins="$mysql_optional_plugins [builtin_]$2[_plugin],"
+ ])
[with_plugin_]$2=yes
AC_MSG_RESULT([yes])
m4_ifdef([$11],[
View
6 configure.in
@@ -2875,7 +2875,7 @@ case $SYSTEM_TYPE in
fi
# if there is no readline, but we want to build with readline, we fail
- if [test "$want_to_use_readline" = "yes"] && [test ! -d "./cmd-line-utils/readline"]
+ if [test "$want_to_use_readline" = "yes"] && [test ! -d "$srcdir/cmd-line-utils/readline"]
then
AC_MSG_ERROR([This commercially licensed MySQL source package can't
be built with libreadline. Please use --with-libedit to use
@@ -3015,8 +3015,8 @@ AC_SUBST(server_scripts)
AC_SUBST(mysql_plugin_dirs)
AC_SUBST(mysql_plugin_libs)
-AC_SUBST(mysql_plugin_defs)
-
+AC_SUBST(mysql_optional_plugins)
+AC_SUBST(mysql_mandatory_plugins)
# Now that sql_client_dirs and sql_server_dirs are stable, determine the union.
# We support client-only builds by "--without-server", but not vice versa,
View
2  include/config-netware.h
@@ -100,7 +100,7 @@ extern "C" {
#define USE_OLD_FUNCTIONS 1
/* no case sensitivity */
-#define FN_NO_CASE_SENCE 1
+#define FN_NO_CASE_SENSE 1
/* the thread alarm is not used */
#define DONT_USE_THR_ALARM 1
View
6 include/config-win.h
@@ -318,10 +318,8 @@ inline ulonglong double2ulonglong(double d)
#define strcasecmp stricmp
#define strncasecmp strnicmp
-#ifdef NOT_USED
#define HAVE_SNPRINTF /* Gave link error */
-#define _snprintf snprintf
-#endif
+#define snprintf _snprintf
#ifdef _MSC_VER
#define HAVE_LDIV /* The optimizer breaks in zortech for ldiv */
@@ -360,7 +358,7 @@ inline ulonglong double2ulonglong(double d)
#define FN_ROOTDIR "\\"
#define FN_DEVCHAR ':'
#define FN_NETWORK_DRIVES /* Uses \\ to indicate network drives */
-#define FN_NO_CASE_SENCE /* Files are not case-sensitive */
+#define FN_NO_CASE_SENSE /* Files are not case-sensitive */
#define OS_FILE_LIMIT UINT_MAX /* No limit*/
#define DO_NOT_REMOVE_THREAD_WRAPPERS
View
4 include/ft_global.h
@@ -28,6 +28,8 @@ extern "C" {
#define HA_FT_MAXBYTELEN 254
#define HA_FT_MAXCHARLEN (HA_FT_MAXBYTELEN/3)
+#define DEFAULT_FTB_SYNTAX "+ -><()~*:\"\"&|"
+
typedef struct st_ft_info FT_INFO;
struct _ft_vft
{
@@ -51,7 +53,7 @@ extern const char *ft_precompiled_stopwords[];
extern ulong ft_min_word_len;
extern ulong ft_max_word_len;
extern ulong ft_query_expansion_limit;
-extern char ft_boolean_syntax[15];
+extern const char *ft_boolean_syntax;
extern struct st_mysql_ftparser ft_default_parser;
int ft_init_stopwords(void);
View
8 include/keycache.h
@@ -87,10 +87,10 @@ typedef struct st_key_cache
initializing the key cache.
*/
- ulonglong param_buff_size; /* size the memory allocated for the cache */
- ulong param_block_size; /* size of the blocks in the key cache */
- ulong param_division_limit; /* min. percentage of warm blocks */
- ulong param_age_threshold; /* determines when hot block is downgraded */
+ ulonglong param_buff_size; /* size the memory allocated for the cache */
+ ulonglong param_block_size; /* size of the blocks in the key cache */
+ ulonglong param_division_limit; /* min. percentage of warm blocks */
+ ulonglong param_age_threshold; /* determines when hot block is downgraded */
/* Statistics variables. These are reset in reset_key_cache_counters(). */
ulong global_blocks_changed; /* number of currently dirty blocks */
View
12 include/m_string.h
@@ -215,7 +215,7 @@ extern char *str2int(const char *src,int radix,long lower,long upper,
long *val);
longlong my_strtoll10(const char *nptr, char **endptr, int *error);
#if SIZEOF_LONG == SIZEOF_LONG_LONG
-#define longlong2str(A,B,C) int2str((A),(B),(C),1)
+#define ll2str(A,B,C,D) int2str((A),(B),(C),(D))
#define longlong10_to_str(A,B,C) int10_to_str((A),(B),(C))
#undef strtoll
#define strtoll(A,B,C) strtol((A),(B),(C))
@@ -228,7 +228,7 @@ longlong my_strtoll10(const char *nptr, char **endptr, int *error);
#endif
#else
#ifdef HAVE_LONG_LONG
-extern char *longlong2str(longlong val,char *dst,int radix);
+extern char *ll2str(longlong val,char *dst,int radix, int upcase);
extern char *longlong10_to_str(longlong val,char *dst,int radix);
#if (!defined(HAVE_STRTOULL) || defined(NO_STRTOLL_PROTO))
extern longlong strtoll(const char *str, char **ptr, int base);
@@ -236,6 +236,7 @@ extern ulonglong strtoull(const char *str, char **ptr, int base);
#endif
#endif
#endif
+#define longlong2str(A,B,C) ll2str((A),(B),(C),1)
/* my_vsnprintf.c */
@@ -260,6 +261,13 @@ typedef struct st_mysql_lex_string LEX_STRING;
#define USTRING_WITH_LEN(X) ((uchar*) X), ((size_t) (sizeof(X) - 1))
#define C_STRING_WITH_LEN(X) ((char *) (X)), ((size_t) (sizeof(X) - 1))
+struct st_mysql_const_lex_string
+{
+ const char *str;
+ size_t length;
+};
+typedef struct st_mysql_const_lex_string LEX_CSTRING;
+
/* SPACE_INT is a word that contains only spaces */
#if SIZEOF_INT == 4
#define SPACE_INT 0x20202020
View
11 include/my_base.h
@@ -275,17 +275,6 @@ enum ha_base_keytype {
#define HA_USES_PARSER 16384 /* Fulltext index uses [pre]parser */
#define HA_USES_BLOCK_SIZE ((uint) 32768)
#define HA_SORT_ALLOWS_SAME 512 /* Intern bit when sorting records */
-#if MYSQL_VERSION_ID < 0x50200
-/*
- Key has a part that can have end space. If this is an unique key
- we have to handle it differently from other unique keys as we can find
- many matching rows for one key (because end space are not compared)
-*/
-#define HA_END_SPACE_KEY 0 /* was: 4096 */
-#else
-#error HA_END_SPACE_KEY is obsolete, please remove it
-#endif
-
/* These flags can be added to key-seg-flag */
View
51 include/my_getopt.h
@@ -32,6 +32,7 @@ C_MODE_START
#define GET_ENUM 12
#define GET_SET 13
#define GET_DOUBLE 14
+#define GET_FLAGSET 15
#define GET_ASK_ADDR 128
#define GET_TYPE_MASK 127
@@ -42,24 +43,40 @@ struct st_typelib;
struct my_option
{
- const char *name; /* Name of the option */
- int id; /* unique id or short option */
- const char *comment; /* option comment, for autom. --help */
- uchar **value; /* The variable value */
- uchar **u_max_value; /* The user def. max variable value */
- struct st_typelib *typelib; /* Pointer to possible values */
- ulong var_type;
- enum get_opt_arg_type arg_type;
- longlong def_value; /* Default value */
- longlong min_value; /* Min allowed value */
- longlong max_value; /* Max allowed value */
- longlong sub_size; /* Subtract this from given value */
- long block_size; /* Value should be a mult. of this */
- void *app_type; /* To be used by an application */
+ const char *name; /**< Name of the option. name=NULL
+ marks the end of the my_option[]
+ array.
+ */
+ int id; /**< For 0<id<255 it's means one
+ character for a short option
+ (like -A), if >255 no short option
+ is created, but a long option still
+ can be identified uniquely in the
+ my_get_one_option() callback.
+ If an opton needs neither special
+ treatment in the my_get_one_option()
+ nor one-letter short equivalent
+ use id=0
+ */
+ const char *comment; /**< option comment, for autom. --help.
+ if it's NULL the option is not
+ visible in --help.
+ */
+ uchar **value; /**< A pointer to the variable value */
+ uchar **u_max_value; /**< The user def. max variable value */
+ struct st_typelib *typelib; /**< Pointer to possible values */
+ ulong var_type; /**< GET_BOOL, GET_ULL, etc */
+ enum get_opt_arg_type arg_type; /**< e.g. REQUIRED_ARG or OPT_ARG */
+ longlong def_value; /**< Default value */
+ longlong min_value; /**< Min allowed value (for numbers) */
+ longlong max_value; /**< Max allowed value (for numbers) */
+ longlong sub_size; /**< Unused */
+ long block_size; /**< Value should be a mult. of this (for numbers) */
+ void *app_type; /**< To be used by an application */
};
-typedef my_bool (* my_get_one_option) (int, const struct my_option *, char * );
-typedef void (* my_error_reporter) (enum loglevel level, const char *format, ... );
+typedef my_bool (*my_get_one_option) (int, const struct my_option *, char * );
+typedef void (*my_error_reporter) (enum loglevel level, const char *format, ... );
extern char *disabled_my_option;
extern my_bool my_getopt_print_errors;
@@ -78,6 +95,8 @@ ulonglong getopt_ull_limit_value(ulonglong num, const struct my_option *optp,
my_bool *fix);
longlong getopt_ll_limit_value(longlong, const struct my_option *,
my_bool *fix);
+double getopt_double_limit_value(double num, const struct my_option *optp,
+ my_bool *fix);
my_bool getopt_compare_strings(const char *s, const char *t, uint length);
C_MODE_END
View
39 include/my_global.h
@@ -93,11 +93,35 @@
#define HAVE_PSI_INTERFACE
#endif /* WITH_PERFSCHEMA_STORAGE_ENGINE */
-/* Make it easier to add conditionl code for windows */
+/* Make it easier to add conditional code in _expressions_ */
#ifdef __WIN__
-#define IF_WIN(A,B) (A)
+#define IF_WIN(A,B) A
#else
-#define IF_WIN(A,B) (B)
+#define IF_WIN(A,B) B
+#endif
+
+#ifdef __NETWARE__
+#define IF_NETWARE(A,B) A
+#else
+#define IF_NETWARE(A,B) B
+#endif
+
+#ifndef DBUG_OFF
+#define IF_DBUG(A,B) A
+#else
+#define IF_DBUG(A,B) B
+#endif
+
+#ifdef HAVE_purify
+#define IF_PURIFY(A,B) A
+#else
+#define IF_PURIFY(A,B) B
+#endif
+
+#ifdef DISABLE_GRANT_OPTIONS
+#define IF_DISABLE_GRANT_OPTIONS(A,B) A
+#else
+#define IF_DISABLE_GRANT_OPTIONS(A,B) B
#endif
#ifndef EMBEDDED_LIBRARY
@@ -249,6 +273,8 @@
#define inline_test_2(X) inline_test_1(X)
#if inline_test_2(inline) != 1
#define HAVE_INLINE
+#else
+#warning No "inline" support in C, all "static inline" functions will be instantiated in every .o file!!!
#endif
#undef inline_test_2
#undef inline_test_1
@@ -489,8 +515,7 @@ C_MODE_END
#define compile_time_assert(X) \
do \
{ \
- char compile_time_assert[(X) ? 1 : -1] \
- __attribute__ ((unused)); \
+ typedef char compile_time_assert[(X) ? 1 : -1]; \
} while(0)
#endif
@@ -787,7 +812,7 @@ typedef SOCKET_SIZE_TYPE size_socket;
#endif
/* #define EXT_IN_LIBNAME */
-/* #define FN_NO_CASE_SENCE */
+/* #define FN_NO_CASE_SENSE */
/* #define FN_UPPER_CASE TRUE */
/*
@@ -810,7 +835,7 @@ typedef SOCKET_SIZE_TYPE size_socket;
/* Typical record cash */
#define RECORD_CACHE_SIZE (uint) (64*1024-MALLOC_OVERHEAD)
/* Typical key cash */
-#define KEY_CACHE_SIZE (uint) (8*1024*1024-MALLOC_OVERHEAD)
+#define KEY_CACHE_SIZE (uint) (8*1024*1024)
/* Default size of a key cache block */
#define KEY_CACHE_BLOCK_SIZE (uint) 1024
View
3  include/my_pthread.h
@@ -154,8 +154,7 @@ int pthread_join(pthread_t thread, void **value_ptr);
#define pthread_detach_this_thread()
#define pthread_condattr_init(A)
#define pthread_condattr_destroy(A)
-/* per the platform's documentation */
-#define pthread_yield() Sleep(0)
+#define pthread_yield() SwitchToThread()
#else /* Normal threads */
View
6 include/my_time.h
@@ -74,12 +74,12 @@ typedef long my_time_t;
TIME_MAX_MINUTE * 60L + TIME_MAX_SECOND)
my_bool check_date(const MYSQL_TIME *ltime, my_bool not_zero_date,
- ulong flags, int *was_cut);
+ ulonglong flags, int *was_cut);
enum enum_mysql_timestamp_type
str_to_datetime(const char *str, uint length, MYSQL_TIME *l_time,
- uint flags, int *was_cut);
+ ulonglong flags, int *was_cut);
longlong number_to_datetime(longlong nr, MYSQL_TIME *time_res,
- uint flags, int *was_cut);
+ ulonglong flags, int *was_cut);
ulonglong TIME_to_ulonglong_datetime(const MYSQL_TIME *);
ulonglong TIME_to_ulonglong_date(const MYSQL_TIME *);
ulonglong TIME_to_ulonglong_time(const MYSQL_TIME *);
View
2  include/myisam.h
@@ -251,7 +251,7 @@ typedef struct st_columndef /* column information */
extern char * myisam_log_filename; /* Name of logfile */
extern ulong myisam_block_size;
-extern ulong myisam_concurrent_insert;
+extern uint myisam_concurrent_insert;
extern my_bool myisam_flush,myisam_delay_key_write,myisam_single_user;
extern my_off_t myisam_max_temp_length;
extern ulong myisam_bulk_insert_tree_size, myisam_data_pointer_size;
View
4 include/mysql.h.pp
@@ -233,6 +233,10 @@
extern const char *get_type(TYPELIB *typelib,unsigned int nr);
extern TYPELIB *copy_typelib(MEM_ROOT *root, TYPELIB *from);
extern TYPELIB sql_protocol_typelib;
+my_ulonglong find_set_from_flags(const TYPELIB *lib, uint default_name,
+ my_ulonglong cur_set, my_ulonglong default_set,
+ const char *str, uint length,
+ char **err_pos, uint *err_len);
typedef struct st_mysql_rows {
struct st_mysql_rows *next;
MYSQL_ROW data;
View
1  include/mysql/plugin.h
@@ -675,6 +675,7 @@ struct st_mysql_value
const char *(*val_str)(struct st_mysql_value *, char *buffer, int *length);
int (*val_real)(struct st_mysql_value *, double *realbuf);
int (*val_int)(struct st_mysql_value *, long long *intbuf);
+ int (*is_unsigned)(struct st_mysql_value *);
};
View
1  include/mysql/plugin.h.pp
@@ -144,6 +144,7 @@
const char *(*val_str)(struct st_mysql_value *, char *buffer, int *length);
int (*val_real)(struct st_mysql_value *, double *realbuf);
int (*val_int)(struct st_mysql_value *, long long *intbuf);
+ int (*is_unsigned)(struct st_mysql_value *);
};
int thd_in_lock_tables(const void* thd);
int thd_tablespace_op(const void* thd);
View
2  include/mysql/service_my_snprintf.h
@@ -53,7 +53,7 @@
<length modifier> can be 'l', 'll', or 'z'.
Supported formats are 's' (null pointer is accepted, printed as
- "(null)"), 'b' (extension, see below), 'c', 'd', 'u', 'x',
+ "(null)"), 'b' (extension, see below), 'c', 'd', 'u', 'x', 'o',
'X', 'p' (works as 0x%x).
Standard syntax for positional arguments $n is supported.
View
6 include/sslopt-longopts.h
@@ -19,8 +19,8 @@
#ifdef HAVE_OPENSSL
{"ssl", OPT_SSL_SSL,
- "Enable SSL for connection (automatically enabled with other flags). Disable with --skip-ssl.",
- (uchar **) &opt_use_ssl, (uchar **) &opt_use_ssl, 0, GET_BOOL, NO_ARG, 0, 0, 0,
+ "Enable SSL for connection (automatically enabled with other flags).",
+ (uchar **) &opt_use_ssl, (uchar **) &opt_use_ssl, 0, GET_BOOL, OPT_ARG, 0, 0, 0,
0, 0, 0},
{"ssl-ca", OPT_SSL_CA,
"CA file in PEM format (check OpenSSL docs, implies --ssl).",
@@ -43,7 +43,7 @@
{"ssl-verify-server-cert", OPT_SSL_VERIFY_SERVER_CERT,
"Verify server's \"Common Name\" in its cert against hostname used when connecting. This option is disabled by default.",
(uchar **) &opt_ssl_verify_server_cert, (uchar **) &opt_ssl_verify_server_cert,
- 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
+ 0, GET_BOOL, OPT_ARG, 0, 0, 0, 0, 0, 0},
#endif
#endif /* HAVE_OPENSSL */
#endif /* SSLOPT_LONGOPTS_INCLUDED */
View
5 include/typelib.h
@@ -36,4 +36,9 @@ extern TYPELIB *copy_typelib(MEM_ROOT *root, TYPELIB *from);
extern TYPELIB sql_protocol_typelib;
+my_ulonglong find_set_from_flags(const TYPELIB *lib, uint default_name,
+ my_ulonglong cur_set, my_ulonglong default_set,
+ const char *str, uint length,
+ char **err_pos, uint *err_len);
+
#endif /* _typelib_h */
View
3  libmysqld/CMakeLists.txt
@@ -117,7 +117,8 @@ SET(LIBMYSQLD_SOURCES emb_qcache.cc libmysqld.c lib_sql.cc
../sql/sql_class.cc ../sql/sql_crypt.cc ../sql/sql_cursor.cc
../sql/sql_db.cc ../sql/sql_delete.cc ../sql/sql_derived.cc
../sql/sql_do.cc ../sql/sql_error.cc ../sql/sql_handler.cc
- ../sql/sql_help.cc ../sql/sql_insert.cc ../sql/sql_lex.cc
+ ../sql/sql_help.cc ../sql/sql_insert.cc
+ ../sql/sql_lex.cc ../sql/keycaches.cc
../sql/sql_list.cc ../sql/sql_load.cc ../sql/sql_locale.cc
../sql/sql_binlog.cc ../sql/sql_manager.cc ../sql/sql_map.cc
../sql/sql_parse.cc ../sql/sql_partition.cc ../sql/sql_plugin.cc
View
4 libmysqld/Makefile.am
@@ -67,7 +67,7 @@ sqlsources = derror.cc field.cc field_conv.cc strfunc.cc filesort.cc \
sql_lex.cc sql_list.cc sql_manager.cc sql_map.cc \
scheduler.cc sql_connect.cc sql_parse.cc \
sql_prepare.cc sql_derived.cc sql_rename.cc \
- sql_select.cc sql_do.cc sql_show.cc set_var.cc \
+ sql_select.cc sql_do.cc sql_show.cc set_var.cc sys_vars.cc \
sql_string.cc sql_table.cc sql_test.cc sql_udf.cc \
sql_update.cc sql_yacc.cc table.cc thr_malloc.cc time.cc \
unireg.cc uniques.cc sql_union.cc hash_filo.cc \
@@ -79,7 +79,7 @@ sqlsources = derror.cc field.cc field_conv.cc strfunc.cc filesort.cc \
sql_tablespace.cc \
rpl_injector.cc my_user.c partition_info.cc \
sql_servers.cc event_parse_data.cc sql_signal.cc \
- rpl_handler.cc
+ rpl_handler.cc keycaches.cc
libmysqld_int_a_SOURCES= $(libmysqld_sources)
nodist_libmysqld_int_a_SOURCES= $(libmysqlsources) $(sqlsources)
View
5 libmysqld/lib_sql.cc
@@ -506,6 +506,9 @@ int init_embedded_server(int argc, char **argv, char **groups)
mysql_server_end();
return 1;
}
+
+ mysql_data_home= mysql_real_data_home;
+ mysql_data_home_len= mysql_real_data_home_len;
/* Get default temporary directory */
opt_mysql_tmpdir=getenv("TMPDIR"); /* Use this if possible */
@@ -614,7 +617,7 @@ void *create_embedded_thd(int client_flag)
/* TODO - add init_connect command execution */
if (thd->variables.max_join_size == HA_POS_ERROR)
- thd->options |= OPTION_BIG_SELECTS;
+ thd->variables.option_bits |= OPTION_BIG_SELECTS;
thd->proc_info=0; // Remove 'login'
thd->command=COM_SLEEP;
thd->version=refresh_version;
View
3  mysql-test/Makefile.am
@@ -99,7 +99,8 @@ TEST_DIRS = t r include std_data std_data/parts collections \
suite/ndb suite/ndb/t suite/ndb/r \
suite/rpl_ndb suite/rpl_ndb/t suite/rpl_ndb/r \
suite/parts suite/parts/t suite/parts/r suite/parts/inc \
- suite/innodb suite/innodb/t suite/innodb/r suite/innodb/include
+ suite/innodb suite/innodb/t suite/innodb/r suite/innodb/include \
+ suite/sys_vars suite/sys_vars/t suite/sys_vars/inc suite/sys_vars/r
# Used by dist-hook and install-data-local to copy all
# test files into either dist or install directory
View
2  mysql-test/collections/mysql-next-mr.push
@@ -1,4 +1,4 @@
-perl mysql-test-run.pl --timer --force --parallel=auto --experimental=collections/default.experimental --comment=n_mix --vardir=var-n_mix --mysqld=--binlog-format=mixed --suite=main,binlog,innodb,federated,rpl
+perl mysql-test-run.pl --timer --force --parallel=auto --experimental=collections/default.experimental --comment=n_mix --vardir=var-n_mix --mysqld=--binlog-format=mixed --suite=main,binlog,innodb,federated,rpl,sys_vars
perl mysql-test-run.pl --timer --force --parallel=auto --experimental=collections/default.experimental --comment=ps_row --vardir=var-ps_row --ps-protocol --mysqld=--binlog-format=row --suite=main,binlog,innodb,federated,rpl
perl mysql-test-run.pl --timer --force --parallel=auto --experimental=collections/default.experimental --comment=embedded --vardir=var-emebbed --embedded --suite=main,binlog,innodb,federated,rpl
perl mysql-test-run.pl --timer --force --parallel=auto --experimental=collections/default.experimental --comment=rpl_binlog_row --vardir=var-rpl_binlog_row --mysqld=--binlog-format=row --suite=rpl,binlog
View
4 mysql-test/extra/rpl_tests/rpl_charset.test
@@ -114,9 +114,7 @@ set @@character_set_server=latin5;
select @@character_set_server;
select @@character_set_server;
-# ONE_SHOT on not charset/collation stuff is not allowed
--- error 1382
-set one_shot max_join_size=10;
+set one_shot max_join_size=1000000;
# Test of wrong character set numbers;
error 1115;
View
1  mysql-test/include/diff_tables.inc
@@ -60,6 +60,7 @@ disable_query_log;
--error 0,1
--remove_file $MYSQLTEST_VARDIR/tmp/diff_table_2
+
let $_diff_table=$diff_table_2;
let $_diff_i=2;
while ($_diff_i) {
View
10 mysql-test/include/have_thread_concurrency.inc
@@ -0,0 +1,10 @@
+disable_query_log;
+disable_result_log;
+set @have_thread_concurrency=0;
+select @have_thread_concurrency:=1 from information_schema.global_variables where variable_name='thread_concurrency';
+if (`select @have_thread_concurrency = 0`)
+{
+ skip Need @@thread_concurrency;
+}
+enable_result_log;
+enable_query_log;
View
2  mysql-test/include/index_merge1.inc
@@ -303,7 +303,7 @@ drop table t4;
create table t4 (a int);
insert into t4 values (1),(4),(3);
set @save_join_buffer_size=@@join_buffer_size;
-set join_buffer_size= 4000;
+set join_buffer_size= 4096;
explain select max(A.key1 + B.key1 + A.key2 + B.key2 + A.key3 + B.key3 + A.key4 + B.key4 + A.key5 + B.key5)
from t0 as A force index(i1,i2), t0 as B force index (i1,i2)
where (A.key1 < 500000 or A.key2 < 3)
View
39 mysql-test/include/mysqld--help.inc
@@ -0,0 +1,39 @@
+#
+# mysqld --help
+#
+--source include/not_embedded.inc
+
+#
+# force lower-case-table-names=1 (linux/macosx have different defaults)
+# force symbolic-links=0 (valgrind build has a different default)
+#
+exec $MYSQLD_BOOTSTRAP_CMD --symbolic-links=0 --lower-case-table-names=1 --help --verbose > $MYSQL_TMP_DIR/mysqld--help.txt 2>&1;
+
+perl;
+ @skipvars=qw/basedir character-sets-dir datadir
+ general-log-file language lc-messages-dir
+ log log-slow-queries pid-file plugin-dir slave-load-tmpdir
+ slow-query-log-file tmpdir open-files-limit/;
+ @plugins=qw/innodb ndb ndbcluster safemalloc debug temp-pool
+ thread-concurrency super-large-pages/;
+ $re1=join('|', @skipvars, @plugins);
+ $re2=join('|', @plugins);
+ $skip=0;
+ open(F, '<', "$ENV{MYSQL_TMP_DIR}/mysqld--help.txt") or die;
+ while (<F>) {
+ next if 1../The following groups are read/;
+ next if /^($re1) /;
+ next if /^($re2)-/;
+ $skip=0 if /^ -/;
+ $skip=1 if / --($re2)\b/;
+ # fixes for 32-bit
+ s/\b4294967295\b/18446744073709551615/;
+ s/\b2146435072\b/9223372036853727232/;
+ s/\b196608\b/262144/;
+ next if /use --skip-(use-)?symbolic-links to disable/; # for valgrind, again
+ next if $skip;
+ print;
+ }
+ close F;
+EOF
+
View
2  mysql-test/include/query_cache.inc
@@ -114,7 +114,7 @@ connection default;
# This should be 'YES'.
SHOW VARIABLES LIKE 'have_query_cache';
-SET GLOBAL query_cache_size = 200000;
+SET GLOBAL query_cache_size = 204800;
flush status;
SET @@autocommit=1;
eval SET SESSION STORAGE_ENGINE = $engine_type;
View
10 mysql-test/include/query_cache_sql_prepare.inc
@@ -27,7 +27,7 @@ connect (con1,localhost,root,,test,$MASTER_MYPORT,);
connection default;
set @initial_query_cache_size = @@global.query_cache_size;
-set @@global.query_cache_size=100000;
+set @@global.query_cache_size=102400;
flush status;
--disable_warnings
drop table if exists t1;
@@ -178,7 +178,7 @@ show status like 'Qcache_hits';
# then QC is re-enabled for more EXECUTE.
--echo ---- switch to connection default ----
connection default;
-set global query_cache_size=100000;
+set global query_cache_size=102400;
# Expect to see additional Qcache_hits.
# The fact that the QC was temporary disabled should have no affect
# except that the first execute will not hit results from the
@@ -235,7 +235,7 @@ prepare stmt3 from "select * from t1 where c1=10";
--echo ---- switch to connection default ----
connection default;
# then QC is enabled at EXECUTE
-set global query_cache_size=100000;
+set global query_cache_size=102400;
show status like 'Qcache_hits';
execute stmt1;
show status like 'Qcache_hits';
@@ -260,7 +260,7 @@ connection default;
set global query_cache_size=0;
prepare stmt1 from "select * from t1 where c1=?";
# then QC is enabled at EXECUTE
-set global query_cache_size=100000;
+set global query_cache_size=102400;
show status like 'Qcache_hits';
set @a=1;
execute stmt1 using @a;
@@ -509,7 +509,7 @@ execute stmt;
set @@global.query_cache_size=0;
alter table t1 add column b int;
execute stmt;
-set @@global.query_cache_size=100000;
+set @@global.query_cache_size=102400;
execute stmt;
execute stmt;
--echo #
View
2  mysql-test/include/show_slave_status2.inc
@@ -3,6 +3,6 @@
# masked out log positions
---replace_result $MASTER_MYPORT MASTER_PORT
+--replace_result $MASTER_MYPORT MASTER_PORT $DEFAULT_MASTER_PORT 3306
--replace_column 1 # 7 # 8 # 9 # 16 # 22 # 23 # 33 # 35 # 36 #
query_vertical SHOW SLAVE STATUS;
View
52 mysql-test/mysql-test-run.pl
@@ -68,8 +68,8 @@ BEGIN
use File::Basename;
use File::Copy;
use File::Find;
-use File::Temp qw /tempdir/;
-use File::Spec::Functions qw / splitdir /;
+use File::Temp qw/tempdir/;
+use File::Spec::Functions qw/splitdir/;
use My::Platform;
use My::SafeProcess;
use My::ConfigFactory;
@@ -118,6 +118,8 @@ END
}
}
+sub env_or_val($$) { defined $ENV{$_[0]} ? $ENV{$_[0]} : $_[1] }
+
my $path_config_file; # The generated config file, var/my.cnf
# Visual Studio produces executables in different sub-directories based on the
@@ -126,7 +128,7 @@ END
# executables will be used by the test suite.
our $opt_vs_config = $ENV{'MTR_VS_CONFIG'};
-my $DEFAULT_SUITES= "main,binlog,federated,rpl,rpl_ndb,ndb,innodb";
+my $DEFAULT_SUITES= "main,sys_vars,binlog,federated,rpl,rpl_ndb,ndb,innodb";
my $opt_suites;
our $opt_verbose= 0; # Verbose output, enable with --verbose
@@ -213,7 +215,7 @@ END
my $opt_wait_all;
my $opt_repeat= 1;
my $opt_retry= 3;
-my $opt_retry_failure= 2;
+my $opt_retry_failure= env_or_val(MTR_RETRY_FAILURE => 2);
my $opt_strace_client;
@@ -242,9 +244,9 @@ END
my $source_dist= 0;
-my $opt_max_save_core= $ENV{MTR_MAX_SAVE_CORE} || 5;
-my $opt_max_save_datadir= $ENV{MTR_MAX_SAVE_DATADIR} || 20;
-my $opt_max_test_fail= $ENV{MTR_MAX_TEST_FAIL} || 10;
+my $opt_max_save_core= env_or_val(MTR_MAX_SAVE_CORE => 5);
+my $opt_max_save_datadir= env_or_val(MTR_MAX_SAVE_DATADIR => 20);
+my $opt_max_test_fail= env_or_val(MTR_MAX_TEST_FAIL => 10);
my $opt_parallel= $ENV{MTR_PARALLEL} || 1;
@@ -783,11 +785,12 @@ sub set_vardir {
sub command_line_setup {
my $opt_comment;
my $opt_usage;
+ my $opt_list_options;
# Read the command line options
# Note: Keep list, and the order, in sync with usage at end of this file
Getopt::Long::Configure("pass_through");
- GetOptions(
+ my %options=(
# Control what engine/variation to run
'embedded-server' => \$opt_embedded_server,
'ps-protocol' => \$opt_ps_protocol,
@@ -905,9 +908,13 @@ sub command_line_setup {
'timediff' => \&report_option,
'help|h' => \$opt_usage,
- ) or usage("Can't read options");
+ 'list-options' => \$opt_list_options,
+ );
+
+ GetOptions(%options) or usage("Can't read options");
usage("") if $opt_usage;
+ list_options(\%options) if $opt_list_options;
# --------------------------------------------------------------------------
# Setup verbosity
@@ -1925,7 +1932,6 @@ sub environment_setup {
split(':', $ENV{'LIBPATH'}) : ());
mtr_debug("LIBPATH: $ENV{'LIBPATH'}");
- $ENV{'CHARSETSDIR'}= $path_charsetsdir;
$ENV{'UMASK'}= "0660"; # The octal *string*
$ENV{'UMASK_DIR'}= "0770"; # The octal *string*
@@ -1943,9 +1949,11 @@ sub environment_setup {
$ENV{'LC_COLLATE'}= "C";
$ENV{'USE_RUNNING_SERVER'}= using_extern();
$ENV{'MYSQL_TEST_DIR'}= $glob_mysql_test_dir;
- $ENV{'DEFAULT_MASTER_PORT'}= $mysqld_variables{'master-port'} || 3306;
+ $ENV{'DEFAULT_MASTER_PORT'}= $mysqld_variables{'port'};
$ENV{'MYSQL_TMP_DIR'}= $opt_tmpdir;
$ENV{'MYSQLTEST_VARDIR'}= $opt_vardir;
+ $ENV{'MYSQL_LIBDIR'}= "$basedir/lib";
+ $ENV{'MYSQL_SHAREDIR'}= $path_language;
# ----------------------------------------------------
# Setup env for NDB
@@ -3784,7 +3792,7 @@ ($$)
mtr_add_arg($args, "--defaults-file=%s", $path_config_file);
mtr_add_arg($args, "--defaults-group-suffix=%s", $mysqld->after('mysqld'));
- mtr_add_arg($args, "--skip-safemalloc");
+ mtr_add_arg($args, "--loose-skip-safemalloc");
mtr_add_arg($args, "--test-file=%s", "include/check-warnings.test");
mtr_add_arg($args, "--verbose");
@@ -4208,7 +4216,7 @@ ($$$)
if ( $opt_valgrind_mysqld )
{
- mtr_add_arg($args, "--skip-safemalloc");
+ mtr_add_arg($args, "--loose-skip-safemalloc");
if ( $mysql_version_id < 50100 )
{
@@ -4993,7 +5001,7 @@ sub gdb_arguments {
my $type= shift;
# Write $args to gdb init file
- my $str= join(" ", @$$args);
+ my $str= join " ", map { s/"/\\"/g; "\"$_\""; } @$$args;
my $gdb_init_file= "$opt_vardir/tmp/gdbinit.$type";
# Remove the old gdbinit file
@@ -5057,7 +5065,7 @@ sub ddd_arguments {
my $type= shift;
# Write $args to ddd init file
- my $str= join(" ", @$$args);
+ my $str= join " ", map { s/"/\\"/g; "\"$_\""; } @$$args;
my $gdb_init_file= "$opt_vardir/tmp/gdbinit.$type";
# Remove the old gdbinit file
@@ -5122,8 +5130,8 @@ sub debugger_arguments {
# vc[express] /debugexe exe arg1 .. argn
# Add /debugexe and name of the exe before args
- unshift(@$$args, "/debugexe");
unshift(@$$args, "$$exe");
+ unshift(@$$args, "/debugexe");
# Set exe to debuggername
$$exe= $debugger;
@@ -5392,3 +5400,15 @@ ($)
}
+sub list_options ($) {
+ my $hash= shift;
+
+ for (keys %$hash) {
+ s/([:=].*|[+!])$//;
+ s/\|/\n--/g;
+ print "--$_\n" unless /list-options/;
+ }
+
+ exit(1);
+}
+
View
2  mysql-test/r/archive.result
@@ -12707,7 +12707,7 @@ DATA_LENGTH AVG_ROW_LENGTH
8700 4350
DROP TABLE t1;
SET @save_join_buffer_size= @@join_buffer_size;
-SET @@join_buffer_size= 8228;
+SET @@join_buffer_size= 8192;
CREATE TABLE t1(a CHAR(255)) ENGINE=archive;
INSERT INTO t1 VALUES('aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa'),
('aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa'),
View
2  mysql-test/r/bug46080.result
@@ -8,6 +8,8 @@ CREATE TABLE t1(a CHAR(255));
INSERT INTO t1 VALUES ('a');
SET @@SESSION.sort_buffer_size=5*16*1000000;
SET @@SESSION.max_heap_table_size=5*1000000;
+Warnings:
+Warning 1292 Truncated incorrect max_heap_table_size value: '5000000'
# Must not crash.
SELECT GROUP_CONCAT(a ORDER BY a) FROM t1 GROUP BY a;
DROP TABLE t1;
View
2  mysql-test/r/cache_innodb.result
@@ -134,7 +134,7 @@ connection default
SHOW VARIABLES LIKE 'have_query_cache';
Variable_name Value
have_query_cache YES
-SET GLOBAL query_cache_size = 200000;
+SET GLOBAL query_cache_size = 204800;
flush status;
SET @@autocommit=1;
SET SESSION STORAGE_ENGINE = InnoDB;
View
2  mysql-test/r/change_user.result
@@ -18,7 +18,7 @@ change_user
SELECT @@session.sql_big_selects;
@@session.sql_big_selects
0
-SET @@global.max_join_size = -1;
+SET @@global.max_join_size = 18446744073709551615;
SET @@session.max_join_size = default;
change_user
SELECT @@session.sql_big_selects;
View
65 mysql-test/r/date_formats.result
@@ -15,71 +15,6 @@ variable_name variable_value
DATETIME_FORMAT %Y-%m-%d %H:%i:%s
DATE_FORMAT %d.%m.%Y
TIME_FORMAT %H.%i.%s
-SET time_format='%H%i%s';
-SET time_format='%H:%i:%s.%f';
-SET time_format='%h-%i-%s.%f%p';
-SET time_format='%h:%i:%s.%f %p';
-SET time_format='%h:%i:%s%p';
-SET date_format='%Y%m%d';
-SET date_format='%Y.%m.%d';
-SET date_format='%d.%m.%Y';
-SET date_format='%m-%d-%Y';
-set datetime_format= '%Y%m%d%H%i%s';
-set datetime_format= '%Y-%m-%d %H:%i:%s';
-set datetime_format= '%m-%d-%y %H:%i:%s.%f';
-set datetime_format= '%d-%m-%Y %h:%i:%s%p';
-set datetime_format= '%H:%i:%s %Y-%m-%d';
-set datetime_format= '%H:%i:%s.%f %m-%d-%Y';
-set datetime_format= '%h:%i:%s %p %Y-%m-%d';
-set datetime_format= '%h:%i:%s.%f %p %Y-%m-%d';
-SELECT variable_name, variable_value
-FROM information_schema.session_variables
-WHERE variable_name IN ('date_format', 'datetime_format', 'time_format')
-ORDER BY variable_name;
-variable_name variable_value
-DATETIME_FORMAT %h:%i:%s.%f %p %Y-%m-%d
-DATE_FORMAT %m-%d-%Y
-TIME_FORMAT %h:%i:%s%p
-SET time_format='%h:%i:%s';
-ERROR 42000: Variable 'time_format' can't be set to the value of '%h:%i:%s'
-SET time_format='%H %i:%s';
-ERROR 42000: Variable 'time_format' can't be set to the value of '%H %i:%s'
-SET time_format='%H::%i:%s';
-ERROR 42000: Variable 'time_format' can't be set to the value of '%H::%i:%s'
-SET time_format='%H:%i:%s%f';
-ERROR 42000: Variable 'time_format' can't be set to the value of '%H:%i:%s%f'
-SET time_format='%H:%i.%f:%s';
-ERROR 42000: Variable 'time_format' can't be set to the value of '%H:%i.%f:%s'
-SET time_format='%H:%i:%s%p';
-ERROR 42000: Variable 'time_format' can't be set to the value of '%H:%i:%s%p'
-SET time_format='%h:%i:%s.%f %p %Y-%m-%d';
-ERROR 42000: Variable 'time_format' can't be set to the value of '%h:%i:%s.%f %p %Y-%m-%d'
-SET time_format='%H%i%s.%f';
-ERROR 42000: Variable 'time_format' can't be set to the value of '%H%i%s.%f'
-SET time_format='%H:%i-%s.%f';
-ERROR 42000: Variable 'time_format' can't be set to the value of '%H:%i-%s.%f'
-SET date_format='%d.%m.%d';
-ERROR 42000: Variable 'date_format' can't be set to the value of '%d.%m.%d'
-SET datetime_format='%h.%m.%y %d.%i.%s';
-ERROR 42000: Variable 'datetime_format' can't be set to the value of '%h.%m.%y %d.%i.%s'
-set datetime_format= '%H:%i:%s.%f %p %Y-%m-%d';
-ERROR 42000: Variable 'datetime_format' can't be set to the value of '%H:%i:%s.%f %p %Y-%m-%d'
-set GLOBAL datetime_format= '%H:%i:%s %Y-%m-%d';
-SET SESSION datetime_format=default;
-select @@global.datetime_format, @@session.datetime_format;
-@@global.datetime_format @@session.datetime_format
-%H:%i:%s %Y-%m-%d %H:%i:%s %Y-%m-%d
-SET GLOBAL datetime_format=default;
-SET SESSION datetime_format=default;
-select @@global.datetime_format, @@session.datetime_format;
-@@global.datetime_format @@session.datetime_format
-%Y-%m-%d %H:%i:%s %Y-%m-%d %H:%i:%s
-SET GLOBAL date_format=default;
-SET GLOBAL time_format=default;
-SET GLOBAL datetime_format=default;
-SET time_format=default;
-SET date_format=default;
-SET datetime_format=default;
select str_to_date(concat('15-01-2001',' 2:59:58.999'),
concat('%d-%m-%Y',' ','%H:%i:%s.%f'));
str_to_date(concat('15-01-2001',' 2:59:58.999'),
View
8 mysql-test/r/errors.result
@@ -109,10 +109,10 @@ SET sql_quote_show_create= _utf8 x'5452C39C45';
ERROR 42000: Variable 'sql_quote_show_create' can't be set to the value of 'TR�E'
SET sql_quote_show_create=_latin1 x'5452DC45';
ERROR 42000: Variable 'sql_quote_show_create' can't be set to the value of 'TR�E'
-SET sql_quote_show_create='TR.E';
-ERROR 42000: Variable 'sql_quote_show_create' can't be set to the value of 'TR.E'
-SET sql_quote_show_create=TR.E;
-ERROR 42000: Variable 'sql_quote_show_create' can't be set to the value of 'E'
+SET sql_quote_show_create='TRE';
+ERROR 42000: Variable 'sql_quote_show_create' can't be set to the value of 'TRE'
+SET sql_quote_show_create=TRE;
+ERROR 42000: Variable 'sql_quote_show_create' can't be set to the value of 'TR�E'
SET NAMES binary;
SET sql_quote_show_create= _binary x'5452C39C45';
ERROR 42000: Variable 'sql_quote_show_create' can't be set to the value of 'TR\xC3\x9CE'
View
6 mysql-test/r/events_2.result
@@ -13,12 +13,6 @@ ERROR HY000: Incorrect AT value: 'definitely not a datetime'
set names utf8;
create event задачка on schedule every 123 minute starts now() ends now() + interval 1 month do select 1;
drop event задачка;
-set event_scheduler=off;
-ERROR HY000: Variable 'event_scheduler' is a GLOBAL variable and should be set with SET GLOBAL
-set global event_scheduler=3;
-ERROR 42000: Variable 'event_scheduler' can't be set to the value of '3'
-set global event_scheduler=disabled;
-ERROR 42000: Variable 'event_scheduler' can't be set to the value of 'disabled'
"DISABLE the scheduler. Testing that it does not work when the variable is 0"
set global event_scheduler=off;
select definer, name, db from mysql.event;
View
11 mysql-test/r/events_bugs.result
@@ -725,16 +725,15 @@ DROP USER mysqltest_u1@localhost;
drop procedure if exists p;
set @old_mode= @@sql_mode;
-set @@sql_mode= pow(2,32)-1;
+set @@sql_mode= cast(pow(2,32)-1 as unsigned integer);
create event e1 on schedule every 1 day do select 1;
-select @@sql_mode;
-@@sql_mode
-REAL_AS_FLOAT,PIPES_AS_CONCAT,ANSI_QUOTES,IGNORE_SPACE,?,ONLY_FULL_GROUP_BY,NO_UNSIGNED_SUBTRACTION,NO_DIR_IN_CREATE,POSTGRESQL,ORACLE,MSSQL,DB2,MAXDB,NO_KEY_OPTIONS,NO_TABLE_OPTIONS,NO_FIELD_OPTIONS,MYSQL323,MYSQL40,ANSI,NO_AUTO_VALUE_ON_ZERO,NO_BACKSLASH_ESCAPES,STRICT_TRANS_TABLES,STRICT_ALL_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ALLOW_INVALID_DATES,ERROR_FOR_DIVISION_BY_ZERO,TRADITIONAL,NO_AUTO_CREATE_USER,HIGH_NOT_PRECEDENCE,NO_ENGINE_SUBSTITUTION,PAD_CHAR_TO_FULL_LENGTH
+select @@sql_mode into @full_mode;
set @@sql_mode= @old_mode;
-select replace(@full_mode, '?', 'NOT_USED') into @full_mode;
+select replace(@full_mode, ',,,', ',NOT_USED,') into @full_mode;
select replace(@full_mode, 'ALLOW_INVALID_DATES', 'INVALID_DATES') into @full_mode;
-select name from mysql.event where name = 'p' and sql_mode = @full_mode;
+select name from mysql.event where name = 'e1' and sql_mode = @full_mode;
name
+e1
drop event e1;
SET @old_server_id = @@GLOBAL.server_id;
SET GLOBAL server_id = (1 << 32) - 1;
View
2  mysql-test/r/have_profiling.require
@@ -1,2 +1,2 @@
Variable_name Value
-have_profiling YES
+have_profiling YES
View
5 mysql-test/r/index_merge_myisam.result
@@ -341,9 +341,7 @@ drop table t4;
create table t4 (a int);
insert into t4 values (1),(4),(3);
set @save_join_buffer_size=@@join_buffer_size;
-set join_buffer_size= 4000;
-Warnings:
-Warning 1292 Truncated incorrect join_buffer_size value: '4000'
+set join_buffer_size= 4096;
explain select max(A.key1 + B.key1 + A.key2 + B.key2 + A.key3 + B.key3 + A.key4 + B.key4 + A.key5 + B.key5)
from t0 as A force index(i1,i2), t0 as B force index (i1,i2)
where (A.key1 < 500000 or A.key2 < 3)
@@ -1435,7 +1433,6 @@ select @@optimizer_switch;
@@optimizer_switch
index_merge=on,index_merge_union=on,index_merge_sort_union=off,index_merge_intersection=on
set optimizer_switch=4;
-ERROR 42000: Variable 'optimizer_switch' can't be set to the value of '4'
set optimizer_switch=NULL;
ERROR 42000: Variable 'optimizer_switch' can't be set to the value of 'NULL'
set optimizer_switch='default,index_merge';
View
4 mysql-test/r/innodb.result
@@ -1788,7 +1788,7 @@ Variable_name Value
innodb_thread_concurrency 0
set global innodb_thread_concurrency=1001;
Warnings:
-Warning 1292 Truncated incorrect thread_concurrency value: '1001'
+Warning 1292 Truncated incorrect innodb_thread_concurrency value: '1001'
show variables like "innodb_thread_concurrency";
Variable_name Value
innodb_thread_concurrency 1000
@@ -1809,7 +1809,7 @@ Variable_name Value
innodb_concurrency_tickets 1000
set global innodb_concurrency_tickets=0;
Warnings:
-Warning 1292 Truncated incorrect concurrency_tickets value: '0'
+Warning 1292 Truncated incorrect innodb_concurrency_tickets value: '0'
show variables like "innodb_concurrency_tickets";
Variable_name Value
innodb_concurrency_tickets 1
View
4 mysql-test/r/innodb_bug42101-nonzero.result
@@ -1,5 +1,5 @@
set global innodb_commit_concurrency=0;
-ERROR HY000: Incorrect arguments to SET
+ERROR 42000: Variable 'innodb_commit_concurrency' can't be set to the value of '0'
select @@innodb_commit_concurrency;
@@innodb_commit_concurrency
1
@@ -16,7 +16,7 @@ select @@innodb_commit_concurrency;
@@innodb_commit_concurrency
1
set global innodb_commit_concurrency=0;
-ERROR HY000: Incorrect arguments to SET
+ERROR 42000: Variable 'innodb_commit_concurrency' can't be set to the value of '0'
select @@innodb_commit_concurrency;
@@innodb_commit_concurrency
1
View
4 mysql-test/r/innodb_bug42101.result
@@ -3,12 +3,12 @@ select @@innodb_commit_concurrency;
@@innodb_commit_concurrency
0
set global innodb_commit_concurrency=1;
-ERROR HY000: Incorrect arguments to SET
+ERROR 42000: Variable 'innodb_commit_concurrency' can't be set to the value of '1'
select @@innodb_commit_concurrency;
@@innodb_commit_concurrency
0
set global innodb_commit_concurrency=42;
-ERROR HY000: Incorrect arguments to SET
+ERROR 42000: Variable 'innodb_commit_concurrency' can't be set to the value of '42'
select @@innodb_commit_concurrency;
@@innodb_commit_concurrency
0
View
21 mysql-test/r/key_cache.result
@@ -274,8 +274,26 @@ Key_blocks_used 4
show status like 'key_blocks_unused';
Variable_name Value
Key_blocks_unused KEY_BLOCKS_UNUSED
+create table t1 (a int primary key);
+cache index t1 in keycache2;
+Table Op Msg_type Msg_text
+test.t1 assign_to_keycache status OK
+insert t1 values (1),(2),(3),(4),(5),(6),(7),(8);
set global keycache2.key_buffer_size=0;
+select * from t1;
+a
+1
+2
+3
+4
+5
+6
+7
+8
+drop table t1;
set global keycache3.key_buffer_size=100;
+Warnings:
+Warning 1292 Truncated incorrect key_buffer_size value: '100'
set global keycache3.key_buffer_size=0;
create table t1 (mytext text, FULLTEXT (mytext));
insert t1 values ('aaabbb');
@@ -334,8 +352,7 @@ test.t1 check status OK
DROP TABLE t1,t2;
set global key_cache_block_size= @my_key_cache_block_size;
set @@global.key_buffer_size=0;
-Warnings:
-Warning 1438 Cannot drop default keycache
+ERROR HY000: Cannot drop default keycache
select @@global.key_buffer_size;
@@global.key_buffer_size
2097152
View
947 mysql-test/r/mysqld--help-notwin.result
@@ -0,0 +1,947 @@
+The following options may be given as the first argument:
+--print-defaults Print the program argument list and exit
+--no-defaults Don't read default options from any options file
+--defaults-file=# Only read default options from the given file #
+--defaults-extra-file=# Read this file after the global files are read
+
+ --abort-slave-event-count=#
+ Option used by mysql-test for debugging and testing of
+ replication.
+ --allow-suspicious-udfs
+ Allows use of UDFs consisting of only one symbol xxx()
+ without corresponding xxx_init() or xxx_deinit(). That
+ also means that one can load any function from any
+ library, for example exit() from libc.so
+ -a, --ansi Use ANSI SQL syntax instead of MySQL syntax. This mode
+ will also set transaction isolation level 'serializable'.
+ --archive[=name] Enable or disable ARCHIVE plugin. Possible values are ON,
+ OFF, FORCE (don't start if the plugin fails to load).
+ --auto-increment-increment[=#]
+ Auto-increment columns are incremented by this
+ --auto-increment-offset[=#]
+ Offset added to Auto-increment columns. Used when
+ auto-increment-increment != 1
+ --automatic-sp-privileges
+ Creating and dropping stored procedures alters ACLs
+ (Defaults to on; use --skip-automatic-sp-privileges to disable.)
+ --back-log=# The number of outstanding connection requests MySQL can
+ have. This comes into play when the main MySQL thread
+ gets very many connection requests in a very short time
+ -b, --basedir=name Path to installation directory. All paths are usually
+ resolved relative to this
+ --big-tables Allow big result sets by saving all temporary sets on
+ file (Solves most 'table full' errors)
+ --bind-address=name IP address to bind to.
+ --binlog-cache-size=#
+ The size of the cache to hold the SQL statements for the
+ binary log during a transaction. If you often use big,
+ multi-statement transactions you can increase this to get
+ more performance
+ --binlog-do-db=name Tells the master it should log updates for the specified
+ database, and exclude all others not explicitly
+ mentioned.
+ --binlog-format=name
+ What form of binary logging the master will use: either
+ ROW for row-based binary logging, STATEMENT for
+ statement-based binary logging, or MIXED. MIXED is
+ statement-based binary logging except for those
+ statements where only row-based is correct: those which
+ involve user-defined functions (i.e. UDFs) or the UUID()
+ function; for those, row-based binary logging is
+ automatically used. If NDBCLUSTER is enabled and
+ binlog-format is MIXED, the format switches to row-based
+ and back implicitly per each query accessing an
+ NDBCLUSTER table
+ --binlog-ignore-db=name
+ Tells the master that updates to the given database
+ should not be logged tothe binary log.
+ --binlog-row-event-max-size=#
+ The maximum size of a row-based binary log event in
+ bytes. Rows will be grouped into events smaller than this
+ size if possible. The value has to be a multiple of 256.
+ --blackhole[=name] Enable or disable BLACKHOLE plugin. Possible values are
+ ON, OFF, FORCE (don't start if the plugin fails to load).
+ --bootstrap Used by mysql installation scripts.
+ --bulk-insert-buffer-size=#
+ Size of tree cache used in bulk insert optimisation. Note
+ that this is a limit per thread!
+ --character-set-client-handshake
+ Don't ignore client side character set value sent during
+ handshake.
+ (Defaults to on; use --skip-character-set-client-handshake to disable.)
+ --character-set-filesystem=name
+ Set the filesystem character set.
+ -C, --character-set-server=name
+ Set the default character set.
+ --character-sets-dir=name
+ Directory where character sets are
+ -r, --chroot=name Chroot mysqld daemon during startup.
+ --collation-server=name
+ Set the default collation.
+ --completion-type=name
+ The transaction completion type, one of NO_CHAIN, CHAIN,
+ RELEASE
+ --concurrent-insert[=name]
+ Use concurrent insert with MyISAM. Possible values are
+ NEVER, AUTO, ALWAYS
+ --connect-timeout=# The number of seconds the mysqld server is waiting for a
+ connect packet before responding with 'Bad handshake'
+ --console Write error output on screen; Don't remove the console
+ window on windows.
+ --core-file Write core on errors.
+ -h, --datadir=name Path to the database root directory
+ --date-format=name The DATE format (ignored)
+ --datetime-format=name
+ The DATETIME format (ignored)
+ -C, --default-character-set=name
+ Set the default character set (deprecated option, use
+ --character-set-server instead).
+ --default-collation=name
+ Set the default collation (deprecated option, use
+ --collation-server instead).
+ --default-storage-engine=name
+ The default storage engine for new tables
+ --default-time-zone=name
+ Set the default time zone.
+ --default-week-format=#
+ The default week format used by WEEK() functions
+ --delay-key-write[=name]
+ Type of DELAY_KEY_WRITE
+ --delay-key-write-for-all-tables
+ Don't flush key buffers between writes for any MyISAM
+ table (Deprecated option, use --delay-key-write=all
+ instead).
+ --delayed-insert-limit=#
+ After inserting delayed_insert_limit rows, the INSERT
+ DELAYED handler will check if there are any SELECT
+ statements pending. If so, it allows these to execute
+ before continuing
+ --delayed-insert-timeout=#
+ How long a INSERT DELAYED thread should wait for INSERT
+ statements before terminating
+ --delayed-queue-size=#
+ What size queue (in rows) should be allocated for
+ handling INSERT DELAYED. If the queue becomes full, any
+ client that does INSERT DELAYED will wait until there is
+ room in the queue again
+ --des-key-file=name Load keys for des_encrypt() and des_encrypt from given
+ file.
+ --disconnect-slave-event-count=#
+ Option used by mysql-test for debugging and testing of
+ replication.
+ --div-precision-increment=#
+ Precision of the result of '/' operator will be increased
+ on that value
+ --enable-locking Deprecated option, use --external-locking instead.
+ --engine-condition-pushdown
+ Push supported query conditions to the storage engine
+ (Defaults to on; use --skip-engine-condition-pushdown to disable.)
+ --event-scheduler[=name]
+ Enable the event scheduler. Possible values are ON, OFF,
+ and DISABLED (keep the event scheduler completely
+ deactivated, it cannot be activated run-time)
+ -T, --exit-info[=#] Used for debugging; Use at your own risk!
+ --expire-logs-days=#
+ If non-zero, binary logs will be purged after
+ expire_logs_days days; possible purges happen at startup
+ and at binary log rotation
+ --external-locking Use system (external) locking (disabled by default).
+ With this option enabled you can run myisamchk to test
+ (not repair) tables while the MySQL server is running.
+ Disable with --skip-external-locking.
+ --federated[=name] Enable or disable FEDERATED plugin. Possible values are
+ ON, OFF, FORCE (don't start if the plugin fails to load).
+ --flush Flush MyISAM tables to disk between SQL commands
+ --flush-time=# A dedicated thread is created to flush all tables at the
+ given interval
+ --ft-boolean-syntax=name
+ List of operators for MATCH ... AGAINST ( ... IN BOOLEAN
+ MODE)
+ --ft-max-word-len=# The maximum length of the word to be included in a
+ FULLTEXT index. Note: FULLTEXT indexes must be rebuilt
+ after changing this variable
+ --ft-min-word-len=# The minimum length of the word to be included in a
+ FULLTEXT index. Note: FULLTEXT indexes must be rebuilt
+ after changing this variable
+ --ft-query-expansion-limit=#
+ Number of best matches to use for query expansion
+ --ft-stopword-file=name
+ Use stopwords from this file instead of built-in list
+ --gdb Set up signals usable for debugging
+ --general-log Log connections and queries to a table or log file.
+ Defaults logging to a file hostname.log or a table
+ mysql.general_logif --log-output=TABLE is used
+ --general-log-file=name
+ Log connections and queries to given file
+ --group-concat-max-len=#
+ The maximum length of the result of function
+ GROUP_CONCAT()
+ -?, --help Display this help and exit.
+ --ignore-builtin-innodb
+ Disable initialization of builtin InnoDB plugin
+ --init-connect=name Command(s) that are executed for each new connection
+ --init-file=name Read SQL commands from this file at startup
+ --init-rpl-role=name
+ Set the replication role.
+ --init-slave=name Command(s) that are executed by a slave server each time
+ the SQL thread starts
+ --interactive-timeout=#
+ The number of seconds the server waits for activity on an
+ interactive connection before closing it
+ --join-buffer-size=#
+ The size of the buffer that is used for full joins
+ --keep-files-on-create
+ Don't overwrite stale .MYD and .MYI even if no directory
+ is specified
+ --key-buffer-size=# The size of the buffer used for index blocks for MyISAM
+ tables. Increase this to get better index handling (for
+ all reads and multiple writes) to as much as you can
+ afford
+ --key-cache-age-threshold=#
+ This characterizes the number of hits a hot block has to
+ be untouched until it is considered aged enough to be
+ downgraded to a warm block. This specifies the percentage
+ ratio of that number of hits to the total number of
+ blocks in key cache
+ --key-cache-block-size=#
+ The default size of key cache blocks
+ --key-cache-division-limit=#
+ The minimum percentage of warm blocks in key cache
+ -L, --language=name Client error messages in given language. May be given as
+ a full path. Deprecated. Use --lc-messages-dir instead.
+ --large-pages Enable support for large pages
+ --lc-messages=name Set the language used for the error messages.
+ -L, --lc-messages-dir=name
+ Directory where error messages are
+ --lc-time-names=name
+ Set the language used for the month names and the days of
+ the week.
+ --local-infile Enable LOAD DATA LOCAL INFILE
+ (Defaults to on; use --skip-local-infile to disable.)
+ -l, --log[=name] Log connections and queries to file (deprecated option,
+ use --general-log/--general-log-file instead).
+ --log-bin[=name] Log update queries in binary format. Optional (but
+ strongly recommended to avoid replication problems if
+ server's hostname changes) argument should be the chosen
+ location for the binary log files.
+ --log-bin-index=name
+ File that holds the names for last binary log files.
+ --log-bin-trust-function-creators
+ If set to FALSE (the default), then when --log-bin is
+ used, creation of a stored function (or trigger) is
+ allowed only to users having the SUPER privilege and only
+ if this stored function (trigger) may not break binary
+ logging. Note that if ALL connections to this server
+ ALWAYS use row-based binary logging, the security issues
+ do not exist and the binary logging cannot break, so you
+ can safely set this to TRUE
+ --log-error[=name] Error log file
+ --log-isam[=name] Log all MyISAM changes to file.
+ -0, --log-long-format
+ Log some extra information to update log. Please note
+ that this option is deprecated; see --log-short-format
+ option.
+ --log-output=name Syntax: log-output=value[,value...], where "value" could
+ be TABLE, FILE or NONE
+ --log-queries-not-using-indexes
+ Log queries that are executed without benefit of any
+ index to the slow log if it is open
+ --log-short-format Don't log extra information to update and slow-query
+ logs.
+ --log-slave-updates Tells the slave to log the updates from the slave thread
+ to the binary log. You will need to turn it on if you
+ plan to daisy-chain the slaves
+ --log-slow-admin-statements
+ Log slow OPTIMIZE, ANALYZE, ALTER and other
+ administrative statements to the slow log if it is open.
+ --log-slow-queries[=name]
+ Log slow queries to a table or log file. Defaults logging
+ to table mysql.slow_log or hostname-slow.log if
+ --log-output=file is used. Must be enabled to activate
+ other slow log options. Deprecated option, use
+ --slow-query-log/--slow-query-log-file instead.
+ --log-slow-slave-statements
+ Log slow statements executed by slave thread to the slow
+ log if it is open.
+ --log-tc=name Path to transaction coordinator log (used for
+ transactions that affect more than one storage engine,
+ when binary log is disabled)
+ --log-tc-size=# Size of transaction coordinator log.
+ --log-update[=name] The update log is deprecated since version 5.0, is
+ replaced by the binary log and this option justs turns on
+ --log-bin instead.
+ -W, --log-warnings[=#]
+ Log some not critical warnings to the log file
+ --long-query-time=# Log all queries that have taken more than long_query_time
+ seconds to execute to file. The argument will be treated
+ as a decimal value with microsecond precision
+ --low-priority-updates
+ INSERT/DELETE/UPDATE has lower priority than selects
+ --lower-case-table-names[=#]
+ If set to 1 table names are stored in lowercase on disk
+ and table names will be case-insensitive. Should be set
+ to 2 if you are using a case insensitive file system
+ --master-info-file=name
+ The location and name of the file that remembers the
+ master and where the I/O replication thread is in the
+ master's binlogs.
+ --master-retry-count=#
+ The number of tries the slave will make to connect to the
+ master before giving up.
+ --max-allowed-packet=#
+ Max packet length to send to or receive from the server
+ --max-binlog-cache-size=#
+ Can be used to restrict the total size used to cache a
+ multi-transaction query
+ --max-binlog-dump-events=#
+ Option used by mysql-test for debugging and testing of
+ replication.
+ --max-binlog-size=# Binary log will be rotated automatically when the size
+ exceeds this value. Will also apply to relay logs if
+ max_relay_log_size is 0
+ --max-connect-errors=#
+ If there is more than this number of interrupted
+ connections from a host this host will be blocked from
+ further connections
+ --max-connections=# The number of simultaneous clients allowed
+ --max-delayed-threads=#
+ Don't start more than this number of threads to handle
+ INSERT DELAYED statements. If set to zero INSERT DELAYED
+ will be not used
+ --max-error-count=# Max number of errors/warnings to store for a statement
+ --max-heap-table-size=#
+ Don't allow creation of heap tables bigger than this
+ --max-join-size=# Joins that are probably going to read more than