From 4f024d238815711848edfe2afb0965b24a78a6ea Mon Sep 17 00:00:00 2001
From: "mleich@mysql.com" <>
Date: Fri, 17 Dec 2004 14:27:39 +0100
Subject: The BIT patch by ramil causes that the old data type BIT is no longer
 available for most storage engines. Therefore column c18 BIT is switched
 TINYINT .

---
 mysql-test/t/ps_5merge.test | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'mysql-test/t/ps_5merge.test')

diff --git a/mysql-test/t/ps_5merge.test b/mysql-test/t/ps_5merge.test
index 9a79842709c..891d1be2c57 100644
--- a/mysql-test/t/ps_5merge.test
+++ b/mysql-test/t/ps_5merge.test
@@ -32,7 +32,7 @@ create table t9
   c5  integer, c6  bigint, c7  float, c8  double,
   c9  double precision, c10 real, c11 decimal(7, 4), c12 numeric(8, 4),
   c13 date, c14 datetime, c15 timestamp(14), c16 time,
-  c17 year, c18 bit, c19 bool, c20 char,
+  c17 year, c18 tinyint, c19 bool, c20 char,
   c21 char(10), c22 varchar(30), c23 tinyblob, c24 tinytext,
   c25 blob, c26 text, c27 mediumblob, c28 mediumtext,
   c29 longblob, c30 longtext, c31 enum('one', 'two', 'three'),
@@ -63,7 +63,7 @@ create table t9
   c5  integer, c6  bigint, c7  float, c8  double,
   c9  double precision, c10 real, c11 decimal(7, 4), c12 numeric(8, 4),
   c13 date, c14 datetime, c15 timestamp(14), c16 time,
-  c17 year, c18 bit, c19 bool, c20 char,
+  c17 year, c18 tinyint, c19 bool, c20 char,
   c21 char(10), c22 varchar(30), c23 tinyblob, c24 tinytext,
   c25 blob, c26 text, c27 mediumblob, c28 mediumtext,
   c29 longblob, c30 longtext, c31 enum('one', 'two', 'three'),
-- 
cgit v1.2.1