Merge lp:~vkolesnikov/pbxt/pbxt-10_02_2010-stable into lp:pbxt

[Vladimir Kolesnikov]

[Vladimir Kolesnikov (vkolesnikov)]

Fixed some tests that failed because of MySQL changes. Removed a stored-procedure test that was irrelevant to PBXT and failed because of changes in MySQL. Update pbxt-test-run.pl to not to use a security option (secure-file-priv) that prevented some tests from LOAD DATA INFILE.

=== modified file 'test/mysql-test/pbxt-test-run.pl'
--- test/mysql-test/pbxt-test-run.pl	2009-12-21 16:41:09 +0000
+++ test/mysql-test/pbxt-test-run.pl	2010-02-10 14:42:13 +0000
@@ -3911,7 +3911,8 @@
   if ( $mysql_version_id >= 50036)
   {
     # By default, prevent the started mysqld to access files outside of vardir
-    mtr_add_arg($args, "%s--secure-file-priv=%s", $prefix, $opt_vardir);
+    # doesn't work with MySQL 5.1.42
+    #mtr_add_arg($args, "%s--secure-file-priv=%s", $prefix, $opt_vardir);
   }
 
   if ( $mysql_version_id >= 50000 )

=== modified file 'test/mysql-test/r/func_group.result'
--- test/mysql-test/r/func_group.result	2009-12-16 12:45:36 +0000
+++ test/mysql-test/r/func_group.result	2010-02-10 14:42:13 +0000
@@ -885,7 +885,7 @@
 3
 select cast(min(df) as signed) from t1;
 cast(min(df) as signed)
-0
+1
 select 1e8 * sum(distinct df) from t1;
 1e8 * sum(distinct df)
 330000000

