Commit graph

160 commits

Author SHA1 Message Date
Sergei Golubchik
59d9d08e2b 5.5 merge 2014-02-01 00:54:03 +01:00
Andrew McDonnell
dd6225c1f6 Updated README with build instructions. 2014-01-31 23:08:02 +10:30
Andrew McDonnell
940bf25a72 Update readme with libjudy reference. 2014-01-27 22:48:06 +10:30
Sergei Golubchik
879a05ce3f improve oqgraph boost check to filter out newer boost versions 2014-01-26 21:49:39 +01:00
Michael Widenius
659304d410 Cleanups:
- Updated help for mysql-test-run
- Added OQGraph to all cmake error output regarding OQGraph to make it easier to spot problems
- Suppressed warning messages from OQGraph
- Added test for version_malloc_library variable

mysql-test/mysql-test-run.pl:
  Updated help
mysql-test/suite/sys_vars/r/version_malloc_library_basic.result:
  Added test for version_malloc_library variable
mysql-test/suite/sys_vars/t/version_malloc_library_basic.test:
  Added test for version_malloc_library variable
storage/oqgraph/CMakeLists.txt:
  Added OQGraph to all cmake error output regarding OQGraph to make it easier to spot problems
storage/oqgraph/mysql-test/oqgraph/boundary_conditions.result:
  Suppressed warning messages
storage/oqgraph/mysql-test/oqgraph/boundary_conditions.test:
  Suppressed warning messages
storage/oqgraph/mysql-test/oqgraph/invalid_operations.result:
  Suppressed warning messages
storage/oqgraph/mysql-test/oqgraph/invalid_operations.test:
  Suppressed warning messages
storage/oqgraph/mysql-test/oqgraph/isnull.result:
  Suppressed warning messages
storage/oqgraph/mysql-test/oqgraph/isnull.test:
  Suppressed warning messages
storage/oqgraph/mysql-test/oqgraph/regression_1233113.result:
  Suppressed warning messages
storage/oqgraph/mysql-test/oqgraph/regression_1233113.test:
  Suppressed warning messages
storage/oqgraph/mysql-test/oqgraph/regression_drop_after.result:
  Suppressed warning messages
storage/oqgraph/mysql-test/oqgraph/regression_drop_after.test:
  Suppressed warning messages
