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

Merge serg.mylan:/usr/home/serg/Abk/mysql-5.0

Browse Source 
into serg.mylan:/usr/home/serg/Abk/mysql-5.1


VC++Files/libmysqld/libmysqld.dsp:
  Auto merged
VC++Files/sql/mysqld.dsp:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/repl_failsafe.cc:
  Auto merged
sql/slave.cc:
  Auto merged
sql/slave.h:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
storage/myisam/ft_nlq_search.c:
  Auto merged
storage/myisam/myisamdef.h:
  Auto merged
storage/myisam/sort.c:
  Auto merged
storage/ndb/src/mgmsrv/Services.cpp:
  Auto merged
storage/ndb/src/ndbapi/ndb_cluster_connection.cpp:
  Auto merged
This commit is contained in:
unknown
2005-10-09 19:10:19 +02:00
parent 6666f9ba79 20a6f1524a
commit 28a5775b08
42 changed files with 361 additions and 408 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
VC++Files/libmysqld/libmysqld.dsp
View File

@ -396,10 +396,6 @@ SOURCE=..\sql\protocol.cpp
# End Source File
# Begin Source File
SOURCE=..\sql\protocol_cursor.cpp
# End Source File
# Begin Source File
SOURCE=..\sql\records.cpp
# End Source File
# Begin Source File

4
VC++Files/sql/mysqld.dsp
View File

@ -1279,10 +1279,6 @@ SOURCE=.\protocol.cpp
# End Source File
# Begin Source File
SOURCE=.\protocol_cursor.cpp
# End Source File
# Begin Source File
SOURCE=.\records.cpp
!IF "$(CFG)" == "mysqld - Win32 Release"

4
VC++Files/test1/mysql_thr.c
View File

@ -33,7 +33,7 @@ typedef CRITICAL_SECTION pthread_mutex_t;
#define pthread_mutex_lock(A) (EnterCriticalSection(A),0)
#define pthread_mutex_unlock(A) LeaveCriticalSection(A)
#define pthread_mutex_destroy(A) DeleteCriticalSection(A)
#define pthread_handler_decl(A,B) unsigned __cdecl A(void *B)
#define pthread_handler_t unsigned __cdecl *
typedef unsigned (__cdecl *pthread_handler)(void *);
#define pthread_self() GetCurrentThread()
@ -155,7 +155,7 @@ int _my_errno(void)
** The test program
*****************************************************************************/
pthread_handler_decl(test_thread,arg)
pthread_handler_t test_thread(void *arg)
{
MYSQL mysql;
MYSQL_RES *res;

4
VC++Files/thr_test/thr_test.c
View File

@ -44,7 +44,7 @@ typedef CRITICAL_SECTION pthread_mutex_t;
#define pthread_mutex_lock(A) (EnterCriticalSection(A),0)
#define pthread_mutex_unlock(A) LeaveCriticalSection(A)
#define pthread_mutex_destroy(A) DeleteCriticalSection(A)
#define pthread_handler_decl(A,B) unsigned __cdecl A(void *B)
#define pthread_handler_t unsigned __cdecl *
typedef unsigned (__cdecl *pthread_handler)(void *);
#define pthread_self() GetCurrentThread()
@ -174,7 +174,7 @@ int _my_errno(void)
** The test program
*****************************************************************************/
pthread_handler_decl(test_thread,arg)
pthread_handler_t test_thread(void *arg)
{
pthread_mutex_lock(&LOCK_thread_count);
thread_count--;