Commit be6b50e1 authored by Sinisa@sinisa.nasamreza.org's avatar Sinisa@sinisa.nasamreza.org
Browse files

Merge sinisa@work.mysql.com:/home/bk/mysql 

into sinisa.nasamreza.org:/mnt/work/mysql
parents 0db5f142 d527bfbd

.bzrignore

+2 −0
Original line number Diff line number Diff line
@@ -331,3 +331,5 @@ bdb/dist/autom4te.cache/traces.0 
innobase/autom4te.cache/output.0

innobase/autom4te.cache/requests

innobase/autom4te.cache/traces.0

innobase/stamp-h1

stamp-h1

sql/mysqld.cc

+1 −1
Original line number Diff line number Diff line
@@ -3110,7 +3110,7 @@ struct show_var_st init_vars[]= { 
#endif

  {"interactive_timeout",     (char*) &net_interactive_timeout,     SHOW_LONG},

  {"join_buffer_size",        (char*) &join_buff_size,              SHOW_LONG},

  {"key_buffer_size",         (char*) &keybuff_size,                SHOW_LONG},

  {"key_buffer_size",         (char*) &keybuff_size,                SHOW_LONG_AS_LONGLONG},

  {"language",                language,                             SHOW_CHAR},

  {"large_files_support",     (char*) &opt_large_files,             SHOW_BOOL},	

#ifdef HAVE_MLOCKALL

sql/sql_show.cc

+3 −0
Original line number Diff line number Diff line
@@ -1145,6 +1145,9 @@ int mysqld_show(THD *thd, const char *wild, show_var_st *variables) 
      switch (variables[i].type){

      case SHOW_LONG:

      case SHOW_LONG_CONST:

        net_store_data(&packet2,(uint32) *(ulong*) variables[i].value);

        break;

      case SHOW_LONG_AS_LONGLONG:

        net_store_data(&packet2,(longlong) *(ulong*) variables[i].value);

        break;

      case SHOW_BOOL:

sql/sql_table.cc

+7 −1
Original line number Diff line number Diff line
@@ -1528,8 +1528,14 @@ int mysql_alter_table(THD *thd,char *new_db, char *new_name, 
    /* We changed a temporary table */

    if (error)

    {

      /* 

       * The following function call will also free a 

       * new_table pointer.

       * Therefore, here new_table pointer is not free'd as it is 

       * free'd in close_temporary() which is called by by the 

       * close_temporary_table() function.

      */

      close_temporary_table(thd,new_db,tmp_name);

      my_free((gptr) new_table,MYF(0));

      goto err;

    }

    /* Close lock if this is a transactional table */

sql/structs.h

+1 −1
Original line number Diff line number Diff line
@@ -125,7 +125,7 @@ typedef struct { 


enum SHOW_TYPE { SHOW_LONG,SHOW_CHAR,SHOW_INT,SHOW_CHAR_PTR,SHOW_BOOL,

		 SHOW_MY_BOOL,SHOW_OPENTABLES,SHOW_STARTTIME,SHOW_QUESTION,

		 SHOW_LONG_CONST, SHOW_INT_CONST, SHOW_HAVE};

		 SHOW_LONG_CONST, SHOW_INT_CONST, SHOW_HAVE, SHOW_LONG_AS_LONGLONG};



enum SHOW_COMP_OPTION { SHOW_OPTION_YES, SHOW_OPTION_NO, SHOW_OPTION_DISABLED};