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

fixed compilation failure affects build without InnoDB

Browse Source
This commit is contained in:
ramil@mysql.com
2005-02-24 20:55:20 +04:00
parent 4390d18cb5
commit 05eb8af434
2 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sql/mysql_priv.h
View File

@ -171,6 +171,12 @@ extern CHARSET_INFO *national_charset_info, *table_alias_charset;
#define FLUSH_TIME 0 /* Don't flush tables */ #define FLUSH_TIME 0 /* Don't flush tables */
#define MAX_CONNECT_ERRORS 10 // errors before disabling host #define MAX_CONNECT_ERRORS 10 // errors before disabling host
#ifdef HAVE_INNOBASE_DB
#define IF_INNOBASE_DB(A, B) (A)
#else
#define IF_INNOBASE_DB(A, B) (B)
#endif
#if defined(__WIN__) || defined(OS2) #if defined(__WIN__) || defined(OS2)
#define IF_WIN(A,B) (A) #define IF_WIN(A,B) (A)
#undef FLUSH_TIME #undef FLUSH_TIME

10
sql/sql_parse.cc
View File

@ -1810,9 +1810,8 @@ bool dispatch_command(enum enum_server_command command, THD *thd,
TABLE_LIST table_list; TABLE_LIST table_list;
LEX_STRING conv_name; LEX_STRING conv_name;
/* Saved variable value */ /* Saved variable value */
#ifdef HAVE_INNOBASE_DB my_bool old_innodb_table_locks=
my_bool old_innodb_table_locks= thd->variables.innodb_table_locks; IF_INNOBASE_DB(thd->variables.innodb_table_locks, FALSE);
#endif
statistic_increment(thd->status_var.com_stat[SQLCOM_SHOW_FIELDS], statistic_increment(thd->status_var.com_stat[SQLCOM_SHOW_FIELDS],
@ -2336,9 +2335,8 @@ mysql_execute_command(THD *thd)
/* Locked closure of all tables */ /* Locked closure of all tables */
TABLE_LIST *locked_tables= NULL; TABLE_LIST *locked_tables= NULL;
/* Saved variable value */ /* Saved variable value */
#ifdef HAVE_INNOBASE_DB my_bool old_innodb_table_locks=
my_bool old_innodb_table_locks= thd->variables.innodb_table_locks; IF_INNOBASE_DB(thd->variables.innodb_table_locks, FALSE);
#endif
DBUG_ENTER("mysql_execute_command"); DBUG_ENTER("mysql_execute_command");
thd->net.no_send_error= 0; thd->net.no_send_error= 0;