OurDelta

Merge lp:~d-launchpad-askneil-com/ourdelta/ourdelta-fix-bug338879 into lp:~ourdelta-core/ourdelta/trunk015fmt

  1. ourdelta-fix-bug338879
  2. Merge into trunk015fmt
Proposed by Neil Katin
Status: Rejected
Rejected by: Arjen Lentz
Proposed branch: lp:~d-launchpad-askneil-com/ourdelta/ourdelta-fix-bug338879
Merge into: lp:~ourdelta-core/ourdelta/trunk015fmt
Diff against target: None lines
To merge this branch: bzr merge lp:~d-launchpad-askneil-com/ourdelta/ourdelta-fix-bug338879
Reviewer Review Type Date Requested Status
Arjen Lentz Disapprove
Review via email: mp+6719@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Neil Katin (d-launchpad-askneil-com) wrote :

Bug fix for https://bugs.launchpad.net/ourdelta/+bug/378879

Its a one line fix: sql/handler.h MAX_HA changed from 14 to 15, to reflected
the added handler for sphinx.

Revision history for this message
Arjen Lentz (arjen-lentz) wrote :

is ok.
sphinx overall did need more fix, for the test result of SHOW STORAGE ENGINES.

review: Approve
Revision history for this message
Arjen Lentz (arjen-lentz) wrote :

not to trunk

review: Disapprove

