summaryrefslogtreecommitdiff
path: root/mysql-test/r/log_tables.result
diff options
context:
space:
mode:
authorunknown <petr@mysql.com>2006-02-03 13:05:14 +0300
committerunknown <petr@mysql.com>2006-02-03 13:05:14 +0300
commitc0b31dc2f027d51d919051528a5c57509de97087 (patch)
tree5c628fcd13c32d98c2f02c80e598dda37aa2eb97 /mysql-test/r/log_tables.result
parent93985f253a6a5b951ef0d775718a7453ebc38ea5 (diff)
downloadmariadb-git-c0b31dc2f027d51d919051528a5c57509de97087.tar.gz
Fix for Bug#16905 Log tables: unicode statements are logged incorrectly
mysql-test/r/log_tables.result: update result mysql-test/t/log_tables.test: add a testcase sql/log.cc: take into account client charset info, while logging into a table. sql/log.h: pass the charset info along with the log messages to log them correctly
Diffstat (limited to 'mysql-test/r/log_tables.result')
-rw-r--r--mysql-test/r/log_tables.result12
1 files changed, 12 insertions, 0 deletions
diff --git a/mysql-test/r/log_tables.result b/mysql-test/r/log_tables.result
index caaf0367bb7..f75cf503938 100644
--- a/mysql-test/r/log_tables.result
+++ b/mysql-test/r/log_tables.result
@@ -52,3 +52,15 @@ select "Mark that we woke up from TRUNCATE in the test"
as "test passed";
test passed
Mark that we woke up from TRUNCATE in the test
+use test;
+truncate table mysql.general_log;
+set names utf8;
+create table bug16905 (s char(15) character set utf8 default 'пусто');
+insert into bug16905 values ('новое');
+select * from mysql.general_log;
+event_time user_host thread_id server_id command_type argument
+TIMESTAMP root[root] @ localhost [] 2 1 Query set names utf8
+TIMESTAMP root[root] @ localhost [] 2 1 Query create table bug16905 (s char(15) character set utf8 default 'пусто')
+TIMESTAMP root[root] @ localhost [] 2 1 Query insert into bug16905 values ('новое')
+TIMESTAMP root[root] @ localhost [] 2 1 Query select * from mysql.general_log
+drop table bug16905;