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.0-opt

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


libmysqld/lib_sql.cc:
  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
mysql-test/mysql-test-run.pl:
  merging
mysql-test/r/flush_block_commit.result:
  SCCS merged
This commit is contained in:
unknown
2006-12-08 15:22:46 +04:00
parent e8be5f6d50 ea1f7e4b56
commit 5e3f06db42
27 changed files with 346 additions and 372 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
mysql-test/include/federated.inc
View File

@ -1,3 +1,4 @@
--source include/not_embedded.inc
--source ./include/have_federated_db.inc
source ./include/master-slave.inc;