bzr commit into mysql-6.0-rpl branch (skozlov:2740) Bug#40145 Bug#40708

[Serge Kozlov]

#At file:///home/ksm/sun/repo/bugs-39903-40145-40708/mysql-6.0-rpl/ based on revid:skozlov@stripped

 2740 Serge Kozlov	2008-11-27 [merge]
      Bug#40145. Argument for LOAD_FILE() can be too long and sometimes
      a query with two or more these functions truncated. Therefore data 
      from each LOAD_FILE() copied into its local variables and then used
      in a query.
      Bug#40708: Sometimes DB mysqltest1 did not removed before
      starting test rpl_row_create_table therefore the patch add 
      the cleanup operation if DB with such name already exists. 
modified:
  mysql-test/r/general_log_func.result
  mysql-test/suite/rpl/r/rpl_row_create_table.result
  mysql-test/suite/rpl/t/rpl_row_create_table.test
  mysql-test/t/general_log_func.test

=== modified file 'mysql-test/r/general_log_func.result'
--- a/mysql-test/r/general_log_func.result	2008-08-04 14:30:50 +0000
+++ b/mysql-test/r/general_log_func.result	2008-11-27 12:20:20 +0000
@@ -27,9 +27,10 @@ INSERT into t1(name) values('Record_3');
 INSERT into t1(name) values('Record_4');
 ## There should be a difference ##
 SET @@session.max_allowed_packet= 1024*1024*1024;
-select
-STRCMP(load_file('MYSQLD_LOGFILE.orig'), load_file('MYSQLD_LOGFILE.copy'));
-STRCMP(load_file('MYSQLD_LOGFILE.orig'), load_file('MYSQLD_LOGFILE.copy'))
+SET @orig_file= load_file('MYSQLD_LOGFILE.orig');
+SET @copy_file= load_file('MYSQLD_LOGFILE.copy');
+SELECT STRCMP(@orig_file, @copy_file);
+STRCMP(@orig_file, @copy_file)
 1
 ## Dropping tables ##
 DROP TABLE t1;

=== modified file 'mysql-test/suite/rpl/r/rpl_row_create_table.result'
--- a/mysql-test/suite/rpl/r/rpl_row_create_table.result	2008-10-29 09:52:46 +0000
+++ b/mysql-test/suite/rpl/r/rpl_row_create_table.result	2008-11-27 12:20:20 +0000
@@ -436,11 +436,13 @@ reset master;
 reset slave;
 drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
 start slave;
+DROP DATABASE IF EXISTS mysqltest1;
 CREATE DATABASE mysqltest1;
 CREATE TABLE mysqltest1.without_select (f1 BIGINT);
 CREATE TABLE mysqltest1.with_select AS SELECT 1 AS f1;
 show binlog events from <binlog_start>;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
+master-bin.000001	#	Query	#	#	DROP DATABASE IF EXISTS mysqltest1
 master-bin.000001	#	Query	#	#	CREATE DATABASE mysqltest1
 master-bin.000001	#	Query	#	#	use `test`; CREATE TABLE mysqltest1.without_select (f1 BIGINT)
 master-bin.000001	#	Query	#	#	use `test`; BEGIN

=== modified file 'mysql-test/suite/rpl/t/rpl_row_create_table.test'
--- a/mysql-test/suite/rpl/t/rpl_row_create_table.test	2008-10-29 09:52:46 +0000
+++ b/mysql-test/suite/rpl/t/rpl_row_create_table.test	2008-11-27 12:20:20 +0000
@@ -274,6 +274,9 @@ sync_slave_with_master;
 source include/master-slave-reset.inc;
 
 connection master;
+--disable_warnings
+DROP DATABASE IF EXISTS mysqltest1;
+--enable_warnings
 CREATE DATABASE mysqltest1;
 
 CREATE TABLE mysqltest1.without_select (f1 BIGINT);

=== modified file 'mysql-test/t/general_log_func.test'
--- a/mysql-test/t/general_log_func.test	2008-08-04 14:30:50 +0000
+++ b/mysql-test/t/general_log_func.test	2008-11-27 12:20:20 +0000
@@ -81,8 +81,10 @@ INSERT into t1(name) values('Record_4');
 --echo ## There should be a difference ##
 SET @@session.max_allowed_packet= 1024*1024*1024;
 --replace_result $MYSQLD_LOGFILE MYSQLD_LOGFILE
-eval select
-  STRCMP(load_file('$MYSQLD_LOGFILE.orig'), load_file('$MYSQLD_LOGFILE.copy'));
+eval SET @orig_file= load_file('$MYSQLD_LOGFILE.orig');
+--replace_result $MYSQLD_LOGFILE MYSQLD_LOGFILE
+eval SET @copy_file= load_file('$MYSQLD_LOGFILE.copy');
+eval SELECT STRCMP(@orig_file, @copy_file);
 --remove_file $MYSQLD_LOGFILE.copy
 --remove_file $MYSQLD_LOGFILE.orig