Unmerged revisions

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'mysql/5.0/sphinxsearch/sphinx_engine/sphinx.5.0.77.patch'
2--- mysql/5.0/sphinxsearch/sphinx_engine/sphinx.5.0.77.patch 2009-03-18 06:35:34 +0000
3+++ mysql/5.0/sphinxsearch/sphinx_engine/sphinx.5.0.77.patch 2009-05-21 01:11:00 +0000
4@@ -1,7 +1,7 @@
5 Index: mysql-5.0.77/config/ac-macros/ha_sphinx.m4
6 ===================================================================
7---- /dev/null 1970-01-01 00:00:00.000000000 +0000
8-+++ mysql-5.0.77/config/ac-macros/ha_sphinx.m4 2009-03-18 15:42:54.000000000 +1000
9+--- /dev/null
10++++ mysql-5.0.77/config/ac-macros/ha_sphinx.m4
11 @@ -0,0 +1,30 @@
12 +dnl ---------------------------------------------------------------------------
13 +dnl Macro: MYSQL_CHECK_EXAMPLEDB
14@@ -35,9 +35,9 @@
15 +
16 Index: mysql-5.0.77/configure.in
17 ===================================================================
18---- mysql-5.0.77.orig/configure.in 2009-03-18 12:48:03.000000000 +1000
19-+++ mysql-5.0.77/configure.in 2009-03-18 15:42:54.000000000 +1000
20-@@ -58,6 +58,7 @@
21+--- mysql-5.0.77.orig/configure.in
22++++ mysql-5.0.77/configure.in
23+@@ -58,6 +58,7 @@ sinclude(config/ac-macros/ha_archive.m4)
24 sinclude(config/ac-macros/ha_berkeley.m4)
25 sinclude(config/ac-macros/ha_blackhole.m4)
26 sinclude(config/ac-macros/ha_example.m4)
27@@ -45,7 +45,7 @@
28 sinclude(config/ac-macros/ha_federated.m4)
29 sinclude(config/ac-macros/ha_innodb.m4)
30 sinclude(config/ac-macros/ha_ndbcluster.m4)
31-@@ -2644,6 +2645,7 @@
32+@@ -2644,6 +2645,7 @@ MYSQL_CHECK_MAX_INDEXES
33 MYSQL_CHECK_BDB
34 MYSQL_CHECK_INNODB
35 MYSQL_CHECK_EXAMPLEDB
36@@ -55,9 +55,9 @@
37 MYSQL_CHECK_BLACKHOLEDB
38 Index: mysql-5.0.77/libmysqld/Makefile.am
39 ===================================================================
40---- mysql-5.0.77.orig/libmysqld/Makefile.am 2009-01-30 07:42:25.000000000 +1000
41-+++ mysql-5.0.77/libmysqld/Makefile.am 2009-03-18 15:42:54.000000000 +1000
42-@@ -29,6 +29,7 @@
43+--- mysql-5.0.77.orig/libmysqld/Makefile.am
44++++ mysql-5.0.77/libmysqld/Makefile.am
45+@@ -29,6 +29,7 @@ INCLUDES= @bdb_includes@ @innodb_inclu
46 -I$(top_builddir)/include -I$(top_srcdir)/include \
47 -I$(top_builddir)/sql -I$(top_srcdir)/sql \
48 -I$(top_srcdir)/sql/examples \
49@@ -65,7 +65,7 @@
50 -I$(top_srcdir)/regex \
51 $(openssl_includes) @ZLIB_INCLUDES@
52
53-@@ -39,6 +40,7 @@
54+@@ -39,6 +40,7 @@ libmysqld_sources= libmysqld.c lib_sql.c
55 libmysqlsources = errmsg.c get_password.c libmysql.c client.c pack.c \
56 my_time.c
57 sqlexamplessources = ha_example.cc ha_tina.cc
58@@ -73,7 +73,7 @@
59
60 noinst_HEADERS = embedded_priv.h emb_qcache.h
61
62-@@ -67,7 +69,7 @@
63+@@ -67,7 +69,7 @@ sqlsources = derror.cc field.cc field_co
64 parse_file.cc sql_view.cc sql_trigger.cc my_decimal.cc \
65 ha_blackhole.cc ha_archive.cc my_user.c
66
67@@ -82,7 +82,7 @@
68 libmysqld_a_SOURCES=
69
70 # automake misses these
71-@@ -147,12 +149,16 @@
72+@@ -147,12 +149,16 @@ link_sources:
73 rm -f $$f; \
74 @LN_CP_F@ $(top_srcdir)/sql/examples/$$f $$f; \
75 done; \
76@@ -102,9 +102,9 @@
77
78 Index: mysql-5.0.77/sql/handler.cc
79 ===================================================================
80---- mysql-5.0.77.orig/sql/handler.cc 2009-03-18 12:48:03.000000000 +1000
81-+++ mysql-5.0.77/sql/handler.cc 2009-03-18 15:42:54.000000000 +1000
82-@@ -77,6 +77,15 @@
83+--- mysql-5.0.77.orig/sql/handler.cc
84++++ mysql-5.0.77/sql/handler.cc
85+@@ -77,6 +77,15 @@ handlerton tina_hton = { "CSV", SHOW_OPT
86 NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
87 HTON_NO_FLAGS };
88 #endif
89@@ -120,7 +120,7 @@
90 #ifdef HAVE_INNOBASE_DB
91 #include "ha_innodb.h"
92 extern handlerton innobase_hton;
93-@@ -141,6 +150,7 @@
94+@@ -141,6 +150,7 @@ handlerton *sys_table_types[]=
95 &example_hton,
96 &archive_hton,
97 &tina_hton,
98@@ -128,7 +128,7 @@
99 &ndbcluster_hton,
100 &federated_hton,
101 &myisammrg_hton,
102-@@ -341,6 +351,12 @@
103+@@ -341,6 +351,12 @@ handler *get_new_handler(TABLE *table, M
104 return new (alloc) ha_tina(table);
105 return NULL;
106 #endif
107@@ -143,9 +143,18 @@
108 if (have_ndbcluster == SHOW_OPTION_YES)
109 Index: mysql-5.0.77/sql/handler.h
110 ===================================================================
111---- mysql-5.0.77.orig/sql/handler.h 2009-03-18 12:48:03.000000000 +1000
112-+++ mysql-5.0.77/sql/handler.h 2009-03-18 15:42:54.000000000 +1000
113-@@ -190,8 +190,9 @@
114+--- mysql-5.0.77.orig/sql/handler.h
115++++ mysql-5.0.77/sql/handler.h
116+@@ -127,7 +127,7 @@
117+ example + csv + heap + blackhole + federated + 0
118+ (yes, the sum is deliberately inaccurate)
119+ */
120+-#define MAX_HA 14
121++#define MAX_HA 15
122+
123+ /*
124+ Bits in index_ddl_flags(KEY *wanted_index)
125+@@ -190,8 +190,9 @@ enum db_type
126 DB_TYPE_BERKELEY_DB, DB_TYPE_INNODB,
127 DB_TYPE_GEMINI, DB_TYPE_NDBCLUSTER,
128 DB_TYPE_EXAMPLE_DB, DB_TYPE_ARCHIVE_DB, DB_TYPE_CSV_DB,
129@@ -158,9 +167,9 @@
130
131 Index: mysql-5.0.77/sql/Makefile.am
132 ===================================================================
133---- mysql-5.0.77.orig/sql/Makefile.am 2009-03-18 12:48:06.000000000 +1000
134-+++ mysql-5.0.77/sql/Makefile.am 2009-03-18 15:47:29.000000000 +1000
135-@@ -67,7 +67,8 @@
136+--- mysql-5.0.77.orig/sql/Makefile.am
137++++ mysql-5.0.77/sql/Makefile.am
138+@@ -67,7 +67,8 @@ noinst_HEADERS = item.h item_func.h item
139 parse_file.h sql_view.h sql_trigger.h \
140 sql_array.h sql_cursor.h \
141 examples/ha_example.h ha_archive.h \
142@@ -170,7 +179,7 @@
143 ha_federated.h repl_mule.h
144 mysqld_SOURCES = sql_lex.cc sql_handler.cc \
145 item.cc item_sum.cc item_buff.cc item_func.cc \
146-@@ -105,6 +106,7 @@
147+@@ -105,6 +106,7 @@ mysqld_SOURCES = sql_lex.cc sql_handler.
148 sp_cache.cc parse_file.cc sql_trigger.cc \
149 examples/ha_example.cc ha_archive.cc \
150 examples/ha_tina.cc ha_blackhole.cc \
151@@ -180,9 +189,9 @@
152 gen_lex_hash_SOURCES = gen_lex_hash.cc
153 Index: mysql-5.0.77/sql/mysqld.cc
154 ===================================================================
155---- mysql-5.0.77.orig/sql/mysqld.cc 2009-03-18 12:54:24.000000000 +1000
156-+++ mysql-5.0.77/sql/mysqld.cc 2009-03-18 15:42:54.000000000 +1000
157-@@ -7097,6 +7097,11 @@
158+--- mysql-5.0.77.orig/sql/mysqld.cc
159++++ mysql-5.0.77/sql/mysqld.cc
160+@@ -7097,6 +7097,11 @@ static void mysql_init_variables(void)
161 #else
162 have_csv_db= SHOW_OPTION_NO;
163 #endif
164@@ -194,7 +203,7 @@
165 #ifdef HAVE_NDBCLUSTER_DB
166 have_ndbcluster=SHOW_OPTION_DISABLED;
167 #else
168-@@ -8257,6 +8262,7 @@
169+@@ -8257,6 +8262,7 @@ void refresh_status(THD *thd)
170 #undef have_example_db
171 #undef have_archive_db
172 #undef have_csv_db
173@@ -202,7 +211,7 @@
174 #undef have_federated_db
175 #undef have_partition_db
176 #undef have_blackhole_db
177-@@ -8267,6 +8273,7 @@
178+@@ -8267,6 +8273,7 @@ SHOW_COMP_OPTION have_ndbcluster= SHOW_O
179 SHOW_COMP_OPTION have_example_db= SHOW_OPTION_NO;
180 SHOW_COMP_OPTION have_archive_db= SHOW_OPTION_NO;
181 SHOW_COMP_OPTION have_csv_db= SHOW_OPTION_NO;
182@@ -212,9 +221,9 @@
183 SHOW_COMP_OPTION have_blackhole_db= SHOW_OPTION_NO;
184 Index: mysql-5.0.77/sql/mysql_priv.h
185 ===================================================================
186---- mysql-5.0.77.orig/sql/mysql_priv.h 2009-03-18 12:48:06.000000000 +1000
187-+++ mysql-5.0.77/sql/mysql_priv.h 2009-03-18 15:42:54.000000000 +1000
188-@@ -1545,6 +1545,12 @@
189+--- mysql-5.0.77.orig/sql/mysql_priv.h
190++++ mysql-5.0.77/sql/mysql_priv.h
191+@@ -1545,6 +1545,12 @@ extern handlerton tina_hton;
192 #else
193 extern SHOW_COMP_OPTION have_csv_db;
194 #endif
195@@ -229,9 +238,9 @@
196 #define have_federated_db federated_hton.state
197 Index: mysql-5.0.77/sql/set_var.cc
198 ===================================================================
199---- mysql-5.0.77.orig/sql/set_var.cc 2009-03-18 12:54:24.000000000 +1000
200-+++ mysql-5.0.77/sql/set_var.cc 2009-03-18 15:42:54.000000000 +1000
201-@@ -993,6 +993,7 @@
202+--- mysql-5.0.77.orig/sql/set_var.cc
203++++ mysql-5.0.77/sql/set_var.cc
204+@@ -993,6 +993,7 @@ struct show_var_st init_vars[]= {
205 {"have_compress", (char*) &have_compress, SHOW_HAVE},
206 {"have_crypt", (char*) &have_crypt, SHOW_HAVE},
207 {"have_csv", (char*) &have_csv_db, SHOW_HAVE},
208@@ -241,9 +250,9 @@
209 {"have_federated_engine", (char*) &have_federated_db, SHOW_HAVE},
210 Index: mysql-5.0.77/sql/sql_lex.h
211 ===================================================================
212---- mysql-5.0.77.orig/sql/sql_lex.h 2009-03-18 12:48:06.000000000 +1000
213-+++ mysql-5.0.77/sql/sql_lex.h 2009-03-18 15:42:54.000000000 +1000
214-@@ -57,6 +57,7 @@
215+--- mysql-5.0.77.orig/sql/sql_lex.h
216++++ mysql-5.0.77/sql/sql_lex.h
217+@@ -57,6 +57,7 @@ enum enum_sql_command {
218 SQLCOM_SHOW_DATABASES, SQLCOM_SHOW_TABLES, SQLCOM_SHOW_FIELDS,
219 SQLCOM_SHOW_KEYS, SQLCOM_SHOW_VARIABLES, SQLCOM_SHOW_LOGS, SQLCOM_SHOW_STATUS,
220 SQLCOM_SHOW_INNODB_STATUS, SQLCOM_SHOW_NDBCLUSTER_STATUS, SQLCOM_SHOW_MUTEX_STATUS,
221@@ -253,8 +262,8 @@
222 SQLCOM_SHOW_COLLATIONS, SQLCOM_SHOW_CREATE_DB, SQLCOM_SHOW_TABLE_STATUS,
223 Index: mysql-5.0.77/sql/sql_parse.cc
224 ===================================================================
225---- mysql-5.0.77.orig/sql/sql_parse.cc 2009-03-18 12:54:20.000000000 +1000
226-+++ mysql-5.0.77/sql/sql_parse.cc 2009-03-18 15:42:54.000000000 +1000
227+--- mysql-5.0.77.orig/sql/sql_parse.cc
228++++ mysql-5.0.77/sql/sql_parse.cc
229 @@ -25,6 +25,9 @@
230 #ifdef HAVE_INNOBASE_DB
231 #include "ha_innodb.h"
232@@ -265,7 +274,7 @@
233
234 #ifdef HAVE_NDBCLUSTER_DB
235 #include "ha_ndbcluster.h"
236-@@ -3595,6 +3598,15 @@
237+@@ -3595,6 +3598,15 @@ mysql_execute_command(THD *thd)
238 break;
239 }
240 #endif
241@@ -283,9 +292,9 @@
242 {
243 Index: mysql-5.0.77/sql/sql_yacc.yy
244 ===================================================================
245---- mysql-5.0.77.orig/sql/sql_yacc.yy 2009-03-18 12:54:20.000000000 +1000
246-+++ mysql-5.0.77/sql/sql_yacc.yy 2009-03-18 15:42:54.000000000 +1000
247-@@ -8400,6 +8400,9 @@
248+--- mysql-5.0.77.orig/sql/sql_yacc.yy
249++++ mysql-5.0.77/sql/sql_yacc.yy
250+@@ -8400,6 +8400,9 @@ show_engine_param:
251 case DB_TYPE_INNODB:
252 Lex->sql_command = SQLCOM_SHOW_INNODB_STATUS;
253 break;
254@@ -297,9 +306,9 @@
255 MYSQL_YYABORT;
256 Index: mysql-5.0.77/mysql-test/r/ps_1general.result
257 ===================================================================
258---- mysql-5.0.77.orig/mysql-test/r/ps_1general.result 2009-01-30 08:38:20.000000000 +1000
259-+++ mysql-5.0.77/mysql-test/r/ps_1general.result 2009-03-18 15:42:54.000000000 +1000
260-@@ -329,6 +329,7 @@
261+--- mysql-5.0.77.orig/mysql-test/r/ps_1general.result
262++++ mysql-5.0.77/mysql-test/r/ps_1general.result
263+@@ -329,6 +329,7 @@ BLACKHOLE YES/NO /dev/null storage engin
264 EXAMPLE YES/NO Example storage engine
265 ARCHIVE YES/NO Archive storage engine
266 CSV YES/NO CSV storage engine

Subscribers

People subscribed via source and target branches