diff options
| author | unknown <bell@sanja.is.com.ua> | 2005-09-21 08:31:20 +0300 |
|---|---|---|
| committer | unknown <bell@sanja.is.com.ua> | 2005-09-21 08:31:20 +0300 |
| commit | ce025393a24968b360a959b80f422d4fc5a4610c (patch) | |
| tree | 13901d965a5065b3d350ea82ce6d2095da928e7c | |
| parent | 21a62eb1c6a281b72c24bb9a7d5af702a5b3d8d5 (diff) | |
| parent | f679e33cf98a7ebd57bb1d4bd3a0eae78def5e5f (diff) | |
| download | mariadb-git-ce025393a24968b360a959b80f422d4fc5a4610c.tar.gz | |
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0
into sanja.is.com.ua:/home/bell/mysql/bk/work-owner5-5.0
| -rwxr-xr-x | BUILD/SETUP.sh | 5 | ||||
| -rw-r--r-- | sql/handler.cc | 2 |
2 files changed, 3 insertions, 4 deletions
diff --git a/BUILD/SETUP.sh b/BUILD/SETUP.sh index 1bf3bad5abe..4c8a8839bdf 100755 --- a/BUILD/SETUP.sh +++ b/BUILD/SETUP.sh @@ -52,9 +52,8 @@ global_warnings="-Wimplicit -Wreturn-type -Wswitch -Wtrigraphs -Wcomment -W -Wch #debug_extra_warnings="-Wuninitialized" c_warnings="$global_warnings -Wunused" cxx_warnings="$global_warnings -Woverloaded-virtual -Wsign-promo -Wreorder -Wctor-dtor-privacy -Wnon-virtual-dtor" - -base_max_configs="--with-innodb --with-berkeley-db --with-ndbcluster --with-archive-storage-engine --with-openssl --with-big-tables --with-blackhole-storage-engine --with-federated-storage-engine" -max_leave_isam_configs="--with-innodb --with-berkeley-db --with-ndbcluster --with-archive-storage-engine --with-federated-storage-engine --with-blackhole-storage-engine --with-openssl --with-embedded-server --with-big-tables" +base_max_configs="--with-innodb --with-berkeley-db --with-ndbcluster --with-archive-storage-engine --with-openssl --with-big-tables --with-blackhole-storage-engine --with-federated-storage-engine --with-csv-storage-engine" +max_leave_isam_configs="--with-innodb --with-berkeley-db --with-ndbcluster --with-archive-storage-engine --with-federated-storage-engine --with-blackhole-storage-engine --with-csv-storage-engine --with-openssl --with-embedded-server --with-big-tables" max_configs="$base_max_configs --with-embedded-server" path=`dirname $0` diff --git a/sql/handler.cc b/sql/handler.cc index 34ce7e60eba..5f8fa33fecc 100644 --- a/sql/handler.cc +++ b/sql/handler.cc @@ -511,7 +511,7 @@ int ha_init() break; #endif #ifdef HAVE_CSV_DB - case DB_TYPE_CSV_DB,: + case DB_TYPE_CSV_DB: types->ht= &tina_hton; break; #endif |