error messages: name the storage engine explicitly,

instead of "used storage engine" and similar changes.

6 files changed, 21 insertions, 15 deletions

diff --git a/storage/innobase/handler/handler0alter.cc b/storage/innobase/handler/handler0alter.cc
index cdd5078c262..3f61fbb3302 100644
--- a/storage/innobase/handler/handler0alter.cc
+++ b/storage/innobase/handler/handler0alter.cc
@@ -311,6 +311,7 @@ innobase_check_index_keys(
 				}
 
 				my_error(ER_WRONG_KEY_COLUMN, MYF(0),
+                                         field->table->file->table_type(),
 					 field->field_name);
 				return(ER_WRONG_KEY_COLUMN);
 			}
@@ -325,6 +326,7 @@ innobase_check_index_keys(
 				}
 
 				my_error(ER_WRONG_KEY_COLUMN, MYF(0),
+                                         field->table->file->table_type(),
 					 key_part1.field->field_name);
 				return(ER_WRONG_KEY_COLUMN);
 			}
diff --git a/storage/pbxt/src/discover_xt.cc b/storage/pbxt/src/discover_xt.cc
index 05891bdf19d..23941374fb1 100644
--- a/storage/pbxt/src/discover_xt.cc
+++ b/storage/pbxt/src/discover_xt.cc
@@ -1196,7 +1196,8 @@ mysql_prepare_create_table(THD *thd, HA_CREATE_INFO *create_info,
       }
       else if (length == 0)
       {
-	my_error(ER_WRONG_KEY_COLUMN, MYF(0), column->field_name);
+	my_error(ER_WRONG_KEY_COLUMN, MYF(0), file->table_type(),
+                 column->field_name);
 	  DBUG_RETURN(TRUE);
       }
       if (length > file->max_key_part_length() && key->type != Key::FULLTEXT)
diff --git a/storage/sequence/mysql-test/sequence/simple.result b/storage/sequence/mysql-test/sequence/simple.result
index 102f17498fe..b14fde2cfef 100644
--- a/storage/sequence/mysql-test/sequence/simple.result
+++ b/storage/sequence/mysql-test/sequence/simple.result
@@ -39,7 +39,7 @@ ERROR 42S02: Table 'test.seq_' doesn't exist
 show create table se;
 ERROR 42S02: Table 'test.se' doesn't exist
 show create table seq_1_to_15_step_0;
-ERROR HY000: Got error 140 "Wrong create options" from storage engine
+ERROR HY000: Got error 140 "Wrong create options" from storage engine SEQUENCE
 select * from seq_1_to_15_step_2;
 seq
 1
diff --git a/storage/sphinx/ha_sphinx.cc b/storage/sphinx/ha_sphinx.cc
index 94940e0b82f..23bf21b6cbe 100644
--- a/storage/sphinx/ha_sphinx.cc
+++ b/storage/sphinx/ha_sphinx.cc
@@ -3424,7 +3424,8 @@ int ha_sphinx::create ( const char * name, TABLE * table, HA_CREATE_INFO * )
 	// report and bail
 	if ( sError[0] )
 	{
-		my_error ( ER_CANT_CREATE_TABLE, MYF(0), sError, -1 );
+		my_error ( ER_CANT_CREATE_TABLE, MYF(0),
+                           table->s->db.str, table->s->table_name, sError );
 		SPH_RET(-1);
 	}
 
diff --git a/storage/test_sql_discovery/mysql-test/sql_discovery/simple.result b/storage/test_sql_discovery/mysql-test/sql_discovery/simple.result
index c2b9160f7c3..4fee0a983ed 100644
--- a/storage/test_sql_discovery/mysql-test/sql_discovery/simple.result
+++ b/storage/test_sql_discovery/mysql-test/sql_discovery/simple.result
@@ -4,7 +4,7 @@ test_sql_discovery_statement
 test_sql_discovery_write_frm	ON
 set sql_quote_show_create=0;
 create table t1 (a int) engine=test_sql_discovery;
