diff options
author | Dmitry Shulga <dmitry.shulga@mariadb.com> | 2021-04-27 16:49:17 +0700 |
---|---|---|
committer | Sergei Golubchik <serg@mariadb.org> | 2021-06-17 19:30:24 +0200 |
commit | aeca826c5fe9e6709bbdb7f89c12a8c4df31c84f (patch) | |
tree | ae99da6979d7be425d6c270a8f1a3b37f62185ce /mysql-test/main/log_tables.test | |
parent | 7586eead5d5f323d9d95b73c21de51e6b992d8c7 (diff) | |
download | mariadb-git-aeca826c5fe9e6709bbdb7f89c12a8c4df31c84f.tar.gz |
MDEV-16708: Unsupported commands for prepared statements
Write a log event to the general log before executing a statemment in PS mode
This change fixes failure of the test main.log_tables when it is run in PS mode
Updated the test main.events_logs_tests to query mysql.general_log
for the command_type 'Query' and 'Execute' in order to have consistent
test result both in case the test is run with --ps-protocol and without it
Diffstat (limited to 'mysql-test/main/log_tables.test')
-rw-r--r-- | mysql-test/main/log_tables.test | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/mysql-test/main/log_tables.test b/mysql-test/main/log_tables.test index 537bd843af8..22db93bd1ed 100644 --- a/mysql-test/main/log_tables.test +++ b/mysql-test/main/log_tables.test @@ -988,7 +988,8 @@ prepare long_query from "select ? as long_query"; execute long_query using @lparam; --enable_result_log set global general_log = off; -select command_type, argument from mysql.general_log where thread_id = @thread_id; +select argument from mysql.general_log where thread_id = @thread_id +AND (command_type = 'Query' OR command_type= 'Execute'); deallocate prepare long_query; set global general_log = @old_general_log; |