Kouhei Sutou
null+****@clear*****
Tue Oct 8 14:41:55 JST 2013
Kouhei Sutou 2013-10-08 14:41:55 +0900 (Tue, 08 Oct 2013) New Revision: e424b6d781dd400a6dda6bf43e9c8b8ac8549b3b https://github.com/mroonga/mroonga/commit/e424b6d781dd400a6dda6bf43e9c8b8ac8549b3b Message: mariadb10.0.4: enable MYSQL_TYPE_XXX2 time related types MariaDB 10.0.4 backports them from MySQL 5.6. But MariaDB 10.0.4 doesn't use these types. It just uses them for reading MySQL 5.6 data. This change fixes the following warnings: ha_mroonga.cpp: In function ‘grn_builtin_type mrn_grn_type_from_field(grn_ctx*, Field*, bool)’: ha_mroonga.cpp:950:10: warning: enumeration value ‘MYSQL_TYPE_TIMESTAMP2’ not handled in switch [-Wswitch] switch (mysql_field_type) { ^ ha_mroonga.cpp:950:10: warning: enumeration value ‘MYSQL_TYPE_DATETIME2’ not handled in switch [-Wswitch] ha_mroonga.cpp:950:10: warning: enumeration value ‘MYSQL_TYPE_TIME2’ not handled in switch [-Wswitch] ha_mroonga.cpp: In member function ‘void ha_mroonga::storage_store_field(Field*, const char*, uint)’: ha_mroonga.cpp:9724:10: warning: enumeration value ‘MYSQL_TYPE_TIMESTAMP2’ not handled in switch [-Wswitch] switch (field->real_type()) { ^ ha_mroonga.cpp:9724:10: warning: enumeration value ‘MYSQL_TYPE_DATETIME2’ not handled in switch [-Wswitch] ha_mroonga.cpp:9724:10: warning: enumeration value ‘MYSQL_TYPE_TIME2’ not handled in switch [-Wswitch] lib/mrn_multiple_column_key_codec.cpp: In member function ‘void mrn::MultipleColumnKeyCodec::get_key_info(KEY_PART_INFO*, mrn::MultipleColumnKeyCodec::DataType*, uint*)’: lib/mrn_multiple_column_key_codec.cpp:294:12: warning: enumeration value ‘MYSQL_TYPE_TIMESTAMP2’ not handled in switch [-Wswitch] switch (field->real_type()) { ^ lib/mrn_multiple_column_key_codec.cpp:294:12: warning: enumeration value ‘MYSQL_TYPE_DATETIME2’ not handled in switch [-Wswitch] lib/mrn_multiple_column_key_codec.cpp:294:12: warning: enumeration value ‘MYSQL_TYPE_TIME2’ not handled in switch [-Wswitch] Modified files: mrn_mysql_compat.h Modified: mrn_mysql_compat.h (+1 -1) =================================================================== --- mrn_mysql_compat.h 2013-10-08 14:37:53 +0900 (96b7e5a) +++ mrn_mysql_compat.h 2013-10-08 14:41:55 +0900 (23321ce) @@ -31,7 +31,7 @@ # define mysql_mutex_unlock(mutex) pthread_mutex_unlock(mutex) #endif -#if MYSQL_VERSION_ID >= 50604 && !defined(MRN_MARIADB_P) +#if MYSQL_VERSION_ID >= 50604 # define MRN_HAVE_MYSQL_TYPE_TIMESTAMP2 # define MRN_HAVE_MYSQL_TYPE_DATETIME2 # define MRN_HAVE_MYSQL_TYPE_TIME2 -------------- next part -------------- HTML����������������������������...下載
