diff options
author | unknown <monty@donna.mysql.com> | 2000-11-28 04:47:47 +0200 |
---|---|---|
committer | unknown <monty@donna.mysql.com> | 2000-11-28 04:47:47 +0200 |
commit | 746f0b3b762f2a9d31347dfddf4b07a1621fc15b (patch) | |
tree | e3d40dd7c6a7e86bd2388da19d59d5a372bf7bb8 /client/mysql.cc | |
parent | 2700d28319bf29ee3957a357eaa102bcc72e1ac4 (diff) | |
download | mariadb-git-746f0b3b762f2a9d31347dfddf4b07a1621fc15b.tar.gz |
New thr_alarm struct for better integration with OS2
Run bootstrap in separate thread
Fix bug in FLUSH TABLES table_name
Docs/manual.texi:
Updated ChangeLog
client/mysql.cc:
Added info about compressed protocol
include/getopt.h:
Fix for OS2
include/global.h:
Fix for OS2
include/my_sys.h:
Fix for OS2
include/mysql_com.h:
Fix for OS2
include/thr_alarm.h:
Cleanup up alarm struct for OS2 port
isam/isamchk.c:
Fix for OS2
libmysql/libmysql.c:
cleanup
libmysql/net.c:
Use new thr_alarm
libmysql/violite.c:
Fix for OS2
myisam/ChangeLog:
Changes
myisam/mi_create.c:
Use less stack
myisam/myisamchk.c:
Fix for OS2
mysys/default.c:
Fix for OS2
mysys/getopt.c:
Fix for OS2
mysys/mf_format.c:
Safety
mysys/mf_path.c:
Fix for OS2
mysys/my_create.c:
Fix for OS2
mysys/my_lock.c:
Fix for OS2
mysys/my_open.c:
Fix for OS2
mysys/thr_alarm.c:
Use new thr_alarm struct
readline/input.c:
Fix for OS2
readline/rltty.c:
Fix for OS2
sql/ha_myisam.cc:
Remove unnecessary fn_format
sql/my_lock.c:
Use new thr_alarm
sql/mysql_priv.h:
Changed bootstrap to run in separate thread to avoid problem with
small stack
sql/mysqld.cc:
Changed bootstrap to run in separate thread to avoid problem with
small stack
sql/net_serv.cc:
Use new thr_alarm
sql/sql_base.cc:
Fix problem with FLUSH TABLE table_name
sql/sql_class.cc:
Fix for new bootstrap
sql/sql_class.h:
cleanup
sql/sql_delete.cc:
cleanup
sql/sql_load.cc:
Fix for OS2
sql/sql_parse.cc:
Changed bootstrap to run in separate thread to avoid problem with
small stack
sql/sql_select.cc:
Reset used structure elements
sql/sql_table.cc:
For OS2
sql/violite.c:
For OS2
Diffstat (limited to 'client/mysql.cc')
-rw-r--r-- | client/mysql.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/client/mysql.cc b/client/mysql.cc index 76eed7e2548..9b6c52fdb6a 100644 --- a/client/mysql.cc +++ b/client/mysql.cc @@ -39,6 +39,8 @@ #include "my_readline.h" #include <signal.h> +const char *VER="11.8"; + gptr sql_alloc(unsigned size); // Don't use mysqld alloc for these void sql_element_free(void *ptr); #include "sql_string.h" @@ -109,8 +111,6 @@ static HashTable ht; enum enum_info_type { INFO_INFO,INFO_ERROR,INFO_RESULT}; typedef enum enum_info_type INFO_TYPE; -const char *VER="11.7"; - static MYSQL mysql; /* The connection */ static bool info_flag=0,ignore_errors=0,wait_flag=0,quick=0, connected=0,opt_raw_data=0,unbuffered=0,output_tables=0, @@ -2156,10 +2156,7 @@ com_status(String *buffer __attribute__((unused)), } #ifndef __WIN__ tee_fprintf(stdout, "Current pager:\t\t%s\n", pager); - if (opt_outfile) - tee_fprintf(stdout, "Using outfile:\t\tYes: '%s'\n", outfile); - else - printf("Using outfile:\t\tNo\n"); + tee_fprintf(stdout, "Using outfile:\t\t'%s'\n", opt_outfile ? outfile : ""); #endif tee_fprintf(stdout, "Server version:\t\t%s\n", mysql_get_server_info(&mysql)); tee_fprintf(stdout, "Protocol version:\t%d\n", mysql_get_proto_info(&mysql)); @@ -2169,6 +2166,9 @@ com_status(String *buffer __attribute__((unused)), tee_fprintf(stdout, "TCP port:\t\t%d\n", mysql.port); else tee_fprintf(stdout, "UNIX socket:\t\t%s\n", mysql.unix_socket); + if (mysql.net.compress) + tee_fprintf(stdout, "Protocol:\t\tCompressed\n"); + if ((status=mysql_stat(&mysql)) && !mysql_error(&mysql)[0]) { char *pos,buff[40]; |