database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-12-24 11:21:21 +03:00
Code Activity

Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.1-new-rpl

Browse Source 
into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.1-merge


mysql-test/t/disabled.def:
  Auto merged
mysql-test/t/ndb_basic.test:
  Auto merged
mysql-test/t/ndb_insert.test:
  Auto merged
mysql-test/t/ndb_restore.test:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/handler.cc:
  Auto merged
sql/handler.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
storage/myisam/ha_myisam.cc:
  Auto merged
storage/myisammrg/ha_myisammrg.h:
  Auto merged
sql/share/errmsg.txt:
  SCCS merged
This commit is contained in:
unknown
2007-06-18 12:10:36 +02:00
parent 1140898b32 f9c8d1dd7f
commit 6da3c0facc
230 changed files with 25292 additions and 925 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,4 +1,5 @@
-- source include/have_ndb.inc
-- source include/have_binlog_format_row.inc
-- source include/not_embedded.inc
--disable_warnings