Below is the list of changes that have just been committed into a local
5.1 repository of marcsql. When marcsql does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html
ChangeSet@stripped, 2007-08-01 16:18:56-06:00, malff@weblab.(none) +3 -0
Bug#27858 (Failing to log to a log table doesn't log anything to error log)
Before this patch, failures to write to the log tables (mysql.slow_log
and mysql.general_log) were improperly printed (the time was printed twice),
or not printed at all.
With this patch, failures to write to the log tables is reported in the
error log, for all cases of failures.
mysql-test/r/log_tables.result@stripped, 2007-08-01 16:18:48-06:00, malff@weblab.(none) +21 -0
Bug#27858 (Failing to log to a log table doesn't log anything to error log)
mysql-test/t/log_tables.test@stripped, 2007-08-01 16:18:48-06:00, malff@weblab.(none) +43 -0
Bug#27858 (Failing to log to a log table doesn't log anything to error log)
sql/log.cc@stripped, 2007-08-01 16:18:48-06:00, malff@weblab.(none) +10 -20
Bug#27858 (Failing to log to a log table doesn't log anything to error log)
diff -Nrup a/mysql-test/r/log_tables.result b/mysql-test/r/log_tables.result
--- a/mysql-test/r/log_tables.result 2007-07-27 00:29:20 -06:00
+++ b/mysql-test/r/log_tables.result 2007-08-01 16:18:48 -06:00
@@ -270,6 +270,10 @@ use mysql;
lock tables general_log read local, help_category read local;
ERROR HY000: You can't use locks with log tables.
unlock tables;
+drop table if exists mysql.renamed_general_log;
+drop table if exists mysql.renamed_slow_log;
+drop table if exists mysql.general_log_new;
+drop table if exists mysql.slow_log_new;
use mysql;
RENAME TABLE general_log TO renamed_general_log;
ERROR HY000: Cannot rename 'general_log'. When logging enabled, rename to/from log table must rename two tables: the log table to an archive table and another table back to 'general_log'
@@ -321,6 +325,23 @@ flush logs;
flush logs;
drop table renamed_general_log, renamed_slow_log;
use test;
+drop table if exists mysql.bad_general_log;
+drop table if exists mysql.bad_slow_log;
+drop table if exists mysql.general_log_hide;
+drop table if exists mysql.slow_log_hide;
+create table mysql.bad_general_log (a int) engine= CSV;
+create table mysql.bad_slow_log (a int) engine= CSV;
+rename table mysql.general_log to mysql.general_log_hide, mysql.bad_general_log TO mysql.general_log;
+rename table mysql.slow_log to mysql.slow_log_hide, mysql.bad_slow_log TO mysql.slow_log;
+flush tables;
+select "logging this should fail";
+logging this should fail
+logging this should fail
+rename table mysql.general_log to mysql.bad_general_log, mysql.general_log_hide TO mysql.general_log;
+rename table mysql.slow_log to mysql.bad_slow_log, mysql.slow_log_hide TO mysql.slow_log;
+flush tables;
+drop table mysql.bad_general_log;
+drop table mysql.bad_slow_log;
use mysql;
repair table general_log;
Table Op Msg_type Msg_text
diff -Nrup a/mysql-test/t/log_tables.test b/mysql-test/t/log_tables.test
--- a/mysql-test/t/log_tables.test 2007-07-27 00:29:20 -06:00
+++ b/mysql-test/t/log_tables.test 2007-08-01 16:18:48 -06:00
@@ -295,6 +295,13 @@ unlock tables;
# Bug #21785 Server crashes after rename of the log table
#
+--disable_warnings
+drop table if exists mysql.renamed_general_log;
+drop table if exists mysql.renamed_slow_log;
+drop table if exists mysql.general_log_new;
+drop table if exists mysql.slow_log_new;
+--enable_warnings
+
use mysql;
# Should result in error
--error ER_CANT_RENAME_LOG_TABLE
@@ -357,6 +364,42 @@ flush logs;
flush logs;
drop table renamed_general_log, renamed_slow_log;
use test;
+
+#
+# Bug#27858 (Failing to log to a log table doesn't log anything to error log)
+#
+
+--disable_warnings
+drop table if exists mysql.bad_general_log;
+drop table if exists mysql.bad_slow_log;
+drop table if exists mysql.general_log_hide;
+drop table if exists mysql.slow_log_hide;
+--enable_warnings
+
+create table mysql.bad_general_log (a int) engine= CSV;
+create table mysql.bad_slow_log (a int) engine= CSV;
+
+# Rename does not perform checks on the table structure,
+# exploiting this to force a failure to log
+rename table mysql.general_log to mysql.general_log_hide, mysql.bad_general_log TO mysql.general_log;
+rename table mysql.slow_log to mysql.slow_log_hide, mysql.bad_slow_log TO mysql.slow_log;
+
+# The following message should be printed in master.log:
+# [ERROR] Failed to write to mysql.general_log
+# TODO: See how verifying this could be automated
+
+flush tables;
+select "logging this should fail";
+
+# Restore the log tables
+
+rename table mysql.general_log to mysql.bad_general_log, mysql.general_log_hide TO mysql.general_log;
+rename table mysql.slow_log to mysql.bad_slow_log, mysql.slow_log_hide TO mysql.slow_log;
+
+flush tables;
+
+drop table mysql.bad_general_log;
+drop table mysql.bad_slow_log;
#
# Bug #21966 Strange warnings on repair of the log tables
diff -Nrup a/sql/log.cc b/sql/log.cc
--- a/sql/log.cc 2007-07-30 23:03:47 -06:00
+++ b/sql/log.cc 2007-08-01 16:18:48 -06:00
@@ -301,7 +301,7 @@ void Log_to_csv_event_handler::cleanup()
RETURN
FALSE - OK
- TRUE - error occured
+ TRUE - error occurred
*/
bool Log_to_csv_event_handler::
@@ -410,19 +410,14 @@ bool Log_to_csv_event_handler::
/* log table entries are not replicated */
if (table->file->ha_write_row(table->record[0]))
- {
- struct tm start;
- localtime_r(&event_time, &start);
-
- sql_print_error("%02d%02d%02d %2d:%02d:%02d - Failed to write to mysql.general_log",
- start.tm_year % 100, start.tm_mon + 1,
- start.tm_mday, start.tm_hour,
- start.tm_min, start.tm_sec);
- }
+ goto err;
result= FALSE;
err:
+ if (result)
+ sql_print_error("Failed to write to mysql.general_log");
+
if (need_rnd_end)
{
table->file->ha_rnd_end();
@@ -470,7 +465,7 @@ err:
RETURN
FALSE - OK
- TRUE - error occured
+ TRUE - error occurred
*/
bool Log_to_csv_event_handler::
@@ -613,19 +608,14 @@ bool Log_to_csv_event_handler::
/* log table entries are not replicated */
if (table->file->ha_write_row(table->record[0]))
- {
- struct tm start;
- localtime_r(¤t_time, &start);
-
- sql_print_error("%02d%02d%02d %2d:%02d:%02d - Failed to write to mysql.slow_log",
- start.tm_year % 100, start.tm_mon + 1,
- start.tm_mday, start.tm_hour,
- start.tm_min, start.tm_sec);
- }
+ goto err;
result= FALSE;
err:
+ if (result)
+ sql_print_error("Failed to write to mysql.slow_log");
+
if (need_rnd_end)
{
table->file->ha_rnd_end();
