database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-09-02 09:41:40 +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

7
server-tools/instance-manager/guardian.cc
View File

@@ -33,18 +33,13 @@
C_MODE_START
pthread_handler_decl(guardian, arg)
pthread_handler_t guardian(void *arg)
{
Guardian_thread *guardian_thread= (Guardian_thread *) arg;
guardian_thread->run();
return 0;
}
C_MODE_END
Guardian_thread::Guardian_thread(Thread_registry &thread_registry_arg,
Instance_map *instance_map_arg,
uint monitoring_interval_arg) :

6
server-tools/instance-manager/guardian.h
View File

@@ -31,11 +31,7 @@ class Instance_map;
class Thread_registry;
struct GUARD_NODE;
C_MODE_START
pthread_handler_decl(guardian, arg);
C_MODE_END
pthread_handler_t guardian(void *arg);
struct Guardian_thread_args
{

7
server-tools/instance-manager/instance.cc
View File

@@ -43,8 +43,6 @@ typedef pid_t My_process_info;
typedef PROCESS_INFORMATION My_process_info;
#endif
C_MODE_START
/*
Proxy thread is a simple way to avoid all pitfalls of the threads
implementation in the OS (e.g. LinuxThreads). With such a thread we
@@ -52,7 +50,7 @@ C_MODE_START
to do it in a portable way.
*/
pthread_handler_decl(proxy, arg)
pthread_handler_t proxy(void *arg)
{
Instance *instance= (Instance *) arg;
start_and_monitor_instance(&instance->options,
@@ -60,9 +58,6 @@ pthread_handler_decl(proxy, arg)
return 0;
}
C_MODE_END
/*
Wait for an instance

8
server-tools/instance-manager/listener.cc
View File

@@ -372,10 +372,7 @@ void Listener_thread::handle_new_mysql_connection(Vio *vio)
}
C_MODE_START
pthread_handler_decl(listener, arg)
pthread_handler_t listener(void *arg)
{
Listener_thread_args *args= (Listener_thread_args *) arg;
Listener_thread listener(*args);
@@ -387,6 +384,3 @@ pthread_handler_decl(listener, arg)
return 0;
}
C_MODE_END

6
server-tools/instance-manager/listener.h
View File

@@ -24,11 +24,7 @@
#include <my_pthread.h>
C_MODE_START
pthread_handler_decl(listener, arg);
C_MODE_END
pthread_handler_t listener(void *arg);
class Thread_registry;
struct Options;

9
server-tools/instance-manager/mysql_connection.cc
View File

@@ -15,7 +15,7 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
#if defined(__GNUC__) && defined(USE_PRAGMA_IMPLEMENTATION)
#pragma interface
#pragma implementation
#endif
#include "mysql_connection.h"
@@ -364,9 +364,7 @@ int Mysql_connection_thread::dispatch_command(enum enum_server_command command,
}
C_MODE_START
pthread_handler_decl(mysql_connection, arg)
pthread_handler_t mysql_connection(void *arg)
{
Mysql_connection_thread_args *args= (Mysql_connection_thread_args *) arg;
Mysql_connection_thread mysql_connection_thread(*args);
@@ -381,9 +379,6 @@ pthread_handler_decl(mysql_connection, arg)
return 0;
}
C_MODE_END
/*
vim: fdm=marker
*/

7
server-tools/instance-manager/mysql_connection.h
View File

@@ -24,12 +24,7 @@
#include <my_pthread.h>
C_MODE_START
pthread_handler_decl(mysql_connection, arg);
C_MODE_END
pthread_handler_t mysql_connection(void *arg);
class Thread_registry;
class User_map;

2
server-tools/instance-manager/user_map.cc
View File

@@ -15,7 +15,7 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
#if defined(__GNUC__) && defined(USE_PRAGMA_IMPLEMENTATION)
#pragma interface
#pragma implementation
#endif
#include "user_map.h"