Fix error code in some tests because of merge

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

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));

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;