Commit fe19bd92 authored by unknown's avatar unknown

Merge gbichot@213.136.52.20:/home/bk/mysql-4.1

into mysql.com:/home/mysql_src/mysql-4.1-874

parents 8428c5e5 f6e5d6ce
...@@ -67,7 +67,8 @@ show status like "Qcache_queries_in_cache"; ...@@ -67,7 +67,8 @@ show status like "Qcache_queries_in_cache";
show status like "Qcache_hits"; show status like "Qcache_hits";
show status like "Qcache_not_cached"; show status like "Qcache_not_cached";
connect (unkuser,localhost,,,,$MASTER_MYPORT,master.sock); # Don't use '' as user because it will pick Unix login
connect (unkuser,localhost,unkuser,,,$MASTER_MYPORT,master.sock);
connection unkuser; connection unkuser;
show grants for current_user(); show grants for current_user();
......
...@@ -1236,6 +1236,12 @@ not always make sense; please check the manual before using it)."; ...@@ -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. Check that the master's global character_set_server and ours are the same.
Not fatal if query fails (old master?). 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) && if (!mysql_real_query(mysql, "SELECT @@GLOBAL.COLLATION_SERVER", 32) &&
(master_res= mysql_store_result(mysql))) (master_res= mysql_store_result(mysql)))
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment