Commit 1bf0b2f6 authored by joerg@debian.(none)'s avatar joerg@debian.(none)
Browse files

Merge debian.(none):/M50/mysql-5.0

into  debian.(none):/M50/push-5.0
parents bb22e366 ad0c033b
Loading
Loading
Loading
Loading
+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
+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
−3.85 KiB (280 KiB)

File changed.

Preview size limit exceeded, changes collapsed.

+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;
+2 −3
Original line number Diff line number Diff line
@@ -484,9 +484,8 @@ BEGIN
WHILE @counter1 < new.f136 
SET @counter1 = @counter1 + 1; 
END//
ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'WHILE @counter1 < new.f136 
SET @counter1 = @counter1 + 1; 
END' at line 3
ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'SET @counter1 = @counter1 + 1; 
END' at line 4
delete from tb3 where f122='Test 3.5.8.5-while';
drop trigger trg7;

Loading