Commit 1ef97f1f authored by unknown's avatar unknown
Browse files

WL #1034 (Internal CRON) pre-push updates 

- fixed test results
- fixed bug caught by information_schema.test . Bison temporal
  variables are very nice but extremely error-prone (Count one more
  time just to be sure).


mysql-test/r/connect.result:
  fix result for WL#1034 (internal CRON)
mysql-test/r/events.result:
  fix result for WL#1034 (internal CRON)
mysql-test/r/grant.result:
  fix result for WL#1034 (internal CRON)
mysql-test/r/information_schema.result:
  fix result for WL#1034 (internal CRON)
mysql-test/r/lowercase_table_grant.result:
  fix result for WL#1034 (internal CRON)
mysql-test/r/ps.result:
  fix result for WL#1034 (internal CRON)
mysql-test/r/system_mysql_db.result:
  fix result for WL#1034 (internal CRON)
mysql-test/t/events.test:
  fix result for WL#1034 (internal CRON)
sql/sql_yacc.yy:
  - fix bug introduced by me when making usage of temporal
    bison variables. COUNT 7 times then write!
parent f133a923

mysql-test/r/connect.result

+3 −0
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ show tables; 
Tables_in_mysql

columns_priv

db

event

func

help_category

help_keyword
@@ -31,6 +32,7 @@ show tables; 
Tables_in_mysql

columns_priv

db

event

func

help_category

help_keyword
@@ -67,6 +69,7 @@ show tables; 
Tables_in_mysql

columns_priv

db

event

func

help_category

help_keyword

mysql-test/r/events.result

+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ Warnings: 
Note	1305	Event event1 does not exist

create event event1 on schedule every 15 minute starts now() ends date_add(now(), interval 5 hour) DO begin end;

alter event event1 rename to event2;

alter event event2 disable;

alter event event2 disabled;

drop event event2;

create event event2 on schedule every 2 second starts now() ends date_add(now(), interval 5 hour) comment "some" DO begin end;

drop event event2;

mysql-test/r/grant.result

+9 −8
Original line number Diff line number Diff line
@@ -11,8 +11,8 @@ GRANT USAGE ON *.* TO 'mysqltest_1'@'localhost' REQUIRE CIPHER 'EDH-RSA-DES-CBC3 
GRANT SELECT ON `mysqltest`.* TO 'mysqltest_1'@'localhost'

grant delete on mysqltest.* to mysqltest_1@localhost;

select * from mysql.user where user="mysqltest_1";

Host	User	Password	Select_priv	Insert_priv	Update_priv	Delete_priv	Create_priv	Drop_priv	Reload_priv	Shutdown_priv	Process_priv	File_priv	Grant_priv	References_priv	Index_priv	Alter_priv	Show_db_priv	Super_priv	Create_tmp_table_priv	Lock_tables_priv	Execute_priv	Repl_slave_priv	Repl_client_priv	Create_view_priv	Show_view_priv	Create_routine_priv	Alter_routine_priv	Create_user_priv	ssl_type	ssl_cipher	x509_issuer	x509_subject	max_questions	max_updates	max_connections	max_user_connections

localhost	mysqltest_1		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	SPECIFIED	EDH-RSA-DES-CBC3-SHA			0	0	0	0

Host	User	Password	Select_priv	Insert_priv	Update_priv	Delete_priv	Create_priv	Drop_priv	Reload_priv	Shutdown_priv	Process_priv	File_priv	Grant_priv	References_priv	Index_priv	Alter_priv	Show_db_priv	Super_priv	Create_tmp_table_priv	Lock_tables_priv	Execute_priv	Repl_slave_priv	Repl_client_priv	Create_view_priv	Show_view_priv	Create_routine_priv	Alter_routine_priv	Create_user_priv	Event_priv	ssl_type	ssl_cipher	x509_issuer	x509_subject	max_questions	max_updates	max_connections	max_user_connections

localhost	mysqltest_1		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	SPECIFIED	EDH-RSA-DES-CBC3-SHA			0	0	0	0

show grants for mysqltest_1@localhost;

Grants for mysqltest_1@localhost

GRANT USAGE ON *.* TO 'mysqltest_1'@'localhost' REQUIRE CIPHER 'EDH-RSA-DES-CBC3-SHA'
@@ -42,15 +42,15 @@ delete from mysql.user where user='mysqltest_1'; 
flush privileges;

grant usage on *.* to mysqltest_1@localhost with max_queries_per_hour 10;

select * from mysql.user where user="mysqltest_1";

