Commit db30c09c authored by unknown's avatar unknown
Browse files

Merge c-0c0be253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/mysql-5.1-new 

into  c-0c0be253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/wl2604-push


sql/ha_ndbcluster.cc:
  Auto merged
sql/ha_ndbcluster.h:
  Auto merged
sql/ha_ndbcluster_binlog.cc:
  Auto merged
parents 6f962fc6 19bbb7cc

include/thr_lock.h

+3 −1
Original line number Diff line number Diff line
@@ -143,10 +143,12 @@ void thr_unlock(THR_LOCK_DATA *data); 
enum enum_thr_lock_result thr_multi_lock(THR_LOCK_DATA **data,

                                         uint count, THR_LOCK_OWNER *owner);

void thr_multi_unlock(THR_LOCK_DATA **data,uint count);

void thr_abort_locks(THR_LOCK *lock);

void thr_abort_locks(THR_LOCK *lock, bool upgrade_lock);

my_bool thr_abort_locks_for_thread(THR_LOCK *lock, pthread_t thread);

void thr_print_locks(void);		/* For debugging */

my_bool thr_upgrade_write_delay_lock(THR_LOCK_DATA *data);

void    thr_downgrade_write_lock(THR_LOCK_DATA *data,

                                 enum thr_lock_type new_lock_type);

my_bool thr_reschedule_write_lock(THR_LOCK_DATA *data);

#ifdef	__cplusplus

}

mysql-test/include/partition_1.inc

0 → 100644
+747 −0

File added.

Preview size limit exceeded, changes collapsed.

mysql-test/include/partition_10.inc

0 → 100644
+73 −0
Original line number Diff line number Diff line 
# include/partition_10.inc

#

#     Do some basic checks on a table.

#

# FIXME: Do not write the statements and results, if SQL return code = 0

#        and result set like expected. Write a message, that all is like

#        expected instead.

#

# All SELECTs are so written, that we get my_value = 1, when everything

# is like expected.

#



--source include/partition_layout.inc



####### Variations with multiple records

#      Select on empty table

SELECT COUNT(*) = 0 AS my_value FROM t1;

#      (mass) Insert of $max_row records

eval INSERT INTO t1 SELECT * FROM t0_template WHERE f1 BETWEEN 1 AND $max_row;

#      Select

eval SELECT (COUNT(*) = $max_row) AND (MIN(f1) = 1) AND (MAX(f1) = $max_row)

            AS my_value FROM t1;

# DEBUG SELECT COUNT(*),MIN(f1),MAX(f1) FROM t1;

#      (mass) Update $max_row_div4 * 2 + 1 records

eval UPDATE t1 SET f1 = f1 + $max_row

WHERE f1 BETWEEN $max_row_div2 - $max_row_div4 AND $max_row_div2 + $max_row_div4;

#      Select

eval SELECT (COUNT(*) = $max_row) AND (MIN(f1) = 1) AND (MAX(f1) = $max_row_div2 + $max_row_div4 + $max_row )

            AS my_value FROM t1;

# DEBUG SELECT COUNT(*),MIN(f1),MAX(f1) FROM t1;

#      (mass) Delete $max_row_div4 * 2 + 1 records

eval DELETE FROM t1

WHERE f1 BETWEEN $max_row_div2 - $max_row_div4 + $max_row AND $max_row_div2 + $max_row_div4 + $max_row;

#      Select

eval SELECT (COUNT(*) = $max_row - $max_row_div4 - $max_row_div4 - 1) AND (MIN(f1) = 1) AND (MAX(f1) = $max_row)

            AS my_value FROM t1;

# DEBUG SELECT COUNT(*),MIN(f1),MAX(f1) FROM t1;



####### Variations with single records

#      Insert one record at beginning

INSERT INTO t1 SET f1 = 0 , f2 = '#######';

#      Select this record

SELECT COUNT(*) = 1 AS my_value FROM t1 WHERE f1 = 0 AND f2 = '#######';

#      Insert one record at end

eval INSERT INTO t1 SET f1 = $max_row + 1, f2 = '#######';

#      Select this record

eval SELECT COUNT(*) = 1 AS my_value FROM t1 WHERE f1 = $max_row + 1 AND f2 = '#######';

#      Update one record

eval UPDATE t1 SET f1 = $max_row + 2, f2 = 'ZZZZZZZ'

     WHERE  f1 = 0 AND f2 = '#######';

#      Select

eval SELECT COUNT(*) = 1 AS my_value FROM t1 WHERE f1 = $max_row + 2 AND f2 = 'ZZZZZZZ';

if ($fixed_bug15968)

{

# Bug #15968: Partitions: crash when INSERT with f1 = -1 into PARTITION BY HASH(f1)

eval UPDATE t1 SET f1 = 0 - 1, f2 = 'ZZZZZZZ'

     WHERE  f1 = $max_row + 1 AND f2 = '#######';

#      Select

SELECT COUNT(*) AS my_value FROM t1 WHERE f1 = 0 - 1 AND f2 = 'ZZZZZZZ';

}

#      Delete

eval DELETE FROM t1 WHERE f1 = $max_row + 2 AND f2 = 'ZZZZZZZ';

if ($fixed_bug15968)

{

DELETE FROM t1 WHERE f1 = 0 - 1 AND f2 = 'ZZZZZZZ';

}

#      Select

