Kouhei Sutou
null+****@clear*****
Tue Mar 17 22:03:58 JST 2015
Kouhei Sutou 2015-03-17 22:03:58 +0900 (Tue, 17 Mar 2015) New Revision: 82d11c9c9c1713d872130c401edd70409c5e66fe https://github.com/mroonga/mroonga/commit/82d11c9c9c1713d872130c401edd70409c5e66fe Message: mysql57: follow strmov() API change Modified files: mrn_mysql_compat.h mrn_table.cpp Modified: mrn_mysql_compat.h (+6 -0) =================================================================== --- mrn_mysql_compat.h 2015-03-17 21:58:15 +0900 (a9f841f) +++ mrn_mysql_compat.h 2015-03-17 22:03:58 +0900 (6c45e77) @@ -194,4 +194,10 @@ # define UINT_MAX64 LONGLONG_MAX #endif +#if MYSQL_VERSION_ID >= 50706 && !defined(MRN_MARIADB_P) +# define mrn_my_stpmov(dst, src) my_stpmov(dst, src) +#else +# define mrn_my_stpmov(dst, src) strmov(dst, src) +#endif + #endif /* MRN_MYSQL_COMPAT_H_ */ Modified: mrn_table.cpp (+1 -1) =================================================================== --- mrn_table.cpp 2015-03-17 21:58:15 +0900 (c925659) +++ mrn_table.cpp 2015-03-17 22:03:58 +0900 (c7f4254) @@ -856,7 +856,7 @@ MRN_SHARE *mrn_get_share(const char *table_name, TABLE *table, int *error) share->col_flags_length = col_flags_length; share->col_type = col_type; share->col_type_length = col_type_length; - strmov(share->table_name, table_name); + mrn_my_stpmov(share->table_name, table_name); share->table_share = table->s; if ( -------------- next part -------------- HTML����������������������������...下载
