diff options
| author | unknown <monty@donna.mysql.com> | 2001-01-12 13:52:32 +0200 |
|---|---|---|
| committer | unknown <monty@donna.mysql.com> | 2001-01-12 13:52:32 +0200 |
| commit | 1a10224cacd1036f79a387698f982bfb5e36add6 (patch) | |
| tree | feed2fb14dbc49c9f89bfedaa06d5d15c58c8993 /sql/mysqld.cc | |
| parent | 5060e7f3fef7658bff42f5fa955689ec58d70e15 (diff) | |
| download | mariadb-git-1a10224cacd1036f79a387698f982bfb5e36add6.tar.gz | |
Patches for NetBSD/macppc
Fixed bug in LEFT JOIN
Added bdb_log_buffer_size
Docs/manual.texi:
Added documentation for mysqlhotcopy
client/mysql.cc:
Fixed core dump when column names couldn't be read
configure.in:
Fixed possible error
mit-pthreads/Changes-mysql:
Patches for NetBSD/macppc
mit-pthreads/config/config.guess:
Patches for NetBSD/macppc
mit-pthreads/config/configure.in:
Patches for NetBSD/macppc
mit-pthreads/config/configure:
Patches for NetBSD/macppc
mysql-test/r/join_outer.result:
New join test
mysql-test/t/join_outer.test:
New join test
scripts/mysqlhotcopy.sh:
Patches from ASK
sql/ha_berkeley.cc:
Adeed log buffer cache
sql/ha_berkeley.h:
Adeed log buffer cache
sql/log.cc:
Fixed possible overrun bug
sql/mysqld.cc:
Fix for Mac OS X public beta
Added bdb_log_buffer_size
sql/sql_select.cc:
Fixed bug in LEFT JOIN
tests/mail_to_db.pl:
Removed unsubscribe tails
tests/pmail.pl:
Sort mails according to date
Diffstat (limited to 'sql/mysqld.cc')
| -rw-r--r-- | sql/mysqld.cc | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc index 1d72f21df1d..4d9b7982f48 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -1190,7 +1190,11 @@ static void init_signals(void) struct sigaction sa; sa.sa_flags = 0; sigemptyset(&sa.sa_mask); sigprocmask(SIG_SETMASK,&sa.sa_mask,NULL); - sa.sa_handler=handle_segfault; +#ifdef HAVE_DARWIN_THREADS + sa.sa_handler=( void (*)() ) handle_segfault; +#else + sa.sa_handler=handle_segfault; +#endif sigaction(SIGSEGV, &sa, NULL); (void) sigemptyset(&set); #ifdef THREAD_SPECIFIC_SIGPIPE @@ -2512,6 +2516,8 @@ CHANGEABLE_VAR changeable_vars[] = { #ifdef HAVE_BERKELEY_DB { "bdb_cache_size", (long*) &berkeley_cache_size, KEY_CACHE_SIZE, 20*1024, (long) ~0, 0, IO_SIZE }, + {"bdb_log_buffer_size", (long*) &berkeley_log_buffer_size, 0, 256*1024L, + ~0L, 0, 1024}, { "bdb_max_lock", (long*) &berkeley_max_lock, 10000, 0, (long) ~0, 0, 1 }, /* QQ: The following should be removed soon! */ @@ -2622,6 +2628,7 @@ struct show_var_st init_vars[]= { {"basedir", mysql_home, SHOW_CHAR}, #ifdef HAVE_BERKELEY_DB {"bdb_cache_size", (char*) &berkeley_cache_size, SHOW_LONG}, + {"bdb_log_buffer_size", (char*) &berkeley_log_buffer_size, SHOW_LONG}, {"bdb_home", (char*) &berkeley_home, SHOW_CHAR_PTR}, {"bdb_max_lock", (char*) &berkeley_max_lock, SHOW_LONG}, {"bdb_logdir", (char*) &berkeley_logdir, SHOW_CHAR_PTR}, @@ -2812,7 +2819,7 @@ static void usage(void) Don't flush key buffers between writes for any MyISAM\n\ table\n\ --enable-locking Enable system locking\n\ - -T, --exit-info Print some debug info at exit\n\ + -T, --exit-info Used for debugging; Use at your own risk!\n\ --flush Flush tables to disk between SQL commands\n\ -?, --help Display this help and exit\n\ --init-file=file Read SQL commands from this file at startup\n\ |