Commit 878c3001 authored by msvensson@pilot.(none)'s avatar msvensson@pilot.(none)
Browse files

Merge bk-internal:/home/bk/mysql-5.0-maint 

into  pilot.(none):/data/msvensson/mysql/mysql-5.0-maint
parents b36295dd 781bc312

client/mysqldump.c

+12 −11
Original line number Diff line number Diff line
@@ -686,6 +686,18 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)), 
    break;

  case 'T':

    opt_disable_keys=0;



    if (strlen(argument) >= FN_REFLEN)

    {

      /*

        This check is made because the some the file functions below

        have FN_REFLEN sized stack allocated buffers and will cause

        a crash even if the input destination buffer is large enough

        to hold the output.

      */

      die(EX_USAGE, "Input filename too long: %s", argument);

    }



    break;

  case '#':

    DBUG_PUSH(argument ? argument : default_dbug_option);
@@ -2324,17 +2336,6 @@ static void dump_table(char *table, char *db) 
  {

    char filename[FN_REFLEN], tmp_path[FN_REFLEN];



    if (strlen(path) >= FN_REFLEN)

    {

      /*

        This check is made because the some the file functions below

        have FN_REFLEN sized stack allocated buffers and will cause

        a crash even if the input destination buffer is large enough

        to hold the output.

      */

      die(EX_USAGE, "Input filename or options too long: %s", path);

    }



    /*

      Convert the path to native os format

      and resolve to the full filepath.

mysql-test/include/have_outfile.inc

+1 −1
Original line number Diff line number Diff line 
-- require r/have_outfile.require

disable_query_log;

select load_file(concat(@tmpdir,"/outfile.test"));

--exec rm $MYSQLTEST_VARDIR/tmp/outfile.test

--remove_file $MYSQLTEST_VARDIR/tmp/outfile.test

enable_query_log;

mysql-test/r/mysqldump.result

+1 −1
Original line number Diff line number Diff line
@@ -3206,7 +3206,7 @@ DROP TABLE t1; 
#

CREATE TABLE t1(a int);

INSERT INTO t1 VALUES (1), (2);

mysqldump: Input filename or options too long: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa

mysqldump: Input filename too long: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa

DROP TABLE t1;

CREATE TABLE t2 (a int);

CREATE TABLE t3 (a int);

mysql-test/r/rpl_misc_functions.result

+12 −4
Original line number Diff line number Diff line
@@ -40,7 +40,15 @@ CALL test_replication_sp2(); 
INSERT INTO t1 VALUES (test_replication_sf());

INSERT INTO t1 VALUES (test_replication_sf());

INSERT INTO t1 VALUES (test_replication_sf());

DROP PROCEDURE IF EXISTS test_replication_sp1;

DROP PROCEDURE IF EXISTS test_replication_sp2;

DROP FUNCTION IF EXISTS test_replication_sf;

DROP TABLE IF EXISTS t1;
 
select * from t1 into outfile "../tmp/t1_slave.txt";

create temporary table t1_slave select * from t1 where 1=0;

load data infile '../tmp/t1_slave.txt' into table t1_slave;

select count(*) into @aux from t1, t1_slave

where ABS(t1.col_a - t1_slave.col_a) < 0.0001 ;

SELECT @aux;

@aux

12

DROP PROCEDURE test_replication_sp1;

DROP PROCEDURE test_replication_sp2;

DROP FUNCTION test_replication_sf;

DROP TABLE t1, t1_slave;

mysql-test/t/rpl_misc_functions.test

+26 −16
Original line number Diff line number Diff line
@@ -77,27 +77,37 @@ INSERT INTO t1 VALUES (test_replication_sf()); 
INSERT INTO t1 VALUES (test_replication_sf());

INSERT INTO t1 VALUES (test_replication_sf());



# Record the results of the query on the master

--exec $MYSQL --port=$MASTER_MYPORT test -e "SELECT * FROM test.t1" > $MYSQLTEST_VARDIR/tmp/rpl_rand_master.sql



--sync_slave_with_master



# Record the results of the query on the slave

--exec $MYSQL --port=$SLAVE_MYPORT test -e "SELECT * FROM test.t1" > $MYSQLTEST_VARDIR/tmp/rpl_rand_slave.sql

# Dump table on slave

select * from t1 into outfile "../tmp/t1_slave.txt";



# Compare the results from the master to the slave.

--exec diff $MYSQLTEST_VARDIR/tmp/rpl_rand_master.sql $MYSQLTEST_VARDIR/tmp/rpl_rand_slave.sql

# Load data from slave into temp table on master

connection master;

create temporary table t1_slave select * from t1 where 1=0;

load data infile '../tmp/t1_slave.txt' into table t1_slave;

--remove_file $MYSQLTEST_VARDIR/tmp/t1_slave.txt



# Compare master and slave temp table, use subtraction

# for floating point comparison of "double"

select count(*) into @aux from t1, t1_slave

where ABS(t1.col_a - t1_slave.col_a) < 0.0001 ;

SELECT @aux;

if (`SELECT @aux <> 12 OR @aux IS NULL`)

{

   --echo # ERROR: We expected to get count(*) = 12.

   SELECT col_a FROM t1;

   SELECT col_a FROM t1_slave;

   --echo # abort

   exit;

}



# Cleanup

connection master;

--disable_warnings

DROP PROCEDURE IF EXISTS test_replication_sp1;

DROP PROCEDURE IF EXISTS test_replication_sp2;

DROP FUNCTION IF EXISTS test_replication_sf;

DROP TABLE IF EXISTS t1;

--enable_warnings

DROP PROCEDURE test_replication_sp1;

DROP PROCEDURE test_replication_sp2;

DROP FUNCTION test_replication_sf;

DROP TABLE t1, t1_slave;

--sync_slave_with_master



# If all is good, when can cleanup our dump files.

--system rm $MYSQLTEST_VARDIR/tmp/rpl_rand_master.sql

--system rm $MYSQLTEST_VARDIR/tmp/rpl_rand_slave.sql