Commit d5a4968e authored by unknown's avatar unknown
Browse files

Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0 

into mysql.com:/home/jonas/src/mysql-5.0


mysql-test/r/order_by.result:
  Auto merged
mysql-test/t/order_by.test:
  Auto merged
parents 12f28354 8f2eb56e

mysql-test/r/ndb_index_unique.result

+1 −1
Original line number Diff line number Diff line 
drop table if exists t1, t2, t3, t4, t5, t6, t7;

drop table if exists t1, t2, t3, t4, t5, t6, t7, t8;

CREATE TABLE t1 (

a int unsigned NOT NULL PRIMARY KEY,

b int unsigned not null,

mysql-test/t/ndb_index_unique.test

+1 −1
Original line number Diff line number Diff line 
-- source include/have_ndb.inc



--disable_warnings

drop table if exists t1, t2, t3, t4, t5, t6, t7;

drop table if exists t1, t2, t3, t4, t5, t6, t7, t8;

--enable_warnings



#