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 mysql.com:/d2/hf/clean/my51-clean

Browse Source 
into  mysql.com:/d2/hf/common/my51-common


libmysqld/Makefile.am:
  Auto merged
libmysqld/lib_sql.cc:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/t/ps.test:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/share/errmsg.txt:
  Auto merged
sql/sql_insert.cc:
  Auto merged
BitKeeper/deleted/.del-ps_not_windows.test:
  Auto merged
storage/myisam/ha_myisam.cc:
  Auto merged
This commit is contained in:
unknown
2006-12-31 12:41:42 +04:00
parent d73b5b8e83 a2fc587451
commit cbff25d04a
34 changed files with 384 additions and 306 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;