Commit ea826f21 authored by unknown's avatar unknown
Browse files

Merge bk-internal.mysql.com:/home/bk/mysql-3.23 

into narttu.mysql.fi:/my/mysql-3.23
parents aa0f5c8e 68ae3653

include/my_sys.h

+1 −0
Original line number Diff line number Diff line
@@ -73,6 +73,7 @@ extern int NEAR my_errno; /* Last error in mysys */ 
#define MY_FREE_ON_ERROR 128	/* my_realloc() ; Free old ptr on error */

#define MY_HOLD_ON_ERROR 256	/* my_realloc() ; Return old ptr on error */

#define MY_THREADSAFE	128	/* pread/pwrite:  Don't allow interrupts */

#define MY_DONT_OVERWRITE_FILE 1024	/* my_copy; Don't overwrite file */



#define MY_CHECK_ERROR	1	/* Params to my_end; Check open-close */

#define MY_GIVE_INFO	2	/* Give time info about process*/

mysql-test/mysql-test-run.sh

+2 −2
Original line number Diff line number Diff line
@@ -604,7 +604,7 @@ start_slave() 
             $EXTRA_SLAVE_OPT $EXTRA_SLAVE_MYSQLD_OPT"

    if [ x$DO_DDD = x1 ]

    then

      $ECHO "set args $master_args" > $GDB_SLAVE_INIT

      $ECHO "set args $slave_args" > $GDB_SLAVE_INIT

      ddd --debugger "gdb -x $GDB_SLAVE_INIT" $SLAVE_MYSQLD &

      prompt_user "Hit enter to continue after you've started the slave"

    elif [ x$DO_GDB = x1 ]
@@ -746,7 +746,7 @@ run_testcase () 
     stop_master

     start_master

   else

     if [ ! -z "$EXTRA_MASTER_OPT" ] || [ x$MASTER_RUNNING != x1 ] ;

     if [ ! -z "$EXTRA_MASTER_OPT" ] || [ x$MASTER_RUNNING != x1 ] || [ -f $master_init_script ]

     then

       EXTRA_MASTER_OPT=""

       stop_master

mysql-test/r/backup.result

+8 −6
Original line number Diff line number Diff line 
Table	Op	Msg_type	Msg_text

test.t1	backup	error	Failed copying .frm file: errno = X

test.t1	backup	status	Operation failed

test.t4	backup	error	Failed copying .frm file (errno: X)

test.t4	backup	status	Operation failed

Table	Op	Msg_type	Msg_text

test.t1	backup	status	OK

test.t4	backup	status	OK

Table	Op	Msg_type	Msg_text

test.t1	restore	status	OK

test.t4	backup	error	Failed copying .frm file (errno: X)

test.t4	backup	status	Operation failed

Table	Op	Msg_type	Msg_text

test.t4	restore	status	OK

count(*)

0

Table	Op	Msg_type	Msg_text
@@ -18,7 +21,6 @@ n 
45

67

Table	Op	Msg_type	Msg_text

test.t1	backup	status	OK

test.t2	backup	status	OK

test.t3	backup	status	OK

Table	Op	Msg_type	Msg_text
@@ -40,4 +42,4 @@ k 
Table	Op	Msg_type	Msg_text

test.t1	restore	status	OK

Table	Op	Msg_type	Msg_text

test.t1	backup	status	OK
 
test.t5	backup	status	OK

mysql-test/t/backup-master.sh

0 → 100755
+5 −0
Original line number Diff line number Diff line 
#!/bin/sh

if [ "$MYSQL_TEST_DIR" ]

then

  rm -f $MYSQL_TEST_DIR/var/tmp/*.frm $MYSQL_TEST_DIR/var/tmp/*.MY?

fi

mysql-test/t/backup.test

+21 −18
Original line number Diff line number Diff line 
#

# This test is a bit tricky as we can't use backup table to overwrite an old

# table

#

connect (con1,localhost,root,,);

connect (con2,localhost,root,,);

connection con1;

set SQL_LOG_BIN=0;

drop table if exists t1;

drop table if exists t1,t2,t3,t4;

create table t4(n int);

--replace_result "errno: 2" "errno: X" "errno: 22" "errno: X" "errno: 23" "errno: X"

backup table t4 to '../bogus';

backup table t4 to '../tmp';

--replace_result "errno: 17" "errno: X"

backup table t4 to '../tmp';

drop table t4;

restore table t4 from '../tmp';

select count(*) from t4;



create table t1(n int);

--replace_result "errno = 2" "errno = X" "errno = 22" "errno = X" "errno = 23" "errno = X"

backup table t1 to '../bogus';

backup table t1 to '../tmp';

drop table t1;

restore table t1 from '../tmp';

select count(*) from t1;

insert into t1 values (23),(45),(67);

backup table t1 to '../tmp';

drop table t1;
@@ -20,29 +28,24 @@ create table t2(m int not null primary key); 
create table t3(k int not null primary key);

insert into t2 values (123),(145),(167);

insert into t3 values (223),(245),(267);

backup table t1,t2,t3 to '../tmp';

backup table t2,t3 to '../tmp';

drop table t1,t2,t3;

restore table t1,t2,t3 from '../tmp';

select n from t1;

select m from t2;

select k from t3;

drop table t1,t2,t3;

drop table t1,t2,t3,t4;

restore table t1 from '../tmp';

connection con2;

rename table t1 to t5;

--send

lock tables t1 write;

lock tables t5 write;

connection con1;

--send

backup table t1 to '../tmp';

backup table t5 to '../tmp';

connection con2;

reap;

unlock tables;

connection con1;

reap;

drop table t1;











drop table t5;