diff options
| author | Michael Widenius <monty@askmonty.org> | 2011-02-28 13:16:17 +0200 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2011-02-28 13:16:17 +0200 |
| commit | 869f5d0e81d5cbecaec3605f292fbb363b9ccbf6 (patch) | |
| tree | 9e2bc4700a2db961d967e53f00c941f3ee501173 /sql/handler.cc | |
| parent | cfa0c6ff1d8f7268f895d79daf94e7d29197327d (diff) | |
| parent | ff3da0f963b28d128005da8ca5d0c93a72d34b27 (diff) | |
| download | mariadb-git-869f5d0e81d5cbecaec3605f292fbb363b9ccbf6.tar.gz | |
Merge with alias as String
Diffstat (limited to 'sql/handler.cc')
| -rw-r--r-- | sql/handler.cc | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/sql/handler.cc b/sql/handler.cc index 0e00832d89b..92e20b86c6d 100644 --- a/sql/handler.cc +++ b/sql/handler.cc @@ -2009,7 +2009,8 @@ int ha_delete_table(THD *thd, handlerton *table_type, const char *path, dummy_share.db.length= strlen(db); dummy_share.table_name.str= (char*) alias; dummy_share.table_name.length= strlen(alias); - dummy_table.alias= alias; + dummy_table.alias.set(alias, dummy_share.table_name.length, + table_alias_charset); file->change_table_ptr(&dummy_table, &dummy_share); @@ -2855,11 +2856,12 @@ void handler::print_error(int error, myf errflag) { const char* engine= table_type(); if (temporary) - my_error(ER_GET_TEMPORARY_ERRMSG, MYF(0), error, str.ptr(), engine); + my_error(ER_GET_TEMPORARY_ERRMSG, MYF(0), error, str.c_ptr(), + engine); else { SET_FATAL_ERROR; - my_error(ER_GET_ERRMSG, MYF(0), error, str.ptr(), engine); + my_error(ER_GET_ERRMSG, MYF(0), error, str.c_ptr(), engine); } } else |