Commit graph

235 commits

Author SHA1 Message Date
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
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