Commit af07ef79 authored by unknown's avatar unknown
Browse files

Merge bk-internal.mysql.com:/home/bk/mysql-4.1 

into mysql.com:/home/dlenev/src/mysql-4.1-bg6765


sql/item_strfunc.cc:
  Auto merged
sql/log.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_db.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_prepare.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
parents cbd5d91c 9ad51c63

mysql-test/r/timezone2.result

+34 −2
Original line number Diff line number Diff line 
drop table if exists t1;

drop table if exists t1, t2;

create table t1 (ts timestamp);

set time_zone='+00:00';

select unix_timestamp(utc_timestamp())-unix_timestamp(current_timestamp());
@@ -256,18 +256,50 @@ delete from mysql.db where user like 'mysqltest\_%'; 
delete from mysql.tables_priv where user like 'mysqltest\_%';

delete from mysql.columns_priv where user like 'mysqltest\_%';

flush privileges;

grant usage on mysqltest.* to mysqltest_1@localhost;

create table t1 (a int, b datetime);

create table t2 (c int, d datetime);

grant all privileges on test.* to mysqltest_1@localhost;

show grants for current_user();

Grants for mysqltest_1@localhost

GRANT USAGE ON *.* TO 'mysqltest_1'@'localhost'

GRANT ALL PRIVILEGES ON `test`.* TO 'mysqltest_1'@'localhost'

set time_zone= '+00:00';

set time_zone= 'Europe/Moscow';

select convert_tz('2004-10-21 19:00:00', 'Europe/Moscow', 'UTC');

convert_tz('2004-10-21 19:00:00', 'Europe/Moscow', 'UTC')

2004-10-21 15:00:00

select convert_tz(b, 'Europe/Moscow', 'UTC') from t1;

convert_tz(b, 'Europe/Moscow', 'UTC')

update t1, t2 set t1.b = convert_tz('2004-10-21 19:00:00', 'Europe/Moscow', 'UTC')

where t1.a = t2.c and t2.d = (select max(d) from t2);

select * from mysql.time_zone_name;

ERROR 42000: Access denied for user 'mysqltest_1'@'localhost' to database 'mysql'

select Name, convert_tz('2004-10-21 19:00:00', Name, 'UTC') from mysql.time_zone_name;

ERROR 42000: Access denied for user 'mysqltest_1'@'localhost' to database 'mysql'

delete from mysql.db where user like 'mysqltest\_%';

flush privileges;

grant all privileges on test.t1 to mysqltest_1@localhost;

grant all privileges on test.t2 to mysqltest_1@localhost;

show grants for current_user();

Grants for mysqltest_1@localhost

GRANT USAGE ON *.* TO 'mysqltest_1'@'localhost'

GRANT ALL PRIVILEGES ON `test`.`t2` TO 'mysqltest_1'@'localhost'

GRANT ALL PRIVILEGES ON `test`.`t1` TO 'mysqltest_1'@'localhost'

set time_zone= '+00:00';

set time_zone= 'Europe/Moscow';

select convert_tz('2004-11-31 12:00:00', 'Europe/Moscow', 'UTC');

convert_tz('2004-11-31 12:00:00', 'Europe/Moscow', 'UTC')

2004-12-01 09:00:00

select convert_tz(b, 'Europe/Moscow', 'UTC') from t1;

convert_tz(b, 'Europe/Moscow', 'UTC')

update t1, t2 set t1.b = convert_tz('2004-11-30 12:00:00', 'Europe/Moscow', 'UTC')

where t1.a = t2.c and t2.d = (select max(d) from t2);

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'

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\_%';

flush privileges;

drop table t1, t2;

mysql-test/t/timezone2.test

+41 −2
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 


# Preparing playground

--disable_warnings

drop table if exists t1;

drop table if exists t1, t2;

--enable_warnings
@@ -205,25 +205,64 @@ drop table t1; 
# even for unprivileged users.

#



# Let us prepare playground

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\_%';

delete from mysql.columns_priv where user like 'mysqltest\_%';

flush privileges;

create table t1 (a int, b datetime);

create table t2 (c int, d datetime);



grant usage on mysqltest.* to mysqltest_1@localhost;

grant all privileges on test.* to mysqltest_1@localhost;

connect (tzuser, localhost, mysqltest_1,,);

connection tzuser;

show grants for current_user();

set time_zone= '+00:00';

set time_zone= 'Europe/Moscow';

select convert_tz('2004-10-21 19:00:00', 'Europe/Moscow', 'UTC');

select convert_tz(b, 'Europe/Moscow', 'UTC') from t1;

# Let us also check whenever multi-update works ok

update t1, t2 set t1.b = convert_tz('2004-10-21 19:00:00', 'Europe/Moscow', 'UTC')

              where t1.a = t2.c and t2.d = (select max(d) from t2);

# But still these two statements should not work:

--error 1044

select * from mysql.time_zone_name;

--error 1044

select Name, convert_tz('2004-10-21 19:00:00', Name, 'UTC') from mysql.time_zone_name;



#

# Test for bug #6765 "Implicit access to time zone description tables

# requires privileges for them if some table or column level grants

# present"

#

connection default;

# Let use some table-level grants instead of db-level 

# to make life more interesting

delete from mysql.db where user like 'mysqltest\_%';

flush privileges;

grant all privileges on test.t1 to mysqltest_1@localhost;

grant all privileges on test.t2 to mysqltest_1@localhost;

# The test itself is almost the same as previous one

connect (tzuser2, localhost, mysqltest_1,,);

connection tzuser2;

show grants for current_user();

set time_zone= '+00:00';

set time_zone= 'Europe/Moscow';

select convert_tz('2004-11-31 12:00:00', 'Europe/Moscow', 'UTC');

select convert_tz(b, 'Europe/Moscow', 'UTC') from t1;

update t1, t2 set t1.b = convert_tz('2004-11-30 12:00:00', 'Europe/Moscow', 'UTC')

              where t1.a = t2.c and t2.d = (select max(d) from t2);

# Again these two statements should not work (but with different errors):

--error 1142

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;



# Clean-up

connection default;

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\_%';

flush privileges;

drop table t1, t2;

sql/item_geofunc.cc

+0 −1
Original line number Diff line number Diff line
@@ -24,7 +24,6 @@ 
#include "mysql_priv.h"



#ifdef HAVE_SPATIAL

#include "sql_acl.h"

#include <m_ctype.h>



void Item_geometry_func::fix_length_and_dec()

sql/item_strfunc.cc

+0 −1
Original line number Diff line number Diff line
@@ -25,7 +25,6 @@ 
#endif



#include "mysql_priv.h"

#include "sql_acl.h"

#include <m_ctype.h>

#ifdef HAVE_OPENSSL

#include <openssl/des.h>

sql/log.cc

+0 −1
Original line number Diff line number Diff line
@@ -23,7 +23,6 @@ 
#endif



#include "mysql_priv.h"

#include "sql_acl.h"

#include "sql_repl.h"

#include "ha_innodb.h" // necessary to cut the binlog when crash recovery