Commit cf297f60 authored by unknown's avatar unknown
Browse files

Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0 

into mysql.com:/Users/kent/mysql/bk/mysql-5.0
parents ad0516d9 4727620b

mysql-test/mysql-test-run.pl

+1 −0
Original line number Diff line number Diff line
@@ -1639,6 +1639,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/grant.result

+5 −0
Original line number Diff line number Diff line
@@ -586,3 +586,8 @@ use test; 
REVOKE ALL PRIVILEGES, GRANT OPTION FROM dummy@localhost;

DROP USER dummy@localhost;

DROP DATABASE mysqltest;

use mysql;

insert into tables_priv values ('','test_db','mysqltest_1','test_table','test_grantor',CURRENT_TIMESTAMP,'Select','Select');

flush privileges;

delete from tables_priv where host = '' and user = 'mysqltest_1';

flush privileges;

mysql-test/r/information_schema.result

+2 −1
Original line number Diff line number Diff line
@@ -738,7 +738,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
@@ -751,6 +751,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/r/mysqldump.result

+1 −1
Original line number Diff line number Diff line
@@ -1665,7 +1665,7 @@ v2 VIEW 
v3	VIEW

show create view v1;

View	Create View

v1	CREATE ALGORITHM=UNDEFINED VIEW `test`.`v1` AS select `test`.`v3`.`a` AS `a`,`test`.`v3`.`b` AS `b`,`test`.`v3`.`c` AS `c` from `test`.`v3` where (`test`.`v3`.`b` in (1,2,3,4,5,6,7))

v1	CREATE ALGORITHM=UNDEFINED VIEW `test`.`v1` AS select `v3`.`a` AS `a`,`v3`.`b` AS `b`,`v3`.`c` AS `c` from `test`.`v3` where (`v3`.`b` in (1,2,3,4,5,6,7))

select * from v1;

a	b	c

1	2	one