database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Merge bk@192.168.21.1:mysql-5.1-opt

Browse Source 
into  mysql.com:/home/hf/work/embt/my51-embt


libmysqld/lib_sql.cc:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/include/federated.inc:
  Auto merged
mysql-test/t/flush_block_commit.test:
  Auto merged
mysql-test/t/innodb.test:
  Auto merged
mysql-test/t/join.test:
  Auto merged
mysql-test/t/status.test:
  Auto merged
mysql-test/t/trigger.test:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/share/errmsg.txt:
  Auto merged
mysql-test/r/flush_block_commit.result:
  SCCS merged
This commit is contained in:
unknown
2006-12-08 15:49:43 +04:00
parent 893055bed6 298aff1267
commit ab4c37dcce
24 changed files with 343 additions and 299 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
mysql-test/t/innodb.test
View File

@ -2451,6 +2451,7 @@ drop table t1, t2, t3, t5, t6, t8, t9;
# bug 18934, "InnoDB crashes when table uses column names like DB_ROW_ID"
--error 1005
--replace_result \\ / $MYSQL_TEST_DIR . /var/master-data/ /
CREATE TABLE t1 (DB_ROW_ID int) engine=innodb;
#