database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Merge with alias as String

Browse Source
This commit is contained in:
Michael Widenius
2011-02-28 13:16:17 +02:00
parent cfa0c6ff1d ff3da0f963
commit 869f5d0e81
42 changed files with 252 additions and 175 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
sql/handler.cc
View File

@ -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