diff options
| author | brian@zim.(none) <> | 2006-08-25 14:07:30 -0700 |
|---|---|---|
| committer | brian@zim.(none) <> | 2006-08-25 14:07:30 -0700 |
| commit | 7216b5bc7a64533634b234f521ee8ce9bf7c9417 (patch) | |
| tree | f2bea38f12b4ec4b52b8886dacb59249b306d9f7 /storage/csv | |
| parent | 257ce16d58c5f375ca026cf05f97d5ded77851eb (diff) | |
| parent | e831273902da0af8d48eab4b76a7c77a06fbc1aa (diff) | |
| download | mariadb-git-7216b5bc7a64533634b234f521ee8ce9bf7c9417.tar.gz | |
Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1
into zim.(none):/home/brian/mysql/arch-5.1
Diffstat (limited to 'storage/csv')
| -rw-r--r-- | storage/csv/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | storage/csv/ha_tina.cc | 1 | ||||
| -rw-r--r-- | storage/csv/plug.in | 5 |
3 files changed, 7 insertions, 0 deletions
diff --git a/storage/csv/CMakeLists.txt b/storage/csv/CMakeLists.txt index 28748527cc3..55e9b50fbfc 100644 --- a/storage/csv/CMakeLists.txt +++ b/storage/csv/CMakeLists.txt @@ -2,5 +2,6 @@ SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DSAFEMALLOC -DSAFE_MUTEX") SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -DSAFEMALLOC -DSAFE_MUTEX") INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include ${CMAKE_SOURCE_DIR}/sql + ${CMAKE_SOURCE_DIR}/regex ${CMAKE_SOURCE_DIR}/extra/yassl/include) ADD_LIBRARY(csv ha_tina.cc ha_tina.h) diff --git a/storage/csv/ha_tina.cc b/storage/csv/ha_tina.cc index 5d18ed99a9a..2fe2afeb470 100644 --- a/storage/csv/ha_tina.cc +++ b/storage/csv/ha_tina.cc @@ -157,6 +157,7 @@ static int tina_init_func() VOID(pthread_mutex_init(&tina_mutex,MY_MUTEX_INIT_FAST)); (void) hash_init(&tina_open_tables,system_charset_info,32,0,0, (hash_get_key) tina_get_key,0,0); + bzero(&tina_hton, sizeof(handlerton)); tina_hton.state= SHOW_OPTION_YES; tina_hton.db_type= DB_TYPE_CSV_DB; tina_hton.create= tina_create_handler; diff --git a/storage/csv/plug.in b/storage/csv/plug.in new file mode 100644 index 00000000000..bbc69680fcd --- /dev/null +++ b/storage/csv/plug.in @@ -0,0 +1,5 @@ +MYSQL_STORAGE_ENGINE(csv,, [CSV Storage Engine], + [Stores tables in text CSV format]) +MYSQL_PLUGIN_DIRECTORY(csv, [storage/csv]) +MYSQL_PLUGIN_STATIC(csv, [libcsv.a]) +MYSQL_PLUGIN_MANDATORY(csv) dnl Used for logging |