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
00267b9f
Commit
00267b9f
authored
Aug 08, 2005
by
unknown
Browse files
Options
Browse Files
Download
Plain Diff
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/usr/home/bar/mysql-4.1.b10892
parents
23095e27
b9ffa4db
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
18 additions
and
4 deletions
+18
-4
mysql-test/r/grant.result
mysql-test/r/grant.result
+3
-0
mysql-test/t/grant.test
mysql-test/t/grant.test
+7
-0
sql/item.cc
sql/item.cc
+8
-4
No files found.
mysql-test/r/grant.result
View file @
00267b9f
...
@@ -440,3 +440,6 @@ insert into tables_priv values ('','test_db','mysqltest_1','test_table','test_gr
...
@@ -440,3 +440,6 @@ insert into tables_priv values ('','test_db','mysqltest_1','test_table','test_gr
flush privileges;
flush privileges;
delete from tables_priv where host = '' and user = 'mysqltest_1';
delete from tables_priv where host = '' and user = 'mysqltest_1';
flush privileges;
flush privileges;
set @user123="non-existent";
select * from mysql.db where user=@user123;
Host Db User Select_priv Insert_priv Update_priv Delete_priv Create_priv Drop_priv Grant_priv References_priv Index_priv Alter_priv Create_tmp_table_priv Lock_tables_priv
mysql-test/t/grant.test
View file @
00267b9f
...
@@ -402,4 +402,11 @@ flush privileges;
...
@@ -402,4 +402,11 @@ flush privileges;
delete from tables_priv where host = '' and user = '
mysqltest_1
';
delete from tables_priv where host = '' and user = '
mysqltest_1
';
flush privileges;
flush privileges;
#
# Bug #10892 user variables not auto cast for comparisons
# Check that we don'
t
get
illegal
mix
of
collations
#
set
@
user123
=
"non-existent"
;
select
*
from
mysql
.
db
where
user
=@
user123
;
# End of 4.1 tests
# End of 4.1 tests
sql/item.cc
View file @
00267b9f
...
@@ -455,14 +455,18 @@ bool DTCollation::aggregate(DTCollation &dt, uint flags)
...
@@ -455,14 +455,18 @@ bool DTCollation::aggregate(DTCollation &dt, uint flags)
;
// Do nothing
;
// Do nothing
}
}
else
if
((
flags
&
MY_COLL_ALLOW_SUPERSET_CONV
)
&&
else
if
((
flags
&
MY_COLL_ALLOW_SUPERSET_CONV
)
&&
derivation
<
dt
.
derivation
&&
collation
->
state
&
MY_CS_UNICODE
&&
collation
->
state
&
MY_CS_UNICODE
)
(
derivation
<
dt
.
derivation
||
(
derivation
==
dt
.
derivation
&&
!
(
dt
.
collation
->
state
&
MY_CS_UNICODE
))))
{
{
// Do nothing
// Do nothing
}
}
else
if
((
flags
&
MY_COLL_ALLOW_SUPERSET_CONV
)
&&
else
if
((
flags
&
MY_COLL_ALLOW_SUPERSET_CONV
)
&&
dt
.
derivation
<
derivation
&&
dt
.
collation
->
state
&
MY_CS_UNICODE
&&
dt
.
collation
->
state
&
MY_CS_UNICODE
)
(
dt
.
derivation
<
derivation
||
(
dt
.
derivation
==
derivation
&&
!
(
collation
->
state
&
MY_CS_UNICODE
))))
{
{
set
(
dt
);
set
(
dt
);
}
}
...
...
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