-ERROR HY000: Can't create table 'test.t1' (errno: 131 "Command not supported by database")
+ERROR HY000: Can't create table `test`.`t1` (errno: 131 "Command not supported by database")
 select * from t1;
 ERROR 42S02: Table 'test.t1' doesn't exist
 set @@test_sql_discovery_statement='t1:foobar bwa-ha-ha';
@@ -16,7 +16,7 @@ show warnings;
 Level	Code	Message
 Error	1064	You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'foobar bwa-ha-ha' at line 1
 Error	1146	Table 'test.t1' doesn't exist
-Error	1030	Got error 130 "Incorrect file format" from storage engine
+Error	1030	Got error 130 "Incorrect file format" from storage engine TEST_SQL_DISCOVERY
 set @@test_sql_discovery_statement='t1:select 1';
 select * from t1;
 ERROR 42S02: Table 'test.t1' doesn't exist
@@ -24,7 +24,7 @@ show warnings;
 Level	Code	Message
 Error	1939	Engine TEST_SQL_DISCOVERY failed to discover table `test`.`t1` with 'select 1'
 Error	1146	Table 'test.t1' doesn't exist
-Error	1030	Got error 130 "Incorrect file format" from storage engine
+Error	1030	Got error 130 "Incorrect file format" from storage engine TEST_SQL_DISCOVERY
 set @@test_sql_discovery_statement='t1:create table t1 (a int primary key) partition by hash(id) partitions 2';
 select * from t1;
 ERROR 42S02: Table 'test.t1' doesn't exist
@@ -32,7 +32,7 @@ show warnings;
 Level	Code	Message
 Error	1290	The MariaDB server is running with the --skip-partition option so it cannot execute this statement
 Error	1146	Table 'test.t1' doesn't exist
-Error	1030	Got error 130 "Incorrect file format" from storage engine
+Error	1030	Got error 130 "Incorrect file format" from storage engine TEST_SQL_DISCOVERY
 set @@test_sql_discovery_statement='t1:create table t1 (a int) union=(t3,t4)';
 select * from t1;
 ERROR 42S02: Table 'test.t1' doesn't exist
@@ -40,7 +40,7 @@ show warnings;
 Level	Code	Message
 Error	1939	Engine TEST_SQL_DISCOVERY failed to discover table `test`.`t1` with 'create table t1 (a int) union=(t3,t4)'
 Error	1146	Table 'test.t1' doesn't exist
-Error	1030	Got error 130 "Incorrect file format" from storage engine
+Error	1030	Got error 130 "Incorrect file format" from storage engine TEST_SQL_DISCOVERY
 set @@test_sql_discovery_statement='t1:create table t1 like t2';
 select * from t1;
 ERROR 42S02: Table 'test.t1' doesn't exist
@@ -48,7 +48,7 @@ show warnings;
 Level	Code	Message
 Error	1939	Engine TEST_SQL_DISCOVERY failed to discover table `test`.`t1` with 'create table t1 like t2'
 Error	1146	Table 'test.t1' doesn't exist
-Error	1030	Got error 130 "Incorrect file format" from storage engine
+Error	1030	Got error 130 "Incorrect file format" from storage engine TEST_SQL_DISCOVERY
 set @@test_sql_discovery_statement='t1:create table t1 select * from t2';
 select * from t1;
 ERROR 42S02: Table 'test.t1' doesn't exist
@@ -56,7 +56,7 @@ show warnings;
 Level	Code	Message
 Error	1939	Engine TEST_SQL_DISCOVERY failed to discover table `test`.`t1` with 'create table t1 select * from t2'
 Error	1146	Table 'test.t1' doesn't exist
-Error	1030	Got error 130 "Incorrect file format" from storage engine
+Error	1030	Got error 130 "Incorrect file format" from storage engine TEST_SQL_DISCOVERY
 set @@test_sql_discovery_statement='t1:create table t1 (a int) index directory="/tmp"';
 select * from t1;
 ERROR 42S02: Table 'test.t1' doesn't exist
