← Back to branch summary

~ourdelta-core/ourdelta/trunk

« back to all changes in this revision

Viewing changes to mysql/5.0/open_query/graph_engine/oqgraph-mysql.patch

  • Committer: Arjen Lentz
  • Date: 2009-11-09 10:39:39 UTC
  • mfrom: (64.1.3 ourdelta-5.0.87)
  • Revision ID: arjen@openquery.com-20091109103939-5wmrrm5hkmwnu3h4
Merge from 5.0.87 prep branch

Show diffs side-by-side

added added

removed removed

Lines of Context:
mysql/5.0/open_query/graph_engine/oqgraph-mysql.patch
1
1
Index: mysql-5.0.86/config/ac-macros/ha_oqgraph.m4
2
2
===================================================================
3
 
--- /dev/null
4
 
+++ mysql-5.0.86/config/ac-macros/ha_oqgraph.m4
 
3
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
 
4
+++ mysql-5.0.86/config/ac-macros/ha_oqgraph.m4 2009-10-23 23:55:44.000000000 -0700
5
5
@@ -0,0 +1,32 @@
6
6
+dnl ---------------------------------------------------------------------------
7
7
+dnl Macro: MYSQL_CHECK_OQGRAPH
37
37
+
38
38
Index: mysql-5.0.86/configure.in
39
39
===================================================================
40
 
--- mysql-5.0.86.orig/configure.in      2009-10-21 18:17:04.000000000 +1000
41
 
+++ mysql-5.0.86/configure.in   2009-10-21 18:17:14.000000000 +1000
 
40
--- mysql-5.0.86.orig/configure.in      2009-10-23 23:55:41.000000000 -0700
 
41
+++ mysql-5.0.86/configure.in   2009-10-23 23:55:44.000000000 -0700
42
42
@@ -59,6 +59,7 @@
43
43
 sinclude(config/ac-macros/ha_blackhole.m4)
44
44
 sinclude(config/ac-macros/ha_example.m4)
57
57
 MYSQL_CHECK_BLACKHOLEDB
58
58
Index: mysql-5.0.86/libmysqld/Makefile.am
59
59
===================================================================
60
 
--- mysql-5.0.86.orig/libmysqld/Makefile.am     2009-10-21 18:17:04.000000000 +1000
61
 
+++ mysql-5.0.86/libmysqld/Makefile.am  2009-10-21 18:17:14.000000000 +1000
 
60
--- mysql-5.0.86.orig/libmysqld/Makefile.am     2009-10-23 23:55:41.000000000 -0700
 
61
+++ mysql-5.0.86/libmysqld/Makefile.am  2009-10-23 23:55:44.000000000 -0700
62
62
@@ -30,9 +30,15 @@
63
63
                        -I$(top_builddir)/sql -I$(top_srcdir)/sql \
64
64
                        -I$(top_srcdir)/sql/examples \
121
121
 
122
122
Index: mysql-5.0.86/sql/Makefile.am
123
123
===================================================================
124
 
--- mysql-5.0.86.orig/sql/Makefile.am   2009-10-21 18:17:04.000000000 +1000
125
 
+++ mysql-5.0.86/sql/Makefile.am        2009-10-21 18:17:14.000000000 +1000
 
124
--- mysql-5.0.86.orig/sql/Makefile.am   2009-10-23 23:55:41.000000000 -0700
 
125
+++ mysql-5.0.86/sql/Makefile.am        2009-10-23 23:55:44.000000000 -0700
126
126
@@ -24,7 +24,7 @@
127
127
                        -I$(top_srcdir)/regex -I$(srcdir) \
128
128
                         $(openssl_includes)
159
159
 gen_lex_hash_SOURCES = gen_lex_hash.cc
160
160
Index: mysql-5.0.86/sql/handler.cc
161
161
===================================================================
162
 
--- mysql-5.0.86.orig/sql/handler.cc    2009-10-21 18:17:04.000000000 +1000
163
 
+++ mysql-5.0.86/sql/handler.cc 2009-10-21 18:17:14.000000000 +1000
 
162
--- mysql-5.0.86.orig/sql/handler.cc    2009-10-23 23:55:41.000000000 -0700
 
163
+++ mysql-5.0.86/sql/handler.cc 2009-10-23 23:55:44.000000000 -0700
164
164
@@ -86,6 +86,15 @@
165
165
   NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
166
166
   HTON_NO_FLAGS };
200
200
     if (have_ndbcluster == SHOW_OPTION_YES)
201
201
Index: mysql-5.0.86/sql/handler.h
202
202
===================================================================
203
 
