diff options
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/ha_myisam.cc | 3 | ||||
| -rw-r--r-- | sql/mysqld.cc | 21 | ||||
| -rw-r--r-- | sql/sql_lex.cc | 3 | ||||
| -rw-r--r-- | sql/sql_table.cc | 1 |
4 files changed, 23 insertions, 5 deletions
diff --git a/sql/ha_myisam.cc b/sql/ha_myisam.cc index c4393ea8c5d..af35c0269c4 100644 --- a/sql/ha_myisam.cc +++ b/sql/ha_myisam.cc @@ -484,7 +484,8 @@ int ha_myisam::repair(THD* thd, HA_CHECK_OPT *check_opt) } break; } - if (!error && start_records != file->state->records) + if (!error && start_records != file->state->records && + !(check_opt->flags & T_VERY_SILENT)) { char llbuff[22],llbuff2[22]; sql_print_error("Warning: Found %s of %s rows when repairing '%s'", diff --git a/sql/mysqld.cc b/sql/mysqld.cc index a25ac8bdbfb..2f672c6f409 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -2716,6 +2716,14 @@ struct show_var_st init_vars[]= { {"have_raid", (char*) &have_raid, SHOW_HAVE}, {"have_ssl", (char*) &have_ssl, SHOW_HAVE}, {"init_file", (char*) &opt_init_file, SHOW_CHAR_PTR}, +#ifdef HAVE_INNOBASE_DB + {"innobase_data_file_path", innobase_data_file_path, SHOW_CHAR}, + {"innobase_data_home_dir", innobase_data_home_dir, SHOW_CHAR}, + {"innobase_flush_log_at_trx_commit", (char*) &innobase_flush_log_at_trx_commit, SHOW_MY_BOOL}, + {"innobase_log_arch_dir", innobase_log_arch_dir, SHOW_CHAR}, + {"innobase_log_archive", (char*) &innobase_log_archive, SHOW_MY_BOOL}, + {"innobase_log_group_home_dir", innobase_log_group_home_dir, SHOW_CHAR}, +#endif {"interactive_timeout", (char*) &net_interactive_timeout, SHOW_LONG}, {"join_buffer_size", (char*) &join_buff_size, SHOW_LONG}, {"key_buffer_size", (char*) &keybuff_size, SHOW_LONG}, @@ -2961,12 +2969,19 @@ static void usage(void) --bdb-tmpdir=directory Berkeley DB tempfile name\n\ --skip-bdb Don't use berkeley db (will save memory)\n\ "); -#endif +#endif /* HAVE_BERKELEY_DB */ #ifdef HAVE_INNOBASE_DB puts("\ - --skip-innobase Don't use innobase (will save memory)\n\ + --innobase_data_home_dir=dir The common part for innobase table spaces\n + --innobase_data_file_path=dir Path to individual files and their sizes\n + --innobase_flush_log_at_trx_commit[=#] + Set to 0 if you don't want to flush logs\n\ + --innobase_log_arch_dir=dir Where full logs should be archived\n\ + --innobase_log_archive[=#] Set to 1 if you want to have logs archived\n\ + --innobase_log_group_home_dir=dir Path to Innobase log files. + --skip-innobase Don't use innobase (will save memory)\n\ "); -#endif +#endif /* HAVE_INNOBASE_DB */ print_defaults("my",load_default_groups); puts(""); diff --git a/sql/sql_lex.cc b/sql/sql_lex.cc index ca36cb9f205..b8d2ee13b0e 100644 --- a/sql/sql_lex.cc +++ b/sql/sql_lex.cc @@ -250,7 +250,8 @@ static char *get_text(LEX *lex) str=lex->tok_start+1; end=lex->ptr-1; - start=(uchar*) sql_alloc((uint) (end-str)+1); + if (!(start=(uchar*) sql_alloc((uint) (end-str)+1))) + return (char*) ""; // Sql_alloc has set error flag if (!found_escape) { lex->yytoklen=(uint) (end-str); diff --git a/sql/sql_table.cc b/sql/sql_table.cc index 4d6a2e79fc3..ed109127e30 100644 --- a/sql/sql_table.cc +++ b/sql/sql_table.cc @@ -1027,6 +1027,7 @@ int mysql_backup_table(THD* thd, TABLE_LIST* table_list) "backup", TL_READ, 0, 0, 0, &handler::backup)); } + int mysql_restore_table(THD* thd, TABLE_LIST* table_list) { DBUG_ENTER("mysql_restore_table"); |