2014-01-09 22:01:12 +02:00
andrew
574590d927 Update copyright year 2014-01-01 20:03:51 +10:30
Sergei Golubchik
ce2fabe442 move oqgraph and sphinx suites into storage/*/mysql-test/ 2013-12-16 13:32:03 +01:00
Sergey Vojtovich
4541c4d3fb MDEV-5319 - Request for merge of Oqgraph v3 functionality
storage/oqgraph into 10.0

- fixed sys_vars.all_vars (added oqgraph_allow_create_integer_latch_basic.test)
- since oqgraph depends on Judy, move it to a separate package
2013-12-16 13:55:43 +04:00
Sergey Vojtovich
af2129f952 MDEV-5319 - Request for merge of Oqgraph v3 functionality storage/oqgraph
into 10.0
2013-12-11 13:02:12 +04:00
Andrew McDonnell
01c514fc88 Update plugin description 2013-11-21 18:03:09 +10:30
Andrew McDonnell
549cee850f Likely fix for 1233113 2013-10-03 20:34:03 +09:30
Andrew McDonnell
05e338a33c Make sure all fields of cursor initialised 2013-10-03 19:36:13 +09:30
Andrew McDonnell
4cc08c968d Fix DEBUG build issues 2013-10-03 19:19:51 +09:30
Andrew McDonnell
a6af7fc047 Backwards compatibility fixes for 5.5.32 2013-09-16 22:47:12 +09:30
Andrew McDonnell
66e8439dd7 More test suite cleanups. 2013-09-14 23:05:05 +09:30
Andrew McDonnell
7dad8f1673 Skip deleted records mid table. 2013-09-13 22:58:22 +09:30
Andrew McDonnell
078cf03304 Partial for for lp bug 796647 - handle DELETED records in ha_rnd_next of backing table 2013-09-13 22:42:09 +09:30
Andrew McDonnell
323d45826f Ensure we have an up to date count of edges of backing table 2013-09-12 22:32:58 +09:30
Andrew McDonnell
2560ce0085 MOre fixes related to merge of lp:maria/10.0 2013-09-10 22:45:18 +09:30
Andrew McDonnell
c43058d0e7 Fix for order by crash, release dangling cursor when unlocking table. 2013-09-10 22:44:45 +09:30
Andrew McDonnell
174fc2a8f3 Fix remaining build problems caused by merge from lp:maria/10.0 2013-09-09 21:50:20 +09:30
Andrew McDonnell
6d1d8847f9 Partial fix for lp bug 1221722 2013-09-07 18:51:05 +09:30
andrew
c2557f372b Partial fix for lp bug 1221722 2013-09-06 23:24:33 +09:30
andrew
86d49f149e Merge upstream latest maria/10.0 2013-09-06 20:45:53 +09:30
andrew
8824afd152 Fix for build error on gcc 4.7 2013-09-06 20:27:33 +09:30
Andrew McDonnell
c18c903c11 Revert half the fix for 1133093 - superfluous 2013-08-16 20:05:09 +09:30
Andrew McDonnell
60f050c3c7 Fix segfault for 1133093 2013-08-15 23:50:54 +09:30
Andrew McDonnell
c2fb0f2ab8 Fix base segfault for order by. However, this shifts the problem elsewhere. 2013-08-15 23:28:44 +09:30
Andrew McDonnell
aed2ffdbe0 Disable ALTER for oqgraph. Fixes crash. 2013-08-15 22:58:36 +09:30
Andrew McDonnell
1c89a75dbc Fix one memory leak (caused by not freeing found cursor in find_vertices) (introduced in fix for #1196020, doh) 2013-08-12 21:44:55 +09:30
Andrew McDonnell
778bf10fa3 Fix const correctness as per ha_example.cc, but doesnt fix bug. 2013-08-11 00:31:12 +09:30
Andrew McDonnell
dedd51e497 Reduce debug verbosity 2013-08-10 20:15:11 +09:30
Andrew McDonnell
69ca634663 Deal with properly 2013-08-10 20:13:20 +09:30
Andrew McDonnell
a70741243f Fix weights on dijkstras originator, fix for #1196036 2013-08-09 20:50:16 +09:30
Andrew McDonnell
e87960d346 Fix for spurious result when searching for non-existing vertex 2013-08-02 20:36:04 +09:30
Sergei Golubchik
b7b5f6f1ab 10.0-monty merge
includes:
* remove some remnants of "Bug#14521864: MYSQL 5.1 TO 5.5 BUGS PARTITIONING"
* introduce LOCK_share, now LOCK_ha_data is strictly for engines
* rea_create_table() always creates .par file (even in "frm-only" mode)
* fix a 5.6 bug, temp file leak on dummy ALTER TABLE
2013-07-21 16:39:19 +02:00
Andrew McDonnell
d4185896f6 Fix for djikstras not working on destid (because of #if 0) same as for bug 1196027 2013-06-29 23:27:17 +09:30
Andrew McDonnell
d1650f8298 Fixes bug 1196027 - breath_first with destid=X 2013-06-29 23:15:19 +09:30
Andrew McDonnell
1c6cccea51 Renamed no_search to '' 2013-06-29 22:56:29 +09:30
Andrew McDonnell
ccd2ca689a Dont allow ORIGID and DESTID columns to be the same as each other. 2013-06-29 21:26:18 +09:30
Andrew McDonnell
9485893068 Fix assert in debug build on invalid latch 2013-05-31 19:29:23 +09:30
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