[Erp5-report] r41920 kazuhiko - /erp5/trunk/patches/

[nobody at svn.erp5.org]

Author: kazuhiko
Date: Sat Jan  1 21:04:37 2011
New Revision: 41920

URL: http://svn.erp5.org?rev=41920&view=rev
Log:
two patches for MariaDB.

Added:
    erp5/trunk/patches/HandlerSocket-Plugin-for-MySQL-1.0.6-mariadb.patch
    erp5/trunk/patches/groonga-storage-engine-0.4.mariadb.patch

Added: erp5/trunk/patches/HandlerSocket-Plugin-for-MySQL-1.0.6-mariadb.patch
URL: http://svn.erp5.org/erp5/trunk/patches/HandlerSocket-Plugin-for-MySQL-1.0.6-mariadb.patch?rev=41920&view=auto
==============================================================================
--- erp5/trunk/patches/HandlerSocket-Plugin-for-MySQL-1.0.6-mariadb.patch (added)
+++ erp5/trunk/patches/HandlerSocket-Plugin-for-MySQL-1.0.6-mariadb.patch [utf8] Sat Jan  1 21:04:37 2011
@@ -0,0 +1,37 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -28,7 +28,7 @@
+         MYSQL_INC="$MYSQL_INC -I$ac_mysql_source_dir/regex"
+         MYSQL_INC="$MYSQL_INC -I$ac_mysql_source_dir"
+         AC_SUBST(MYSQL_INC)
+-        MYSQL_SOURCE_VERSION=`cat $ac_mysql_source_dir/configure.in | grep "\[[MySQL Server\]]" | sed -e "s|.*\([[0-9]]\+\.[[0-9]]\+\.[[0-9]]\+[[0-9a-zA-Z\_\-]]*\).*|\1|"`
++        MYSQL_SOURCE_VERSION=`cat $ac_mysql_source_dir/configure.in | grep "\[[MariaDB Server\]]" | sed -e "s|.*\([[0-9]]\+\.[[0-9]]\+\.[[0-9]]\+[[0-9a-zA-Z\_\-]]*\).*|\1|"`
+         AC_MSG_RESULT([yes: Using $ac_mysql_source_dir, version $MYSQL_SOURCE_VERSION])
+       else
+         AC_MSG_ERROR([invalid MySQL source directory: $ac_mysql_source_dir])
+--- a/handlersocket/database.cpp
++++ b/handlersocket/database.cpp
+@@ -686,19 +686,19 @@
+   for (uint32_t i = 0; i < limit + skip; ++i) {
+     if (i == 0) {
+       const key_part_map kpm = (1U << args.kvalslen) - 1;
+-      r = hnd->index_read_map(table->record[0], key_buf, kpm, find_flag);
++      r = hnd->ha_index_read_map(table->record[0], key_buf, kpm, find_flag);
+     } else {
+       switch (find_flag) {
+       case HA_READ_BEFORE_KEY:
+       case HA_READ_KEY_OR_PREV:
+-	r = hnd->index_prev(table->record[0]);
++	r = hnd->ha_index_prev(table->record[0]);
+ 	break;
+       case HA_READ_AFTER_KEY:
+       case HA_READ_KEY_OR_NEXT:
+-	r = hnd->index_next(table->record[0]);
++	r = hnd->ha_index_next(table->record[0]);
+ 	break;
+       case HA_READ_KEY_EXACT:
+-	r = hnd->index_next_same(table->record[0], key_buf, kplen_sum);
++	r = hnd->ha_index_next_same(table->record[0], key_buf, kplen_sum);
+ 	break;
+       default:
+ 	r = HA_ERR_END_OF_FILE; /* to finish the loop */

Added: erp5/trunk/patches/groonga-storage-engine-0.4.mariadb.patch
URL: http://svn.erp5.org/erp5/trunk/patches/groonga-storage-engine-0.4.mariadb.patch?rev=41920&view=auto
==============================================================================
--- erp5/trunk/patches/groonga-storage-engine-0.4.mariadb.patch (added)
+++ erp5/trunk/patches/groonga-storage-engine-0.4.mariadb.patch [utf8] Sat Jan  1 21:04:37 2011
@@ -0,0 +1,14 @@
+diff -ur groonga-storage-engine-0.4.orig/configure groonga-storage-engine-0.4/configure
+--- groonga-storage-engine-0.4.orig/configure	2010-11-24 06:23:50.000000000 +0100
++++ groonga-storage-engine-0.4/configure	2011-01-01 16:01:07.000000000 +0100
+@@ -13925,8 +13925,8 @@
+     as_fn_error "failed to run \"$ac_mysql_config\": $plugindir" "$LINENO" 5
+   fi
+   MYSQL_INC="$MYSQL_INC $($ac_mysql_config --include)"
+-  ac_mysql_major_version="`$ac_mysql_config --version | cut -b 1-3`"
+-  if test "$ac_mysql_major_version" = "5.1"; then
++  ac_mysql_major_version="`$ac_mysql_config --version | cut -b 1,3`"
++  if test $ac_mysql_major_version -lt 55; then
+     MYSQL51="-DMYSQL51"
+ 
+   fi