Host	User	Password	Select_priv	Insert_priv	Update_priv	Delete_priv	Create_priv	Drop_priv	Reload_priv	Shutdown_priv	Process_priv	File_priv	Grant_priv	References_priv	Index_priv	Alter_priv	Show_db_priv	Super_priv	Create_tmp_table_priv	Lock_tables_priv	Execute_priv	Repl_slave_priv	Repl_client_priv	Create_view_priv	Show_view_priv	Create_routine_priv	Alter_routine_priv	Create_user_priv	ssl_type	ssl_cipher	x509_issuer	x509_subject	max_questions	max_updates	max_connections	max_user_connections

localhost	mysqltest_1		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					10	0	0	0

Host	User	Password	Select_priv	Insert_priv	Update_priv	Delete_priv	Create_priv	Drop_priv	Reload_priv	Shutdown_priv	Process_priv	File_priv	Grant_priv	References_priv	Index_priv	Alter_priv	Show_db_priv	Super_priv	Create_tmp_table_priv	Lock_tables_priv	Execute_priv	Repl_slave_priv	Repl_client_priv	Create_view_priv	Show_view_priv	Create_routine_priv	Alter_routine_priv	Create_user_priv	Event_priv	ssl_type	ssl_cipher	x509_issuer	x509_subject	max_questions	max_updates	max_connections	max_user_connections

localhost	mysqltest_1		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					10	0	0	0

show grants for mysqltest_1@localhost;

Grants for mysqltest_1@localhost

GRANT USAGE ON *.* TO 'mysqltest_1'@'localhost' WITH MAX_QUERIES_PER_HOUR 10

grant usage on *.* to mysqltest_1@localhost with max_updates_per_hour 20 max_connections_per_hour 30;

select * from mysql.user where user="mysqltest_1";

Host	User	Password	Select_priv	Insert_priv	Update_priv	Delete_priv	Create_priv	Drop_priv	Reload_priv	Shutdown_priv	Process_priv	File_priv	Grant_priv	References_priv	Index_priv	Alter_priv	Show_db_priv	Super_priv	Create_tmp_table_priv	Lock_tables_priv	Execute_priv	Repl_slave_priv	Repl_client_priv	Create_view_priv	Show_view_priv	Create_routine_priv	Alter_routine_priv	Create_user_priv	ssl_type	ssl_cipher	x509_issuer	x509_subject	max_questions	max_updates	max_connections	max_user_connections

localhost	mysqltest_1		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					10	20	30	0

Host	User	Password	Select_priv	Insert_priv	Update_priv	Delete_priv	Create_priv	Drop_priv	Reload_priv	Shutdown_priv	Process_priv	File_priv	Grant_priv	References_priv	Index_priv	Alter_priv	Show_db_priv	Super_priv	Create_tmp_table_priv	Lock_tables_priv	Execute_priv	Repl_slave_priv	Repl_client_priv	Create_view_priv	Show_view_priv	Create_routine_priv	Alter_routine_priv	Create_user_priv	Event_priv	ssl_type	ssl_cipher	x509_issuer	x509_subject	max_questions	max_updates	max_connections	max_user_connections

localhost	mysqltest_1		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					10	20	30	0

show grants for mysqltest_1@localhost;

Grants for mysqltest_1@localhost

GRANT USAGE ON *.* TO 'mysqltest_1'@'localhost' WITH MAX_QUERIES_PER_HOUR 10 MAX_UPDATES_PER_HOUR 20 MAX_CONNECTIONS_PER_HOUR 30
@@ -85,7 +85,7 @@ revoke LOCK TABLES, ALTER on mysqltest.* from mysqltest_1@localhost; 
show grants for mysqltest_1@localhost;

Grants for mysqltest_1@localhost

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

GRANT SELECT, INSERT, UPDATE, DELETE, CREATE, DROP, REFERENCES, INDEX, CREATE TEMPORARY TABLES, EXECUTE, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE ON `mysqltest`.* TO 'mysqltest_1'@'localhost' WITH GRANT OPTION

GRANT SELECT, INSERT, UPDATE, DELETE, CREATE, DROP, REFERENCES, INDEX, CREATE TEMPORARY TABLES, EXECUTE, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, EVENT ON `mysqltest`.* TO 'mysqltest_1'@'localhost' WITH GRANT OPTION

revoke all privileges on mysqltest.* from mysqltest_1@localhost;

delete from mysql.user where user='mysqltest_1';

flush privileges;
@@ -448,6 +448,7 @@ Create view Tables To create new views 
Create user	Server Admin	To create new users

Delete	Tables	To delete existing rows

Drop	Databases,Tables	To drop databases, tables, and views

Event	Server Admin	Creation, alteration, deletion and execution of events.

Execute	Functions,Procedures	To execute stored routines

File	File access on server	To read and write files on the server

