diff options
| author | unknown <jamppa@bk-internal.mysql.com> | 2007-04-17 15:45:35 +0200 |
|---|---|---|
| committer | unknown <jamppa@bk-internal.mysql.com> | 2007-04-17 15:45:35 +0200 |
| commit | 9340cb193e40516d051f02cdd074dd30b99816a4 (patch) | |
| tree | 87310f47abe960fdb7ddb0d4d388995eb3ce601b /sql/ha_ndbcluster.h | |
| parent | cc76701e8f47ca52ca209150f49ba665a215c1d0 (diff) | |
| parent | 9c0097fa8b4b5adc593797166fcd6f5ea53fca19 (diff) | |
| download | mariadb-git-9340cb193e40516d051f02cdd074dd30b99816a4.tar.gz | |
Merge bk-internal.mysql.com:/data0/bk/mysql-5.1
into bk-internal.mysql.com:/data0/bk/mysql-5.1-marvel
mysql-test/r/strict.result:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/item.cc:
Auto merged
sql/item.h:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/sql_delete.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_table.cc:
Auto merged
Diffstat (limited to 'sql/ha_ndbcluster.h')
| -rw-r--r-- | sql/ha_ndbcluster.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sql/ha_ndbcluster.h b/sql/ha_ndbcluster.h index fe79135a47d..72e03fc2edd 100644 --- a/sql/ha_ndbcluster.h +++ b/sql/ha_ndbcluster.h @@ -1004,4 +1004,6 @@ void ndbcluster_print_error(int error, const NdbOperation *error_op); static const char ndbcluster_hton_name[]= "ndbcluster"; static const int ndbcluster_hton_name_length=sizeof(ndbcluster_hton_name)-1; - +extern int ndbcluster_terminating; +extern int ndb_util_thread_running; +extern pthread_cond_t COND_ndb_util_ready; |