diff options
| author | unknown <monty@hundin.mysql.fi> | 2002-06-27 11:27:04 +0300 |
|---|---|---|
| committer | unknown <monty@hundin.mysql.fi> | 2002-06-27 11:27:04 +0300 |
| commit | 835a75c97bbc31e35e25171db9c046ec1dae5b87 (patch) | |
| tree | 857f8b9d553911f4937bee644ea5d2c3606e8e58 /libmysql | |
| parent | d471ad0c236d2d2ff23e75dc02e3095e5edb7f17 (diff) | |
| download | mariadb-git-835a75c97bbc31e35e25171db9c046ec1dae5b87.tar.gz | |
Removed mysql_ssl_clear()
Added statistics information for alarms (for bug tracking)
Don't store "incomplete" in the xxx.cfg file if we are not using --restart. (Crash-me)
Enlarged STACK_BUF_ALLOC becasue of failed crash-me test
Aded new script mysql_tableinfo to make a system directory.
Docs/manual.texi:
Changelog and TODO
include/mysql.h:
Removed mysql_ssl_clear() (One should use mysql_close() instead)
include/thr_alarm.h:
Added info for alarms
libmysql/libmysql.c:
Made mysql_ssl_clear() static
libmysql/libmysql.def:
cleanup
libmysqld/libmysqld.def:
cleanup
myisam/myisamchk.c:
describe -> description
myisam/myisampack.c:
Fixed copyright.
mysys/thr_alarm.c:
Added statistics information for alarms (for bug tracking)
scripts/Makefile.am:
Added mysql_table_info
sql-bench/crash-me.sh:
Don't store "incomplete" in the xxx.cfg file if we are not using --restart.
This was done becasue "incomplete" made it harder to quickly repeat a test that
failed.
sql-bench/limits/mysql.cfg:
Update to 1.58
sql/hostname.cc:
Remved compiler warning
sql/item_func.cc:
cleanup
sql/item_func.h:
Cleanup
sql/mysql_priv.h:
Enlarged STACK_BUF_ALLOC becasue of failed crash-me test
sql/opt_range.cc:
Removed purify warning
sql/sql_parse.cc:
cleanup
sql/sql_test.cc:
Added ala
Diffstat (limited to 'libmysql')
| -rw-r--r-- | libmysql/libmysql.c | 6 | ||||
| -rw-r--r-- | libmysql/libmysql.def | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/libmysql/libmysql.c b/libmysql/libmysql.c index 646c165d512..fa505063deb 100644 --- a/libmysql/libmysql.c +++ b/libmysql/libmysql.c @@ -1448,8 +1448,8 @@ mysql_ssl_set(MYSQL *mysql __attribute__((unused)) , NB! Errors are not reported until you do mysql_real_connect. **************************************************************************/ -int STDCALL -mysql_ssl_clear(MYSQL *mysql __attribute__((unused))) +static int +mysql_ssl_free(MYSQL *mysql __attribute__((unused))) { #ifdef HAVE_OPENSSL my_free(mysql->options.ssl_key, MYF(MY_ALLOW_ZERO_PTR)); @@ -2051,7 +2051,7 @@ mysql_close(MYSQL *mysql) my_free(mysql->options.charset_dir,MYF(MY_ALLOW_ZERO_PTR)); my_free(mysql->options.charset_name,MYF(MY_ALLOW_ZERO_PTR)); #ifdef HAVE_OPENSSL - mysql_ssl_clear(mysql); + mysql_ssl_free(mysql); #endif /* HAVE_OPENSSL */ /* Clear pointers for better safety */ mysql->host_info=mysql->user=mysql->passwd=mysql->db=0; diff --git a/libmysql/libmysql.def b/libmysql/libmysql.def index 9405ecd58ff..988f2b09195 100644 --- a/libmysql/libmysql.def +++ b/libmysql/libmysql.def @@ -90,7 +90,7 @@ EXPORTS mysql_real_escape_string mysql_ssl_set mysql_ssl_clear - mysql_real_connect + mysql_real_connect mysql_master_query mysql_master_send_query mysql_slave_query |