diff options
| author | unknown <bell@sanja.is.com.ua> | 2005-11-21 21:15:48 +0200 |
|---|---|---|
| committer | unknown <bell@sanja.is.com.ua> | 2005-11-21 21:15:48 +0200 |
| commit | faa0c00eba05bc549afa26d6b8c22767384d3cf1 (patch) | |
| tree | 3a8cc6b267e12ab825770b0f18f3a66f0cb1877f /sql/mysqld.cc | |
| parent | 789340bc5fc3b996f79593442e116554d52f84f2 (diff) | |
| parent | fe63e095816a744950e3a3f6d978f074fd3fcd93 (diff) | |
| download | mariadb-git-faa0c00eba05bc549afa26d6b8c22767384d3cf1.tar.gz | |
Merge sanja.is.com.ua:/home/bell/mysql/bk/work-bug1-5.0
into sanja.is.com.ua:/home/bell/mysql/bk/work-merge-5.0
sql/ha_federated.cc:
Auto merged
sql/handler.cc:
Auto merged
sql/item.cc:
Auto merged
sql/item.h:
Auto merged
sql/item_func.cc:
Auto merged
sql/item_timefunc.cc:
Auto merged
sql/log.cc:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sp_head.cc:
Auto merged
sql/spatial.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_prepare.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_show.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/sql_view.cc:
Auto merged
Diffstat (limited to 'sql/mysqld.cc')
| -rw-r--r-- | sql/mysqld.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc index b22330152e8..35032d1ec41 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -496,6 +496,8 @@ pthread_cond_t COND_refresh,COND_thread_count; pthread_t signal_thread; pthread_attr_t connection_attrib; +File_parser_dummy_hook file_parser_dummy_hook; + /* replication parameters, if master_host is not NULL, we are a slave */ uint master_port= MYSQL_PORT, master_connect_retry = 60; uint report_port= MYSQL_PORT; |