SOURCES (MYSQL_5_0): mysql-sphinx.patch - update to mysql-5.0.37

glen glen at pld-linux.org
Thu Mar 15 15:25:03 CET 2007


Author: glen                         Date: Thu Mar 15 14:25:03 2007 GMT
Module: SOURCES                       Tag: MYSQL_5_0
---- Log message:
- update to mysql-5.0.37

---- Files affected:
SOURCES:
   mysql-sphinx.patch (1.1 -> 1.1.2.1) 

---- Diffs:

================================================================
Index: SOURCES/mysql-sphinx.patch
diff -u SOURCES/mysql-sphinx.patch:1.1 SOURCES/mysql-sphinx.patch:1.1.2.1
--- SOURCES/mysql-sphinx.patch:1.1	Thu Mar 15 15:18:52 2007
+++ SOURCES/mysql-sphinx.patch	Thu Mar 15 15:24:57 2007
@@ -1,4 +1,3 @@
-diff -B -N -r -u mysql-5.0.22/config/ac-macros/ha_sphinx.m4 mysql-5.0.22.sx/config/ac-macros/ha_sphinx.m4
 --- mysql-5.0.22/config/ac-macros/ha_sphinx.m4	1970-01-01 01:00:00.000000000 +0100
 +++ mysql-5.0.22.sx/config/ac-macros/ha_sphinx.m4	2006-06-06 19:49:38.000000000 +0200
 @@ -0,0 +1,30 @@
@@ -32,7 +31,6 @@
 +dnl END OF MYSQL_CHECK_EXAMPLE SECTION
 +dnl ---------------------------------------------------------------------------
 +
-diff -B -N -r -u mysql-5.0.22/configure.in mysql-5.0.22.sx/configure.in
 --- mysql-5.0.22/configure.in	2006-05-25 10:56:45.000000000 +0200
 +++ mysql-5.0.22.sx/configure.in	2006-06-06 19:49:38.000000000 +0200
 @@ -41,6 +41,7 @@
@@ -51,19 +49,17 @@
  MYSQL_CHECK_ARCHIVEDB
  MYSQL_CHECK_CSVDB
  MYSQL_CHECK_BLACKHOLEDB
-diff -B -N -r -u mysql-5.0.22/libmysqld/Makefile.am mysql-5.0.22.sx/libmysqld/Makefile.am
---- mysql-5.0.22/libmysqld/Makefile.am	2006-05-25 10:56:55.000000000 +0200
-+++ mysql-5.0.22.sx/libmysqld/Makefile.am	2006-06-06 19:49:38.000000000 +0200
-@@ -27,7 +27,7 @@
- 			-DSHAREDIR="\"$(MYSQLSHAREdir)\""
- INCLUDES=		@bdb_includes@ \
+--- mysql-5.0.22.sx/libmysqld/Makefile.am	2006-06-06 19:49:38.000000000 +0200
++++ mysql-5.0.37/libmysqld/Makefile.am	2007-03-15 16:23:41.829249633 +0200
+@@ -29,6 +29,7 @@
  			-I$(top_builddir)/include -I$(top_srcdir)/include \
--			-I$(top_srcdir)/sql -I$(top_srcdir)/sql/examples \
-+			-I$(top_srcdir)/sql -I$(top_srcdir)/sql/examples -I$(top_srcdir)/sql/sphinx \
+ 			-I$(top_builddir)/sql -I$(top_srcdir)/sql \
+ 			-I$(top_srcdir)/sql/examples \
++			-I$(top_srcdir)/sql/sphinx \
  			-I$(top_srcdir)/regex \
- 			$(openssl_includes) $(yassl_includes) @ZLIB_INCLUDES@
+ 			$(openssl_includes) @ZLIB_INCLUDES@
  
-@@ -38,6 +38,7 @@
+@@ -38,6 +39,7 @@
  libmysqlsources =	errmsg.c get_password.c libmysql.c client.c pack.c \
                          my_time.c
  sqlexamplessources =	ha_example.cc ha_tina.cc
@@ -71,7 +67,7 @@
  
  noinst_HEADERS =	embedded_priv.h emb_qcache.h
  
-@@ -65,7 +66,7 @@
+@@ -65,7 +67,7 @@
  	parse_file.cc sql_view.cc sql_trigger.cc my_decimal.cc \
  	ha_blackhole.cc ha_archive.cc my_user.c
  
@@ -80,7 +76,7 @@
  libmysqld_a_SOURCES=
  
  # automake misses these
-@@ -133,12 +134,16 @@
+@@ -133,12 +135,16 @@
  	    rm -f $$f; \
  	    @LN_CP_F@ $(top_srcdir)/sql/examples/$$f $$f; \
  	  done; \
@@ -98,7 +94,6 @@
  	       $(top_srcdir)/linked_libmysqld_sources; \
  	rm -f client_settings.h
  
