diff options
| author | unknown <serg@serg.mylan> | 2005-10-09 19:10:19 +0200 |
|---|---|---|
| committer | unknown <serg@serg.mylan> | 2005-10-09 19:10:19 +0200 |
| commit | 28a5775b0812384769a57aaec40430f35af0fa3c (patch) | |
| tree | 77b39ce261df192477ba9a78f82bed28feb11e3e /sql/repl_failsafe.cc | |
| parent | 6666f9ba7958bc88866552ce574c4d22634c6d18 (diff) | |
| parent | 20a6f1524aef600d4dc39b9826ddcc4663a8049f (diff) | |
| download | mariadb-git-28a5775b0812384769a57aaec40430f35af0fa3c.tar.gz | |
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
Diffstat (limited to 'sql/repl_failsafe.cc')
| -rw-r--r-- | sql/repl_failsafe.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/repl_failsafe.cc b/sql/repl_failsafe.cc index 93aafbdc0e0..35035a8b5a5 100644 --- a/sql/repl_failsafe.cc +++ b/sql/repl_failsafe.cc @@ -579,7 +579,7 @@ int find_recovery_captain(THD* thd, MYSQL* mysql) } -pthread_handler_decl(handle_failsafe_rpl,arg) +pthread_handler_t handle_failsafe_rpl(void *arg) { DBUG_ENTER("handle_failsafe_rpl"); THD *thd = new THD; |