Commit 79a90dad authored by joerg@trift2.'s avatar joerg@trift2.
Browse files

Merge trift2.:/MySQL/M50/mysql-5.0 

into  trift2.:/MySQL/M50/push-5.0
parents 81905ee1 88ef9a42

Makefile.am

+1 −2
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ AUTOMAKE_OPTIONS = foreign 
# These are built from source in the Docs directory

EXTRA_DIST =		INSTALL-SOURCE INSTALL-WIN-SOURCE \

			README COPYING EXCEPTIONS-CLIENT CMakeLists.txt



SUBDIRS =		. include @docs_dirs@ @zlib_dir@ @yassl_dir@ \

			@readline_topdir@ sql-common scripts \

			@thread_dirs@ pstack \
@@ -157,8 +158,6 @@ test-bt: 
	@PERL@ ./mysql-test-run.pl --force --comment=funcs1_ps --ps-protocol --suite=funcs_1

	-cd mysql-test ; MTR_BUILD_THREAD=auto \

	@PERL@ ./mysql-test-run.pl --force --comment=funcs2 --suite=funcs_2

	-cd mysql-test ; MTR_BUILD_THREAD=auto \

	@PERL@ ./mysql-test-run.pl --force --comment=rowlock --suite=row_lock

	-if [ -d mysql-test/suite/nist ] ; then \

	  cd mysql-test ; MTR_BUILD_THREAD=auto \

	  @PERL@ ./mysql-test-run.pl --comment=NIST+normal --force --suite=nist ; \

mysql-test/suite/funcs_1/datadict/datadict_master.inc

+6 −9
Original line number Diff line number Diff line
@@ -437,19 +437,23 @@ eval SELECT * 
# check also with a 'simple' user

CREATE USER user_3212@localhost;

GRANT ALL ON db_datadict.* TO user_3212@localhost;

# OBN: The following line was added following the fix to bug 28181  

#      where queries to information_schema will fail if exporting to 

#      a file without having the FILE attribute

GRANT FILE ON *.* TO user_3212@localhost;





--replace_result $MASTER_MYPORT MYSQL_PORT $MASTER_MYSOCK MYSQL_SOCK

connect (u3212,localhost,user_3212,,db_datadict);

--source suite/funcs_1/include/show_connection.inc



# no db given --> db_datadict.schema does not exist

--error 1045

--error 1146

eval SELECT *

  INTO OUTFILE '../tmp/out.$ENGINE_TYPE.user.file'

  FIELDS TERMINATED BY ',' OPTIONALLY ENCLOSED BY '"'

  LINES TERMINATED BY '\n'

  FROM schemata LIMIT 0, 5;

# FIXME 3.2.1.2: why do we get different error numbers with and without OUTFILE ?

--error 1146

eval SELECT *

  FROM schemata LIMIT 0, 5;
@@ -460,8 +464,6 @@ eval SELECT * 
  LINES TERMINATED BY '\n'

  FROM information_schema.schemata

  WHERE schema_name LIKE 'db_%';

# The above will fail with access error as long as 

# BUBG#28181 - a regression introduced in 5.0.42 is not fixed



eval SELECT *

  FROM information_schema.schemata
@@ -469,14 +471,11 @@ eval SELECT * 


USE information_schema;



# no db given --> db_datadict.schema does not exist

eval SELECT *

  INTO OUTFILE '../tmp/out.$ENGINE_TYPE.user_2.file'

  FIELDS TERMINATED BY ',' OPTIONALLY ENCLOSED BY '"'

  LINES TERMINATED BY '\n'

  FROM schemata LIMIT 0, 5;

# The above will fail with access error as long as 

# BUBG#28181 - a regression introduced in 5.0.42 is not fixed



eval SELECT *

  FROM schemata LIMIT 0, 5;
@@ -487,8 +486,6 @@ eval SELECT * 
  LINES TERMINATED BY '\n'

  FROM information_schema.schemata

  WHERE schema_name LIKE 'db_%';

# The above will fail with access error as long as 

# BUBG#28181 - a regression introduced in 5.0.42 is not fixed



eval SELECT *

  FROM information_schema.schemata

mysql-test/suite/funcs_1/r/innodb__datadict.result

+2 −1
Original line number Diff line number Diff line
@@ -4859,6 +4859,7 @@ INTO OUTFILE '../tmp/out.innodb.db.file' 
WHERE schema_name LIKE 'db_%';

CREATE USER user_3212@localhost;

GRANT ALL ON db_datadict.* TO user_3212@localhost;

GRANT FILE ON *.* TO user_3212@localhost;

connect(localhost,user_3212,,db_datadict,MYSQL_PORT,MYSQL_SOCK);

	

user_3212@localhost	db_datadict
@@ -4867,7 +4868,7 @@ INTO OUTFILE '../tmp/out.innodb.user.file' 
  FIELDS TERMINATED BY ',' OPTIONALLY ENCLOSED BY '"'

  LINES TERMINATED BY '\n'

  FROM schemata LIMIT 0, 5;

ERROR 28000: Access denied for user 'user_3212'@'localhost' (using password: NO)

ERROR 42S02: Table 'db_datadict.schemata' doesn't exist

SELECT *

FROM schemata LIMIT 0, 5;

ERROR 42S02: Table 'db_datadict.schemata' doesn't exist

mysql-test/suite/funcs_1/r/innodb_func_view.result

−3.85 KiB (280 KiB)

File changed.

Preview size limit exceeded, changes collapsed.

View original file
View changed file

mysql-test/suite/funcs_1/r/innodb_trig_0102.result

+1 −1
Original line number Diff line number Diff line
@@ -237,7 +237,7 @@ create table t1 (f1 integer) engine = innodb; 
use test;

CREATE TRIGGER trig_db.trg6_2 AFTER INSERT on tb3 

for each row set @ret_trg6_2 = 5;

ERROR HY000: Trigger in wrong schema

ERROR 42S02: Table 'trig_db.tb3' doesn't exist

use trig_db;

CREATE TRIGGER trg6_3 AFTER INSERT on test.tb3 

for each row set @ret_trg6_3 = 18;