diff options
| author | unknown <monty@hundin.mysql.fi> | 2002-10-29 21:59:03 +0200 |
|---|---|---|
| committer | unknown <monty@hundin.mysql.fi> | 2002-10-29 21:59:03 +0200 |
| commit | ea3ffb9b3efedc03baf011467a0b84f394b1b19e (patch) | |
| tree | 5eb822c41165cc8204269340f47d7a10e2b83d7f /sql/mysqld.cc | |
| parent | 14cbecdc8b53b60dcaf101368bd3df3ae5a7c75e (diff) | |
| download | mariadb-git-ea3ffb9b3efedc03baf011467a0b84f394b1b19e.tar.gz | |
Added back old LARGEFILE handling
Fixed reference to freed memory in acl_init()/grant_init()
Fixed possible memory leak. (Could only happen in very strange circumstances)
Fixed bug in ALTER TABLE with BDB tables
Updated mysql-test for valgrind
Docs/manual.texi:
ChangeLog
acinclude.m4:
Added back old LARGEFILE handling.
(Needed to get MySQL to compile on Solaris 2.9 with gcc 3.x)
configure.in:
Added back old LARGEFILE handling.
(Needed to get MySQL to compile on Solaris 2.9 with gcc 3.x)
libmysqld/lib_sql.cc:
Fixed reference to freed memory
mysql-test/mysql-test-run.sh:
Added option --valgrind
mysys/Makefile.am:
Removed warning when doing make
sql/mysqld.cc:
Free regexp memory on shutdown.
read 'des' key files from data directory
Fixed reference to freed memory in grant_init()
sql/slave.cc:
Fixed wrong printf() argument
sql/sql_acl.cc:
Fixed reference to freed memory
sql/sql_acl.h:
Fixed reference to freed memory
sql/sql_base.cc:
Fixed possible memory leak. (Could only happen in very strange circumstances)
sql/sql_parse.cc:
Updated arguments to grant_reload()
sql/sql_table.cc:
Fixed bug in ALTER TABLE with BDB tables
sql/sql_yacc.yy:
memset -> bzero
Diffstat (limited to 'sql/mysqld.cc')
| -rw-r--r-- | sql/mysqld.cc | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc index f3aef7f1622..1bb1ff1de74 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -858,6 +858,9 @@ void clean_up(bool print_message) bitmap_free(&temp_pool); free_max_user_conn(); end_slave_list(); +#ifdef USE_REGEX + regex_end(); +#endif #if !defined(__WIN__) && !defined(EMBEDDED_LIBRARY) if (!opt_bootstrap) @@ -1894,8 +1897,6 @@ int main(int argc, char **argv) if (!ssl_acceptor_fd) opt_use_ssl = 0; } - if (des_key_file) - load_des_key_file(des_key_file); #endif /* HAVE_OPENSSL */ #ifdef HAVE_LIBWRAP @@ -1968,6 +1969,10 @@ int main(int argc, char **argv) reset_floating_point_exceptions(); init_thr_lock(); init_slave_list(); +#ifdef HAVE_OPENSSL + if (des_key_file) + load_des_key_file(des_key_file); +#endif /* HAVE_OPENSSL */ /* Setup log files */ if (opt_log) @@ -2032,7 +2037,7 @@ int main(int argc, char **argv) exit(1); } start_signal_handler(); // Creates pidfile - if (acl_init(opt_noacl)) + if (acl_init((THD*) 0, opt_noacl)) { abort_loop=1; select_thread_in_use=0; @@ -2044,7 +2049,7 @@ int main(int argc, char **argv) exit(1); } if (!opt_noacl) - (void) grant_init(); + (void) grant_init((THD*) 0); init_max_user_conn(); init_update_queries(); |