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
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
MariaDB
Commits
b4b87456
Commit
b4b87456
authored
Jul 15, 2005
by
jimw@mysql.com
Browse files
Options
Browse Files
Download
Plain Diff
Merge mysql.com:/home/jimw/my/mysql-4.1-9979
into mysql.com:/home/jimw/my/mysql-4.1-clean
parents
b144b920
ec54dcb0
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
22 additions
and
2 deletions
+22
-2
mysql-test/r/timezone_grant.result
mysql-test/r/timezone_grant.result
+7
-0
mysql-test/t/timezone_grant.test
mysql-test/t/timezone_grant.test
+12
-0
sql/sql_parse.cc
sql/sql_parse.cc
+3
-2
No files found.
mysql-test/r/timezone_grant.result
View file @
b4b87456
...
...
@@ -45,6 +45,13 @@ select * from mysql.time_zone_name;
ERROR 42000: SELECT command denied to user 'mysqltest_1'@'localhost' for table 'time_zone_name'
select Name, convert_tz('2004-11-30 12:00:00', Name, 'UTC') from mysql.time_zone_name;
ERROR 42000: SELECT command denied to user 'mysqltest_1'@'localhost' for table 'time_zone_name'
drop table t1, t2;
create table t1 (a int, b datetime);
create table t2 (a int, b varchar(40));
update t1 set b = '2005-01-01 10:00';
update t1 set b = convert_tz(b, 'UTC', 'UTC');
update t1 join t2 on (t1.a = t2.a) set t1.b = '2005-01-01 10:00' where t2.b = 'foo';
update t1 join t2 on (t1.a = t2.a) set t1.b = convert_tz('2005-01-01 10:00','UTC','UTC') where t2.b = 'foo';
delete from mysql.user where user like 'mysqltest\_%';
delete from mysql.db where user like 'mysqltest\_%';
delete from mysql.tables_priv where user like 'mysqltest\_%';
...
...
mysql-test/t/timezone_grant.test
View file @
b4b87456
...
...
@@ -61,6 +61,18 @@ select * from mysql.time_zone_name;
--
error
1142
select
Name
,
convert_tz
(
'2004-11-30 12:00:00'
,
Name
,
'UTC'
)
from
mysql
.
time_zone_name
;
#
# Bug #9979: Use of CONVERT_TZ in multiple-table UPDATE causes bogus
# privilege error
#
drop
table
t1
,
t2
;
create
table
t1
(
a
int
,
b
datetime
);
create
table
t2
(
a
int
,
b
varchar
(
40
));
update
t1
set
b
=
'2005-01-01 10:00'
;
update
t1
set
b
=
convert_tz
(
b
,
'UTC'
,
'UTC'
);
update
t1
join
t2
on
(
t1
.
a
=
t2
.
a
)
set
t1
.
b
=
'2005-01-01 10:00'
where
t2
.
b
=
'foo'
;
update
t1
join
t2
on
(
t1
.
a
=
t2
.
a
)
set
t1
.
b
=
convert_tz
(
'2005-01-01 10:00'
,
'UTC'
,
'UTC'
)
where
t2
.
b
=
'foo'
;
# Clean-up
connection
default
;
delete
from
mysql
.
user
where
user
like
'mysqltest\_%'
;
...
...
sql/sql_parse.cc
View file @
b4b87456
...
...
@@ -1940,7 +1940,8 @@ mysql_execute_command(THD *thd)
that is not a SHOW command or a select that only access local
variables, but for now this is probably good enough.
*/
if
(
tables
||
&
lex
->
select_lex
!=
lex
->
all_selects_list
)
if
(
tables
||
&
lex
->
select_lex
!=
lex
->
all_selects_list
||
lex
->
time_zone_tables_used
)
mysql_reset_errors
(
thd
);
/*
...
...
@@ -5413,7 +5414,7 @@ int multi_update_precheck(THD *thd, TABLE_LIST *tables)
/*
Is there tables of subqueries?
*/
if
(
&
lex
->
select_lex
!=
lex
->
all_selects_list
)
if
(
&
lex
->
select_lex
!=
lex
->
all_selects_list
||
lex
->
time_zone_tables_used
)
{
DBUG_PRINT
(
"info"
,(
"Checking sub query list"
));
for
(
table
=
tables
;
table
;
table
=
table
->
next
)
...
...
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