Commit 6b7f067e authored by unknown's avatar unknown
Browse files

merge

parents 514b2364 9d548d7f

mysql-test/mysql-test-run.sh

+3 −0
Original line number Diff line number Diff line
@@ -490,6 +490,7 @@ export MASTER_MYPORT MASTER_MYPORT1 SLAVE_MYPORT MYSQL_TCP_PORT MASTER_MYSOCK MA 
NDBCLUSTER_BASE_PORT=`expr $NDBCLUSTER_PORT + 2`

NDBCLUSTER_OPTS="--port=$NDBCLUSTER_PORT --port-base=$NDBCLUSTER_BASE_PORT --data-dir=$MYSQL_TEST_DIR/var --ndb_mgm-extra-opts=$NDB_MGM_EXTRA_OPTS --ndb_mgmd-extra-opts=$NDB_MGMD_EXTRA_OPTS --ndbd-extra-opts=$NDBD_EXTRA_OPTS"

NDB_BACKUP_DIR=$MYSQL_TEST_DIR/var/ndbcluster-$NDBCLUSTER_PORT

NDB_TOOLS_OUTPUT=$MYSQL_TEST_DIR/var/log/ndb_tools.log



if [ x$SOURCE_DIST = x1 ] ; then

 MY_BASEDIR=$MYSQL_TEST_DIR
@@ -690,6 +691,7 @@ export CLIENT_BINDIR MYSQL_CLIENT_TEST CHARSETSDIR 
export NDB_TOOLS_DIR

export NDB_MGM

export NDB_BACKUP_DIR

export NDB_TOOLS_OUTPUT

export PURIFYOPTIONS



MYSQL_TEST_ARGS="--no-defaults --socket=$MASTER_MYSOCK --database=$DB \
@@ -1043,6 +1045,7 @@ start_ndbcluster() 
{

  if [ ! -z "$USE_NDBCLUSTER" ]

  then

  rm -f $NDB_TOOLS_OUTPUT

  if [ -z "$USE_RUNNING_NDBCLUSTER" ]

  then

    echo "Starting ndbcluster"

mysql-test/t/ndb_autodiscover.test

+5 −5
Original line number Diff line number Diff line
@@ -199,7 +199,7 @@ insert into t4 values (1, "Automatic"); 
select * from t4;



# Remove the table from NDB

system exec $NDB_TOOLS_DIR/ndb_drop_table --no-defaults -d test t4 > /dev/null ; 

system exec $NDB_TOOLS_DIR/ndb_drop_table --no-defaults -d test t4 >> $NDB_TOOLS_OUTPUT ; 



#

# Test that correct error is returned
@@ -230,7 +230,7 @@ select * from t4; 
flush tables;



# Remove the table from NDB

system exec $NDB_TOOLS_DIR/ndb_drop_table --no-defaults -d test t4 > /dev/null ; 

system exec $NDB_TOOLS_DIR/ndb_drop_table --no-defaults -d test t4 >> $NDB_TOOLS_OUTPUT ;



SHOW TABLES;
@@ -264,8 +264,8 @@ insert into t8 values (8, "myisam table 8"); 
insert into t9 values (9);



# Remove t3, t5 from NDB

system exec $NDB_TOOLS_DIR/ndb_drop_table --no-defaults -d test t3 > /dev/null  ;

system exec $NDB_TOOLS_DIR/ndb_drop_table --no-defaults -d test t5 > /dev/null  ;

system exec $NDB_TOOLS_DIR/ndb_drop_table --no-defaults -d test t3 >> $NDB_TOOLS_OUTPUT ;

system exec $NDB_TOOLS_DIR/ndb_drop_table --no-defaults -d test t5 >> $NDB_TOOLS_OUTPUT ;

# Remove t6, t7 from disk

system rm var/master-data/test/t6.frm > /dev/null ; 

system rm var/master-data/test/t7.frm > /dev/null ;
@@ -479,4 +479,4 @@ create table t10 ( 


insert into t10 values (1, 'kalle');



--exec $NDB_TOOLS_DIR/ndb_drop_table --no-defaults -d test `$NDB_TOOLS_DIR/ndb_show_tables --no-defaults | grep BLOB` > /dev/null 2>&1 || true
 
--exec $NDB_TOOLS_DIR/ndb_drop_table --no-defaults -d test `$NDB_TOOLS_DIR/ndb_show_tables --no-defaults | grep BLOB` >> $NDB_TOOLS_OUTPUT 2>&1 || true

mysql-test/t/ndb_restore.test

+3 −3
Original line number Diff line number Diff line
@@ -141,10 +141,10 @@ create table t8_c engine=ndbcluster as select * from t8; 
create table t9_c engine=ndbcluster as select * from t9;





--exec $NDB_MGM --no-defaults -e "start backup" > /dev/null

--exec $NDB_MGM --no-defaults -e "start backup" >> $NDB_TOOLS_OUTPUT

drop table t1_c,t2_c,t3_c,t4_c,t5_c,t6_c,t7_c,t8_c,t9_c;

--exec $NDB_TOOLS_DIR/ndb_restore --no-defaults -b 1 -n 1 -m -r --print --print_meta $NDB_BACKUP_DIR/BACKUP/BACKUP-1 > /tmp/ndb_restore.out

--exec $NDB_TOOLS_DIR/ndb_restore --no-defaults -b 1 -n 2 -r --print --print_meta $NDB_BACKUP_DIR/BACKUP/BACKUP-1 > /tmp/ndb_restore.out

--exec $NDB_TOOLS_DIR/ndb_restore --no-defaults -b 1 -n 1 -m -r --print --print_meta $NDB_BACKUP_DIR/BACKUP/BACKUP-1 >> $NDB_TOOLS_OUTPUT

--exec $NDB_TOOLS_DIR/ndb_restore --no-defaults -b 1 -n 2 -r --print --print_meta $NDB_BACKUP_DIR/BACKUP/BACKUP-1 >> $NDB_TOOLS_OUTPUT



show tables;

ndb/include/ndbapi/NdbConnection.hpp

+2 −0
Original line number Diff line number Diff line
@@ -687,6 +687,8 @@ private: 


  void remove_list(NdbOperation*& head, NdbOperation*);

  void define_scan_op(NdbIndexScanOperation*);



  friend int runOperations(class NDBT_Context*, class NDBT_Step*);

};



inline

ndb/src/kernel/blocks/dbacc/DbaccMain.cpp

+2 −1
Original line number Diff line number Diff line
@@ -5704,7 +5704,8 @@ void Dbacc::commitOperation(Signal* signal) 
  Uint32 tmp2Olq;









  if ((operationRecPtr.p->commitDeleteCheckFlag == ZFALSE) &&









      (operationRecPtr.p->operation != ZSCAN_OP)) {









      (operationRecPtr.p->operation != ZSCAN_OP) &&









      (operationRecPtr.p->operation != ZREAD)) {









    jam();









    /*  This method is used to check whether the end result of the transaction









        will be to delete the tuple. In this case all operation will be marked