diff options
author | unknown <monty@hundin.mysql.fi> | 2001-11-25 13:50:48 +0200 |
---|---|---|
committer | unknown <monty@hundin.mysql.fi> | 2001-11-25 13:50:48 +0200 |
commit | 2239aa172b9a7e0100f0ab98e7e421bc0cfeb270 (patch) | |
tree | 20c1ecfa7529a49fc978cd3d82ae1115d507a9c0 /client | |
parent | e585c81a869ddf4a1be91d04ef3d69f2e969dcb7 (diff) | |
download | mariadb-git-2239aa172b9a7e0100f0ab98e7e421bc0cfeb270.tar.gz |
Fixes for embedded version.
BitKeeper/deleted/.del-WHITEPAPER~da1226799debcf3f:
Delete: libmysqld/WHITEPAPER
Docs/manual.texi:
Changelog
client/mysqltest.c:
Fix things that crashed embedded MySQL
libmysqld/examples/test-run:
Cleanup of old BDB files.
mysql-test/r/innodb.result:
Fix for embedded library
mysql-test/t/innodb.test:
Fix for embedded library
mysys/mf_keycache.c:
Safety
sql/ha_berkeley.cc:
Added DBUG statements
sql/ha_innobase.cc:
Fixed bug for embedded version
sql/ha_innobase.h:
Fix to use index when doing an ORDER BY on a whole InnoDB table
sql/handler.h:
Fix to use index when doing an ORDER BY on a whole InnoDB table
sql/mysqld.cc:
Safety fix
sql/sql_base.cc:
cleanup
sql/sql_select.cc:
Fix to use index when doing an ORDER BY on a whole InnoDB table
Diffstat (limited to 'client')
-rw-r--r-- | client/mysqltest.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/client/mysqltest.c b/client/mysqltest.c index 71b4e886f91..3174294fd8a 100644 --- a/client/mysqltest.c +++ b/client/mysqltest.c @@ -1334,9 +1334,9 @@ int do_connect(struct st_query* q) con_sock=fn_format(buff, con_sock, TMPDIR, "",0); if (!con_db[0]) con_db=db; - if((con_error = safe_connect(&next_con->mysql, con_host, - con_user, con_pass, - con_db, con_port, *con_sock ? con_sock: 0))) + if ((con_error = safe_connect(&next_con->mysql, con_host, + con_user, con_pass, + con_db, con_port, con_sock ? con_sock: 0))) die("Could not open connection '%s': %s", con_name, mysql_error(&next_con->mysql)); @@ -2403,7 +2403,6 @@ int main(int argc, char** argv) printf("ok\n"); } - mysql_server_end(); free_used_memory(); exit(error ? 1 : 0); return error ? 1 : 0; /* Keep compiler happy */ |