Show all generated warnings in SHOW ERROR

Previously we only stored the first given error (the error sent to the client)


include/mysys_err.h:
  Moved ER_FILENOTFOUND last to avoid getting 'error 0'
mysql-test/r/backup.result:
  More warnings from in case of errors
mysql-test/r/innodb.result:
  More warnings from in case of errors
mysql-test/r/key_cache.result:
  More warnings from in case of errors
mysql-test/r/myisam.result:
  More warnings from in case of errors
mysql-test/r/preload.result:
  More warnings from in case of errors
mysql-test/r/repair.result:
  More warnings from in case of errors
mysql-test/r/rpl_failed_optimize.result:
  More warnings from in case of errors
mysql-test/r/subselect.result:
  More warnings from in case of errors
mysql-test/t/backup.test:
  Portability fix
mysql-test/t/innodb.test:
  Avoid some warnings
mysql-test/t/myisam.test:
  Portability fix
mysql-test/t/rpl_rotate_logs.test:
  Portablitiy fix
mysys/errors.c:
  Move ER_FILENOTFOUND last to avoid error 0
sql/mysql_priv.h:
  Indentation change
sql/mysqld.cc:
  Save all given errors for SHOW ERRORS
sql/protocol.cc:
  Store new errors for SHOW ERROR
  (Ignore those that are already reported with my_error())
sql/sql_class.cc:
  More errors with SHOW ERROR
sql/sql_class.h:
  More errors with SHOW ERROR
sql/sql_error.cc:
  More errors with SHOW ERROR
sql/sql_parse.cc:
  Temporary fix: Don't give error for the to-be-removed 'pre-open tables code'
sql/sql_show.cc:
  More debugging
  Don't register errors while populating schema tables.
  (If we do, we get a LOT of warnings from information_schema.test)
sql/sql_table.cc:
  Don't register errors from handler in drop table (as we already do it the upper level DROP TABLE code)
  Don't register errors for 'restore_table' as in most cases the table doesn't exists
sql/sql_union.cc:
  Use file->write_row() instead of 'write_record'.
  This gives us easer to handle error messages and is faster than the old version

8 files changed, 33 insertions, 4 deletions

diff --git a/mysql-test/r/backup.result b/mysql-test/r/backup.result
index e53c3c3eb55..c7b4b1c4155 100644
--- a/mysql-test/r/backup.result
+++ b/mysql-test/r/backup.result
@@ -5,6 +5,8 @@ backup table t4 to '../bogus';
 Table	Op	Msg_type	Msg_text
 test.t4	backup	error	Failed copying .frm file (errno: X)
 test.t4	backup	status	Operation failed
+Warnings:
+Error	1	Can't create/write to file 'MYSQL_TEST_DIR/var/bogus/t4.frm' (Errcode: X)
 backup table t4 to '../tmp';
 Table	Op	Msg_type	Msg_text
 test.t4	backup	status	OK
@@ -12,6 +14,8 @@ backup table t4 to '../tmp';
 Table	Op	Msg_type	Msg_text
 test.t4	backup	error	Failed copying .frm file (errno: X)
 test.t4	backup	status	Operation failed
+Warnings:
+Error	1	Can't create/write to file 'MYSQL_TEST_DIR/var/tmp/t4.frm' (Errcode: X)
 drop table t4;
 restore table t4 from '../tmp';
 Table	Op	Msg_type	Msg_text
@@ -28,6 +32,8 @@ drop table t1;
 restore table t1 from '../bogus';
 Table	Op	Msg_type	Msg_text
 t1	restore	error	Failed copying .frm file
+Warnings:
+Error	29	File 'MYSQL_TEST_DIR/var/bogus/t1.frm' not found (Errcode: X)
 restore table t1 from '../tmp';
 Table	Op	Msg_type	Msg_text
 test.t1	restore	status	OK
diff --git a/mysql-test/r/innodb.result b/mysql-test/r/innodb.result
index d65ce794a75..fb8d632aed9 100644
--- a/mysql-test/r/innodb.result
+++ b/mysql-test/r/innodb.result
@@ -1449,18 +1449,18 @@ test.t1	2948697075
 test.t2	NULL
 test.t3	NULL
 test.t4	NULL
-checksum table t1, t2, t3, t4;
+Warnings:
+Error	1146	Table 'test.t4' doesn't exist
+checksum table t1, t2, t3;
 Table	Checksum
 test.t1	2948697075
 test.t2	968604391
 test.t3	968604391
-test.t4	NULL
-checksum table t1, t2, t3, t4 extended;
+checksum table t1, t2, t3 extended;
 Table	Checksum
 test.t1	3092701434
 test.t2	968604391
 test.t3	968604391
-test.t4	NULL
 drop table t1,t2,t3;
 create table t1 (id int,  name char(10) not null,  name2 char(10) not null) engine=innodb;
 insert into t1 values(1,'first','fff'),(2,'second','sss'),(3,'third','ttt');
