diff options
| author | Sergey Petrunya <psergey@askmonty.org> | 2013-07-04 15:45:58 +0400 |
|---|---|---|
| committer | Sergey Petrunya <psergey@askmonty.org> | 2013-07-04 15:45:58 +0400 |
| commit | 77584dd6d7a5d7c1d2f8b99726316017dc5ed5fc (patch) | |
| tree | c78144f039841952896e9139fd9b585857f22ba1 | |
| parent | 5b19ff65b3cf5c7a8ac1a961629c49e6485c2c8d (diff) | |
| download | mariadb-git-77584dd6d7a5d7c1d2f8b99726316017dc5ed5fc.tar.gz | |
MDEV-4756: 10.0-monty tree: log_state.test fails
- make the test output stable
- make Log_to_csv_event_handler::log_slow() to write the value
of thd->thread_id (it didn't, and so 0 was always logged).
| -rw-r--r-- | mysql-test/r/log_state.result | 6 | ||||
| -rw-r--r-- | mysql-test/t/log_state.test | 4 | ||||
| -rw-r--r-- | sql/log.cc | 3 |
3 files changed, 8 insertions, 5 deletions
diff --git a/mysql-test/r/log_state.result b/mysql-test/r/log_state.result index 3ccd1451bc4..1ce7eb0d2aa 100644 --- a/mysql-test/r/log_state.result +++ b/mysql-test/r/log_state.result @@ -45,7 +45,7 @@ select sleep(@long_query_time + 1); sleep(@long_query_time + 1) 0 select * from mysql.slow_log where sql_text NOT LIKE '%slow_log%'; -start_time user_host query_time lock_time rows_sent rows_examined db last_insert_id insert_id server_id sql_text +start_time user_host query_time lock_time rows_sent rows_examined db last_insert_id insert_id server_id sql_text thread_id # Switch to connection default set global slow_query_log= ON; # Switch to connection con1 @@ -54,8 +54,8 @@ select sleep(@long_query_time + 1); sleep(@long_query_time + 1) 0 select * from mysql.slow_log where sql_text NOT LIKE '%slow_log%'; -start_time user_host query_time lock_time rows_sent rows_examined db last_insert_id insert_id server_id sql_text -TIMESTAMP USER_HOST QUERY_TIME 00:00:00.000000 1 0 test 0 0 1 select sleep(@long_query_time + 1) +start_time user_host query_time lock_time rows_sent rows_examined db last_insert_id insert_id server_id sql_text thread_id +TIMESTAMP USER_HOST QUERY_TIME 00:00:00.000000 1 0 test 0 0 1 select sleep(@long_query_time + 1) THREAD_ID # Switch to connection default show global variables where Variable_name = 'log' or Variable_name = 'log_slow_queries' or diff --git a/mysql-test/t/log_state.test b/mysql-test/t/log_state.test index e8f0bf8c511..0b900b14b0b 100644 --- a/mysql-test/t/log_state.test +++ b/mysql-test/t/log_state.test @@ -48,7 +48,7 @@ connection con1; set @long_query_time = 2; set session long_query_time = @long_query_time; select sleep(@long_query_time + 1); ---replace_column 1 TIMESTAMP 2 USER_HOST 3 QUERY_TIME +--replace_column 1 TIMESTAMP 2 USER_HOST 3 QUERY_TIME 12 THREAD_ID select * from mysql.slow_log where sql_text NOT LIKE '%slow_log%'; --echo # Switch to connection default connection default; @@ -58,7 +58,7 @@ set global slow_query_log= ON; connection con1; set session long_query_time = @long_query_time; select sleep(@long_query_time + 1); ---replace_column 1 TIMESTAMP 2 USER_HOST 3 QUERY_TIME +--replace_column 1 TIMESTAMP 2 USER_HOST 3 QUERY_TIME 12 THREAD_ID select * from mysql.slow_log where sql_text NOT LIKE '%slow_log%'; --echo # Switch to connection default connection default; diff --git a/sql/log.cc b/sql/log.cc index 3c1e830402a..78fbd2cf0ab 100644 --- a/sql/log.cc +++ b/sql/log.cc @@ -895,6 +895,9 @@ bool Log_to_csv_event_handler:: if (table->field[10]->store(sql_text, sql_text_len, client_cs) < 0) goto err; + if (table->field[11]->store((longlong) thd->thread_id, TRUE)) + goto err; + /* log table entries are not replicated */ if (table->file->ha_write_row(table->record[0])) goto err; |