packages (MYSQL_5_0): mysql/mysql-sphinx.patch - update from ourdelta patch...
glen
glen at pld-linux.org
Thu Apr 8 22:58:46 CEST 2010
Author: glen Date: Thu Apr 8 20:58:46 2010 GMT
Module: packages Tag: MYSQL_5_0
---- Log message:
- update from ourdelta patches: sphinxsearch/sphinx_engine/sphinx.5.0.86.patch
no functional differences, just to stay updated
---- Files affected:
packages/mysql:
mysql-sphinx.patch (1.1.2.5 -> 1.1.2.6)
---- Diffs:
================================================================
Index: packages/mysql/mysql-sphinx.patch
diff -u packages/mysql/mysql-sphinx.patch:1.1.2.5 packages/mysql/mysql-sphinx.patch:1.1.2.6
--- packages/mysql/mysql-sphinx.patch:1.1.2.5 Sun Aug 10 22:36:20 2008
+++ packages/mysql/mysql-sphinx.patch Thu Apr 8 22:58:41 2010
@@ -1,6 +1,7 @@
-diff -BNru mysql-5.0.37/config/ac-macros/ha_sphinx.m4 mysql-5.0.37-sphinx/config/ac-macros/ha_sphinx.m4
---- mysql-5.0.37/config/ac-macros/ha_sphinx.m4 1969-12-31 16:00:00.000000000 -0800
-+++ mysql-5.0.37-sphinx/config/ac-macros/ha_sphinx.m4 2007-04-01 15:35:16.000000000 -0700
+Index: mysql-5.0.77/config/ac-macros/ha_sphinx.m4
+===================================================================
+--- /dev/null
++++ mysql-5.0.77/config/ac-macros/ha_sphinx.m4
@@ -0,0 +1,30 @@
+dnl ---------------------------------------------------------------------------
+dnl Macro: MYSQL_CHECK_EXAMPLEDB
@@ -32,10 +33,11 @@
+dnl END OF MYSQL_CHECK_EXAMPLE SECTION
+dnl ---------------------------------------------------------------------------
+
-diff -BNru mysql-5.0.37/configure.in mysql-5.0.37-sphinx/configure.in
---- mysql-5.0.37/configure.in 2007-03-05 11:21:13.000000000 -0800
-+++ mysql-5.0.37-sphinx/configure.in 2007-04-01 15:35:16.000000000 -0700
-@@ -45,6 +45,7 @@
+Index: mysql-5.0.77/configure.in
+===================================================================
+--- mysql-5.0.77.orig/configure.in
++++ mysql-5.0.77/configure.in
+@@ -58,6 +58,7 @@ sinclude(config/ac-macros/ha_archive.m4)
sinclude(config/ac-macros/ha_berkeley.m4)
sinclude(config/ac-macros/ha_blackhole.m4)
sinclude(config/ac-macros/ha_example.m4)
@@ -43,7 +45,7 @@
sinclude(config/ac-macros/ha_federated.m4)
sinclude(config/ac-macros/ha_innodb.m4)
sinclude(config/ac-macros/ha_ndbcluster.m4)
-@@ -2532,6 +2533,7 @@
+@@ -2644,6 +2645,7 @@ MYSQL_CHECK_MAX_INDEXES
MYSQL_CHECK_BDB
MYSQL_CHECK_INNODB
MYSQL_CHECK_EXAMPLEDB
@@ -51,10 +53,11 @@
MYSQL_CHECK_ARCHIVEDB
MYSQL_CHECK_CSVDB
MYSQL_CHECK_BLACKHOLEDB
-diff -BNru mysql-5.0.37/libmysqld/Makefile.am mysql-5.0.37-sphinx/libmysqld/Makefile.am
---- mysql-5.0.37/libmysqld/Makefile.am 2007-03-05 11:21:41.000000000 -0800
-+++ mysql-5.0.37-sphinx/libmysqld/Makefile.am 2007-04-01 15:35:54.000000000 -0700
-@@ -29,6 +29,7 @@
+Index: mysql-5.0.77/libmysqld/Makefile.am
+===================================================================
+--- mysql-5.0.77.orig/libmysqld/Makefile.am
++++ mysql-5.0.77/libmysqld/Makefile.am
+@@ -29,6 +29,7 @@ INCLUDES= @bdb_includes@ @innodb_inclu
-I$(top_builddir)/include -I$(top_srcdir)/include \
-I$(top_builddir)/sql -I$(top_srcdir)/sql \
-I$(top_srcdir)/sql/examples \
@@ -62,7 +65,7 @@
-I$(top_srcdir)/regex \
$(openssl_includes) @ZLIB_INCLUDES@
-@@ -39,6 +40,7 @@
+@@ -39,6 +40,7 @@ libmysqld_sources= libmysqld.c lib_sql.c
libmysqlsources = errmsg.c get_password.c libmysql.c client.c pack.c \
my_time.c
sqlexamplessources = ha_example.cc ha_tina.cc
@@ -70,7 +73,7 @@
noinst_HEADERS = embedded_priv.h emb_qcache.h
-@@ -67,7 +69,7 @@
+@@ -67,7 +69,7 @@ sqlsources = derror.cc field.cc field_co
parse_file.cc sql_view.cc sql_trigger.cc my_decimal.cc \
ha_blackhole.cc ha_archive.cc my_user.c
@@ -79,7 +82,7 @@
libmysqld_a_SOURCES=
# automake misses these
-@@ -147,12 +149,16 @@
+@@ -147,12 +149,16 @@ link_sources:
rm -f $$f; \
@LN_CP_F@ $(top_srcdir)/sql/examples/$$f $$f; \
done; \
@@ -97,10 +100,11 @@
$(top_srcdir)/linked_libmysqld_sources; \
rm -f client_settings.h
-diff -BNru mysql-5.0.37/sql/handler.cc mysql-5.0.37-sphinx/sql/handler.cc
---- mysql-5.0.37/sql/handler.cc 2007-03-05 11:21:13.000000000 -0800
-+++ mysql-5.0.37-sphinx/sql/handler.cc 2007-04-01 15:35:16.000000000 -0700
-@@ -77,6 +77,15 @@
+Index: mysql-5.0.77/sql/handler.cc
+===================================================================
+--- mysql-5.0.77.orig/sql/handler.cc
++++ mysql-5.0.77/sql/handler.cc
+@@ -77,6 +77,15 @@ handlerton tina_hton = { "CSV", SHOW_OPT
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
HTON_NO_FLAGS };
#endif
@@ -108,7 +112,7 @@
+#include "sphinx/ha_sphinx.h"
+extern handlerton sphinx_hton;
+#else
-+handlerton sphinx_hton = { "SPHINX", SHOW_OPTION_NO, "SPHINX storage engine",
++handlerton sphinx_hton = { "SPHINX", SHOW_OPTION_NO, "Sphinx storage engine",
+ DB_TYPE_SPHINX_DB, NULL, 0, 0, NULL, NULL,
+ NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
+ HTON_NO_FLAGS };
@@ -116,7 +120,7 @@
#ifdef HAVE_INNOBASE_DB
#include "ha_innodb.h"
extern handlerton innobase_hton;
-@@ -146,6 +155,7 @@
+@@ -141,6 +150,7 @@ handlerton *sys_table_types[]=
&example_hton,
&archive_hton,
&tina_hton,
@@ -124,7 +128,7 @@
&ndbcluster_hton,
&federated_hton,
&myisammrg_hton,
-@@ -346,6 +356,12 @@
+@@ -341,6 +351,12 @@ handler *get_new_handler(TABLE *table, M
return new (alloc) ha_tina(table);
return NULL;
#endif
@@ -137,10 +141,20 @@
#ifdef HAVE_NDBCLUSTER_DB
case DB_TYPE_NDBCLUSTER:
if (have_ndbcluster == SHOW_OPTION_YES)
-diff -BNru mysql-5.0.37/sql/handler.h mysql-5.0.37-sphinx/sql/handler.h
---- mysql-5.0.37/sql/handler.h 2007-03-05 11:21:22.000000000 -0800
-+++ mysql-5.0.37-sphinx/sql/handler.h 2007-04-01 15:35:16.000000000 -0700
-@@ -184,8 +184,9 @@
+Index: mysql-5.0.77/sql/handler.h
+===================================================================
+--- mysql-5.0.77.orig/sql/handler.h
++++ mysql-5.0.77/sql/handler.h
+@@ -127,7 +127,7 @@
+ example + csv + heap + blackhole + federated + 0
+ (yes, the sum is deliberately inaccurate)
+ */
+-#define MAX_HA 14
++#define MAX_HA 15
+
+ /*
+ Bits in index_ddl_flags(KEY *wanted_index)
+@@ -190,8 +190,9 @@ enum db_type
DB_TYPE_BERKELEY_DB, DB_TYPE_INNODB,
DB_TYPE_GEMINI, DB_TYPE_NDBCLUSTER,
DB_TYPE_EXAMPLE_DB, DB_TYPE_ARCHIVE_DB, DB_TYPE_CSV_DB,
@@ -151,29 +165,33 @@
DB_TYPE_DEFAULT // Must be last
};
-diff -BNru mysql-5.0.37/sql/Makefile.am mysql-5.0.37-sphinx/sql/Makefile.am
---- mysql-5.0.37/sql/Makefile.am 2007-03-05 11:21:40.000000000 -0800
-+++ mysql-5.0.37-sphinx/sql/Makefile.am 2007-04-01 15:35:16.000000000 -0700
-@@ -67,6 +67,7 @@
+Index: mysql-5.0.77/sql/Makefile.am
+===================================================================
+--- mysql-5.0.77.orig/sql/Makefile.am
++++ mysql-5.0.77/sql/Makefile.am
+@@ -67,7 +67,8 @@ noinst_HEADERS = item.h item_func.h item
+ parse_file.h sql_view.h sql_trigger.h \
sql_array.h sql_cursor.h \
examples/ha_example.h ha_archive.h \
- examples/ha_tina.h ha_blackhole.h \
+- examples/ha_tina.h ha_blackhole.h \
++ examples/ha_tina.h ha_blackhole.h \
+ sphinx/ha_sphinx.h \
ha_federated.h
mysqld_SOURCES = sql_lex.cc sql_handler.cc \
item.cc item_sum.cc item_buff.cc item_func.cc \
-@@ -104,6 +105,7 @@
+@@ -105,6 +106,7 @@ mysqld_SOURCES = sql_lex.cc sql_handler.
sp_cache.cc parse_file.cc sql_trigger.cc \
examples/ha_example.cc ha_archive.cc \
examples/ha_tina.cc ha_blackhole.cc \
-+ sphinx/ha_sphinx.cc \
++ sphinx/ha_sphinx.cc \
ha_federated.cc
gen_lex_hash_SOURCES = gen_lex_hash.cc
-diff -BNru mysql-5.0.37/sql/mysqld.cc mysql-5.0.37-sphinx/sql/mysqld.cc
---- mysql-5.0.37/sql/mysqld.cc 2007-03-05 11:21:11.000000000 -0800
-+++ mysql-5.0.37-sphinx/sql/mysqld.cc 2007-04-01 15:35:16.000000000 -0700
-@@ -6542,6 +6542,11 @@
+Index: mysql-5.0.77/sql/mysqld.cc
+===================================================================
+--- mysql-5.0.77.orig/sql/mysqld.cc
++++ mysql-5.0.77/sql/mysqld.cc
+@@ -7097,6 +7097,11 @@ static void mysql_init_variables(void)
#else
have_csv_db= SHOW_OPTION_NO;
#endif
@@ -185,7 +203,7 @@
#ifdef HAVE_NDBCLUSTER_DB
have_ndbcluster=SHOW_OPTION_DISABLED;
#else
-@@ -7596,6 +7601,7 @@
+@@ -8257,6 +8262,7 @@ void refresh_status(THD *thd)
#undef have_example_db
#undef have_archive_db
#undef have_csv_db
@@ -193,7 +211,7 @@
#undef have_federated_db
#undef have_partition_db
#undef have_blackhole_db
-@@ -7606,6 +7612,7 @@
+@@ -8267,6 +8273,7 @@ SHOW_COMP_OPTION have_ndbcluster= SHOW_O
SHOW_COMP_OPTION have_example_db= SHOW_OPTION_NO;
SHOW_COMP_OPTION have_archive_db= SHOW_OPTION_NO;
SHOW_COMP_OPTION have_csv_db= SHOW_OPTION_NO;
@@ -201,10 +219,11 @@
SHOW_COMP_OPTION have_federated_db= SHOW_OPTION_NO;
SHOW_COMP_OPTION have_partition_db= SHOW_OPTION_NO;
SHOW_COMP_OPTION have_blackhole_db= SHOW_OPTION_NO;
-diff -BNru mysql-5.0.37/sql/mysql_priv.h mysql-5.0.37-sphinx/sql/mysql_priv.h
---- mysql-5.0.37/sql/mysql_priv.h 2007-03-05 11:21:40.000000000 -0800
-+++ mysql-5.0.37-sphinx/sql/mysql_priv.h 2007-04-01 15:35:16.000000000 -0700
-@@ -1364,6 +1364,12 @@
+Index: mysql-5.0.77/sql/mysql_priv.h
+===================================================================
+--- mysql-5.0.77.orig/sql/mysql_priv.h
++++ mysql-5.0.77/sql/mysql_priv.h
+@@ -1545,6 +1545,12 @@ extern handlerton tina_hton;
#else
extern SHOW_COMP_OPTION have_csv_db;
#endif
@@ -217,10 +236,11 @@
#ifdef HAVE_FEDERATED_DB
extern handlerton federated_hton;
#define have_federated_db federated_hton.state
-diff -BNru mysql-5.0.37/sql/set_var.cc mysql-5.0.37-sphinx/sql/set_var.cc
---- mysql-5.0.37/sql/set_var.cc 2007-03-05 11:21:24.000000000 -0800
-+++ mysql-5.0.37-sphinx/sql/set_var.cc 2007-04-01 15:35:16.000000000 -0700
-@@ -868,6 +868,7 @@
+Index: mysql-5.0.77/sql/set_var.cc
+===================================================================
+--- mysql-5.0.77.orig/sql/set_var.cc
++++ mysql-5.0.77/sql/set_var.cc
+@@ -993,6 +993,7 @@ struct show_var_st init_vars[]= {
{"have_compress", (char*) &have_compress, SHOW_HAVE},
{"have_crypt", (char*) &have_crypt, SHOW_HAVE},
{"have_csv", (char*) &have_csv_db, SHOW_HAVE},
@@ -228,10 +248,11 @@
{"have_dynamic_loading", (char*) &have_dlopen, SHOW_HAVE},
{"have_example_engine", (char*) &have_example_db, SHOW_HAVE},
{"have_federated_engine", (char*) &have_federated_db, SHOW_HAVE},
-diff -BNru mysql-5.0.37/sql/sql_lex.h mysql-5.0.37-sphinx/sql/sql_lex.h
---- mysql-5.0.37/sql/sql_lex.h 2007-03-05 11:21:05.000000000 -0800
-+++ mysql-5.0.37-sphinx/sql/sql_lex.h 2007-04-01 15:35:16.000000000 -0700
-@@ -57,6 +57,7 @@
+Index: mysql-5.0.77/sql/sql_lex.h
+===================================================================
+--- mysql-5.0.77.orig/sql/sql_lex.h
++++ mysql-5.0.77/sql/sql_lex.h
+@@ -57,6 +57,7 @@ enum enum_sql_command {
SQLCOM_SHOW_DATABASES, SQLCOM_SHOW_TABLES, SQLCOM_SHOW_FIELDS,
SQLCOM_SHOW_KEYS, SQLCOM_SHOW_VARIABLES, SQLCOM_SHOW_LOGS, SQLCOM_SHOW_STATUS,
SQLCOM_SHOW_INNODB_STATUS, SQLCOM_SHOW_NDBCLUSTER_STATUS, SQLCOM_SHOW_MUTEX_STATUS,
@@ -239,10 +260,11 @@
SQLCOM_SHOW_PROCESSLIST, SQLCOM_SHOW_MASTER_STAT, SQLCOM_SHOW_SLAVE_STAT,
SQLCOM_SHOW_GRANTS, SQLCOM_SHOW_CREATE, SQLCOM_SHOW_CHARSETS,
SQLCOM_SHOW_COLLATIONS, SQLCOM_SHOW_CREATE_DB, SQLCOM_SHOW_TABLE_STATUS,
-diff -BNru mysql-5.0.37/sql/sql_parse.cc mysql-5.0.37-sphinx/sql/sql_parse.cc
---- mysql-5.0.37/sql/sql_parse.cc 2007-03-05 11:21:40.000000000 -0800
-+++ mysql-5.0.37-sphinx/sql/sql_parse.cc 2007-04-01 15:35:16.000000000 -0700
-@@ -24,6 +24,9 @@
+Index: mysql-5.0.77/sql/sql_parse.cc
+===================================================================
+--- mysql-5.0.77.orig/sql/sql_parse.cc
++++ mysql-5.0.77/sql/sql_parse.cc
+@@ -25,6 +25,9 @@
#ifdef HAVE_INNOBASE_DB
#include "ha_innodb.h"
#endif
@@ -252,7 +274,7 @@
#ifdef HAVE_NDBCLUSTER_DB
#include "ha_ndbcluster.h"
-@@ -2882,6 +2885,15 @@
+@@ -3595,6 +3598,15 @@ mysql_execute_command(THD *thd)
break;
}
#endif
@@ -268,10 +290,11 @@
#ifdef HAVE_REPLICATION
case SQLCOM_LOAD_MASTER_TABLE:
{
-diff -BNru mysql-5.0.37/sql/sql_yacc.yy mysql-5.0.37-sphinx/sql/sql_yacc.yy
---- mysql-5.0.37/sql/sql_yacc.yy 2007-03-05 11:21:23.000000000 -0800
-+++ mysql-5.0.37-sphinx/sql/sql_yacc.yy 2007-04-01 15:35:16.000000000 -0700
-@@ -7052,6 +7052,9 @@
+Index: mysql-5.0.77/sql/sql_yacc.yy
+===================================================================
+--- mysql-5.0.77.orig/sql/sql_yacc.yy
++++ mysql-5.0.77/sql/sql_yacc.yy
+@@ -8400,6 +8400,9 @@ show_engine_param:
case DB_TYPE_INNODB:
Lex->sql_command = SQLCOM_SHOW_INNODB_STATUS;
break;
@@ -280,4 +303,16 @@
+ break;
default:
my_error(ER_NOT_SUPPORTED_YET, MYF(0), "STATUS");
- YYABORT;
+ MYSQL_YYABORT;
+Index: mysql-5.0.77/mysql-test/r/ps_1general.result
+===================================================================
+--- mysql-5.0.77.orig/mysql-test/r/ps_1general.result
++++ mysql-5.0.77/mysql-test/r/ps_1general.result
+@@ -329,6 +329,7 @@ BLACKHOLE YES/NO /dev/null storage engin
+ EXAMPLE YES/NO Example storage engine
+ ARCHIVE YES/NO Archive storage engine
+ CSV YES/NO CSV storage engine
++SPHINX YES/NO Sphinx storage engine
+ ndbcluster YES/NO Clustered, fault-tolerant, memory-based tables
+ FEDERATED YES/NO Federated MySQL storage engine
+ MRG_MYISAM YES/NO Collection of identical MyISAM tables
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/mysql-sphinx.patch?r1=1.1.2.5&r2=1.1.2.6&f=u
More information about the pld-cvs-commit
mailing list