@@ -64,7 +64,7 @@ show warnings;
 Level	Code	Message
 Error	1939	Engine TEST_SQL_DISCOVERY failed to discover table `test`.`t1` with 'create table t1 (a int) index directory="/tmp"'
 Error	1146	Table 'test.t1' doesn't exist
-Error	1030	Got error 130 "Incorrect file format" from storage engine
+Error	1030	Got error 130 "Incorrect file format" from storage engine TEST_SQL_DISCOVERY
 set @@test_sql_discovery_statement='t1:create table t1 (a int) data directory="/tmp"';
 select * from t1;
 ERROR 42S02: Table 'test.t1' doesn't exist
@@ -72,7 +72,7 @@ show warnings;
 Level	Code	Message
 Error	1939	Engine TEST_SQL_DISCOVERY failed to discover table `test`.`t1` with 'create table t1 (a int) data directory="/tmp"'
 Error	1146	Table 'test.t1' doesn't exist
-Error	1030	Got error 130 "Incorrect file format" from storage engine
+Error	1030	Got error 130 "Incorrect file format" from storage engine TEST_SQL_DISCOVERY
 set @@test_sql_discovery_statement='t1:create table t1 (a int) engine=myisam';
 select * from t1;
 ERROR 42S02: Table 'test.t1' doesn't exist
@@ -80,7 +80,7 @@ show warnings;
 Level	Code	Message
 Error	1939	Engine TEST_SQL_DISCOVERY failed to discover table `test`.`t1` with 'create table t1 (a int) engine=myisam'
 Error	1146	Table 'test.t1' doesn't exist
-Error	1030	Got error 130 "Incorrect file format" from storage engine
+Error	1030	Got error 130 "Incorrect file format" from storage engine TEST_SQL_DISCOVERY
 set @@test_sql_discovery_statement='t1:create temporary table t1 (a int)';
 select * from t1;
 ERROR 42S02: Table 'test.t1' doesn't exist
@@ -88,7 +88,7 @@ show warnings;
 Level	Code	Message
 Error	1939	Engine TEST_SQL_DISCOVERY failed to discover table `test`.`t1` with 'create temporary table t1 (a int)'
 Error	1146	Table 'test.t1' doesn't exist
-Error	1030	Got error 130 "Incorrect file format" from storage engine
+Error	1030	Got error 130 "Incorrect file format" from storage engine TEST_SQL_DISCOVERY
 set @@test_sql_discovery_statement='t1:create table if not exists t1 (a int)';
 select * from t1;
 ERROR 42S02: Table 'test.t1' doesn't exist
@@ -96,7 +96,7 @@ show warnings;
 Level	Code	Message
 Error	1939	Engine TEST_SQL_DISCOVERY failed to discover table `test`.`t1` with 'create table if not exists t1 (a int)'
 Error	1146	Table 'test.t1' doesn't exist
-Error	1030	Got error 130 "Incorrect file format" from storage engine
+Error	1030	Got error 130 "Incorrect file format" from storage engine TEST_SQL_DISCOVERY
 set @@test_sql_discovery_statement='t1:create table t1 (a int)';
 select * from t1;
 a
diff --git a/storage/xtradb/handler/handler0alter.cc b/storage/xtradb/handler/handler0alter.cc
index 88b07bbebe3..3a32cf95bc9 100644
--- a/storage/xtradb/handler/handler0alter.cc
+++ b/storage/xtradb/handler/handler0alter.cc
@@ -312,6 +312,7 @@ innobase_check_index_keys(
 				}
 
 				my_error(ER_WRONG_KEY_COLUMN, MYF(0),
+                                         field->table->file->table_type(),
 					 field->field_name);
 				return(ER_WRONG_KEY_COLUMN);
 			}
@@ -326,6 +327,7 @@ innobase_check_index_keys(
 				}
 
 				my_error(ER_WRONG_KEY_COLUMN, MYF(0),
+                                         field->table->file->table_type(),
 					 key_part1.field->field_name);
 				return(ER_WRONG_KEY_COLUMN);
 			}