mirror of
https://github.com/MariaDB/server.git
synced 2025-07-30 16:24:05 +03:00
Fixes for Netware
Call pthread_mutex_destroy() on not used mutex. Changed comments in .h and .c files from // -> /* */ Added detection of mutex on which one didn't call pthread_mutex_destroy() Fixed bug in create_tmp_field() which causes a memory overrun in queries that uses "ORDER BY constant_expression" Added optimisation for ORDER BY NULL BitKeeper/deleted/.del-ChangeLog~dfc92e15bee6fc75: Delete: sql/ChangeLog BUILD/compile-pentium-valgrind-max: Don't use valgrind with safemalloc as this can hide some bugs Makefile.am: Added platform dirs bdb/os/os_handle.c: Portability fix client/mysql.cc: Fixes for Netware. Fixed duplicate output when using 'tee' Simple optimisations client/mysqldump.c: Portability fix client/mysqltest.c: Portability fix configure.in: Fixes for Netware extra/resolveip.c: Fixes for Netware include/Makefile.am: Fixes for Netware include/config-win.h: Portability fix include/my_global.h: Fixes for Netware include/my_net.h: Fixes for Netware include/my_pthread.h: Fixes for Netware Added detection of mutexes that was not destroyed include/my_sys.h: Fixes for Netware Added 'extern' before external functions include/mysql.h: Fixes for Netware innobase/configure.in: Fixes for Netware innobase/include/os0thread.h: Fixes for Netware innobase/os/os0sync.c: Fixes for Netware innobase/os/os0thread.c: Fixes for Netware innobase/srv/srv0srv.c: Fixes for Netware innobase/srv/srv0start.c: Fixes for Netware innobase/sync/sync0sync.c: Fixes for Netware isam/test3.c: Disable test on Netware libmysql/Makefile.shared: Added my_sleep libmysql/get_password.c: Fixes for Netware libmysql/libmysql.c: Fixes for Netware Made mysql_once_init() global libmysql/manager.c: Fixes for Netware myisam/mi_test3.c: Disable test for netware mysql-test/mysql-test-run.sh: Give warning if output file contains errors mysql-test/r/count_distinct.result: More tests mysql-test/r/group_by.result: Test of ORDER BY NULL mysql-test/t/backup.test: Fixes for Netware mysql-test/t/count_distinct.test: More tests mysql-test/t/func_crypt.test: Fixes for Netware mysql-test/t/grant_cache.test: Fixes for Netware mysql-test/t/group_by.test: Tests of ORDER BY NULL mysql-test/t/rpl000015.test: Fixes for Netware mysql-test/t/rpl000017.test: Fixes for Netware mysql-test/t/rpl_rotate_logs.test: Fixes for Netware mysys/Makefile.am: Added my_sleep.c and my_netware.c mysys/charset.c: Fixes for Netware mysys/default.c: Fixes for Netware mysys/mf_tempfile.c: Fixes for Netware mysys/my_clock.c: Fixes for Netware mysys/my_copy.c: Fixes for Netware mysys/my_getwd.c: Changed function comment from // -> /* */ mysys/my_init.c: Fixes for Netware mysys/my_lock.c: Fixes for Netware mysys/my_messnc.c: Fixes for Netware mysys/my_os2cond.c: Removed comment mysys/my_os2dirsrch.c: Changed function comment from // -> /* */ Fixed indentation mysys/my_os2dirsrch.h: Changed function comment from // -> /* */ Fixed indentation mysys/my_os2file64.c: Changed function comment from // -> /* */ Fixed indentation mysys/my_os2mutex.c: Changed function comment from // -> /* */ Fixed indentation mysys/my_os2thread.c: Changed function comment from // -> /* */ Fixed indentation mysys/my_os2tls.c: Changed function comment from // -> /* */ Fixed indentation mysys/my_pthread.c: Fixes for Netware mysys/my_redel.c: Fixes for Netware mysys/my_tempnam.c: Fixes for Netware mysys/my_thr_init.c: Remove created mutexes when program ends. mysys/mysys_priv.h: Cleanup mysys/safemalloc.c: Prefix error messages with "Error:" mysys/thr_alarm.c: Destroy internal mutex on end_thr_alarm. mysys/thr_mutex.c: Added detection of mutex on which one didn't call pthread_mutex_destroy() scripts/make_binary_distribution.sh: Fixes for Netware sql/des_key_file.cc: Free mutex at end sql/ha_innodb.cc: Free mutex at end sql/ha_myisam.cc: Changed warnings from REPAIR Note: (For mysql-test-run) sql/hostname.cc: Fixes for Netware sql/item.h: Fixed bug in create_tmp_field() which causes a memory overrun sql/item_func.cc: Free used mutexes sql/item_sum.cc: Fixed bug in create_tmp_field() which causes a memory overrun sql/log.cc: Free used mutexes sql/my_lock.c: Fixes for Netware sql/mysql_priv.h: Fixes for Netware sql/mysqld.cc: Fixes for Netware Added Have_crypt Properly free mutexes from MYSQL_LOG by calling cleanup Free mutex before exit sql/repl_failsafe.cc: Fixes for Netware sql/set_var.cc: Added have_crypt sql/share/english/errmsg.txt: Added version socket and port to stderr log sql/slave.cc: Remove global MASTER_INFO variable and use instead an allocated variable. This allows us to correctly free used mutex. sql/slave.h: Move constructors and destuctors to slave.cc (To make it easier to clear all needed variables) sql/sql_base.cc: Safety fix sql/sql_class.h: Portability fixes. Added 'cleanup' to log handling to be able to free mutexes. sql/sql_insert.cc: Fixes for Netware mysys/my_sleep.c: E sql/sql_parse.cc: Fixes for Netware sql/sql_select.cc: Added optimisation for ORDER BY NULL sql/sql_select.h: Fixed bug in create_tmp_field() which causes a memory overrun sql/sql_table.cc: Fixed bug in create_tmp_field() which causes a memory overrun sql/sql_udf.cc: Free mutex on end vio/test-ssl.c: Simple code cleanup vio/test-sslclient.c: Simple code cleanup vio/test-sslserver.c: Simple code cleanup vio/viotest-ssl.c: Simple code cleanup
This commit is contained in:
unknown
@ -1,4 +1,4 @@
|
||||
/* Copyright (C) Yuri Dario & 2000 MySQL AB
|
||||
/* Copyright (C) Yuri Dario & 2000-2003 MySQL AB
|
||||
All the above parties has a full, independent copyright to
|
||||
the following code, including the right to use the code in
|
||||
any manner without any demands from the other parties.
|
||||
@ -18,77 +18,79 @@
|
||||
Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
|
||||
MA 02111-1307, USA */
|
||||
|
||||
|
||||
/* Win32 directory search emulation */
|
||||
|
||||
#if defined(OS2)
|
||||
|
||||
//#define _DEBUG
|
||||
|
||||
long _findfirst( char* path, struct _finddata_t* dos_file)
|
||||
{
|
||||
HDIR hdir = HDIR_CREATE;
|
||||
APIRET rc;
|
||||
FILEFINDBUF3 buf3;
|
||||
ULONG entries = 1;
|
||||
HDIR hdir = HDIR_CREATE;
|
||||
APIRET rc;
|
||||
FILEFINDBUF3 buf3;
|
||||
ULONG entries = 1;
|
||||
|
||||
#ifdef _DEBUG
|
||||
printf( "_findfirst path %s\n", path);
|
||||
printf( "_findfirst path %s\n", path);
|
||||
#endif
|
||||
|
||||
memset( &buf3, 0, sizeof( buf3));
|
||||
rc = DosFindFirst(
|
||||
path, /* Address of the ASCIIZ path name of the file or subdirectory to be found. */
|
||||
&hdir, /* Address of the handle associated with this DosFindFirst request. */
|
||||
FILE_NORMAL | FILE_DIRECTORY, /* Attribute value that determines the file objects to be searched for. */
|
||||
&buf3, /* Result buffer. */
|
||||
sizeof( buf3), /* The length, in bytes, of pfindbuf. */
|
||||
&entries, /* Pointer to the number of entries: */
|
||||
FIL_STANDARD); /* The level of file information required. */
|
||||
memset( &buf3, 0, sizeof( buf3));
|
||||
rc = DosFindFirst(
|
||||
path, /* The ASCIIZ path name of the file or subdirectory to be found. */
|
||||
&hdir, /* The handle associated with this DosFindFirst request. */
|
||||
FILE_NORMAL | FILE_DIRECTORY, /* Attribute value that determines the file objects to be searched for. */
|
||||
&buf3, /* Result buffer. */
|
||||
sizeof( buf3), /* The length, in bytes, of pfindbuf. */
|
||||
&entries, /* Pointer to the number of entries: */
|
||||
FIL_STANDARD); /* The level of file information required. */
|
||||
|
||||
#ifdef _DEBUG
|
||||
printf( "_findfirst rc=%d hdir=%d entries=%d->%s\n", rc, hdir, entries, buf3.achName);
|
||||
printf( "_findfirst rc=%d hdir=%d entries=%d->%s\n", rc, hdir, entries,
|
||||
buf3.achName);
|
||||
#endif
|
||||
|
||||
if (rc /* && entries == 0 */)
|
||||
return -1;
|
||||
if (rc /* && entries == 0 */)
|
||||
return -1;
|
||||
|
||||
if (dos_file) {
|
||||
memset( dos_file, 0, sizeof( struct _finddata_t));
|
||||
strcpy( dos_file->name, buf3.achName);
|
||||
dos_file->size = buf3.cbFile;
|
||||
dos_file->attrib = buf3.attrFile;
|
||||
}
|
||||
return (ULONG) hdir;
|
||||
if (dos_file)
|
||||
{
|
||||
memset( dos_file, 0, sizeof( struct _finddata_t));
|
||||
strcpy( dos_file->name, buf3.achName);
|
||||
dos_file->size = buf3.cbFile;
|
||||
dos_file->attrib = buf3.attrFile;
|
||||
}
|
||||
return (ULONG) hdir;
|
||||
}
|
||||
|
||||
|
||||
long _findnext( long hdir, struct _finddata_t* dos_file)
|
||||
{
|
||||
APIRET rc;
|
||||
FILEFINDBUF3 buf3;
|
||||
ULONG entries = 1;
|
||||
APIRET rc;
|
||||
FILEFINDBUF3 buf3;
|
||||
ULONG entries = 1;
|
||||
|
||||
memset( &buf3, 0, sizeof( buf3));
|
||||
rc = DosFindNext(
|
||||
hdir,
|
||||
&buf3, /* Result buffer. */
|
||||
sizeof( buf3), /* The length, in bytes, of pfindbuf. */
|
||||
&entries); /* Pointer to the number of entries: */
|
||||
memset( &buf3, 0, sizeof( buf3));
|
||||
rc = DosFindNext(hdir,
|
||||
&buf3, /* Result buffer. */
|
||||
sizeof( buf3), /* Length, in bytes, of pfindbuf. */
|
||||
&entries); /* Pointer to the number of entries */
|
||||
|
||||
#ifdef _DEBUG
|
||||
printf( "_findnext rc=%d hdir=%d entries=%d->%s\n", rc, hdir, entries, buf3.achName);
|
||||
printf( "_findnext rc=%d hdir=%d entries=%d->%s\n", rc, hdir, entries,
|
||||
buf3.achName);
|
||||
#endif
|
||||
|
||||
if (rc /* && entries == 0 */)
|
||||
return -1;
|
||||
if (rc /* && entries == 0 */)
|
||||
return -1;
|
||||
|
||||
if (dos_file) {
|
||||
memset( dos_file, 0, sizeof( struct _finddata_t));
|
||||
strcpy( dos_file->name, buf3.achName);
|
||||
dos_file->size = buf3.cbFile;
|
||||
dos_file->attrib = buf3.attrFile;
|
||||
}
|
||||
return 0;
|
||||
if (dos_file)
|
||||
{
|
||||
memset( dos_file, 0, sizeof( struct _finddata_t));
|
||||
strcpy( dos_file->name, buf3.achName);
|
||||
dos_file->size = buf3.cbFile;
|
||||
dos_file->attrib = buf3.attrFile;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
void _findclose( long hdir)
|
||||
@ -101,82 +103,82 @@ void _findclose( long hdir)
|
||||
#endif
|
||||
}
|
||||
|
||||
DIR* opendir( char* path)
|
||||
DIR* opendir(char* path)
|
||||
{
|
||||
DIR* dir = (DIR*) calloc( 1, sizeof( DIR));
|
||||
char buffer[260];
|
||||
APIRET rc;
|
||||
ULONG entries = 1;
|
||||
DIR* dir = (DIR*) calloc(1, sizeof( DIR));
|
||||
char buffer[260];
|
||||
APIRET rc;
|
||||
ULONG entries = 1;
|
||||
|
||||
strcpy( buffer, path);
|
||||
strcat( buffer, "*.*");
|
||||
strmov(strmov(buffer, path), "*.*");
|
||||
|
||||
#ifdef _DEBUG
|
||||
printf( "_findfirst path %s\n", buffer);
|
||||
printf( "_findfirst path %s\n", buffer);
|
||||
#endif
|
||||
|
||||
dir->hdir = HDIR_CREATE;
|
||||
memset( &dir->buf3, 0, sizeof( dir->buf3));
|
||||
rc = DosFindFirst(
|
||||
buffer, /* Address of the ASCIIZ path name of the file or subdirectory to be found. */
|
||||
&dir->hdir, /* Address of the handle associated with this DosFindFirst request. */
|
||||
FILE_NORMAL | FILE_DIRECTORY, /* Attribute value that determines the file objects to be searched for. */
|
||||
&dir->buf3, /* Result buffer. */
|
||||
sizeof( dir->buf3), /* The length, in bytes, of pfindbuf. */
|
||||
&entries, /* Pointer to the number of entries: */
|
||||
FIL_STANDARD); /* The level of file information required. */
|
||||
dir->hdir = HDIR_CREATE;
|
||||
memset( &dir->buf3, 0, sizeof( dir->buf3));
|
||||
rc = DosFindFirst(
|
||||
buffer, /* Address of the ASCIIZ path name of the file or subdirectory to be found. */
|
||||
&dir->hdir, /* Address of the handle associated with this DosFindFirst request. */
|
||||
FILE_NORMAL | FILE_DIRECTORY, /* Attribute value that determines the file objects to be searched for. */
|
||||
&dir->buf3, /* Result buffer. */
|
||||
sizeof( dir->buf3), /* The length, in bytes, of pfindbuf. */
|
||||
&entries, /* Pointer to the number of entries: */
|
||||
FIL_STANDARD); /* The level of file information required. */
|
||||
|
||||
#ifdef _DEBUG
|
||||
printf( "opendir rc=%d hdir=%d entries=%d->%s\n", rc, dir->hdir, entries, dir->buf3.achName);
|
||||
printf( "opendir rc=%d hdir=%d entries=%d->%s\n", rc, dir->hdir, entries, dir->buf3.achName);
|
||||
#endif
|
||||
|
||||
if (rc /* && entries == 0 */)
|
||||
return NULL;
|
||||
if (rc /* && entries == 0 */)
|
||||
return NULL;
|
||||
|
||||
return dir;
|
||||
return dir;
|
||||
}
|
||||
|
||||
|
||||
struct dirent* readdir( DIR* dir)
|
||||
{
|
||||
APIRET rc;
|
||||
//FILEFINDBUF3 buf3;
|
||||
ULONG entries = 1;
|
||||
APIRET rc;
|
||||
ULONG entries = 1;
|
||||
|
||||
if (!dir->buf3.achName[0]) // file not found on previous query
|
||||
return NULL;
|
||||
if (!dir->buf3.achName[0]) /* file not found on previous query */
|
||||
return NULL;
|
||||
|
||||
// copy last file name
|
||||
strcpy( dir->ent.d_name, dir->buf3.achName);
|
||||
/* copy last file name */
|
||||
strcpy( dir->ent.d_name, dir->buf3.achName);
|
||||
|
||||
// query next file
|
||||
memset( &dir->buf3, 0, sizeof( dir->buf3));
|
||||
rc = DosFindNext(
|
||||
dir->hdir,
|
||||
&dir->buf3, /* Result buffer. */
|
||||
sizeof( dir->buf3), /* The length, in bytes, of pfindbuf. */
|
||||
&entries); /* Pointer to the number of entries: */
|
||||
/* query next file */
|
||||
memset( &dir->buf3, 0, sizeof( dir->buf3));
|
||||
rc= DosFindNext(
|
||||
dir->hdir,
|
||||
&dir->buf3, /* Result buffer. */
|
||||
sizeof(dir->buf3), /* Length, in bytes, of pfindbuf. */
|
||||
&entries); /* Pointer to the number of entries */
|
||||
|
||||
#ifdef _DEBUG
|
||||
printf( "_findnext rc=%d hdir=%d entries=%d->%s\n", rc, dir->hdir, entries, dir->buf3.achName);
|
||||
printf( "_findnext rc=%d hdir=%d entries=%d->%s\n", rc, dir->hdir, entries,
|
||||
dir->buf3.achName);
|
||||
#endif
|
||||
|
||||
if (rc /* && entries == 0 */)
|
||||
strcpy( dir->buf3.achName, ""); // reset name for next query
|
||||
if (rc /* && entries == 0 */)
|
||||
*dir->buf3.achName= 0; /* reset name for next query */
|
||||
|
||||
return &dir->ent;
|
||||
return &dir->ent;
|
||||
}
|
||||
|
||||
|
||||
int closedir (DIR *dir)
|
||||
{
|
||||
APIRET rc;
|
||||
APIRET rc;
|
||||
|
||||
rc = DosFindClose( dir->hdir);
|
||||
rc = DosFindClose( dir->hdir);
|
||||
#ifdef _DEBUG
|
||||
printf( "_findclose rc=%d hdir=%d\n", rc, dir->hdir);
|
||||
printf( "_findclose rc=%d hdir=%d\n", rc, dir->hdir);
|
||||
#endif
|
||||
free(dir);
|
||||
return 0;
|
||||
free(dir);
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
#endif // OS2
|
||||
#endif /* OS2 */
|
||||
|
||||
Reference in New Issue
Block a user