database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

Fixed --no-defaults in mysqltest

Browse Source 
BUILD/compile-pentium-debug:
  Use /usr/local/BerkeleyDB-dbug/ if available
BUILD/compile-pentium:
  Use /usr/local/BerkeleyDB-opt/ if available
Docs/internals.texi:
  Added 'unedited' documentation for mysys functions
Docs/manual.texi:
  Cleanups
client/mysql.cc:
  Added client language to status
client/mysqltest.c:
  Fixed bug with --no-defaults
heap/_check.c:
  Added option to print status.
heap/hp_close.c:
  Update to use new status interface
heap/hp_hash.c:
  Clean up hash function and add new experimental hash
heap/hp_test1.c:
  Update to use new status interface
heap/hp_test2.c:
  Update to use new status interface
include/heap.h:
  Update to use new status interface
mysql-test/r/key_diff.result:
  Cleanup tests that may give rows in random order
mysql-test/r/type_blob.result:
  Removed \r from output as this confused bk
mysql-test/t/key_diff.test:
  Cleanup tests that may give rows in random order
BitKeeper/etc/ignore:
  Added Docs/my_sys.doc to the ignore list
mysql-test/t/type_blob.test:
  Removed \r from output as this confused bk
mysys/hash.c:
  Add new experimental hash function
scripts/safe_mysqld.sh:
  Added --mysqld option
sql/ha_innobase.cc:
  Fixed store_locking
sql/mysqld.cc:
  Cleaned up warning messages
This commit is contained in:
unknown
2000-12-29 16:06:10 +02:00
parent ccf4b28298
commit 29fa72526a
22 changed files with 385 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
client/mysql.cc
View File

@@ -39,7 +39,7 @@
#include "my_readline.h"
#include <signal.h>
const char *VER="11.9";
const char *VER="11.10";
gptr sql_alloc(unsigned size); // Don't use mysqld alloc for these
void sql_element_free(void *ptr);
@@ -2162,7 +2162,9 @@ com_status(String *buffer __attribute__((unused)),
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));
tee_fprintf(stdout, "Connection:\t\t%s\n", mysql_get_host_info(&mysql));
tee_fprintf(stdout, "Language:\t\t%s\n", mysql.charset->name);
tee_fprintf(stdout, "Client characterset:\t%s\n",
default_charset_info->name);
tee_fprintf(stdout, "Server characterset:\t%s\n", mysql.charset->name);
if (strstr(mysql_get_host_info(&mysql),"TCP/IP") || ! mysql.unix_socket)
tee_fprintf(stdout, "TCP port:\t\t%d\n", mysql.port);
else