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 chilla.local:/home/mydev/mysql-5.1-amain

Browse Source 
into  chilla.local:/home/mydev/mysql-5.1-axmrg


mysql-test/lib/mtr_report.pl:
  Auto merged
mysql-test/r/show_check.result:
  Auto merged
mysql-test/suite/ndb/r/ndb_update.result:
  Auto merged
mysql-test/suite/ndb/t/ndb_single_user.test:
  Auto merged
mysql-test/suite/ndb/t/ndb_update.test:
  Auto merged
mysql-test/suite/parts/r/rpl_partition.result:
  Auto merged
mysql-test/suite/parts/t/rpl_partition.test:
  Auto merged
mysql-test/t/disabled.def:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_class.cc:
  Auto merged
mysql-test/suite/rpl/r/rpl_sp.result:
  Auto merged
This commit is contained in:
unknown
2007-07-14 19:35:43 +02:00
parent 22531a8e7b 32638825f3
commit bfa3d409bd
14 changed files with 271 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mysql-test/suite/parts/t/rpl_partition.test
View File

@ -9,12 +9,12 @@ SET GLOBAL binlog_format = 'ROW';
SET SESSION binlog_format = 'ROW';
select @@global.binlog_format, @@session.binlog_format;
--disable-warnings
--disable_warnings
DROP TABLE IF EXISTS t1, t2, t3;
DROP PROCEDURE IF EXISTS p1;
DROP PROCEDURE IF EXISTS p2;
DROP PROCEDURE IF EXISTS p3;
--enable-warnings
--enable_warnings
eval CREATE TABLE t1(id MEDIUMINT NOT NULL AUTO_INCREMENT,
dt TIMESTAMP, user CHAR(255), uuidf LONGBLOB,