Grant option	Databases,Tables,Functions,Procedures	To give to other users those privileges you possess
@@ -593,7 +594,7 @@ delete from tables_priv where host = '' and user = 'mysqltest_1'; 
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	Create_view_priv	Show_view_priv	Create_routine_priv	Alter_routine_priv	Execute_priv

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	Create_view_priv	Show_view_priv	Create_routine_priv	Alter_routine_priv	Execute_priv	Event_priv

set names koi8r;

create database ;

grant select on .* to root@localhost;

mysql-test/r/information_schema.result

+8 −2
Original line number Diff line number Diff line
@@ -54,6 +54,7 @@ VIEWS 
USER_PRIVILEGES

columns_priv

db

event

func

help_category

help_keyword
@@ -394,6 +395,7 @@ GRANTEE TABLE_CATALOG TABLE_SCHEMA PRIVILEGE_TYPE IS_GRANTABLE 
'mysqltest_1'@'localhost'	NULL	test	SHOW VIEW	YES

'mysqltest_1'@'localhost'	NULL	test	CREATE ROUTINE	YES

'mysqltest_1'@'localhost'	NULL	test	ALTER ROUTINE	YES

'mysqltest_1'@'localhost'	NULL	test	EVENT	YES

select * from information_schema.TABLE_PRIVILEGES where grantee like '%mysqltest_1%';

GRANTEE	TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	PRIVILEGE_TYPE	IS_GRANTABLE

'mysqltest_1'@'localhost'	NULL	test	t1	SELECT	NO
@@ -723,7 +725,7 @@ CREATE TABLE t_crashme ( f1 BIGINT); 
CREATE VIEW a1 (t_CRASHME) AS SELECT f1 FROM t_crashme GROUP BY f1;

CREATE VIEW a2 AS SELECT t_CRASHME FROM a1;

count(*)

102

103

drop view a2, a1;

drop table t_crashme;

select table_schema,table_name, column_name from
@@ -747,6 +749,10 @@ TABLES CREATE_TIME datetime 
TABLES	UPDATE_TIME	datetime

TABLES	CHECK_TIME	datetime

TRIGGERS	CREATED	datetime

event	execute_at	datetime

event	last_executed	datetime

event	starts	datetime

event	ends	datetime

SELECT COUNT(*) FROM INFORMATION_SCHEMA.TABLES A

WHERE NOT EXISTS 

(SELECT * FROM INFORMATION_SCHEMA.COLUMNS B
@@ -794,7 +800,7 @@ flush privileges; 
SELECT table_schema, count(*) FROM information_schema.TABLES GROUP BY TABLE_SCHEMA;

table_schema	count(*)

information_schema	16

mysql	18

mysql	19

create table t1 (i int, j int);

create trigger trg1 before insert on t1 for each row

begin

mysql-test/r/lowercase_table_grant.result

+4 −4
Original line number Diff line number Diff line
@@ -6,8 +6,8 @@ Grants for mysqltest_1@localhost 
GRANT USAGE ON *.* TO 'mysqltest_1'@'localhost'

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

select * from db where user = 'mysqltest_1';

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	Create_view_priv	Show_view_priv	Create_routine_priv	Alter_routine_priv	Execute_priv

localhost	mysqltest	mysqltest_1	Y	Y	Y	Y	Y	Y	N	Y	Y	Y	Y	Y	Y	Y	Y	Y	Y

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	Create_view_priv	Show_view_priv	Create_routine_priv	Alter_routine_priv	Execute_priv	Event_priv

localhost	mysqltest	mysqltest_1	Y	Y	Y	Y	Y	Y	N	Y	Y	Y	Y	Y	Y	Y	Y	Y	Y	Y

update db set db = 'MYSQLtest' where db = 'mysqltest' and user = 'mysqltest_1' and host = 'localhost';

flush privileges;

show grants for mysqltest_1@localhost;
@@ -15,8 +15,8 @@ Grants for mysqltest_1@localhost 
GRANT USAGE ON *.* TO 'mysqltest_1'@'localhost'

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

select * from db where user = 'mysqltest_1';

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	Create_view_priv	Show_view_priv	Create_routine_priv	Alter_routine_priv	Execute_priv

localhost	MYSQLtest	mysqltest_1	Y	Y	Y	Y	Y	Y	N	Y	Y	Y	Y	Y	Y	Y	Y	Y	Y

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	Create_view_priv	Show_view_priv	Create_routine_priv	Alter_routine_priv	Execute_priv	Event_priv

localhost	MYSQLtest	mysqltest_1	Y	Y	Y	Y	Y	Y	N	Y	Y	Y	Y	Y	Y	Y	Y	Y	Y	Y

delete from db where db = 'MYSQLtest' and user = 'mysqltest_1' and host = 'localhost';

flush privileges;

drop user mysqltest_1@localhost;