=== removed file 'test/mysql-test/r/sp-destruct.result'
--- test/mysql-test/r/sp-destruct.result	2008-03-10 11:36:34 +0000
+++ test/mysql-test/r/sp-destruct.result	1970-01-01 00:00:00 +0000
@@ -1,83 +0,0 @@
-use test;
-drop procedure if exists bug14233;
-drop function if exists bug14233;
-drop table if exists t1;
-drop view if exists v1;
-create procedure bug14233()
-set @x = 42;
-create function bug14233_f() returns int
-return 42;
-create table t1 (id int);
-create trigger t1_ai after insert on t1 for each row call bug14233();
-alter table mysql.proc drop type;
-call bug14233();
-ERROR HY000: Failed to load routine test.bug14233. The table mysql.proc is missing, corrupt, or contains bad data (internal code -5)
-create view v1 as select bug14233_f();
-ERROR HY000: Failed to load routine test.bug14233_f. The table mysql.proc is missing, corrupt, or contains bad data (internal code -5)
-insert into t1 values (0);
-ERROR HY000: Failed to load routine test.bug14233. The table mysql.proc is missing, corrupt, or contains bad data (internal code -5)
-flush table mysql.proc;
-call bug14233();
-ERROR HY000: Incorrect information in file: './mysql/proc.frm'
-create view v1 as select bug14233_f();
-ERROR HY000: Incorrect information in file: './mysql/proc.frm'
-insert into t1 values (0);
-ERROR HY000: Incorrect information in file: './mysql/proc.frm'
-flush table mysql.proc;
-call bug14233();
-ERROR 42S02: Table 'mysql.proc' doesn't exist
-create view v1 as select bug14233_f();
-ERROR 42S02: Table 'mysql.proc' doesn't exist
-insert into t1 values (0);
-ERROR 42S02: Table 'mysql.proc' doesn't exist
-flush table mysql.proc;
-flush privileges;
-delete from mysql.proc where name like 'bug14233%';
-insert into mysql.proc
-(
-db, name, type, specific_name, language, sql_data_access, is_deterministic,
-security_type, param_list, returns, body, definer, created, modified,
-sql_mode, comment
-)
-values
-(
-'test', 'bug14233_1', 'FUNCTION', 'bug14233_1', 'SQL', 'READS_SQL_DATA', 'NO',
-'DEFINER', '', 'int(10)',
-'select count(*) from mysql.user',
-'root@localhost', NOW() , '0000-00-00 00:00:00', '', ''
-),
-(
-'test', 'bug14233_2', 'FUNCTION', 'bug14233_2', 'SQL', 'READS_SQL_DATA', 'NO',
-'DEFINER', '', 'int(10)',
-'begin declare x int; select count(*) into x from mysql.user; end',
-'root@localhost', NOW() , '0000-00-00 00:00:00', '', ''
-),
-(
-'test', 'bug14233_3', 'PROCEDURE', 'bug14233_3', 'SQL', 'READS_SQL_DATA','NO',
-'DEFINER', '', '',
-'alksj wpsj sa ^#!@ ',
-'root@localhost', NOW() , '0000-00-00 00:00:00', '', ''
-);
-select bug14233_1();
-ERROR HY000: Failed to load routine test.bug14233_1. The table mysql.proc is missing, corrupt, or contains bad data (internal code -6)
-create view v1 as select bug14233_1();
-ERROR HY000: Failed to load routine test.bug14233_1. The table mysql.proc is missing, corrupt, or contains bad data (internal code -6)
-select bug14233_2();
-ERROR HY000: Failed to load routine test.bug14233_2. The table mysql.proc is missing, corrupt, or contains bad data (internal code -6)
-create view v1 as select bug14233_2();
-ERROR HY000: Failed to load routine test.bug14233_2. The table mysql.proc is missing, corrupt, or contains bad data (internal code -6)
-call bug14233_3();
-ERROR HY000: Failed to load routine test.bug14233_3. The table mysql.proc is missing, corrupt, or contains bad data (internal code -6)
-drop trigger t1_ai;
-create trigger t1_ai after insert on t1 for each row call bug14233_3();
-insert into t1 values (0);
-ERROR HY000: Failed to load routine test.bug14233_3. The table mysql.proc is missing, corrupt, or contains bad data (internal code -6)
-drop trigger t1_ai;
-drop table t1;
-drop function bug14233_1;
-drop function bug14233_2;
-drop procedure bug14233_3;
-show procedure status;
-Db	Name	Type	Definer	Modified	Created	Security_type	Comment	character_set_client	collation_connection	Database Collation
-show function status;
-Db	Name	Type	Definer	Modified	Created	Security_type	Comment	character_set_client	collation_connection	Database Collation

