Commit 5abbffd7 authored by unknown's avatar unknown
Browse files

fixed compilation failure affects build without InnoDB 


sql/mysql_priv.h:
  IF_INNOBASE_DB macro added
parent 5c1fcd4b

sql/mysql_priv.h

+6 −0
Original line number Diff line number Diff line
@@ -171,6 +171,12 @@ extern CHARSET_INFO *national_charset_info, *table_alias_charset; 
#define FLUSH_TIME		0		/* Don't flush tables */

#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)

#define IF_WIN(A,B) (A)

#undef	FLUSH_TIME

sql/sql_parse.cc

+4 −6
Original line number Diff line number Diff line
@@ -1810,9 +1810,8 @@ bool dispatch_command(enum enum_server_command command, THD *thd, 
    TABLE_LIST table_list;

    LEX_STRING conv_name;

    /* Saved variable value */

#ifdef HAVE_INNOBASE_DB

    my_bool old_innodb_table_locks= thd->variables.innodb_table_locks;

#endif

    my_bool old_innodb_table_locks= 

              IF_INNOBASE_DB(thd->variables.innodb_table_locks, FALSE);





    statistic_increment(thd->status_var.com_stat[SQLCOM_SHOW_FIELDS],
@@ -2336,9 +2335,8 @@ mysql_execute_command(THD *thd) 
  /* Locked closure of all tables */

  TABLE_LIST *locked_tables= NULL;

  /* Saved variable value */

#ifdef HAVE_INNOBASE_DB

  my_bool old_innodb_table_locks= thd->variables.innodb_table_locks;

#endif

  my_bool old_innodb_table_locks=

            IF_INNOBASE_DB(thd->variables.innodb_table_locks, FALSE);

  DBUG_ENTER("mysql_execute_command");

  thd->net.no_send_error= 0;