diff options
| author | unknown <monty@donna.mysql.com> | 2000-12-29 16:06:10 +0200 |
|---|---|---|
| committer | unknown <monty@donna.mysql.com> | 2000-12-29 16:06:10 +0200 |
| commit | 29fa72526a22c31a79c73a00bf7b1974c44ff9d2 (patch) | |
| tree | 53ef6da34dcfaf79e0e133177cccfb9bb63a9637 /client | |
| parent | ccf4b2829882f566d5665e4ddf7eabcd6d197872 (diff) | |
| download | mariadb-git-29fa72526a22c31a79c73a00bf7b1974c44ff9d2.tar.gz | |
Fixed --no-defaults in mysqltest
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
Diffstat (limited to 'client')
| -rw-r--r-- | client/mysql.cc | 6 | ||||
| -rw-r--r-- | client/mysqltest.c | 3 |
2 files changed, 4 insertions, 5 deletions
diff --git a/client/mysql.cc b/client/mysql.cc index e3cc17e23cd..dbd7bfbf899 100644 --- a/client/mysql.cc +++ b/client/mysql.cc @@ -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 diff --git a/client/mysqltest.c b/client/mysqltest.c index 5896c655d22..535822d80fd 100644 --- a/client/mysqltest.c +++ b/client/mysqltest.c @@ -1277,9 +1277,6 @@ int main(int argc, char** argv) if (!( mysql_init(&cur_con->mysql))) die("Failed in mysql_init()"); - - mysql_options(&cur_con->mysql, MYSQL_READ_DEFAULT_GROUP, "mysql"); - cur_con->name = my_strdup("default", MYF(MY_WME)); if (!cur_con->name) die("Out of memory"); |