=== removed file 'test/mysql-test/t/sp-destruct.test'
--- test/mysql-test/t/sp-destruct.test	2006-10-23 09:14:04 +0000
+++ test/mysql-test/t/sp-destruct.test	1970-01-01 00:00:00 +0000
@@ -1,144 +0,0 @@
-#
-# Destructive stored procedure tests
-#
-# We do horrible things to the mysql.proc table here, so any unexpected
-# failures here might leave it in an undetermined state.
-#
-# In the case of trouble you might want to skip this.
-#
-
-# embedded server returns different paths in error messages
-# in lines like 'call bug14233();'
-# mysqltest should be fixed to allow REPLACE_RESULT in error message
--- source include/not_embedded.inc
-
-# We're using --system things that probably doesn't work on Windows.
---source include/not_windows.inc
-
-# Backup proc table
---system rm -rf $MYSQLTEST_VARDIR/master-data/mysql/backup
---system mkdir $MYSQLTEST_VARDIR/master-data/mysql/backup
---system cp $MYSQLTEST_VARDIR/master-data/mysql/proc.* $MYSQLTEST_VARDIR/master-data/mysql/backup/
-
-use test;
-
---disable_warnings
-drop procedure if exists bug14233;
-drop function if exists bug14233;
-drop table if exists t1;
-drop view if exists v1;
---enable_warnings
-
-create procedure bug14233()
-  set @x = 42;
-
-create function bug14233_f() returns int
-  return 42;
-
-create table t1 (id int);
-create trigger t1_ai after insert on t1 for each row call bug14233();
-
-# Unsupported tampering with the mysql.proc definition
-alter table mysql.proc drop type;
---replace_result $MYSQL_TEST_DIR .
---error ER_SP_PROC_TABLE_CORRUPT
-call bug14233();
---replace_result $MYSQL_TEST_DIR .
---error ER_SP_PROC_TABLE_CORRUPT
-create view v1 as select bug14233_f();
---replace_result $MYSQL_TEST_DIR .
---error ER_SP_PROC_TABLE_CORRUPT
-insert into t1 values (0);
-
-flush table mysql.proc;
-
-# Thrashing the .frm file
---system echo 'saljdlfa' > $MYSQLTEST_VARDIR/master-data/mysql/proc.frm
---replace_result $MYSQLTEST_VARDIR . master-data// ''
---error ER_NOT_FORM_FILE
-call bug14233();
---replace_result $MYSQLTEST_VARDIR . master-data// ''
---error ER_NOT_FORM_FILE
-create view v1 as select bug14233_f();
---replace_result $MYSQLTEST_VARDIR . master-data// ''
---error ER_NOT_FORM_FILE
-insert into t1 values (0);
-
-
-flush table mysql.proc;
-
-# Drop the mysql.proc table
---system rm $MYSQLTEST_VARDIR/master-data/mysql/proc.*
---error ER_NO_SUCH_TABLE
-call bug14233();
---error ER_NO_SUCH_TABLE
-create view v1 as select bug14233_f();
---error ER_NO_SUCH_TABLE
-insert into t1 values (0);
-
-# Restore mysql.proc
---system mv $MYSQLTEST_VARDIR/master-data/mysql/backup/* $MYSQLTEST_VARDIR/master-data/mysql/
---system rmdir $MYSQLTEST_VARDIR/master-data/mysql/backup
-
-flush table mysql.proc;
-flush privileges;
-
-delete from mysql.proc where name like 'bug14233%';
-
-# Unsupported editing of mysql.proc, circumventing checks in "create ..."
-insert into mysql.proc
-(
-  db, name, type, specific_name, language, sql_data_access, is_deterministic,
-  security_type, param_list, returns, body, definer, created, modified,
-  sql_mode, comment
-)
-values
-(
-  'test', 'bug14233_1', 'FUNCTION', 'bug14233_1', 'SQL', 'READS_SQL_DATA', 'NO',
-  'DEFINER', '', 'int(10)',
-  'select count(*) from mysql.user',
-  'root@localhost', NOW() , '0000-00-00 00:00:00', '', ''
-),
-(
-  'test', 'bug14233_2', 'FUNCTION', 'bug14233_2', 'SQL', 'READS_SQL_DATA', 'NO',
-  'DEFINER', '', 'int(10)',
-  'begin declare x int; select count(*) into x from mysql.user; end',
-  'root@localhost', NOW() , '0000-00-00 00:00:00', '', ''
-),
-(
-  'test', 'bug14233_3', 'PROCEDURE', 'bug14233_3', 'SQL', 'READS_SQL_DATA','NO',
-  'DEFINER', '', '',
-  'alksj wpsj sa ^#!@ ',
-  'root@localhost', NOW() , '0000-00-00 00:00:00', '', ''
-);
-
---error ER_SP_PROC_TABLE_CORRUPT
-select bug14233_1();
---error ER_SP_PROC_TABLE_CORRUPT
-create view v1 as select bug14233_1();
-
---error ER_SP_PROC_TABLE_CORRUPT
-select bug14233_2();
---error ER_SP_PROC_TABLE_CORRUPT
-create view v1 as select bug14233_2();
-
---error ER_SP_PROC_TABLE_CORRUPT
-call bug14233_3();
-drop trigger t1_ai;
-create trigger t1_ai after insert on t1 for each row call bug14233_3();
---error ER_SP_PROC_TABLE_CORRUPT
-insert into t1 values (0);
-
-# Clean-up
-drop trigger t1_ai;
-drop table t1;
-
-#
-# BUG#16303: erroneus stored procedures and functions should be droppable
-#
-drop function bug14233_1;
-drop function bug14233_2;
-drop procedure bug14233_3;
-# Assert: These should show nothing.
-show procedure status;
-show function status;