Kouhei Sutou
null+****@clear*****
Sun May 19 22:36:49 JST 2013
Kouhei Sutou 2013-05-19 22:36:49 +0900 (Sun, 19 May 2013) New Revision: e61674d6c5069c47df41bfc6fbb4d95c9746a466 https://github.com/mroonga/mroonga/commit/e61674d6c5069c47df41bfc6fbb4d95c9746a466 Message: Update the patch for MariaDB to work with mroonga on Windows fixes #1691 Modified files: packages/source/patches/mariadb-10.0.2-windows-build.diff Modified: packages/source/patches/mariadb-10.0.2-windows-build.diff (+47 -0) =================================================================== --- packages/source/patches/mariadb-10.0.2-windows-build.diff 2013-05-19 22:22:34 +0900 (c135088) +++ packages/source/patches/mariadb-10.0.2-windows-build.diff 2013-05-19 22:36:49 +0900 (327da7d) @@ -1,3 +1,38 @@ +diff -ur mariadb-10.0.2.orig/include/my_time.h mariadb-10.0.2/include/my_time.h +--- mariadb-10.0.2.orig/include/my_time.h 2013-04-23 13:13:59.000000000 +0900 ++++ mariadb-10.0.2/include/my_time.h 2013-05-19 22:27:02.711998196 +0900 +@@ -26,7 +26,7 @@ + + C_MODE_START + +-extern ulonglong log_10_int[20]; ++extern MYSQL_PLUGIN_IMPORT ulonglong log_10_int[20]; + extern uchar days_in_month[]; + + /* +diff -ur mariadb-10.0.2.orig/sql/rpl_filter.h mariadb-10.0.2/sql/rpl_filter.h +--- mariadb-10.0.2.orig/sql/rpl_filter.h 2013-04-23 13:13:57.000000000 +0900 ++++ mariadb-10.0.2/sql/rpl_filter.h 2013-05-19 22:27:20.363552564 +0900 +@@ -141,6 +141,6 @@ + }; + + extern Rpl_filter *global_rpl_filter; +-extern Rpl_filter *binlog_filter; ++extern MYSQL_PLUGIN_IMPORT Rpl_filter *binlog_filter; + + #endif // RPL_FILTER_H +diff -ur mariadb-10.0.2.orig/sql/sql_base.h mariadb-10.0.2/sql/sql_base.h +--- mariadb-10.0.2.orig/sql/sql_base.h 2013-04-23 13:13:57.000000000 +0900 ++++ mariadb-10.0.2/sql/sql_base.h 2013-05-19 22:28:54.397172092 +0900 +@@ -69,7 +69,7 @@ + #define RTFC_WAIT_OTHER_THREAD_FLAG 0x0002 + #define RTFC_CHECK_KILLED_FLAG 0x0004 + +-extern HASH table_def_cache; ++extern MYSQL_PLUGIN_IMPORT HASH table_def_cache; + + bool check_dup(const char *db, const char *name, TABLE_LIST *tables); + extern mysql_mutex_t LOCK_open; diff -ur mariadb-10.0.2.orig/sql/sql_locale.cc mariadb-10.0.2/sql/sql_locale.cc --- mariadb-10.0.2.orig/sql/sql_locale.cc 2013-04-23 13:13:59.000000000 +0900 +++ mariadb-10.0.2/sql/sql_locale.cc 2013-05-19 12:55:27.590366542 +0900 @@ -7,3 +42,15 @@ diff -ur mariadb-10.0.2.orig/sql/sql_locale.cc mariadb-10.0.2/sql/sql_locale.cc This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by +diff -ur mariadb-10.0.2.orig/sql/tztime.h mariadb-10.0.2/sql/tztime.h +--- mariadb-10.0.2.orig/sql/tztime.h 2013-04-23 13:13:59.000000000 +0900 ++++ mariadb-10.0.2/sql/tztime.h 2013-05-19 22:27:55.286668590 +0900 +@@ -72,7 +72,7 @@ + static inline void adjust_leap_second(MYSQL_TIME *t); + }; + +-extern Time_zone * my_tz_UTC; ++extern MYSQL_PLUGIN_IMPORT Time_zone * my_tz_UTC; + extern Time_zone * my_tz_SYSTEM; + extern Time_zone * my_tz_OFFSET0; + extern Time_zone * my_tz_find(THD *thd, const String *name); -------------- next part -------------- HTML����������������������������...ダウンロード
