mirror of
https://github.com/MariaDB/server.git
synced 2025-01-17 20:42:30 +01:00
26bb50a19b
Add pack_bits to pack_reclength for dynamic rows. This solves buffer a possible buffer overflow on update. (This will probably solve bug #563) Fix test for available file descriptors in mysqltest Fixed core dump bug in replication tests when running without transactional table support acconfig.h: Add detection of in_addr_t acinclude.m4: Add detection of in_addr_t configure.in: Add detection of in_addr_t extra/my_print_defaults.c: Cleanup extra/resolveip.c: Add detection of in_addr_t libmysql/dll.c: Fixed C++ commments myisam/mi_dynrec.c: Add ASSERT if allocated record length is to small myisam/mi_open.c: Add pack_bits to pack_reclength for dynamic rows. This solves buffer a possible buffer overflow on update. myisam/mi_test_all.sh: Added valgrind option to make it easier to verify tests mysql-test/include/check_var_limit.inc: Fix test for available file descriptors mysql-test/r/myisam.result: More tests mysql-test/t/myisam.test: More tests mysql-test/t/query_cache_merge.test: Fix test for available file descriptors mysys/default.c: Cleanup mysys/my_pthread.c: Remove C++ comments sql/log.cc: Code cleanup Fixed core dump bug in replication tests when running without transactional table support.
134 lines
3.4 KiB
C
134 lines
3.4 KiB
C
/* Copyright (C) 2000 MySQL AB
|
|
|
|
This program is free software; you can redistribute it and/or modify
|
|
it under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation; either version 2 of the License, or
|
|
(at your option) any later version.
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
GNU General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with this program; if not, write to the Free Software
|
|
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
|
|
|
|
/*
|
|
** Handling initialization of the dll library
|
|
*/
|
|
|
|
#include <my_global.h>
|
|
#include <my_sys.h>
|
|
#include <my_pthread.h>
|
|
|
|
static bool libmysql_inited=0;
|
|
|
|
void libmysql_init(void)
|
|
{
|
|
if (libmysql_inited)
|
|
return;
|
|
libmysql_inited=1;
|
|
my_init();
|
|
{
|
|
DBUG_ENTER("libmysql_init");
|
|
#ifdef LOG_ALL
|
|
DBUG_PUSH("d:t:S:O,c::\\tmp\\libmysql.log");
|
|
#else
|
|
if (getenv("LIBMYSQL_LOG") != NULL)
|
|
DBUG_PUSH(getenv("LIBMYSQL_LOG"));
|
|
#endif
|
|
DBUG_VOID_RETURN;
|
|
}
|
|
}
|
|
|
|
#ifdef __WIN__
|
|
|
|
static int inited=0,threads=0;
|
|
HINSTANCE NEAR s_hModule; /* Saved module handle */
|
|
DWORD main_thread;
|
|
|
|
BOOL APIENTRY LibMain(HANDLE hInst,DWORD ul_reason_being_called,
|
|
LPVOID lpReserved)
|
|
{
|
|
switch (ul_reason_being_called) {
|
|
case DLL_PROCESS_ATTACH: /* case of libentry call in win 3.x */
|
|
if (!inited++)
|
|
{
|
|
s_hModule=hInst;
|
|
libmysql_init();
|
|
main_thread=GetCurrentThreadId();
|
|
}
|
|
break;
|
|
case DLL_THREAD_ATTACH:
|
|
threads++;
|
|
my_thread_init();
|
|
break;
|
|
case DLL_PROCESS_DETACH: /* case of wep call in win 3.x */
|
|
if (!--inited) /* Safety */
|
|
{
|
|
/* my_thread_init() */ /* This may give extra safety */
|
|
my_end(0);
|
|
}
|
|
break;
|
|
case DLL_THREAD_DETACH:
|
|
/* Main thread will free by my_end() */
|
|
threads--;
|
|
if (main_thread != GetCurrentThreadId())
|
|
my_thread_end();
|
|
break;
|
|
default:
|
|
break;
|
|
} /* switch */
|
|
|
|
return TRUE;
|
|
|
|
UNREFERENCED_PARAMETER(lpReserved);
|
|
} /* LibMain */
|
|
|
|
int __stdcall DllMain(HANDLE hInst,DWORD ul_reason_being_called,LPVOID lpReserved)
|
|
{
|
|
return LibMain(hInst,ul_reason_being_called,lpReserved);
|
|
}
|
|
|
|
#elif defined(WINDOWS)
|
|
|
|
/****************************************************************************
|
|
** This routine is called by LIBSTART.ASM at module load time. All it
|
|
** does in this sample is remember the DLL module handle. The module
|
|
** handle is needed if you want to do things like load stuff from the
|
|
** resource file (for instance string resources).
|
|
****************************************************************************/
|
|
|
|
int _export FAR PASCAL libmain(HANDLE hModule,short cbHeapSize,
|
|
UCHAR FAR *lszCmdLine)
|
|
{
|
|
s_hModule = hModule;
|
|
libmysql_init();
|
|
return TRUE;
|
|
}
|
|
|
|
#endif
|
|
|
|
#ifdef OS2
|
|
|
|
/*
|
|
This function is called automatically by _DLL_InitTerm
|
|
Every dll runtime enviroment is not tz enabled, so tzset()
|
|
must be called to enable TZ handling
|
|
Also timezone is fixed.
|
|
*/
|
|
|
|
extern "C" unsigned long _System DllMain(unsigned long modhandle,
|
|
unsigned long flag)
|
|
{
|
|
if (flag == 0) {
|
|
tzset(); // Set tzname
|
|
time_t currentTime = time(NULL);
|
|
struct tm *ts = localtime(¤tTime);
|
|
if (ts->tm_isdst > 0)
|
|
_timezone -= 3600;
|
|
}
|
|
}
|
|
|
|
#endif
|