mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-18 21:12:26 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
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
sql/sql_insert.cc:
  Auto merged
This commit is contained in:
unknown 2005-01-28 07:55:42 +01:00
commit 2224afb79a
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
mysql-test/r/ndb_index_unique.result
View file

@ -1,4 +1,4 @@
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,

2
mysql-test/t/ndb_index_unique.test
View file

@ -1,7 +1,7 @@
-- 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
#