--- mysql-5.0.86.orig/sql/handler.h     2009-10-21 18:17:04.000000000 +1000
204
 
+++ mysql-5.0.86/sql/handler.h  2009-10-21 18:17:14.000000000 +1000
 
203
--- mysql-5.0.86.orig/sql/handler.h     2009-10-23 23:55:41.000000000 -0700
 
204
+++ mysql-5.0.86/sql/handler.h  2009-10-23 23:55:44.000000000 -0700
205
205
@@ -193,6 +193,7 @@
206
206
   DB_TYPE_FEDERATED_DB, 
207
207
   DB_TYPE_BLACKHOLE_DB,
212
212
 
213
213
Index: mysql-5.0.86/sql/mysql_priv.h
214
214
===================================================================
215
 
--- mysql-5.0.86.orig/sql/mysql_priv.h  2009-10-21 18:17:04.000000000 +1000
216
 
+++ mysql-5.0.86/sql/mysql_priv.h       2009-10-21 18:17:14.000000000 +1000
 
215
--- mysql-5.0.86.orig/sql/mysql_priv.h  2009-10-23 23:55:43.000000000 -0700
 
216
+++ mysql-5.0.86/sql/mysql_priv.h       2009-10-23 23:55:44.000000000 -0700
217
217
@@ -1564,6 +1564,12 @@
218
218
 #else
219
219
 extern SHOW_COMP_OPTION have_sphinx_db;
229
229
 #define have_federated_db federated_hton.state
230
230
Index: mysql-5.0.86/sql/mysqld.cc
231
231
===================================================================
232
 
--- mysql-5.0.86.orig/sql/mysqld.cc     2009-10-21 18:17:04.000000000 +1000
233
 
+++ mysql-5.0.86/sql/mysqld.cc  2009-10-21 18:17:14.000000000 +1000
 
232
--- mysql-5.0.86.orig/sql/mysqld.cc     2009-10-23 23:55:41.000000000 -0700
 
233
+++ mysql-5.0.86/sql/mysqld.cc  2009-10-23 23:55:44.000000000 -0700
234
234
@@ -7156,6 +7156,11 @@
235
235
 #else
236
236
   have_sphinx_db= SHOW_OPTION_NO;
261
261
 SHOW_COMP_OPTION have_blackhole_db= SHOW_OPTION_NO;
262
262
Index: mysql-5.0.86/sql/set_var.cc
263
263
===================================================================
264
 
--- mysql-5.0.86.orig/sql/set_var.cc    2009-10-21 18:17:04.000000000 +1000
265
 
+++ mysql-5.0.86/sql/set_var.cc 2009-10-21 18:17:14.000000000 +1000
 
264
--- mysql-5.0.86.orig/sql/set_var.cc    2009-10-23 23:55:41.000000000 -0700
 
265
+++ mysql-5.0.86/sql/set_var.cc 2009-10-23 23:55:44.000000000 -0700
266
266
@@ -1031,6 +1031,7 @@
267
267
   {"have_ndbcluster",         (char*) &have_ndbcluster,             SHOW_HAVE},
268
268
   /* have_openssl is just and alias for have_ssl */
279
279
 ARCHIVE        YES/NO  Archive storage engine
280
280
 CSV    YES/NO  CSV storage engine
281
281
 SPHINX YES/NO  Sphinx storage engine
282
 
+OQGRAPH        YES/NO  Open Query Graph Computation Engine, stored in memory
 
282
+OQGRAPH        YES/NO  Open Query Graph Computation Engine, stored in memory (http://openquery.com/graph)
283
283
 ndbcluster     YES/NO  Clustered, fault-tolerant, memory-based tables
284
284
 FEDERATED      YES/NO  Federated MySQL storage engine
285
285
 MRG_MYISAM     YES/NO  Collection of identical MyISAM tables
286
286
Index: mysql-5.0.86/patch_info/graph_engine.info
287
287
===================================================================
288
288
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
289
 
+++ mysql-5.0.86/patch_info/graph_engine.info   2009-10-21 20:44:41.000000000 +1000
 
289
+++ mysql-5.0.86/patch_info/graph_engine.info   2009-10-23 23:55:44.000000000 -0700
290
290
@@ -0,0 +1,6 @@
291
291
+File=graph_engine.patch
292
292
+Name=Graph Computation Engine
293
293
+Version=2.0
294
294
+Author=Arjen G Lentz & Antony T Curtis for Open Query <graph@openquery.com>
295
 
+License=GPL
 
295
+License=GPLv2+
296
296
+Comment=For info/docs/support/engineering/licensing, see http://openquery.com/graph