database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Merge with 4.0.11

Browse Source 
BitKeeper/etc/ignore:
  auto-union
BitKeeper/etc/logging_ok:
  auto-union
BUILD/FINISH.sh:
  Auto merged
client/mysqldump.c:
  Auto merged
include/my_base.h:
  Auto merged
include/my_pthread.h:
  Auto merged
innobase/row/row0sel.c:
  Auto merged
innobase/ut/ut0mem.c:
  Auto merged
myisam/myisamchk.c:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
mysql-test/r/bigint.result:
  Auto merged
mysql-test/r/handler.result:
  Auto merged
mysql-test/r/innodb.result:
  Auto merged
mysql-test/r/innodb_handler.result:
  Auto merged
mysql-test/r/query_cache.result:
  Auto merged
mysql-test/t/bigint.test:
  Auto merged
mysql-test/t/handler.test:
  Auto merged
mysql-test/t/innodb.test:
  Auto merged
mysql-test/t/innodb_handler.test:
  Auto merged
mysql-test/t/query_cache.test:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/opt_sum.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_handler.cc:
  Auto merged
sql/sql_load.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged
sql/share/czech/errmsg.txt:
  Auto merged
sql/share/danish/errmsg.txt:
  Auto merged
sql/share/dutch/errmsg.txt:
  Auto merged
sql/share/english/errmsg.txt:
  Auto merged
sql/share/estonian/errmsg.txt:
  Auto merged
sql/share/french/errmsg.txt:
  Auto merged
sql/share/greek/errmsg.txt:
  Auto merged
sql/share/hungarian/errmsg.txt:
  Auto merged
sql/share/italian/errmsg.txt:
  Auto merged
sql/share/japanese/errmsg.txt:
  Auto merged
sql/share/korean/errmsg.txt:
  Auto merged
sql/share/norwegian-ny/errmsg.txt:
  Auto merged
sql/share/norwegian/errmsg.txt:
  Auto merged
sql/share/polish/errmsg.txt:
  Auto merged
sql/share/portuguese/errmsg.txt:
  Auto merged
sql/share/romanian/errmsg.txt:
  Auto merged
sql/share/russian/errmsg.txt:
  Auto merged
sql/share/slovak/errmsg.txt:
  Auto merged
sql/share/spanish/errmsg.txt:
  Auto merged
sql/share/swedish/errmsg.txt:
  Auto merged
sql/share/ukrainian/errmsg.txt:
  Auto merged
sql/table.h:
  Auto merged
This commit is contained in:
unknown
2003-02-26 01:03:47 +02:00
parent 829af50169 bebafeba44
commit a7e3ba1df5
77 changed files with 1391 additions and 149 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
sql/mysqld.cc
View File

@ -267,6 +267,9 @@ bool opt_large_files= sizeof(my_off_t) > 4;
#define GET_HA_ROWS GET_ULONG
#endif
#ifdef HAVE_LIBWRAP
char *libwrapName= NULL;
#endif
/*
Variables to store startup options
@ -1883,14 +1886,13 @@ struct utsname
char nodename[FN_REFLEN];
};
int uname(struct utsname *a)
{
return -1;
}
#endif
#ifdef __WIN__
extern "C" pthread_handler_decl(handle_shutdown,arg)
{
MSG msg;
@ -1906,7 +1908,7 @@ extern "C" pthread_handler_decl(handle_shutdown,arg)
return 0;
}
int __stdcall handle_kill(ulong ctrl_type)
int STDCALL handle_kill(ulong ctrl_type)
{
if (ctrl_type == CTRL_CLOSE_EVENT ||
ctrl_type == CTRL_SHUTDOWN_EVENT)
@ -1948,10 +1950,6 @@ extern "C" pthread_handler_decl(handle_shutdown,arg)
const char *load_default_groups[]= { "mysqld","server",0 };
#ifdef HAVE_LIBWRAP
char *libwrapName=NULL;
#endif
bool open_log(MYSQL_LOG *log, const char *hostname,
const char *opt_name, const char *extension,
const char *index_file_name,