Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
mariadb
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
mariadb
Commits
fe19bd92
Commit
fe19bd92
authored
Aug 12, 2004
by
unknown
Browse files
Options
Browse Files
Download
Plain Diff
Merge gbichot@213.136.52.20:/home/bk/mysql-4.1
into mysql.com:/home/mysql_src/mysql-4.1-874
parents
8428c5e5
f6e5d6ce
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
1 deletion
+8
-1
mysql-test/t/grant_cache.test
mysql-test/t/grant_cache.test
+2
-1
sql/slave.cc
sql/slave.cc
+6
-0
No files found.
mysql-test/t/grant_cache.test
View file @
fe19bd92
...
...
@@ -67,7 +67,8 @@ show status like "Qcache_queries_in_cache";
show
status
like
"Qcache_hits"
;
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
;
show
grants
for
current_user
();
...
...
sql/slave.cc
View file @
fe19bd92
...
...
@@ -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
)))
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment