Author: glen Date: Sat Jul 24 13:09:04 2010 GMT
Module: packages Tag: MYSQL_5_0
---- Log message:
- update from sphinx-0.9.9/mysqlse/sphinx.5.0.37.diff
---- Files affected:
packages/mysql:
mysql-sphinx.patch (1.1.2.6 -> 1.1.2.7)
---- Diffs:
================================================================
Index: packages/mysql/mysql-sphinx.patch
diff -u packages/mysql/mysql-sphinx.patch:1.1.2.6
packages/mysql/mysql-sphinx.patch:1.1.2.7
--- packages/mysql/mysql-sphinx.patch:1.1.2.6 Thu Apr 8 22:58:41 2010
+++ packages/mysql/mysql-sphinx.patch Sat Jul 24 15:08:59 2010
@@ -1,7 +1,5 @@
-Index: mysql-5.0.77/config/ac-macros/ha_sphinx.m4
-===================================================================
---- /dev/null
-+++ mysql-5.0.77/config/ac-macros/ha_sphinx.m4
+--- mysql-5.0.67/config/ac-macros/ha_sphinx.m4 1970-01-01 10:00:00.000000000
+1000
++++ mysql-5.0.67-sphinx/config/ac-macros/ha_sphinx.m4 2009-02-14
09:15:48.000000000 +1000
@@ -0,0 +1,30 @@
+dnl
---------------------------------------------------------------------------
+dnl Macro: MYSQL_CHECK_EXAMPLEDB
@@ -33,11 +31,9 @@
+dnl END OF MYSQL_CHECK_EXAMPLE SECTION
+dnl
---------------------------------------------------------------------------
+
-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)
+--- mysql-5.0.67/configure.in 2008-08-04 23:19:07.000000000 +1100
++++ mysql-5.0.67-sphinx/configure.in 2009-02-14 09:15:48.000000000 +1000
+@@ -58,6 +58,7 @@
sinclude(config/ac-macros/ha_berkeley.m4)
sinclude(config/ac-macros/ha_blackhole.m4)
sinclude(config/ac-macros/ha_example.m4)
@@ -45,7 +41,7 @@
sinclude(config/ac-macros/ha_federated.m4)
sinclude(config/ac-macros/ha_innodb.m4)
sinclude(config/ac-macros/ha_ndbcluster.m4)
-@@ -2644,6 +2645,7 @@ MYSQL_CHECK_MAX_INDEXES
+@@ -2625,6 +2626,7 @@
MYSQL_CHECK_BDB
MYSQL_CHECK_INNODB
MYSQL_CHECK_EXAMPLEDB
@@ -53,11 +49,9 @@
MYSQL_CHECK_ARCHIVEDB
MYSQL_CHECK_CSVDB
MYSQL_CHECK_BLACKHOLEDB
-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
+--- mysql-5.0.67/libmysqld/Makefile.am 2008-08-04 23:19:18.000000000 +1100
++++ mysql-5.0.67-sphinx/libmysqld/Makefile.am 2009-02-14 09:15:48.000000000
+1000
+@@ -29,6 +29,7 @@
-I$(top_builddir)/include -I$(top_srcdir)/include \
-I$(top_builddir)/sql -I$(top_srcdir)/sql \
-I$(top_srcdir)/sql/examples \
@@ -65,7 +59,7 @@
-I$(top_srcdir)/regex \
$(openssl_includes) @ZLIB_INCLUDES@
-@@ -39,6 +40,7 @@ libmysqld_sources= libmysqld.c lib_sql.c
+@@ -39,6 +40,7 @@
libmysqlsources = errmsg.c get_password.c libmysql.c client.c pack.c \
my_time.c
sqlexamplessources = ha_example.cc ha_tina.cc
@@ -73,7 +67,7 @@
noinst_HEADERS = embedded_priv.h emb_qcache.h
-@@ -67,7 +69,7 @@ sqlsources = derror.cc field.cc field_co
+@@ -67,7 +69,7 @@
parse_file.cc sql_view.cc sql_trigger.cc my_decimal.cc \
ha_blackhole.cc ha_archive.cc my_user.c
@@ -82,7 +76,7 @@
libmysqld_a_SOURCES=
# automake misses these
-@@ -147,12 +149,16 @@ link_sources:
+@@ -147,12 +149,16 @@
rm -f $$f; \
@LN_CP_F@ $(top_srcdir)/sql/examples/$$f $$f; \
done; \
@@ -100,11 +94,9 @@
$(top_srcdir)/linked_libmysqld_sources; \
rm -f client_settings.h
-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
+--- mysql-5.0.67/sql/handler.cc 2008-08-04 23:20:04.000000000 +1100
++++ mysql-5.0.67-sphinx/sql/handler.cc 2009-02-14 09:15:48.000000000 +1000
+@@ -77,6 +77,15 @@
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
HTON_NO_FLAGS };
#endif
@@ -112,7 +104,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 };
@@ -120,7 +112,7 @@
#ifdef HAVE_INNOBASE_DB
#include "ha_innodb.h"
extern handlerton innobase_hton;
-@@ -141,6 +150,7 @@ handlerton *sys_table_types[]=
+@@ -141,6 +150,7 @@
&example_hton,
&archive_hton,
&tina_hton,
@@ -128,7 +120,7 @@
&ndbcluster_hton,
&federated_hton,
&myisammrg_hton,
-@@ -341,6 +351,12 @@ handler *get_new_handler(TABLE *table, M
+@@ -341,6 +351,12 @@
return new (alloc) ha_tina(table);
return NULL;
#endif
@@ -141,20 +133,9 @@
#ifdef HAVE_NDBCLUSTER_DB
case DB_TYPE_NDBCLUSTER:
if (have_ndbcluster == SHOW_OPTION_YES)
-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
+--- mysql-5.0.67/sql/handler.h 2008-08-04 23:20:04.000000000 +1100
++++ mysql-5.0.67-sphinx/sql/handler.h 2009-02-14 09:15:48.000000000 +1000
+@@ -186,8 +186,9 @@
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,
@@ -165,33 +146,63 @@
DB_TYPE_DEFAULT // Must be last
};
-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 \
+--- mysql-5.0.67/sql/Makefile.am 2008-08-04 23:20:02.000000000 +1100
++++ mysql-5.0.67-sphinx/sql/Makefile.am 2009-02-14 09:23:28.000000000
+1000
+@@ -68,6 +68,7 @@
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 \
-@@ -105,6 +106,7 @@ mysqld_SOURCES = sql_lex.cc sql_handler.
+@@ -105,6 +106,7 @@
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
-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)
+@@ -174,6 +176,10 @@
+ udf_example_la_SOURCES= udf_example.c
+ udf_example_la_LDFLAGS= -module -rpath $(pkglibdir)
+
++pkglib_LTLIBRARIES = sphinx/sphinx.la
++sphinx_sphinx_la_SOURCES = sphinx/snippets_udf.cc
++sphinx_sphinx_la_LDFLAGS = -module
++
+
+ # Don't update the files from bitkeeper
+ %::SCCS/s.%
+--- mysql-5.0.67/sql/mysqld.cc 2008-08-04 23:20:07.000000000 +1100
++++ mysql-5.0.67-sphinx/sql/mysqld.cc 2009-02-14 09:15:48.000000000 +1000
+@@ -36,6 +36,10 @@
+ #include <sys/prctl.h>
+ #endif
+
++#ifdef HAVE_SPHINX_DB
++#include "sphinx/ha_sphinx.h"
++#endif
++
+ #ifdef HAVE_INNOBASE_DB
+ #define OPT_INNODB_DEFAULT 1
+ #else
+@@ -6633,6 +6637,13 @@
+ {"Threads_running", (char*) &thread_running,
SHOW_INT_CONST},
+ {"Uptime", (char*) 0,
SHOW_STARTTIME},
+ {"Uptime_since_flush_status",(char*) 0,
SHOW_FLUSHTIME},
++#ifdef HAVE_SPHINX_DB
++ {"sphinx_total", (char *)sphinx_showfunc_total,
SHOW_SPHINX_FUNC},
++ {"sphinx_total_found", (char *)sphinx_showfunc_total_found,
SHOW_SPHINX_FUNC},
++ {"sphinx_time", (char *)sphinx_showfunc_time,
SHOW_SPHINX_FUNC},
++ {"sphinx_word_count", (char *)sphinx_showfunc_word_count,
SHOW_SPHINX_FUNC},
++ {"sphinx_words", (char *)sphinx_showfunc_words,
SHOW_SPHINX_FUNC},
++#endif
+ {NullS, NullS, SHOW_LONG}
+ };
+
+@@ -6875,6 +6886,11 @@
#else
have_csv_db= SHOW_OPTION_NO;
#endif
@@ -203,7 +214,7 @@
#ifdef HAVE_NDBCLUSTER_DB
have_ndbcluster=SHOW_OPTION_DISABLED;
#else
-@@ -8257,6 +8262,7 @@ void refresh_status(THD *thd)
+@@ -7983,6 +7999,7 @@
#undef have_example_db
#undef have_archive_db
#undef have_csv_db
@@ -211,7 +222,7 @@
#undef have_federated_db
#undef have_partition_db
#undef have_blackhole_db
-@@ -8267,6 +8273,7 @@ SHOW_COMP_OPTION have_ndbcluster= SHOW_O
+@@ -7993,6 +8010,7 @@
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;
@@ -219,11 +230,9 @@
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;
-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;
+--- mysql-5.0.67/sql/mysql_priv.h 2008-08-04 23:20:07.000000000 +1100
++++ mysql-5.0.67-sphinx/sql/mysql_priv.h 2009-02-14 09:15:48.000000000
+1000
+@@ -1439,6 +1439,12 @@
#else
extern SHOW_COMP_OPTION have_csv_db;
#endif
@@ -236,11 +245,9 @@
#ifdef HAVE_FEDERATED_DB
extern handlerton federated_hton;
#define have_federated_db federated_hton.state
-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[]= {
+--- mysql-5.0.67/sql/set_var.cc 2008-08-04 23:20:08.000000000 +1100
++++ mysql-5.0.67-sphinx/sql/set_var.cc 2009-02-14 09:15:48.000000000 +1000
+@@ -888,6 +888,7 @@
{"have_compress", (char*) &have_compress, SHOW_HAVE},
{"have_crypt", (char*) &have_crypt, SHOW_HAVE},
{"have_csv", (char*) &have_csv_db,
SHOW_HAVE},
@@ -248,11 +255,9 @@
{"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},
-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 {
+--- mysql-5.0.67/sql/sql_lex.h 2008-08-04 23:20:10.000000000 +1100
++++ mysql-5.0.67-sphinx/sql/sql_lex.h 2009-02-14 09:15:48.000000000 +1000
+@@ -57,6 +57,7 @@
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,
@@ -260,11 +265,9 @@
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,
-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 @@
+--- mysql-5.0.67/sql/sql_parse.cc 2008-08-04 23:20:10.000000000 +1100
++++ mysql-5.0.67-sphinx/sql/sql_parse.cc 2009-02-14 09:15:48.000000000
+1000
+@@ -24,6 +24,9 @@
#ifdef HAVE_INNOBASE_DB
#include "ha_innodb.h"
#endif
@@ -274,7 +277,7 @@
#ifdef HAVE_NDBCLUSTER_DB
#include "ha_ndbcluster.h"
-@@ -3595,6 +3598,15 @@ mysql_execute_command(THD *thd)
+@@ -3006,6 +3009,15 @@
break;
}
#endif
@@ -290,11 +293,9 @@
#ifdef HAVE_REPLICATION
case SQLCOM_LOAD_MASTER_TABLE:
{
-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:
+--- mysql-5.0.67/sql/sql_yacc.yy 2008-08-04 23:20:12.000000000 +1100
++++ mysql-5.0.67-sphinx/sql/sql_yacc.yy 2009-02-14 09:15:48.000000000
+1000
+@@ -7393,6 +7393,9 @@
case DB_TYPE_INNODB:
Lex->sql_command = SQLCOM_SHOW_INNODB_STATUS;
break;
@@ -304,15 +305,34 @@
default:
my_error(ER_NOT_SUPPORTED_YET, MYF(0), "STATUS");
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
+--- mysql-5.0.67/sql/structs.h 2008-08-04 23:20:12.000000000 +1100
++++ mysql-5.0.67-sphinx/sql/structs.h 2009-02-14 09:15:48.000000000 +1000
+@@ -188,6 +188,9 @@
+ SHOW_SSL_CTX_SESS_TIMEOUTS, SHOW_SSL_CTX_SESS_CACHE_FULL,
+ SHOW_SSL_GET_CIPHER_LIST,
+ #endif /* HAVE_OPENSSL */
++#ifdef HAVE_SPHINX_DB
++ SHOW_SPHINX_FUNC,
++#endif
+ SHOW_NET_COMPRESSION,
+ SHOW_RPL_STATUS, SHOW_SLAVE_RUNNING, SHOW_SLAVE_RETRIED_TRANS,
+ SHOW_KEY_CACHE_LONG, SHOW_KEY_CACHE_CONST_LONG, SHOW_KEY_CACHE_LONGLONG,
+--- mysql-5.0.67/sql/sql_show.cc 2008-08-04 23:20:11.000000000 +1100
++++ mysql-5.0.67-sphinx/sql/sql_show.cc 2009-02-14 09:15:48.000000000
+1000
+@@ -1473,6 +1473,16 @@
+ value= (char*) ((sys_var*) value)->value_ptr(thd, value_type,
+ &null_lex_str);
+ }
++ #ifdef HAVE_SPHINX_DB
++ else if (show_type == SHOW_SPHINX_FUNC)
++ {
++ SHOW_VAR var;
++ ((int (*)(THD *, SHOW_VAR *, char *))value)(thd, &var,
buff);
++
++ value = var.value;
++ show_type = var.type;
++ }
++ #endif /* HAVE_SPHINX_DB */
+
+ pos= end= buff;
+ switch (show_type) {
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/mysql-sphinx.patch?r1=1.1.2.6&r2=1.1.2.7&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
