diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2012-03-21 18:30:34 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2012-03-21 18:30:34 +0100 |
| commit | c88e2679c60f56719b6d347c30374e69ffd3d5c4 (patch) | |
| tree | 93dfaefc07a8589710c137c01c3e2ea1af9024e5 /sql | |
| parent | e638e605895fb572047ec8027e91c5438d77cbf4 (diff) | |
| parent | d1f311799988266159310afce3cf19eaf58a1fa5 (diff) | |
| download | mariadb-git-c88e2679c60f56719b6d347c30374e69ffd3d5c4.tar.gz | |
merge
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/signal_handler.cc | 2 | ||||
| -rw-r--r-- | sql/sql_show.cc | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/sql/signal_handler.cc b/sql/signal_handler.cc index 3847b7a5f6d..8128dddc7ee 100644 --- a/sql/signal_handler.cc +++ b/sql/signal_handler.cc @@ -72,7 +72,7 @@ extern "C" sig_handler handle_fatal_signal(int sig) curr_time= my_time(0); localtime_r(&curr_time, &tm); - fprintf(stderr, "%02d%02d%02d %2d:%02d:%02d ", + my_safe_printf_stderr("%02d%02d%02d %2d:%02d:%02d ", tm.tm_year % 100, tm.tm_mon+1, tm.tm_mday, tm.tm_hour, tm.tm_min, tm.tm_sec); if (opt_expect_abort diff --git a/sql/sql_show.cc b/sql/sql_show.cc index 5bbc337c761..6811af83d49 100644 --- a/sql/sql_show.cc +++ b/sql/sql_show.cc @@ -6741,6 +6741,8 @@ bool get_schema_tables_result(JOIN *join, join->error= 1; tab->read_record.file= table_list->table->file; table_list->schema_table_state= executed_place; + if (!thd->is_error()) + my_error(ER_UNKNOWN_ERROR, MYF(0)); break; } tab->read_record.file= table_list->table->file; |