1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge mysql.com:/home/ram/work/b30088/b30088.5.0

Browse Source 
into  mysql.com:/home/ram/work/b30088/b30088.5.1


sql/mysqld.cc:
  Auto merged
mysql-test/t/show_check.test:
  SCCS merged
This commit is contained in:
unknown 2007-08-02 16:56:32 +05:00
commit 2a20aa7f8a
3 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/t/show_check-master.opt
View File

@ -1 +1 @@
--log-slow-queries --log-long-format --log-queries-not-using-indexes --log-slow-queries --log-long-format --log-queries-not-using-indexes --myisam-recover=""

5
mysql-test/t/show_check.test
View File

@ -903,6 +903,11 @@ show variables like "log_queries_not_using_indexes";
select 1 from information_schema.tables limit 1; select 1 from information_schema.tables limit 1;
show status like 'slow_queries'; show status like 'slow_queries';
#
# Bug #30088: Can't disable myisam-recover by a value of ""
#
show variables like 'myisam_recover_options';
--echo End of 5.0 tests --echo End of 5.0 tests
--disable_result_log --disable_result_log

7
sql/mysqld.cc
View File

@ -7627,11 +7627,16 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)),
#endif #endif
case OPT_MYISAM_RECOVER: case OPT_MYISAM_RECOVER:
{ {
if (!argument || !argument[0]) if (!argument)
{ {
myisam_recover_options= HA_RECOVER_DEFAULT; myisam_recover_options= HA_RECOVER_DEFAULT;
myisam_recover_options_str= myisam_recover_typelib.type_names[0]; myisam_recover_options_str= myisam_recover_typelib.type_names[0];
} }
else if (!argument[0])
{
myisam_recover_options= HA_RECOVER_NONE;
myisam_recover_options_str= "OFF";
}
else else
{ {
myisam_recover_options_str=argument; myisam_recover_options_str=argument;