Commit graph

134 commits

Author SHA1 Message Date
Vladislav Vaintroub
bd39599668 fix oqgraph on MSVC 2012-08-02 23:17:27 +02:00
Sergei Golubchik
6d4acc43e5 MDEV-336 oqgraph 5.5 crashes in buildbot
make CMakeLists.txt to detect if the installed boost can be compiled with the
installed compile and specified set of compiler options.

Background: even sufficiently new Boost cannot be compiled with the sufficiently old gcc
in the presence of -fno-rtti
2012-07-31 22:39:33 +02:00
Sergei Golubchik
25609313ff 5.3.4 merge 2012-02-15 18:08:08 +01:00
Vladislav Vaintroub
33a60e7fb6 Fix oqgraph so it can be built on Window as well.
Note: to build with -fno-rtti as we currently build the server, boost version  1.45 or later is required.
(without -fno-rtti, 1.40 is enough)
2011-12-30 11:21:39 +01:00
Vladislav Vaintroub
aa5623ce33 Fix oqgraph build . Plugin does not need rtti, and does not load if rtti compile settings are different from server's 2011-12-28 22:47:27 +01:00
Vladislav Vaintroub
0e8f71b2bc LPBUG#906638 : Fixes to build oqgraph with boost 1.48
- dijkstra_shortest_paths() needs a Graph as first parameter, in case of reverse_graph we now need to use
  its m_g member
- use boost::tuples::tie() on all places where tie() was used . Reason -
  fix the build with Visual Studio 10 SP1 (which includes std:tr1:tie, thus creating  ambiguity)
2011-12-22 15:50:33 +01:00
Michael Widenius
9292953d5a Fixed that oqgraph and libmysqld/examples compiles on OpenSuse 11.4
.bzrignore:
  Ignore generated file emacs.h
libmysqld/CMakeLists.txt:
  Remove direct usage of 'dbug' library
  This fixes that 'BUILD/compile-dist' works
storage/oqgraph/CMakeLists.txt:
  Remove compiler option '-fno-rtti' as BOOST requires this
2011-10-26 15:24:07 +03:00
Sergei Golubchik
aeaa112edb fixes for windows 2011-10-21 23:07:13 +02:00
Sergei Golubchik
76f0b94bb0 merge with 5.3
sql/sql_insert.cc:
  CREATE ... IF NOT EXISTS may do nothing, but
  it is still not a failure. don't forget to my_ok it.
  ******
  CREATE ... IF NOT EXISTS may do nothing, but
  it is still not a failure. don't forget to my_ok it.
sql/sql_table.cc:
  small cleanup
  ******
  small cleanup
2011-10-19 21:45:18 +02:00
Sergei Golubchik
27762df304 fixing pbxt and oqgraph suites 2011-07-14 18:25:05 +02:00
Sergei Golubchik
7e6c8ea891 remove unused autotools files 2011-07-03 20:07:41 +02:00
Sergei Golubchik
b4a0b2c2f8 post-merge fixes.
most tests pass.
5.3 merge is next
2011-07-02 22:12:12 +02:00
Antony T Curtis
0fee6ce7b8 compile fixes 2011-05-16 15:22:58 +10:00
Sergei Golubchik
0accbd0364 lots of post-merge changes 2011-04-25 17:22:25 +02:00
Antony T Curtis
a062735d60 Cleanup, simplify and optimize. Change makefile a little so that we have debug symbols for the graph core. 2011-04-13 19:06:43 -07:00
Antony T Curtis
b27a83d502 Fixup and debugging 2011-04-12 17:00:50 -07:00
Antony T Curtis
2037f387ee Commit work for OQGraph v3
Todo:
 - Add #ifdefs for building in MySQL
 - Lots more testing
2011-04-12 15:50:32 -07:00
Vladislav Vaintroub
fcd29b7845 Detect Boost installation and build OQGRAPH when possible. For now, disable oqgraph on x64 until
LPBUG 756966 is solved.
2011-04-10 22:48:28 -07:00
Michael Widenius
39616eb9ef Fixed compiler warnings and some test failures found by buildbot
dbug/dbug.c:
  Fixed compiler warnings on windows
mysql-test/r/index_intersect_innodb.result:
  Don't print number of rows as this varies
mysql-test/suite/funcs_1/r/processlist_val_no_prot.result:
  Update to use new State
mysql-test/suite/handler/heap.result:
  Update results
mysql-test/suite/handler/heap.test:
  Changed key used in test as the key 'b' will not guarantee order of the two last elements (as the key value is the same)
