2006-06-19 15:30:55 +02:00
|
|
|
-- source include/not_embedded.inc
|
|
|
|
|
--source include/have_csv.inc
|
|
|
|
|
|
|
|
|
|
--disable_ps_protocol
|
|
|
|
|
set global general_log= OFF;
|
|
|
|
|
truncate table mysql.general_log;
|
|
|
|
|
truncate table mysql.slow_log;
|
|
|
|
|
show global variables
|
|
|
|
|
where Variable_name = 'log' or Variable_name = 'log_slow_queries' or
|
|
|
|
|
Variable_name = 'general_log' or Variable_name = 'slow_query_log';
|
|
|
|
|
flush logs;
|
|
|
|
|
set global general_log= ON;
|
|
|
|
|
create table t1(f1 int);
|
2006-06-22 16:20:29 +02:00
|
|
|
--replace_column 1 TIMESTAMP 2 USER_HOST 3 #
|
2006-06-19 15:30:55 +02:00
|
|
|
select * from mysql.general_log;
|
|
|
|
|
set global general_log= OFF;
|
|
|
|
|
drop table t1;
|
2006-06-22 16:20:29 +02:00
|
|
|
--replace_column 1 TIMESTAMP 2 USER_HOST 3 #
|
2006-06-19 15:30:55 +02:00
|
|
|
select * from mysql.general_log;
|
|
|
|
|
set global general_log= ON;
|
|
|
|
|
flush logs;
|
|
|
|
|
show global variables
|
|
|
|
|
where Variable_name = 'log' or Variable_name = 'log_slow_queries' or
|
|
|
|
|
Variable_name = 'general_log' or Variable_name = 'slow_query_log';
|
|
|
|
|
|
|
|
|
|
connect (con1,localhost,root,,);
|
|
|
|
|
connection con1;
|
|
|
|
|
set session long_query_time=1;
|
|
|
|
|
select sleep(2);
|
2006-06-22 16:20:29 +02:00
|
|
|
--replace_column 1 TIMESTAMP 2 USER_HOST 3 QUERY_TIME
|
2007-08-08 13:49:19 +02:00
|
|
|
select * from mysql.slow_log where sql_text NOT LIKE '%slow_log%';
|
2006-06-19 15:30:55 +02:00
|
|
|
connection default;
|
|
|
|
|
|
|
|
|
|
set global slow_query_log= ON;
|
|
|
|
|
connection con1;
|
|
|
|
|
set session long_query_time=1;
|
|
|
|
|
select sleep(2);
|
2006-06-22 16:20:29 +02:00
|
|
|
--replace_column 1 TIMESTAMP 2 USER_HOST 3 QUERY_TIME
|
2007-08-08 13:49:19 +02:00
|
|
|
select * from mysql.slow_log where sql_text NOT LIKE '%slow_log%';
|
2006-06-19 15:30:55 +02:00
|
|
|
connection default;
|
|
|
|
|
show global variables
|
|
|
|
|
where Variable_name = 'log' or Variable_name = 'log_slow_queries' or
|
|
|
|
|
Variable_name = 'general_log' or Variable_name = 'slow_query_log';
|
|
|
|
|
|
|
|
|
|
set global general_log= ON;
|
|
|
|
|
set global general_log= OFF;
|
|
|
|
|
set global general_log= OFF;
|
|
|
|
|
set global slow_query_log= ON;
|
|
|
|
|
set global slow_query_log= OFF;
|
|
|
|
|
set global slow_query_log= OFF;
|
|
|
|
|
|
|
|
|
|
set global general_log= ON;
|
|
|
|
|
truncate table mysql.general_log;
|
|
|
|
|
create table t1(f1 int);
|
|
|
|
|
drop table t1;
|
2006-06-22 16:20:29 +02:00
|
|
|
--replace_column 1 TIMESTAMP 2 USER_HOST 3 #
|
2006-06-19 15:30:55 +02:00
|
|
|
select * from mysql.general_log;
|
|
|
|
|
set global general_log= OFF;
|
|
|
|
|
truncate table mysql.general_log;
|
2006-06-22 16:20:29 +02:00
|
|
|
--replace_column 1 TIMESTAMP 2 USER_HOST 3 #
|
2006-06-19 15:30:55 +02:00
|
|
|
select * from mysql.general_log;
|
|
|
|
|
set global general_log= ON;
|
|
|
|
|
show global variables
|
|
|
|
|
where Variable_name = 'log' or Variable_name = 'log_slow_queries' or
|
|
|
|
|
Variable_name = 'general_log' or Variable_name = 'slow_query_log';
|
|
|
|
|
|
|
|
|
|
--replace_column 2 #
|
|
|
|
|
show variables like 'general_log_file';
|
|
|
|
|
--replace_column 2 #
|
|
|
|
|
show variables like 'slow_query_log_file';
|
|
|
|
|
show variables like 'log_output';
|
|
|
|
|
|
2007-02-20 21:00:05 +01:00
|
|
|
# Can't set general_log_file to a non existing file
|
2006-06-19 15:30:55 +02:00
|
|
|
--error 1231
|
|
|
|
|
set global general_log_file='/not exiting path/log.master';
|
2007-02-20 21:00:05 +01:00
|
|
|
|
|
|
|
|
# Can't set general_log_file to a directory
|
|
|
|
|
--replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
|
2006-06-19 15:30:55 +02:00
|
|
|
--error 1231
|
2007-02-20 21:00:05 +01:00
|
|
|
eval set global general_log_file='$MYSQLTEST_VARDIR';
|
|
|
|
|
|
|
|
|
|
# Can't set general_log_file to empty string
|
2006-06-19 15:30:55 +02:00
|
|
|
--error 1231
|
|
|
|
|
set global general_log_file='';
|
2007-02-20 21:00:05 +01:00
|
|
|
|
2006-06-19 15:30:55 +02:00
|
|
|
--replace_column 2 #
|
|
|
|
|
show variables like 'general_log_file';
|
|
|
|
|
set global general_log= OFF;
|
2006-07-04 22:37:32 +02:00
|
|
|
--replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
|
|
|
|
|
eval set global general_log_file='$MYSQLTEST_VARDIR/tmp/log.master';
|
2006-06-19 15:30:55 +02:00
|
|
|
set global general_log= ON;
|
|
|
|
|
create table t1(f1 int);
|
|
|
|
|
drop table t1;
|
|
|
|
|
set global general_log= OFF;
|
|
|
|
|
set global general_log_file=default;
|
|
|
|
|
set global general_log= ON;
|
|
|
|
|
create table t1(f1 int);
|
|
|
|
|
drop table t1;
|
|
|
|
|
--replace_column 2 #
|
|
|
|
|
show variables like 'general_log_file';
|
|
|
|
|
--replace_column 2 #
|
|
|
|
|
show variables like 'slow_query_log_file';
|
|
|
|
|
|
|
|
|
|
set global general_log= default;
|
|
|
|
|
set global slow_query_log= default;
|
|
|
|
|
set global general_log_file= default;
|
|
|
|
|
set global slow_query_log_file= default;
|
|
|
|
|
show variables like 'general_log';
|
|
|
|
|
show variables like 'slow_query_log';
|
|
|
|
|
set global general_log=ON;
|
|
|
|
|
set global log_output=default;
|
|
|
|
|
show variables like 'log_output';
|
|
|
|
|
set global general_log=OFF;
|
|
|
|
|
set global log_output=FILE;
|
|
|
|
|
truncate table mysql.general_log;
|
|
|
|
|
show variables like 'log_output';
|
|
|
|
|
set global general_log=ON;
|
|
|
|
|
create table t1(f1 int);
|
2006-06-22 16:20:29 +02:00
|
|
|
--replace_column 1 TIMESTAMP 2 USER_HOST 3 #
|
2006-06-19 15:30:55 +02:00
|
|
|
select * from mysql.general_log;
|
|
|
|
|
set global general_log=OFF;
|
|
|
|
|
set global log_output="FILE,TABLE";
|
|
|
|
|
show variables like 'log_output';
|
|
|
|
|
set global general_log=ON;
|
|
|
|
|
drop table t1;
|
2006-06-22 16:20:29 +02:00
|
|
|
--replace_column 1 TIMESTAMP 2 USER_HOST 3 #
|
2006-06-19 15:30:55 +02:00
|
|
|
select * from mysql.general_log;
|
|
|
|
|
|
WL#3984 (Revise locking of mysql.general_log and mysql.slow_log)
Bug#25422 (Hang with log tables)
Bug 17876 (Truncating mysql.slow_log in a SP after using cursor locks the
thread)
Bug 23044 (Warnings on flush of a log table)
Bug 29129 (Resetting general_log while the GLOBAL READ LOCK is set causes
a deadlock)
Prior to this fix, the server would hang when performing concurrent
ALTER TABLE or TRUNCATE TABLE statements against the LOG TABLES,
which are mysql.general_log and mysql.slow_log.
The root cause traces to the following code:
in sql_base.cc, open_table()
if (table->in_use != thd)
{
/* wait_for_condition will unlock LOCK_open for us */
wait_for_condition(thd, &LOCK_open, &COND_refresh);
}
The problem with this code is that the current implementation of the
LOGGER creates 'fake' THD objects, like
- Log_to_csv_event_handler::general_log_thd
- Log_to_csv_event_handler::slow_log_thd
which are not associated to a real thread running in the server,
so that waiting for these non-existing threads to release table locks
cause the dead lock.
In general, the design of Log_to_csv_event_handler does not fit into the
general architecture of the server, so that the concept of general_log_thd
and slow_log_thd has to be abandoned:
- this implementation does not work with table locking
- it will not work with commands like SHOW PROCESSLIST
- having the log tables always opened does not integrate well with DDL
operations / FLUSH TABLES / SET GLOBAL READ_ONLY
With this patch, the fundamental design of the LOGGER has been changed to:
- always open and close a log table when writing a log
- remove totally the usage of fake THD objects
- clarify how locking of log tables is implemented in general.
See WL#3984 for details related to the new locking design.
Additional changes (misc bugs exposed and fixed):
1)
mysqldump which would ignore some tables in dump_all_tables_in_db(),
but forget to ignore the same in dump_all_views_in_db().
2)
mysqldump would also issue an empty "LOCK TABLE" command when all the tables
to lock are to be ignored (numrows == 0), instead of not issuing the query.
3)
Internal errors handlers could intercept errors but not warnings
(see sql_error.cc).
4)
Implementing a nested call to open tables, for the performance schema tables,
exposed an existing bug in remove_table_from_cache(), which would perform:
in_use->some_tables_deleted=1;
against another thread, without any consideration about thread locking.
This call inside remove_table_from_cache() was not required anyway,
since calling mysql_lock_abort() takes care of aborting -- cleanly -- threads
that might hold a lock on a table.
This line (in_use->some_tables_deleted=1) has been removed.
sql/handler.cc:
Moved logic for system / log tables in the SQL layer.
sql/handler.h:
Moved logic for system / log tables in the SQL layer.
sql/lock.cc:
Revised locking of log tables
sql/log.cc:
Major cleanup: changed how log tables are locked / written to.
sql/log.h:
Major cleanup: changed how log tables are locked / written to.
sql/mysql_priv.h:
performance schema helpers
sql/slave.cc:
open_ltable() lock flags
sql/sp.cc:
open_ltable() lock flags
sql/sql_acl.cc:
open_ltable() lock flags
sql/sql_class.h:
performance schema helpers
sql/sql_delete.cc:
log tables cleanup in TRUNCATE
sql/sql_error.cc:
Internal handlers can also intercept warnings
sql/sql_insert.cc:
open_ltable() lock flags
sql/sql_parse.cc:
performance schema helpers
sql/sql_plugin.cc:
open_ltable() lock flags
sql/sql_rename.cc:
log tables cleanup in RENAME
sql/sql_servers.cc:
open_ltable() lock flags
sql/sql_show.cc:
Move INFORMATION_SCHEMA_NAME to table.cc
sql/sql_table.cc:
log tables cleanup (admin operations, ALTER TABLE)
sql/sql_udf.cc:
open_ltable() lock flags
sql/table.cc:
Implemented TABLE_CATEGORY.
sql/share/errmsg.txt:
Changed the wording and name of ER_CANT_READ_LOCK_LOG_TABLE
sql/table.h:
Implemented TABLE_CATEGORY.
storage/csv/ha_tina.cc:
Moved logic for system / log tables in the SQL layer.
storage/csv/ha_tina.h:
Moved logic for system / log tables in the SQL layer.
storage/myisam/ha_myisam.cc:
Moved logic for system / log tables in the SQL layer.
storage/myisam/ha_myisam.h:
Moved logic for system / log tables in the SQL layer.
client/mysqldump.c:
Don't lock tables in the ignore list.
Don't issue empty LOCK TABLES queries.
sql/sql_base.cc:
log tables cleanup
performance schema helpers
mysql-test/r/ps.result:
Adjust test results
mysql-test/r/show_check.result:
Adjust test results
mysql-test/r/status.result:
Adjust test results
mysql-test/t/log_state.test:
Added tests for Bug#29129
mysql-test/t/ps.test:
Make the test output deterministic
mysql-test/t/show_check.test:
Make the test output deterministic
mysql-test/r/log_state.result:
Changed the default location of the log output to LOG_FILE,
for backward compatibility with MySQL 5.0
---
Adjust test results
mysql-test/r/log_tables.result:
cleanup for -ps-protocol
mysql-test/t/log_tables.test:
cleanup for -ps-protocol
sql/set_var.cc:
Changed the default location of the log output to LOG_FILE,
for backward compatibility with MySQL 5.0
---
log tables cleanup
2007-07-27 08:31:06 +02:00
|
|
|
#
|
|
|
|
|
# Bug#29129 (Resetting general_log while the GLOBAL READ LOCK is set causes
|
|
|
|
|
# a deadlock)
|
|
|
|
|
|
|
|
|
|
# save state
|
|
|
|
|
|
|
|
|
|
SET @old_general_log_state = @@global.general_log;
|
|
|
|
|
SET @old_slow_log_state = @@global.slow_query_log;
|
|
|
|
|
|
|
|
|
|
# Test ON->OFF transition under a GLOBAL READ LOCK
|
|
|
|
|
|
|
|
|
|
SET GLOBAL general_log = ON;
|
|
|
|
|
SET GLOBAL slow_query_log = ON;
|
|
|
|
|
|
|
|
|
|
FLUSH TABLES WITH READ LOCK;
|
|
|
|
|
|
|
|
|
|
SET GLOBAL general_log = OFF;
|
|
|
|
|
SET GLOBAL slow_query_log = OFF;
|
|
|
|
|
|
|
|
|
|
UNLOCK TABLES;
|
|
|
|
|
|
|
|
|
|
# Test OFF->ON transition under a GLOBAL READ LOCK
|
|
|
|
|
|
|
|
|
|
FLUSH TABLES WITH READ LOCK;
|
|
|
|
|
|
|
|
|
|
SET GLOBAL general_log = ON;
|
|
|
|
|
SET GLOBAL slow_query_log = ON;
|
|
|
|
|
|
|
|
|
|
UNLOCK TABLES;
|
|
|
|
|
|
|
|
|
|
# Test ON->OFF transition under a GLOBAL READ_ONLY
|
|
|
|
|
|
|
|
|
|
SET GLOBAL READ_ONLY = ON;
|
|
|
|
|
|
|
|
|
|
SET GLOBAL general_log = OFF;
|
|
|
|
|
SET GLOBAL slow_query_log = OFF;
|
|
|
|
|
|
|
|
|
|
SET GLOBAL READ_ONLY = OFF;
|
|
|
|
|
|
|
|
|
|
# Test OFF->ON transition under a GLOBAL READ_ONLY
|
|
|
|
|
|
|
|
|
|
SET GLOBAL READ_ONLY = ON;
|
|
|
|
|
|
|
|
|
|
SET GLOBAL general_log = ON;
|
|
|
|
|
SET GLOBAL slow_query_log = ON;
|
|
|
|
|
|
|
|
|
|
SET GLOBAL READ_ONLY = OFF;
|
|
|
|
|
|
|
|
|
|
# Restore state
|
|
|
|
|
|
|
|
|
|
SET GLOBAL general_log = @old_general_log_state;
|
|
|
|
|
SET GLOBAL slow_query_log = @old_slow_log_state;
|
|
|
|
|
|
2007-10-25 12:03:24 +02:00
|
|
|
#
|
|
|
|
|
# Bug #29131: SHOW VARIABLES reports variable 'log' but SET doesn't recognize it
|
|
|
|
|
#
|
|
|
|
|
|
|
|
|
|
SET @old_general_log_state = @@global.general_log;
|
|
|
|
|
SET @old_slow_log_state = @@global.slow_query_log;
|
|
|
|
|
|
|
|
|
|
SHOW VARIABLES LIKE 'general_log';
|
|
|
|
|
SHOW VARIABLES LIKE 'log';
|
|
|
|
|
SELECT @@general_log, @@log;
|
|
|
|
|
SET GLOBAL log = 0;
|
|
|
|
|
SHOW VARIABLES LIKE 'general_log';
|
|
|
|
|
SHOW VARIABLES LIKE 'log';
|
|
|
|
|
SELECT @@general_log, @@log;
|
|
|
|
|
SET GLOBAL general_log = 1;
|
|
|
|
|
SHOW VARIABLES LIKE 'general_log';
|
|
|
|
|
SHOW VARIABLES LIKE 'log';
|
|
|
|
|
SELECT @@general_log, @@log;
|
|
|
|
|
|
|
|
|
|
SHOW VARIABLES LIKE 'slow_query_log';
|
|
|
|
|
SHOW VARIABLES LIKE 'log_slow_queries';
|
|
|
|
|
SELECT @@slow_query_log, @@log_slow_queries;
|
|
|
|
|
SET GLOBAL log_slow_queries = 0;
|
|
|
|
|
SHOW VARIABLES LIKE 'slow_query_log';
|
|
|
|
|
SHOW VARIABLES LIKE 'log_slow_queries';
|
|
|
|
|
SELECT @@slow_query_log, @@log_slow_queries;
|
|
|
|
|
SET GLOBAL slow_query_log = 1;
|
|
|
|
|
SHOW VARIABLES LIKE 'slow_query_log';
|
|
|
|
|
SHOW VARIABLES LIKE 'log_slow_queries';
|
|
|
|
|
SELECT @@slow_query_log, @@log_slow_queries;
|
|
|
|
|
|
|
|
|
|
SET GLOBAL general_log = @old_general_log_state;
|
|
|
|
|
SET GLOBAL slow_query_log = @old_slow_log_state;
|
|
|
|
|
|
2007-10-16 14:19:07 +02:00
|
|
|
#
|
|
|
|
|
# Bug #31604: server crash when setting slow_query_log_file/general_log_file
|
|
|
|
|
#
|
|
|
|
|
set @old_general_log_file= @@global.general_log_file;
|
|
|
|
|
set @old_slow_query_log_file= @@global.slow_query_log_file;
|
|
|
|
|
|
|
|
|
|
--error 1231
|
|
|
|
|
set global general_log_file= concat('/not exiting path/log.maste', 'r');
|
|
|
|
|
--error 1231
|
|
|
|
|
set global general_log_file= NULL;
|
|
|
|
|
--error 1231
|
|
|
|
|
set global slow_query_log_file= concat('/not exiting path/log.maste', 'r');
|
|
|
|
|
--error 1231
|
|
|
|
|
set global slow_query_log_file= NULL;
|
|
|
|
|
|
|
|
|
|
set global general_log_file= @old_general_log_file;
|
|
|
|
|
set global slow_query_log_file= @old_slow_query_log_file;
|
|
|
|
|
|
2007-10-25 12:03:24 +02:00
|
|
|
--echo End of 5.1 tests
|
|
|
|
|
|
2006-06-19 15:30:55 +02:00
|
|
|
--enable_ps_protocol
|
2007-01-30 12:52:26 +01:00
|
|
|
|
|
|
|
|
#
|
|
|
|
|
# Cleanup (must be done last to avoid delayed 'Quit' message in general log)
|
|
|
|
|
#
|
|
|
|
|
disconnect con1;
|
2007-03-20 11:21:27 +01:00
|
|
|
|
|
|
|
|
# Remove the log files that was created in the "default location"
|
|
|
|
|
# i.e var/run
|
|
|
|
|
--remove_file $MYSQLTEST_VARDIR/run/master.log
|