summaryrefslogtreecommitdiff
path: root/mysql-test/std_data/loaddata6.dat
diff options
context:
space:
mode:
authorunknown <bar@mysql.com>2007-02-28 17:06:57 +0400
committerunknown <bar@mysql.com>2007-02-28 17:06:57 +0400
commitc3a3aff54feeb194e0217249305f74f18021099a (patch)
tree08757272c814e1759ead34b34a2311273d1cf48d /mysql-test/std_data/loaddata6.dat
parent9dfb1d9011cf5b31d139d3904a0bf3afae91ad24 (diff)
downloadmariadb-git-c3a3aff54feeb194e0217249305f74f18021099a.tar.gz
Bug#15126 character_set_database is not replicated (LOAD DATA INFILE need it)
This patch fixes problem that LOAD DATA could use different character sets when loading files on master and on slave sides: - Adding replication of thd->variables.collation_database - Adding optional character set clause into LOAD DATA Note, the second way, with explicit CHARACTER SET clause should be the recommended way to load data using an alternative character set. The old way, using "SET @@character_set_database=xxx" should be gradually depricated. mysql-test/r/mysqlbinlog.result: Adding test case mysql-test/t/mysqlbinlog.test: Adding test case sql/log_event.cc: Adding logging of thd->variables.collation_database sql/log_event.h: Adding declarations sql/sql_class.cc: Exchange character set is null by default sql/sql_class.h: Adding character set into sql_exchange sql/sql_load.cc: - Using exchange character set (if it was specified in LOAD DATA syntax) - Using thd->variables.collation_database by default sql/sql_yacc.yy: Adding optional character set clause into LOAD DATA syntax mysql-test/r/rpl_loaddata2.result: New BitKeeper file ``mysql-test/r/rpl_loaddata2.result'' mysql-test/std_data/loaddata6.dat: New BitKeeper file ``mysql-test/std_data/loaddata6.dat'' mysql-test/t/rpl_loaddata2.test: New BitKeeper file ``mysql-test/t/rpl_loaddata2.test''
Diffstat (limited to 'mysql-test/std_data/loaddata6.dat')
-rw-r--r--mysql-test/std_data/loaddata6.dat1
1 files changed, 1 insertions, 0 deletions
diff --git a/mysql-test/std_data/loaddata6.dat b/mysql-test/std_data/loaddata6.dat
new file mode 100644
index 00000000000..29e181ebb88
--- /dev/null
+++ b/mysql-test/std_data/loaddata6.dat
@@ -0,0 +1 @@
+ÿ