mysql-test/suite/pbxt/r/lock_multi.result:
  Update to use new State
mysql-test/t/index_intersect.test:
  Don't print number of rows as this varies
mysql-test/valgrind.supp:
  Added suppression for linux
mysys/hash.c:
  Fixed compiler warnings on windows
plugin/handler_socket/handlersocket/database.cpp:
  Fixed compiler warnings
sql-common/client_plugin.c:
  Changed variable to define to avoid compiler warnings when variable is not used
sql-common/my_time.c:
  Initialize all my_time elements to avoid compiler warnings
storage/oqgraph/ha_oqgraph.cc:
  Use right function (to avoid compiler warning)
storage/pbxt/src/table_xt.cc:
  Initialize variables (to avoid compiler warnings)
2011-02-23 02:06:58 +02:00
Michael Widenius
b7b25dc666 Merge with 5.1-release.
- Fixed problem with oqgraph and 'make dist'

Note that after this merge we have a problem show in join_outer where we examine too many rows in one specific case (related to BUG#57024).
This will be fixed when mwl#128 is merged into 5.3.
2010-12-06 10:25:44 +02:00
Michael Widenius
6426564753 Fixed compiler warnings but calling field->store(longlong, unsigned_flag) with proper arguments. 2010-12-04 12:35:41 +02:00
Michael Widenius
ab5e4eefd5 Fixed some compiler warnings found when compiling for windows.
Changed rows_read and rows_sent status variables to be longlong (to avoid compiler warnings)


sql/item_func.cc:
  Fixed wrong usage of alias
sql/item_subselect.cc:
  Changed buffer size to ulonglong to be able detect buffers bigger than size_t
sql/item_subselect.h:
  Changed buffer size to ulonglong to be able detect buffers bigger than size_t
sql/multi_range_read.cc:
  Fixed compiler warning by using correct type for function argument
sql/mysqld.cc:
  Changed rows_read and rows_sent status variables to be longlong
sql/opt_subselect.h:
  Fixed compiler warning by using correct type for function argument
sql/sql_class.cc:
  Changed rows_read and rows_sent status variables to be longlong
sql/sql_class.h:
  Changed rows_read and rows_sent status variables to be longlong
  Changed max_nulls_in_row to uint as this is number of columns in row.
  This fixed some compiler warnings.
sql/sql_select.cc:
  Added casts to avoid compiler warnings
storage/heap/ha_heap.cc:
  Initilize different types separate
storage/oqgraph/ha_oqgraph.cc:
  Fixed argument to store(longlong) to avoid compiler warnings
2010-11-30 01:27:14 +02:00
Sergei Golubchik
65ca700def merge.
checkpoint.
does not compile.
2010-11-25 18:17:28 +01:00
unknown
95b37a254b Merge MariaDB 5.1->5.2 2010-11-19 22:33:47 +01:00
Sergei Golubchik
6467bcca60 oqgraph and sphinx on windows 2010-09-15 17:29:57 +02:00
Sergei Golubchik
422c136658 MYSQL_PLUGIN_WITHOUT() macro for plug.in
Using it in oqgraph/plug.in to fix bug#635633
2010-09-14 23:11:46 +02:00
Michael Widenius
13141c9842 Fixed compiler warnings and test failures 2010-08-06 11:05:44 +03:00
Sergei Golubchik
5eae48c905 oqgraph fix: not all gcc versions support -fvisibility-inlines-hidden 2010-05-15 10:44:55 +02:00
unknown
88b3697d1b MBug#524625: OQGraph error with binary logging enabled
Set the correct engine flags for OQGraph to get binlogging working.
2010-04-12 16:23:51 -07:00
unknown
dec8b0254c Fix compiler warnings 2010-03-31 09:54:07 +02:00
unknown
da44736a9d Comment out dtrace stuff for now, as it does not work properly on systems that lack dtrace.
Remove generated header from bzr
2010-03-30 20:12:00 +02:00
unknown
205baff9ab Require Boost version 1.40.0 to build OQGraph (earlier versions have a bug).
storage/oqgraph/README:
  Added small README explaining the need for Boost
storage/oqgraph/graphcore.cc:
  Fix using deprecated header that is gone in recent Boost.
storage/oqgraph/plug.in:
  Change Boost detection to look for version number (patch by Sergei Golubchik).
2010-03-30 09:33:38 +02:00
unknown
7a3163cf06 Fix wrong db_type for OQGraph hton. 2010-01-04 14:32:42 +01:00
unknown
ccf8a63f2d Import OQGraph engine into MariaDB. 2010-01-04 09:27:50 +01:00