diff options
| author | unknown <guilhem@mysql.com> | 2004-08-12 13:12:09 +0200 |
|---|---|---|
| committer | unknown <guilhem@mysql.com> | 2004-08-12 13:12:09 +0200 |
| commit | f6e5d6ce9dc3f367cb7c665bca94316ee31cf384 (patch) | |
| tree | 3ff100ec8d87b14a651197f717fb495bc5ce0f07 /sql/slave.cc | |
| parent | 438f11ef41d2e3bc60e1fae175e65178fc41fa8c (diff) | |
| download | mariadb-git-f6e5d6ce9dc3f367cb7c665bca94316ee31cf384.tar.gz | |
Fix for BUG#4678 "mysql-test-run fails on grant_cache":
do not use '' as user in tests, because it picks the Unix login (which gives unexpected results if it is 'root')
(such behaviour is a feature of mysql_real_connect(), see the manual).
mysql-test/t/grant_cache.test:
do not use '' as user in tests, because it picks the Unix login (which gives unexpected results if it is 'root').
sql/slave.cc:
a comment
Diffstat (limited to 'sql/slave.cc')
| -rw-r--r-- | sql/slave.cc | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/sql/slave.cc b/sql/slave.cc index 7e46fb81053..0fe525d766f 100644 --- a/sql/slave.cc +++ b/sql/slave.cc @@ -1236,6 +1236,12 @@ not always make sense; please check the manual before using it)."; /* Check that the master's global character_set_server and ours are the same. Not fatal if query fails (old master?). + Note that we don't check for equality of global character_set_client and + collation_connection (neither do we prevent their setting in + set_var.cc). That's because from what I (Guilhem) have tested, the global + values of these 2 are never used (new connections don't use them). + We don't test equality of global collation_database either as it's is + going to be deprecated (made read-only) in 4.1 very soon. */ if (!mysql_real_query(mysql, "SELECT @@GLOBAL.COLLATION_SERVER", 32) && (master_res= mysql_store_result(mysql))) |