diff --git a/mysql-test/r/key_cache.result b/mysql-test/r/key_cache.result
index 79b5a6e84b2..7c286ced58a 100644
--- a/mysql-test/r/key_cache.result
+++ b/mysql-test/r/key_cache.result
@@ -193,6 +193,8 @@ cache index t1 key (unknown_key) in keycache1;
 Table	Op	Msg_type	Msg_text
 test.t1	assign_to_keycache	error	Key column 'unknown_key' doesn't exist in table
 test.t1	assign_to_keycache	status	Operation failed
+Warnings:
+Error	1072	Key column 'unknown_key' doesn't exist in table
 select @@keycache2.key_buffer_size;
 @@keycache2.key_buffer_size
 4194304
diff --git a/mysql-test/r/myisam.result b/mysql-test/r/myisam.result
index 256bc1e3745..b0cb6462252 100644
--- a/mysql-test/r/myisam.result
+++ b/mysql-test/r/myisam.result
@@ -516,16 +516,22 @@ Table	Checksum
 test.t1	2948697075
 test.t2	NULL
 test.t3	NULL
+Warnings:
+Error	1146	Table 'test.t3' doesn't exist
 checksum table t1, t2, t3;
 Table	Checksum
 test.t1	2948697075
 test.t2	3092701434
 test.t3	NULL
+Warnings:
+Error	1146	Table 'test.t3' doesn't exist
 checksum table t1, t2, t3 extended;
 Table	Checksum
 test.t1	3092701434
 test.t2	3092701434
 test.t3	NULL
+Warnings:
+Error	1146	Table 'test.t3' doesn't exist
 drop table t1,t2;
 create table t1 (a int, key (a));
 show keys from t1;
diff --git a/mysql-test/r/preload.result b/mysql-test/r/preload.result
index 7237a0da7e0..b5e6dcfcdbb 100644
--- a/mysql-test/r/preload.result
+++ b/mysql-test/r/preload.result
@@ -145,6 +145,8 @@ load index into cache t3, t2 key (primary,b) ;
 Table	Op	Msg_type	Msg_text
 test.t3	preload_keys	error	Table 'test.t3' doesn't exist
 test.t2	preload_keys	status	OK
+Warnings:
+Error	1146	Table 'test.t3' doesn't exist
 show status like "key_read%";
 Variable_name	Value
 Key_read_requests	355
@@ -160,6 +162,9 @@ Table	Op	Msg_type	Msg_text
 test.t3	preload_keys	error	Table 'test.t3' doesn't exist
 test.t2	preload_keys	error	Key column 'c' doesn't exist in table
 test.t2	preload_keys	status	Operation failed
+Warnings:
+Error	1146	Table 'test.t3' doesn't exist
+Error	1072	Key column 'c' doesn't exist in table
 show status like "key_read%";
 Variable_name	Value
 Key_read_requests	0
diff --git a/mysql-test/r/repair.result b/mysql-test/r/repair.result
index 0347d3a52f5..d8fa4dbbb72 100644
--- a/mysql-test/r/repair.result
+++ b/mysql-test/r/repair.result
@@ -27,11 +27,15 @@ drop table t1;
 repair table t1 use_frm;
 Table	Op	Msg_type	Msg_text
 test.t1	repair	error	Table 'test.t1' doesn't exist
+Warnings:
+Error	1146	Table 'test.t1' doesn't exist
 create table t1 engine=myisam SELECT 1,"table 1";
 flush tables;
 repair table t1;
 Table	Op	Msg_type	Msg_text
 test.t1	repair	error	Incorrect file format 't1'
+Warnings:
+Error	130	Incorrect file format 't1'
 repair table t1 use_frm;
 Table	Op	Msg_type	Msg_text
 test.t1	repair	warning	Number of rows changed from 0 to 1
diff --git a/mysql-test/r/rpl_failed_optimize.result b/mysql-test/r/rpl_failed_optimize.result
index 1576ec60500..c7199e56ec8 100644
--- a/mysql-test/r/rpl_failed_optimize.result
+++ b/mysql-test/r/rpl_failed_optimize.result
@@ -10,6 +10,10 @@ INSERT INTO t1 VALUES (1);
 OPTIMIZE TABLE t1;
 Table	Op	Msg_type	Msg_text
 test.t1	optimize	status	Operation failed
+Warnings:
+Error	1205	Lock wait timeout exceeded; try restarting transaction
 OPTIMIZE TABLE non_existing;
 Table	Op	Msg_type	Msg_text
 test.non_existing	optimize	error	Table 'test.non_existing' doesn't exist
+Warnings:
+Error	1146	Table 'test.non_existing' doesn't exist
diff --git a/mysql-test/r/subselect.result b/mysql-test/r/subselect.result
index 49006a6fecf..738c011012d 100644
--- a/mysql-test/r/subselect.result
+++ b/mysql-test/r/subselect.result
@@ -1598,6 +1598,8 @@ insert into t1 values (2);
 set sort_buffer_size = (select s1 from t1);
 ERROR 21000: Subquery returns more than 1 row
 do (select * from t1);
+Warnings:
+Error	1242	Subquery returns more than 1 row
 drop table t1;
 create table t1 (s1 char);
 insert into t1 values ('e');