database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

Fix windows pushbuild failure: the bug occured because

Browse Source 
we didn't check for NULL value of the
lex_create_info->db_type pointer.
The pointer is NULL in the case, when the engine name is
unknown to the server. This happens with NDB on Windows.
This commit is contained in:
petr/cps@mysql.com/owlet.
2006-08-08 12:03:24 +04:00
parent af461de728
commit 5431ecb593
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
sql/sql_table.cc
View File

@ -5043,8 +5043,9 @@ bool mysql_alter_table(THD *thd,char *new_db, char *new_name,
/* Disable alter of log tables to unsupported engine */ /* Disable alter of log tables to unsupported engine */
if ((table_kind == GENERAL_LOG || table_kind == SLOW_LOG) && if ((table_kind == GENERAL_LOG || table_kind == SLOW_LOG) &&
(lex_create_info->used_fields & HA_CREATE_USED_ENGINE) && (lex_create_info->used_fields & HA_CREATE_USED_ENGINE) &&
(!lex_create_info->db_type || /* unknown engine */
!(lex_create_info->db_type->db_type == DB_TYPE_MYISAM || !(lex_create_info->db_type->db_type == DB_TYPE_MYISAM ||
lex_create_info->db_type->db_type == DB_TYPE_CSV_DB)) lex_create_info->db_type->db_type == DB_TYPE_CSV_DB)))
{ {
my_error(ER_BAD_LOG_ENGINE, MYF(0)); my_error(ER_BAD_LOG_ENGINE, MYF(0));
DBUG_RETURN(TRUE); DBUG_RETURN(TRUE);