diff options
| author | unknown <hf@deer.(none)> | 2003-10-21 16:05:17 +0500 |
|---|---|---|
| committer | unknown <hf@deer.(none)> | 2003-10-21 16:05:17 +0500 |
| commit | 8d94e500e025fb5626df12c8183e8ab14c74e624 (patch) | |
| tree | 6bd29233c656d8429437a224f9c3588a94963cb4 /sql/init.cc | |
| parent | d894f23372ad7abd1efd108562574b4d15dd0709 (diff) | |
| download | mariadb-git-8d94e500e025fb5626df12c8183e8ab14c74e624.tar.gz | |
Fix for Windows bug reported throuhg Miguel
libmysqld/lib_sql.cc:
This code seems to be superfluous
sql/derror.cc:
in embedded server these functions should return the sign of the error
instead of halting the program
sql/init.cc:
my_abort_hook left unchanged
sql/mysql_priv.h:
declaration of init_errmessage changed
unireg_abort was replaced with DBUG_RETURN for embedded server
sql/mysqld.cc:
these functions don't work in embedded server thus #ifdef-ed
Diffstat (limited to 'sql/init.cc')
| -rw-r--r-- | sql/init.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/init.cc b/sql/init.cc index 50d504068a0..8b15fef4ee3 100644 --- a/sql/init.cc +++ b/sql/init.cc @@ -37,7 +37,9 @@ void unireg_init(ulong options) #ifdef USE_MY_ATOF init_my_atof(); /* use our atof */ #endif +#ifndef EMBEDDED_LIBRARY my_abort_hook=unireg_abort; /* Abort with close of databases */ +#endif VOID(strmov(reg_ext,".frm")); for (i=0 ; i < 6 ; i++) // YYMMDDHHMMSS |