Linking problem on Windows

3ed6b24d · Sergei Golubchik · 0d25ee4f · 3ed6b24d · 3ed6b24d
Commit 3ed6b24d authored Apr 10, 2013 by Sergei Golubchik
Show whitespace changes
Inline Side-by-side

Showing with 4 additions and 8 deletions

storage/innobase/handler/handler0alter.cc storage/innobase/handler/handler0alter.cc +2 -4

storage/xtradb/handler/handler0alter.cc storage/xtradb/handler/handler0alter.cc +2 -4

No files found.
--- a/storage/innobase/handler/handler0alter.cc
+++ b/storage/innobase/handler/handler0alter.cc
@@ -310,8 +310,7 @@ innobase_check_index_keys(
 					}
 				}

-				my_error(ER_WRONG_KEY_COLUMN, MYF(0),
-                                         field->table->file->table_type(),
+				my_error(ER_WRONG_KEY_COLUMN, MYF(0), "InnoDB",
 					 field->field_name);
 				return(ER_WRONG_KEY_COLUMN);
 			}
@@ -325,8 +324,7 @@ innobase_check_index_keys(
 					continue;
 				}

-				my_error(ER_WRONG_KEY_COLUMN, MYF(0),
-                                         field->table->file->table_type(),
+				my_error(ER_WRONG_KEY_COLUMN, MYF(0), "InnoDB",
 					 key_part1.field->field_name);
 				return(ER_WRONG_KEY_COLUMN);
 			}

--- a/storage/xtradb/handler/handler0alter.cc
+++ b/storage/xtradb/handler/handler0alter.cc
@@ -311,8 +311,7 @@ innobase_check_index_keys(
 					}
 				}

-				my_error(ER_WRONG_KEY_COLUMN, MYF(0),
-                                         field->table->file->table_type(),
+				my_error(ER_WRONG_KEY_COLUMN, MYF(0), "InnoDB",
 					 field->field_name);
 				return(ER_WRONG_KEY_COLUMN);
 			}
@@ -326,8 +325,7 @@ innobase_check_index_keys(
 					continue;
 				}

-				my_error(ER_WRONG_KEY_COLUMN, MYF(0),
-                                         field->table->file->table_type(),
+				my_error(ER_WRONG_KEY_COLUMN, MYF(0), "InnoDB",
 					 key_part1.field->field_name);
 				return(ER_WRONG_KEY_COLUMN);
 			}