Commit 78d5a764 authored by Sergei Golubchik's avatar Sergei Golubchik

compiler warnings

parent 1ed1b779
...@@ -6480,8 +6480,8 @@ static int get_check_constraints_record(THD *thd, TABLE_LIST *tables, ...@@ -6480,8 +6480,8 @@ static int get_check_constraints_record(THD *thd, TABLE_LIST *tables,
push_warning(thd, Sql_condition::WARN_LEVEL_WARN, push_warning(thd, Sql_condition::WARN_LEVEL_WARN,
thd->get_stmt_da()->sql_errno(), thd->get_stmt_da()->sql_errno(),
thd->get_stmt_da()->message()); thd->get_stmt_da()->message());
thd->clear_error(); thd->clear_error();
DBUG_RETURN(0); DBUG_RETURN(0);
} }
if(!tables->view) if(!tables->view)
{ {
......
...@@ -2655,7 +2655,7 @@ fts_optimize_new_table( ...@@ -2655,7 +2655,7 @@ fts_optimize_new_table(
empty_slot = i; empty_slot = i;
} else if (slot->table == table) { } else if (slot->table == table) {
/* Already exists in our optimize queue. */ /* Already exists in our optimize queue. */
ut_ad(slot->table_id = table->id); ut_ad(slot->table_id == table->id);
return(FALSE); return(FALSE);
} }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment