Commit 28a5775b authored by unknown's avatar unknown
Browse files

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

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
parents 6666f9ba 20a6f152

VC++Files/libmysqld/libmysqld.dsp

+0 −4
Original line number Diff line number Diff line
@@ -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

VC++Files/sql/mysqld.dsp

+0 −4
Original line number Diff line number Diff line
@@ -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"

VC++Files/test1/mysql_thr.c

+2 −2
Original line number Diff line number Diff line
@@ -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;

VC++Files/thr_test/thr_test.c

+2 −2
Original line number Diff line number Diff line
@@ -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--;

client/mysql.cc

+0 −1
Original line number Diff line number Diff line
@@ -1014,7 +1014,6 @@ static int read_and_execute(bool interactive) 
      unsigned long clen;

      do

      {

        line= my_cgets((char*)tmpbuf.ptr(), tmpbuf.alloced_length()-1, &clen);

        buffer.append(line, clen);

        /* 

           if we got buffer fully filled than there is a chance that