Post-merge fix. New error ER_NON_INSERTABLE_TABLE put at end of errmsg.txt,...

Post-merge fix.  New error ER_NON_INSERTABLE_TABLE put at end of errmsg.txt, means that the error number in 5.1 is 1573, while in 5.0 it is 1471.

mysql-test/r/ctype_ucs.result

@@ -762,7 +762,7 @@ NOT NULL default 'passive'
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `status` enum('active','passive') character set latin1 collate latin1_general_ci NOT NULL default 'passive'
+  `status` enum('active','passive') CHARACTER SET latin1 COLLATE latin1_general_ci NOT NULL DEFAULT 'passive'
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 ALTER TABLE t1 ADD a int NOT NULL AFTER status;
 CREATE TABLE t2 (
@@ -772,7 +772,7 @@ NOT NULL default 'passive'
 SHOW CREATE TABLE t2;
 Table	Create Table
 t2	CREATE TABLE `t2` (
-  `status` enum('active','passive') character set ucs2 collate ucs2_turkish_ci NOT NULL default 'passive'
+  `status` enum('active','passive') CHARACTER SET ucs2 COLLATE ucs2_turkish_ci NOT NULL DEFAULT 'passive'
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 ALTER TABLE t2 ADD a int NOT NULL AFTER status;
 DROP TABLE t1,t2;

mysql-test/r/ctype_utf8.result

@@ -1340,19 +1340,6 @@ select a from t1 group by a;
 a
 e
 drop table t1;
-set names utf8;
-grant select on test.* to юзер_юзер@localhost;
-user()
-юзер_юзер@localhost
-revoke all on test.* from юзер_юзер@localhost;
-drop user юзер_юзер@localhost;
-create database имя_базы_в_кодировке_утф8_длиной_больше_чем_45;
-use имя_базы_в_кодировке_утф8_длиной_больше_чем_45;
-select database();
-database()
-имя_базы_в_кодировке_утф8_длиной_больше_чем_45
-drop database имя_базы_в_кодировке_утф8_длиной_больше_чем_45;
-use test;
 create table t1(a char(10)) default charset utf8;
 insert into t1 values ('123'), ('456');
 explain

mysql-test/t/ctype_utf8.test

@@ -1069,23 +1069,6 @@ explain select a from t1 group by a;
 select a from t1 group by a;
 drop table t1;
 
-#
-# Bug#20393: User name truncation in mysql client
-# Bug#21432: Database/Table name limited to 64 bytes, not chars, problems with multi-byte
-#
-set names utf8;
-#create user юзер_юзер@localhost;
-grant select on test.* to юзер_юзер@localhost;
---exec $MYSQL --default-character-set=utf8 --user=юзер_юзер -e "select user()"
-revoke all on test.* from юзер_юзер@localhost;
-drop user юзер_юзер@localhost;
-
-create database имя_базы_в_кодировке_утф8_длиной_больше_чем_45;
-use имя_базы_в_кодировке_утф8_длиной_больше_чем_45;
-select database();
-drop database имя_базы_в_кодировке_утф8_длиной_больше_чем_45;
-use test;
-
 #
 # Bug #20204: "order by" changes the results returned
 #

mysql-test/t/view.test

@@ -347,13 +347,13 @@ create view v3 (x,y,z) as select b, a, b from t1;
 create view v4 (x,y,z) as select c+1, b, a from t1;
 create algorithm=temptable view v5 (x,y,z) as select c, b, a from t1;
 # try insert to VIEW with fields duplicate
--- error 1471
+-- error 1573
 insert into v3 values (-60,4,30);
 # try insert to VIEW with expression in SELECT list
--- error 1471
+-- error 1573
 insert into v4 values (-60,4,30);
 # try insert to VIEW using temporary table algorithm
--- error 1471
+-- error 1573
 insert into v5 values (-60,4,30);
 insert into v1 values (-60,4,30);
 insert into v1 (z,y,x) values (50,6,-100);
@@ -375,13 +375,13 @@ create view v3 (x,y,z) as select b, a, b from t1;
 create view v4 (x,y,z) as select c+1, b, a from t1;
 create algorithm=temptable view v5 (x,y,z) as select c, b, a from t1;
 # try insert to VIEW with fields duplicate
--- error 1471
+-- error 1573
 insert into v3 select c, b, a from t2;
 # try insert to VIEW with expression in SELECT list
--- error 1471
+-- error 1573
 insert into v4 select c, b, a from t2;
 # try insert to VIEW using temporary table algorithm
--- error 1471
+-- error 1573
 insert into v5 select c, b, a from t2;
 insert into v1 select c, b, a from t2;
 insert into v1 (z,y,x) select a+20,b+2,-100 from t2;
@@ -1249,14 +1249,14 @@ drop table t1;
 #
 create table t1 (s1 smallint);
 create view v1 as select * from t1 where 20 < (select (s1) from t1);
--- error 1471
+-- error 1573
 insert into v1 values (30);
 create view v2 as select * from t1;
 create view v3 as select * from t1 where 20 < (select (s1) from v2);
--- error 1471
+-- error 1573
 insert into v3 values (30);
 create view v4 as select * from v2 where 20 < (select (s1) from t1);
--- error 1471
+-- error 1573
 insert into v4 values (30);
 drop view v4, v3, v2, v1;
 drop table t1;
@@ -2861,7 +2861,7 @@ DROP TABLE t1;
 #
 create table t1 (s1 int);
 create view v1 as select s1 as a, s1 as b from t1;
---error 1471
+--error 1573
 insert into v1 values (1,1); 
 update v1 set a = 5;
 drop view v1;