mirror of
https://github.com/MariaDB/server.git
synced 2025-01-22 23:04:20 +01:00
077840fa23
into a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-4.1 include/thr_alarm.h: Auto merged mysys/my_pthread.c: Auto merged BUILD/SETUP.sh: Merged from 4.0 configure.in: Merged from 4.0 include/my_global.h: Merged from 4.0 include/my_pthread.h: Merged from 4.0 mysys/thr_alarm.c: Merged from 4.0 sql/mysqld.cc: Merged from 4.0 BUILD/SETUP.sh.rej: Merged from 4.0 configure.in.rej: Merged from 4.0 include/my_global.h.rej: Merged from 4.0 include/my_pthread.h.rej: Merged from 4.0 mysys/thr_alarm.c.rej: Merged from 4.0 sql/mysqld.cc.rej: Merged from 4.0
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,
|