mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-29 18:20:07 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Proper fix for SHOW VARS on 64-bit systems

Browse source
This commit is contained in:
Sinisa@sinisa.nasamreza.org 2002-12-02 15:33:16 +02:00
parent 2c7c19769a
commit 9b331dc354
3 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
sql/mysqld.cc
View file

@ -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

5
sql/sql_show.cc
View file

@ -1145,7 +1145,10 @@ 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,(int32) *(ulong*) variables[i].value);
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:
net_store_data(&packet2,(ulong) *(bool*) variables[i].value ?

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,
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};