From 05071ff49f4fd820be9377bb002815367f94168f Mon Sep 17 00:00:00 2001
From: unknown <jimw@mysql.com>
Date: Mon, 8 Aug 2005 11:42:09 -0700
Subject: [PATCH] Fix error code in some tests because of merge

mysql-test/t/errors.test:
  Fix error code
mysql-test/t/type_bit.test:
  Fix error code
mysql-test/t/type_bit_innodb.test:
  Fix error code
---
 mysql-test/t/errors.test          | 2 +-
 mysql-test/t/type_bit.test        | 2 +-
 mysql-test/t/type_bit_innodb.test | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/mysql-test/t/errors.test b/mysql-test/t/errors.test
index f7913ab402c..a3aeee2ce66 100644
--- a/mysql-test/t/errors.test
+++ b/mysql-test/t/errors.test
@@ -35,7 +35,7 @@ drop table t1;
 #
 # Bug #6080: Error message for a field with a display width that is too long
 #
---error 1438
+--error 1439
 create table t1 (a int(256));
 set sql_mode='traditional';
 --error 1074
diff --git a/mysql-test/t/type_bit.test b/mysql-test/t/type_bit.test
index fd5eb49858c..005a2c78a14 100644
--- a/mysql-test/t/type_bit.test
+++ b/mysql-test/t/type_bit.test
@@ -19,7 +19,7 @@ select 0 + b'1000000000000001';
 drop table if exists t1;
 --enable_warnings
 
---error 1074
+--error 1439
 create table t1 (a bit(65));
 
 create table t1 (a bit(0));
diff --git a/mysql-test/t/type_bit_innodb.test b/mysql-test/t/type_bit_innodb.test
index 090b7aef218..ec433f40a88 100644
--- a/mysql-test/t/type_bit_innodb.test
+++ b/mysql-test/t/type_bit_innodb.test
@@ -20,7 +20,7 @@ select 0 + b'1000000000000001';
 drop table if exists t1;
 --enable_warnings
 
---error 1438
+--error 1439
 create table t1 (a bit(65)) engine=innodb;
 
 create table t1 (a bit(0)) engine=innodb;