mirror of
https://github.com/MariaDB/server.git
synced 2025-01-16 12:02:42 +01:00
0b3eee81df
into ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.1-lex-string BUILD/SETUP.sh: Auto merged mysql-test/r/create.result: Auto merged mysql-test/t/create.test: Auto merged sql/mysql_priv.h: Auto merged sql/sql_class.h: Auto merged sql/sql_db.cc: Auto merged sql/sql_lex.cc: Auto merged sql/sql_lex.h: Auto merged sql/sql_parse.cc: Auto merged sql/sql_table.cc: Auto merged sql/sql_yacc.yy: Auto merged sql/table.cc: Auto merged tests/mysql_client_test.c: Auto merged sql/item_timefunc.cc: Manual merge. sql/mysqld.cc: Manual merge. sql/mysqld.cc.rej: manual merge
17 lines
1,003 B
Text
17 lines
1,003 B
Text
***************
|
|
*** 5316,5322 ****
|
|
(gptr*) &locked_in_memory, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
|
|
{"merge", OPT_MERGE, "Enable Merge storage engine. Disable with \
|
|
--skip-merge.",
|
|
! (gptr*) &opt_merge, (gptr*) &opt_merge, 0, GET_BOOL, NO_ARG, 1, 0, 0, 0, 0},
|
|
{"myisam-recover", OPT_MYISAM_RECOVER,
|
|
"Syntax: myisam-recover[=option[,option...]], where option can be DEFAULT, BACKUP, FORCE or QUICK.",
|
|
(gptr*) &myisam_recover_options_str, (gptr*) &myisam_recover_options_str, 0,
|
|
--- 5336,5342 ----
|
|
(gptr*) &locked_in_memory, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
|
|
{"merge", OPT_MERGE, "Enable Merge storage engine. Disable with \
|
|
--skip-merge.",
|
|
! (gptr*) &opt_merge, (gptr*) &opt_merge, 0, GET_BOOL, NO_ARG, 1, 0, 0, 0, 0, 0},
|
|
{"myisam-recover", OPT_MYISAM_RECOVER,
|
|
"Syntax: myisam-recover[=option[,option...]], where option can be DEFAULT, BACKUP, FORCE or QUICK.",
|
|
(gptr*) &myisam_recover_options_str, (gptr*) &myisam_recover_options_str, 0,
|