Commit graph

269 commits

Author SHA1 Message Date
Michael Widenius
3143ad589a Push a lot of small fixes to get larger parts to compile 2013-05-21 22:00:08 +03:00
Andrew McDonnell
4e66318d80 Cleanup warning consistency 2013-05-19 22:05:07 +09:30
Andrew McDonnell
0532a847cd Fixes for compilation when DEBUG_VERBOSE and RETAIN_INT_LATCH_COMPATIBILITY not defined 2013-05-19 21:43:43 +09:30
Andrew McDonnell
8c39cbd9ca System variable to allow testing - integrate 2013-05-19 21:34:42 +09:30
Andrew McDonnell
aa861d66a8 System variable to allow testing 2013-05-19 21:21:40 +09:30
Alexander Barkov
bc80fb07de ha_cassandra.so and ha_oqgraph.so can be build only if boost is installed
on the build machine. So put them into the deb packages optionally.
     
Additionally, fixing cassandra/CMakeLists.txt to work with thrift
installed in /opt/local and /opt. It was supposed to work, but did
not work actually. Only thrift installed in /usr or /usr/local worked.


renamed:
  debian/dist/Debian/mariadb-server-10.0.files => debian/dist/Debian/mariadb-server-10.0.files.in
  debian/dist/Ubuntu/mariadb-server-10.0.files => debian/dist/Ubuntu/mariadb-server-10.0.files.in
modified:
  .bzrignore
  CMakeLists.txt
  storage/cassandra/CMakeLists.txt
  storage/cassandra/cassandra_se.cc
  storage/cassandra/gen-cpp/Cassandra.h
  storage/cassandra/gen-cpp/cassandra_types.h
  storage/oqgraph/CMakeLists.txt
  debian/dist/Debian/mariadb-server-10.0.files.in
  debian/dist/Ubuntu/mariadb-server-10.0.files.in
2013-04-25 17:12:52 +04:00
Sergei Golubchik
a9035be5b7 10.0-base merge 2013-04-15 15:09:22 +02:00
Sergei Golubchik
69ba585a1e remove #if MYSQL_VERSION_ID
there is no "upstream" OQGraph version that needs to stay compatible
with different MariaDB releases.
2013-04-07 17:09:05 +02:00
Sergei Golubchik
993ea79f2d 5.5 merge 2013-03-27 23:41:02 +01:00
Andrew McDonnell
227bb5e030 String code and string number work for djikstra and breadth_first, assertion on '0' for no_search 2013-03-08 23:26:26 +10:30
Andrew McDonnell
87f741a698 Implement latch VARCHAR()- query works with good string names, but partially for string'd numbers, and not for null or cast numbers 2013-03-07 23:59:21 +10:30
Andrew McDonnell
4884ba5ef5 Implement latch VARCHAR()- table structure - retain SHORTINT backwards compatibility. Passes test for b/compat 2013-03-04 23:15:29 +10:30
Andrew McDonnell
44222abf21 Fix typo 2013-03-03 10:10:24 +10:30
Andrew McDonnell
b75ca6c6ec First cut at conversion to use varchar (untested) 2013-03-02 23:14:27 +10:30
Arjen Lentz
1a11797f98 Added oqgraph "create attr" test as per Andrew's regression test. Fixups required before we can record results. 2013-03-01 11:05:05 +10:00
Andrew McDonnell
a0ab3d0d37 Regression test for #1134338 and #1134337 and #1134265 2013-02-28 23:17:17 +10:30
Andrew McDonnell
ce46146b35 Fix segfaults caused by invalid origid, destid, weight attributes 2013-02-28 23:01:10 +10:30
Andrew McDonnell
eccf20b5a0 Fix typo (empty destid still getting through open table) 2013-02-28 22:54:46 +10:30
Arjen Lentz
d4b02db9cb oqgraph cleanups 2013-02-28 15:49:53 +10:00
Arjen Lentz
d0e852a723 Removed old oqgraph v1 files (graphstore.*)
Updated oqgraph copyright, version and author info.
2013-02-28 10:16:29 +10:00
Andrew McDonnell
79f8ad1b79 Fix error calculating length of underlying table name. 2013-02-27 23:11:57 +10:30
Andrew McDonnell
60c7736f58 Sanity check that expected attributes exist when opening the table. 2013-02-27 22:35:19 +10:30
Vladislav Vaintroub
2c97d5a305 Compilation : fix oqgraph's system check, in case where boost header aren't in standard include directory. 2013-02-24 20:05:26 +01:00
Antony T Curtis
86ed2765bb Fix for FindJust.cmake
Make sure that boost is included with consistent config.
2013-02-21 10:36:25 -08:00
Antony T Curtis
694cbb5fb9 fix judy cmake case sensitivity 2013-02-14 10:38:35 -08:00
Antony T Curtis
321de37e68 Merge with lp:maria/10.0 2013-02-10 16:21:49 -08:00
Antony T Curtis
1af7d555b7 Fixups for OQGraph v3 on MariaDB 10.0 2013-02-10 16:07:55 -08:00
Antony T Curtis
a72913a5ea fix indent 2013-01-19 22:56:10 -08:00
unknown
701419b02f Merge MariaDB 10.0-base to MariaDB 10.0 2012-12-18 15:01:58 +01:00
Sergei Golubchik
cb7f5948ec simplify the handler api - table_type() is no longer abstract, not even virtual 2012-12-17 11:00:39 +01:00
Sergei Golubchik
7a1b9ef607 fix oqgraph compilation failures.
fix rpl_mdev382.result
2012-10-20 18:26:56 +02:00
Antony T Curtis
8e4f1619ba Import Judy 1.0.4 2012-09-30 15:01:32 -07:00
Antony T Curtis
2847178edd Post merge fixes 2012-09-30 14:49:46 -07:00
Antony T Curtis
b965d031bb Merge OQGraph3 into MariaDB 5.5.27 2012-09-30 12:14:12 -07:00
Sergei Golubchik
c9b95de246 MDEV-336 oqgraph 5.5 crashes in buildbot
compile oqgraph with -fno-strict-aliasing
2012-08-11 10:31:10 +02:00
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