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

Removed files that had been accidentally committed

Browse Source 
Removed compiler warnings
This commit is contained in:
Monty
2014-10-07 11:39:42 +03:00
parent cc8aed3eb7
commit 4af97bc0e3
14 changed files with 57 additions and 604 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
sql/sql_parse.cc
View File

@ -2781,10 +2781,9 @@ mysql_execute_command(THD *thd)
else
res= check_access(thd, privileges_requested, any_db, NULL, NULL, 0, 0);
if (res)
break;
if (!res)
res= execute_sqlcom_select(thd, all_tables);
res= execute_sqlcom_select(thd, all_tables);
break;
}
case SQLCOM_PREPARE:
@ -3135,7 +3134,7 @@ mysql_execute_command(THD *thd)
*/
if (thd->query_name_consts &&
mysql_bin_log.is_open() &&
WSREP_FORMAT(thd->variables.binlog_format) == BINLOG_FORMAT_STMT &&
WSREP_FORMAT((enum enum_binlog_format) thd->variables.binlog_format) == BINLOG_FORMAT_STMT &&
!mysql_bin_log.is_query_in_union(thd, thd->query_id))
{
List_iterator_fast<Item> it(select_lex->item_list);