1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
into sinisa.nasamreza.org:/mnt/work/mysql
This commit is contained in:
Sinisa@sinisa.nasamreza.org 2002-12-04 20:52:42 +02:00
commit be6b50e152
5 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.bzrignore
View File

@ -331,3 +331,5 @@ bdb/dist/autom4te.cache/traces.0
innobase/autom4te.cache/output.0 innobase/autom4te.cache/output.0
innobase/autom4te.cache/requests innobase/autom4te.cache/requests
innobase/autom4te.cache/traces.0 innobase/autom4te.cache/traces.0
innobase/stamp-h1
stamp-h1

2
sql/mysqld.cc
View File

@ -3110,7 +3110,7 @@ struct show_var_st init_vars[]= {
#endif #endif
{"interactive_timeout", (char*) &net_interactive_timeout, SHOW_LONG}, {"interactive_timeout", (char*) &net_interactive_timeout, SHOW_LONG},
{"join_buffer_size", (char*) &join_buff_size, 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}, {"language", language, SHOW_CHAR},
{"large_files_support", (char*) &opt_large_files, SHOW_BOOL}, {"large_files_support", (char*) &opt_large_files, SHOW_BOOL},
#ifdef HAVE_MLOCKALL #ifdef HAVE_MLOCKALL

3
sql/sql_show.cc
View File

@ -1145,6 +1145,9 @@ int mysqld_show(THD *thd, const char *wild, show_var_st *variables)
switch (variables[i].type){ switch (variables[i].type){
case SHOW_LONG: case SHOW_LONG:
case SHOW_LONG_CONST: 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); net_store_data(&packet2,(longlong) *(ulong*) variables[i].value);
break; break;
case SHOW_BOOL: case SHOW_BOOL:

8
sql/sql_table.cc
View File

@ -1528,8 +1528,14 @@ int mysql_alter_table(THD *thd,char *new_db, char *new_name,
/* We changed a temporary table */ /* We changed a temporary table */
if (error) 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); close_temporary_table(thd,new_db,tmp_name);
my_free((gptr) new_table,MYF(0));
goto err; goto err;
} }
/* Close lock if this is a transactional table */ /* Close lock if this is a transactional table */

2
sql/structs.h
View File

@ -125,7 +125,7 @@ typedef struct {
enum SHOW_TYPE { SHOW_LONG,SHOW_CHAR,SHOW_INT,SHOW_CHAR_PTR,SHOW_BOOL, enum SHOW_TYPE { SHOW_LONG,SHOW_CHAR,SHOW_INT,SHOW_CHAR_PTR,SHOW_BOOL,
SHOW_MY_BOOL,SHOW_OPENTABLES,SHOW_STARTTIME,SHOW_QUESTION, 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}; enum SHOW_COMP_OPTION { SHOW_OPTION_YES, SHOW_OPTION_NO, SHOW_OPTION_DISABLED};