Commit 616d5a6f authored by unknown's avatar unknown
Browse files

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

into mysql.com:/my/mysql-4.1
parents 9735fb42 3ec5446c

innobase/include/univ.i

+3 −1
Original line number Diff line number Diff line
@@ -80,8 +80,10 @@ memory is read outside the allocated blocks. */ 


/* Make a non-inline debug version */



/*

#ifdef DBUG_ON

# define UNIV_DEBUG

#endif /* DBUG_ON */

/*

#define UNIV_MEM_DEBUG

#define UNIV_IBUF_DEBUG

#define UNIV_SYNC_DEBUG

ndb/test/run-test/atrt-mysql-test-run

+2 −2
Original line number Diff line number Diff line
@@ -5,8 +5,8 @@ p=`pwd` 
cd $MYSQL_BASE_DIR/mysql-test 

./mysql-test-run --with-ndbcluster --ndb-connectstring=$NDB_CONNECTSTRING $* | tee $p/output.txt



f=`grep -c fail $p/output.txt`

o=`grep -c pass $p/output.txt`

f=`grep -c '\[ fail \]' $p/output.txt`

o=`grep -c '\[ pass \]' $p/output.txt`



if [ $o -gt 0 -a $f -eq 0 ]

then

ndb/test/run-test/daily-basic-tests.txt

+8 −0
Original line number Diff line number Diff line 
max-time: 25000

cmd: atrt-mysql-test-run

args: --force



max-time: 600

cmd: atrt-testBackup

args: -n BackupOne T1 T6 T3 I3



# BASIC FUNCTIONALITY

max-time: 500

cmd: testBasic

ndb/test/run-test/daily-devel-tests.txt

+0 −8
Original line number Diff line number Diff line 
max-time: 2500

cmd: atrt-mysql-test-run

args: --do-test=ndb --force



#

# INDEX

#
@@ -22,10 +18,6 @@ args: -n CreateLoadDrop T1 T10 
#

# BACKUP

#

max-time: 600

cmd: atrt-testBackup

args: -n BackupOne T1 T6 T3 I3



max-time: 1000

cmd: atrt-testBackup

args: -n BackupBank T6

sql/sql_insert.cc

+5 −5
Original line number Diff line number Diff line
@@ -241,7 +241,7 @@ int mysql_insert(THD *thd,TABLE_LIST *table_list, 
  error=0;

  id=0;

  thd->proc_info="update";

  if (duplic != DUP_ERROR)

  if (duplic != DUP_ERROR || ignore)

    table->file->extra(HA_EXTRA_IGNORE_DUP_KEY);

  /*

    let's *try* to start bulk inserts. It won't necessary
@@ -380,7 +380,7 @@ int mysql_insert(THD *thd,TABLE_LIST *table_list, 
  table->next_number_field=0;

  thd->count_cuted_fields= CHECK_FIELD_IGNORE;

  thd->next_insert_id=0;			// Reset this if wrongly used

  if (duplic != DUP_ERROR)

  if (duplic != DUP_ERROR || ignore)

    table->file->extra(HA_EXTRA_NO_IGNORE_DUP_KEY);



  /* Reset value of LAST_INSERT_ID if no rows where inserted */
@@ -1345,7 +1345,7 @@ bool delayed_insert::handle_inserts(void) 
    info.ignore= row->ignore;

    info.handle_duplicates= row->dup;

    if (info.ignore ||

	info.handle_duplicates == DUP_REPLACE)

	info.handle_duplicates != DUP_ERROR)

    {

      table->file->extra(HA_EXTRA_IGNORE_DUP_KEY);

      using_ignore=1;
@@ -1463,7 +1463,7 @@ select_insert::prepare(List<Item> &values, SELECT_LEX_UNIT *u) 
  table->next_number_field=table->found_next_number_field;

  thd->cuted_fields=0;

  if (info.ignore ||

      info.handle_duplicates == DUP_REPLACE)

      info.handle_duplicates != DUP_ERROR)

    table->file->extra(HA_EXTRA_IGNORE_DUP_KEY);

  table->file->start_bulk_insert((ha_rows) 0);

  DBUG_RETURN(0);
@@ -1649,7 +1649,7 @@ select_create::prepare(List<Item> &values, SELECT_LEX_UNIT *u) 
  restore_record(table,default_values);			// Get empty record

  thd->cuted_fields=0;

  if (info.ignore ||

      info.handle_duplicates == DUP_REPLACE)

      info.handle_duplicates != DUP_ERROR)

    table->file->extra(HA_EXTRA_IGNORE_DUP_KEY);

  table->file->start_bulk_insert((ha_rows) 0);

  DBUG_RETURN(0);