bk commit into 6.0 tree (hakank:1.2765)

[Hakan Kuecuekyilmaz]

Below is the list of changes that have just been committed into a local
6.0 repository of hakan. When hakan does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-12-19 20:09:58+01:00, hakank@lu0011.(none) +2 -0
  Make sure that test is executed only when Falcon
  is compiled and for row based binlog.

  mysql-test/suite/bugs/r/rpl_bug33055.result@stripped, 2007-12-19 20:09:56+01:00, hakank@lu0011.(none) +10 -4
    Test case clean up.

  mysql-test/suite/bugs/t/rpl_bug33055.test@stripped, 2007-12-19 20:09:56+01:00, hakank@lu0011.(none) +15 -4
    Make sure that test is executed only when Falcon
    is compiled and for row based binlog.

diff -Nrup a/mysql-test/suite/bugs/r/rpl_bug33055.result b/mysql-test/suite/bugs/r/rpl_bug33055.result
--- a/mysql-test/suite/bugs/r/rpl_bug33055.result	2007-12-19 16:02:36 +01:00
+++ b/mysql-test/suite/bugs/r/rpl_bug33055.result	2007-12-19 20:09:56 +01:00
@@ -4,19 +4,25 @@ reset master;
 reset slave;
 drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
 start slave;
-**** On Master **** 
+**** On Master ****
+DROP DATABASE IF EXISTS tpcb;
 CREATE DATABASE tpcb;
 USE tpcb;
 SET BINLOG_FORMAT = 'ROW';
-CREATE TABLE account (id INT, bid INT, balance DECIMAL(10,2), 
-filler CHAR(255), PRIMARY KEY(id)) ENGINE=falcon;
+CREATE TABLE account (
+id int,
+bid int,
+balance decimal(10,2),
+filler blob,
+PRIMARY KEY(id)
+) ENGINE=Falcon;
 SHOW CREATE TABLE account;
 Table	Create Table
 account	CREATE TABLE `account` (
   `id` int(11) NOT NULL DEFAULT '0',
   `bid` int(11) DEFAULT NULL,
   `balance` decimal(10,2) DEFAULT NULL,
-  `filler` char(255) DEFAULT NULL,
+  `filler` blob,
   PRIMARY KEY (`id`)
 ) ENGINE=Falcon DEFAULT CHARSET=latin1
 INSERT INTO account VALUES (1, 2, 1.2, "FRESH ACCOUNT");
diff -Nrup a/mysql-test/suite/bugs/t/rpl_bug33055.test b/mysql-test/suite/bugs/t/rpl_bug33055.test
--- a/mysql-test/suite/bugs/t/rpl_bug33055.test	2007-12-19 16:02:37 +01:00
+++ b/mysql-test/suite/bugs/t/rpl_bug33055.test	2007-12-19 20:09:56 +01:00
@@ -1,14 +1,25 @@
-source include/master-slave.inc;
+--source include/have_falcon.inc
+--source include/have_binlog_format_row.inc
+--source include/master-slave.inc
 
---echo **** On Master **** 
+--echo **** On Master ****
+
+--disable_warnings
+DROP DATABASE IF EXISTS tpcb;
+--enable_warnings
 
 CREATE DATABASE tpcb;
 USE tpcb;
 
 SET BINLOG_FORMAT = 'ROW';
 
-CREATE TABLE account (id INT, bid INT, balance DECIMAL(10,2), 
-             filler BLOB, PRIMARY KEY(id)) ENGINE=falcon;
+CREATE TABLE account (
+  id int,
+  bid int,
+  balance decimal(10,2),
+  filler blob,
+  PRIMARY KEY(id)
+) ENGINE=Falcon;
 
 SHOW CREATE TABLE account;