diff options
author | unknown <guilhem@mysql.com> | 2005-01-12 19:42:46 +0100 |
---|---|---|
committer | unknown <guilhem@mysql.com> | 2005-01-12 19:42:46 +0100 |
commit | f5d30e0cac50677699d9fadfa540f4e900b679c3 (patch) | |
tree | 0bea6516515d337b101938bb98055d257310d16d /sql/log_event.cc | |
parent | e8e48614012d968d59606d4994d9e3ab6aa61eee (diff) | |
download | mariadb-git-f5d30e0cac50677699d9fadfa540f4e900b679c3.tar.gz |
Fix for BUG#7793 "mysqlbinlog produces incorrect queries":
when printing SET @var in mysqlbinlog, backtick the collation (as BINARY is a reserved word)
mysql-test/r/ctype_ucs.result:
backticks added
mysql-test/r/user_var.result:
backticks added
mysql-test/t/user_var.test:
testing a variable with BINARY collation, which needs the backticks
sql/log_event.cc:
when printing SET @var in mysqlbinlog, backtick the collation (as BINARY is a reserved word)
Diffstat (limited to 'sql/log_event.cc')
-rw-r--r-- | sql/log_event.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/log_event.cc b/sql/log_event.cc index c027c3a8ee4..c86b67376ea 100644 --- a/sql/log_event.cc +++ b/sql/log_event.cc @@ -2459,7 +2459,7 @@ void User_var_log_event::print(FILE* file, bool short_form, char* last_db) */ fprintf(file, ":=???;\n"); else - fprintf(file, ":=_%s %s COLLATE %s;\n", cs->csname, hex_str, cs->name); + fprintf(file, ":=_%s %s COLLATE `%s`;\n", cs->csname, hex_str, cs->name); my_afree(hex_str); } break; |