-diff -B -N -r -u mysql-5.0.22/sql/handler.cc mysql-5.0.22.sx/sql/handler.cc
 --- mysql-5.0.22/sql/handler.cc	2006-05-25 10:56:42.000000000 +0200
 +++ mysql-5.0.22.sx/sql/handler.cc	2006-06-06 19:49:38.000000000 +0200
 @@ -78,6 +78,15 @@
@@ -138,7 +133,6 @@
  #ifdef HAVE_NDBCLUSTER_DB
    case DB_TYPE_NDBCLUSTER:
      if (have_ndbcluster == SHOW_OPTION_YES)
-diff -B -N -r -u mysql-5.0.22/sql/handler.h mysql-5.0.22.sx/sql/handler.h
 --- mysql-5.0.22/sql/handler.h	2006-05-25 10:56:55.000000000 +0200
 +++ mysql-5.0.22.sx/sql/handler.h	2006-06-06 19:49:38.000000000 +0200
 @@ -183,8 +183,9 @@
@@ -152,7 +146,6 @@
    DB_TYPE_DEFAULT // Must be last
  };
  
-diff -B -N -r -u mysql-5.0.22/sql/Makefile.am mysql-5.0.22.sx/sql/Makefile.am
 --- mysql-5.0.22/sql/Makefile.am	2006-05-25 10:56:41.000000000 +0200
 +++ mysql-5.0.22.sx/sql/Makefile.am	2006-06-06 19:49:38.000000000 +0200
 @@ -66,6 +66,7 @@
@@ -171,7 +164,6 @@
  			ha_federated.cc
  
  gen_lex_hash_SOURCES =	gen_lex_hash.cc
-diff -B -N -r -u mysql-5.0.22/sql/mysqld.cc mysql-5.0.22.sx/sql/mysqld.cc
 --- mysql-5.0.22/sql/mysqld.cc	2006-05-25 10:56:41.000000000 +0200
 +++ mysql-5.0.22.sx/sql/mysqld.cc	2006-06-06 19:49:38.000000000 +0200
 @@ -6420,6 +6420,11 @@
@@ -202,7 +194,6 @@
  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 -B -N -r -u mysql-5.0.22/sql/mysql_priv.h mysql-5.0.22.sx/sql/mysql_priv.h
 --- mysql-5.0.22/sql/mysql_priv.h	2006-05-25 10:56:43.000000000 +0200
 +++ mysql-5.0.22.sx/sql/mysql_priv.h	2006-06-06 19:49:38.000000000 +0200
 @@ -1279,6 +1279,12 @@
@@ -218,7 +209,6 @@
  #ifdef HAVE_FEDERATED_DB
  extern handlerton federated_hton;
  #define have_federated_db federated_hton.state
-diff -B -N -r -u mysql-5.0.22/sql/set_var.cc mysql-5.0.22.sx/sql/set_var.cc
 --- mysql-5.0.22/sql/set_var.cc	2006-05-25 10:56:41.000000000 +0200
 +++ mysql-5.0.22.sx/sql/set_var.cc	2006-06-06 19:49:38.000000000 +0200
 @@ -864,6 +864,7 @@
@@ -229,7 +219,6 @@
    {"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 -B -N -r -u mysql-5.0.22/sql/sql_lex.h mysql-5.0.22.sx/sql/sql_lex.h
 --- mysql-5.0.22/sql/sql_lex.h	2006-05-25 10:56:41.000000000 +0200
 +++ mysql-5.0.22.sx/sql/sql_lex.h	2006-06-06 19:49:38.000000000 +0200
 @@ -58,6 +58,7 @@
@@ -240,7 +229,6 @@
    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 -B -N -r -u mysql-5.0.22/sql/sql_parse.cc mysql-5.0.22.sx/sql/sql_parse.cc
 --- mysql-5.0.22/sql/sql_parse.cc	2006-05-25 10:56:41.000000000 +0200
 +++ mysql-5.0.22.sx/sql/sql_parse.cc	2006-06-06 19:49:38.000000000 +0200
 @@ -25,6 +25,9 @@
@@ -269,7 +257,6 @@
  #ifdef HAVE_REPLICATION
    case SQLCOM_LOAD_MASTER_TABLE:
    {
-diff -B -N -r -u mysql-5.0.22/sql/sql_yacc.yy mysql-5.0.22.sx/sql/sql_yacc.yy
 --- mysql-5.0.22/sql/sql_yacc.yy	2006-05-25 10:56:43.000000000 +0200
 +++ mysql-5.0.22.sx/sql/sql_yacc.yy	2006-06-06 19:49:38.000000000 +0200
 @@ -6584,6 +6584,9 @@
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/mysql-sphinx.patch?r1=1.1&r2=1.1.2.1&f=u



More information about the pld-cvs-commit mailing list