database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

Merge with 4.0.13

Browse Source 
BitKeeper/etc/gone:
  auto-union
BitKeeper/etc/logging_ok:
  auto-union
myisam/sort.c:
  Auto merged
mysql-test/r/group_by.result:
  Auto merged
mysql-test/r/join_outer.result:
  Auto merged
mysql-test/r/order_by.result:
  Auto merged
mysql-test/r/query_cache.result:
  Auto merged
mysql-test/r/type_blob.result:
  Auto merged
mysql-test/r/type_ranges.result:
  Auto merged
mysql-test/r/update.result:
  Auto merged
mysql-test/t/bdb-crash.test:
  Auto merged
mysql-test/t/group_by.test:
  Auto merged
mysql-test/t/join_outer.test:
  Auto merged
mysql-test/t/order_by.test:
  Auto merged
mysql-test/t/query_cache.test:
  Auto merged
mysql-test/t/type_blob.test:
  Auto merged
mysql-test/t/type_decimal.test:
  Auto merged
mysql-test/t/type_ranges.test:
  Auto merged
mysql-test/t/update.test:
  Auto merged
sql-bench/crash-me.sh:
  Auto merged
client/mysql.cc:
  Keep old code
This commit is contained in:
unknown
2003-03-26 18:37:38 +02:00
parent c8bdced214 221dfec1a4
commit 9630bdffdd
65 changed files with 674 additions and 477 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/t/bdb-crash.test
View File

@ -6,7 +6,7 @@
drop table if exists t1;
--enable_warnings
CREATE TABLE t1 (
ChargeID int(10) unsigned DEFAULT '0' NOT NULL auto_increment,
ChargeID int(10) unsigned NOT NULL auto_increment,
ServiceID int(10) unsigned DEFAULT '0' NOT NULL,
ChargeDate date DEFAULT '0000-00-00' NOT NULL,
ChargeAmount decimal(20,2) DEFAULT '0.00' NOT NULL,