diff options
| author | unknown <aelkin@mysql.com> | 2006-02-14 20:48:34 +0200 |
|---|---|---|
| committer | unknown <aelkin@mysql.com> | 2006-02-14 20:48:34 +0200 |
| commit | 85305ce79cc870ea85596a7d52e661d0660da7c5 (patch) | |
| tree | 005ea2bc06d7d8ab8cacf1f754769cd2adfb6967 /mysql-test/r/user_var-binlog.result | |
| parent | 75dd30dfce2db2785b9545ba73fae77b8bdd963f (diff) | |
| parent | 86c920ba776ddf5e9999e8293d5824be25bb43b6 (diff) | |
| download | mariadb-git-85305ce79cc870ea85596a7d52e661d0660da7c5.tar.gz | |
Merge mysql.com:/usr_rh9/home/elkin.rh9/MySQL/Merge/5.0
into mysql.com:/usr_rh9/home/elkin.rh9/MySQL/Merge/5.1-new
BitKeeper/deleted/.del-ctype_ucs_binlog.result~280d136b1a0bcf17:
Auto merged
mysql-test/r/user_var-binlog.result:
Auto merged
mysql-test/t/mysql.test:
Auto merged
mysql-test/t/mysqlbinlog.test:
Auto merged
mysql-test/t/rpl_trigger.test:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
mysql-test/r/rpl_stm_charset.result:
Auto merged
sql/log_event.cc:
Auto merged
sql/sql_select.cc:
Auto merged
mysql-test/r/rpl_timezone.result:
manual merge use local. Result file has to be refined according to changes brought in
to the test.
Diffstat (limited to 'mysql-test/r/user_var-binlog.result')
| -rw-r--r-- | mysql-test/r/user_var-binlog.result | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/mysql-test/r/user_var-binlog.result b/mysql-test/r/user_var-binlog.result index a77ec20a402..8813d2b499f 100644 --- a/mysql-test/r/user_var-binlog.result +++ b/mysql-test/r/user_var-binlog.result @@ -21,6 +21,7 @@ use test; SET TIMESTAMP=10000; SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1; SET @@session.sql_mode=0; +/*!\C latin1 */; SET @@session.character_set_client=8,@@session.collation_connection=8,@@session.collation_server=8; INSERT INTO t1 VALUES(@`a b`); SET @`var1`:=_latin1 0x273B616161 COLLATE `latin1_swedish_ci`; |