Commit 93f7607d authored by unknown's avatar unknown
Browse files

Fix information_schema test on Windows. (Bug #10844) 


mysql-test/mysql_test_run_new.c:
  Add --log-bin-trust-routine-creators
mysql-test/mysql-test-run.pl:
  Add --log-bin-trust-routine-creators
mysql-test/t/information_schema.test:
  Fix use of users to cope with lack of grant to %@localhost to test.*
mysql-test/r/information_schema.result:
  Update results
parent 0945dea8

mysql-test/mysql-test-run.pl

+1 −0
Original line number Diff line number Diff line
@@ -1706,6 +1706,7 @@ sub mysqld_arguments ($$$$$) { 
  mtr_add_arg($args, "%s--basedir=%s", $prefix, $path_my_basedir);

  mtr_add_arg($args, "%s--character-sets-dir=%s", $prefix, $path_charsetsdir);

  mtr_add_arg($args, "%s--core", $prefix);

  mtr_add_arg($args, "%s--log-bin-trust-routine-creators", $prefix);

  mtr_add_arg($args, "%s--default-character-set=latin1", $prefix);

  mtr_add_arg($args, "%s--language=%s", $prefix, $path_language);

  mtr_add_arg($args, "%s--tmpdir=$opt_tmpdir", $prefix);

mysql-test/mysql_test_run_new.c

+1 −0
Original line number Diff line number Diff line
@@ -486,6 +486,7 @@ void start_master() 
#endif

  add_arg(&al, "--local-infile");

  add_arg(&al, "--core");

  add_arg(&al, "--log-bin-trust-routine-creators");

  add_arg(&al, "--datadir=%s", master_dir);

#ifndef __WIN__

  add_arg(&al, "--pid-file=%s", master_pid);

mysql-test/r/information_schema.result

+2 −1
Original line number Diff line number Diff line
@@ -735,7 +735,7 @@ x_real NULL NULL 
x_float	NULL	NULL

x_double_precision	NULL	NULL

drop table t1;

create user mysqltest_4@localhost;

grant select on test.* to mysqltest_4@localhost;

SELECT TABLE_NAME, COLUMN_NAME, PRIVILEGES FROM INFORMATION_SCHEMA.COLUMNS 

where COLUMN_NAME='TABLE_NAME';

TABLE_NAME	COLUMN_NAME	PRIVILEGES
@@ -748,6 +748,7 @@ COLUMN_PRIVILEGES TABLE_NAME select 
TABLE_CONSTRAINTS	TABLE_NAME	select

KEY_COLUMN_USAGE	TABLE_NAME	select

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

delete from mysql.db where user='mysqltest_4';

flush privileges;

SELECT table_schema, count(*) FROM information_schema.TABLES GROUP BY TABLE_SCHEMA;

table_schema	count(*)

mysql-test/t/information_schema.test

+5 −4
Original line number Diff line number Diff line
@@ -483,13 +483,14 @@ drop table t1; 
# Bug#10261  INFORMATION_SCHEMA.COLUMNS, incomplete result for non root user

#



create user mysqltest_4@localhost;

grant select on test.* to mysqltest_4@localhost;

connect (user4,localhost,mysqltest_4,,);

connection user4;

SELECT TABLE_NAME, COLUMN_NAME, PRIVILEGES FROM INFORMATION_SCHEMA.COLUMNS 

where COLUMN_NAME='TABLE_NAME';

connection default;

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

delete from mysql.db where user='mysqltest_4';

flush privileges;



#
@@ -510,9 +511,9 @@ grant select on mysqltest.t2 to user2@localhost; 
grant select on mysqltest.* to user3@localhost;

grant select on *.* to user4@localhost;



connect (con1,localhost,user1,,);

connect (con2,localhost,user2,,);

connect (con3,localhost,user3,,);

connect (con1,localhost,user1,,mysqltest);

connect (con2,localhost,user2,,mysqltest);

connect (con3,localhost,user3,,mysqltest);

connect (con4,localhost,user4,,);

connection con1;

select * from information_schema.column_privileges;