SELECT COUNT(*) = 0 AS my_value FROM t1 WHERE f2 = 'ZZZZZZZ';



#      Truncate

TRUNCATE t1;

#      Select on empty table

SELECT COUNT(*) = 0 AS my_value FROM t1;

mysql-test/include/partition_11.inc

0 → 100644
+34 −0
Original line number Diff line number Diff line 
# include/partition_11.inc

#

#    Try to create a table with the given partition number

#



eval CREATE TABLE t1 ( f1 INTEGER, f2 char(20))

PARTITION BY HASH(f1) PARTITIONS $part_number;

--disable_query_log

eval SET @my_errno= $mysql_errno ;

let $run= `SELECT @my_errno = 0`;

--enable_query_log

#

# If this operation was successfull, check + drop this table

if ($run)

{

   --source include/partition_10.inc

   eval DROP TABLE t1;

}

#### Try to create a table with the given subpartition number

eval CREATE TABLE t1 ( f1 INTEGER, f2 char(20))

PARTITION    BY RANGE(f1) SUBPARTITION BY HASH(f1)

SUBPARTITIONS $part_number

(PARTITION part1 VALUES LESS THAN ($max_row_div2), PARTITION part2 VALUES LESS THAN ($max_int_4));

--disable_query_log

eval SET @my_errno= $mysql_errno ;

let $run= `SELECT @my_errno = 0`;

--enable_query_log

#

# If this operation was successfull, check + drop this table

if ($run)

{

   --source include/partition_10.inc

   eval DROP TABLE t1;

}

mysql-test/include/partition_12.inc

0 → 100644
+65 −0
Original line number Diff line number Diff line 
# include/partition_12.inc

#

# Do some basic things on a table, if the SQL command executed just before

# sourcing this file was successful.

#



--source include/partition_layout.inc



####### Variations with multiple records

   #      (mass) Insert max_row_div2 + 1 records

   eval INSERT INTO t1 SELECT * FROM t0_template WHERE f1 BETWEEN $max_row_div2 AND $max_row;

   #      Select

   eval SELECT (COUNT(*) = $max_row) AND (MIN(f1) = 1) AND (MAX(f1) = $max_row)

            AS my_value FROM t1;

   # DEBUG SELECT COUNT(*),MIN(f1),MAX(f1) FROM t1;

   #      (mass) Update $max_row_div4 * 2 + 1 records

   eval UPDATE t1 SET f1 = f1 + $max_row

   WHERE f1 BETWEEN $max_row_div2 - $max_row_div4 AND $max_row_div2 + $max_row_div4;

   #      Select

   eval SELECT (COUNT(*) = $max_row) AND (MIN(f1) = 1) AND (MAX(f1) = $max_row_div2 + $max_row_div4 + $max_row )

            AS my_value FROM t1;

   # DEBUG SELECT COUNT(*),MIN(f1),MAX(f1) FROM t1;

   #      (mass) Delete $max_row_div4 * 2 + 1 records

   eval DELETE FROM t1

   WHERE f1 BETWEEN $max_row_div2 - $max_row_div4 + $max_row AND $max_row_div2 + $max_row_div4 + $max_row;

   #      Select

   eval SELECT (COUNT(*) = $max_row - $max_row_div4 - $max_row_div4 - 1) AND (MIN(f1) = 1) AND (MAX(f1) = $max_row)

            AS my_value FROM t1;

   # DEBUG SELECT COUNT(*),MIN(f1),MAX(f1) FROM t1;



####### Variations with single records

#      Insert one record at beginning

INSERT INTO t1 SET f1 = 0 , f2 = '#######';

#      Select this record

SELECT COUNT(*) = 1 AS my_value FROM t1 WHERE f1 = 0 AND f2 = '#######';

#      Insert one record at end

eval INSERT INTO t1 SET f1 = $max_row + 1, f2 = '#######';

#      Select this record

eval SELECT COUNT(*) = 1 AS my_value FROM t1 WHERE f1 = $max_row + 1 AND f2 = '#######';

#      Update one record

eval UPDATE t1 SET f1 = $max_row + 2, f2 = 'ZZZZZZZ'

     WHERE  f1 = 0 AND f2 = '#######';

#      Select

eval SELECT COUNT(*) = 1 AS my_value FROM t1 WHERE f1 = $max_row + 2 AND f2 = 'ZZZZZZZ';

if ($fixed_bug15968)

{

# Bug #15968: Partitions: crash when INSERT with f1 = -1 into PARTITION BY HASH(f1)

eval UPDATE t1 SET f1 = 0 - 1, f2 = 'ZZZZZZZ'

     WHERE  f1 = $max_row + 1 AND f2 = '#######';

#      Select

SELECT COUNT(*) AS my_value FROM t1 WHERE f1 = 0 - 1 AND f2 = 'ZZZZZZZ';

}

#      Delete

eval DELETE FROM t1 WHERE f1 = $max_row + 2 AND f2 = 'ZZZZZZZ';

if ($fixed_bug15968)

{

DELETE FROM t1 WHERE f1 = 0 - 1 AND f2 = 'ZZZZZZZ';

}

#      Select

SELECT COUNT(*) = 0 AS my_value FROM t1 WHERE f2 = 'ZZZZZZZ';



#      Truncate

TRUNCATE t1;

#      Select on empty table

SELECT COUNT(*) = 0 AS my_value FROM t1;