mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-24 07:44:22 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
88733 commits 2778 branches 343 tags 1.6 GiB
Commit graph

54 commits

Author SHA1 Message Date
Sergei Golubchik
d3e2e1243b 5.5 merge 2014-05-09 12:35:11 +02:00
andrew
97954225ae MDEV-5996 - fix odd behaviour of some combinations of table and database names 2014-04-07 22:16:02 +09:30
Sergei Golubchik
8705d00ab6 MDEV-5748 Assertion `status_var.memory_used == 0' fails on disconnect after opening an OQGRAPH table 
make sure MY_THREAD_SPECIFIC is not set for memroot that can be
transferred between threads
 2014-03-02 19:01:34 +01:00
Andrew McDonnell
01c514fc88 Update plugin description 2013-11-21 18:03:09 +10: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
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 McDonnell
60f050c3c7 Fix segfault for 1133093 2013-08-15 23:50:54 +09:30
Andrew McDonnell
aed2ffdbe0 Disable ALTER for oqgraph. Fixes crash. 2013-08-15 22:58:36 +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
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
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
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
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
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
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
Sergei Golubchik
7a1b9ef607 fix oqgraph compilation failures. 
fix rpl_mdev382.result
 2012-10-20 18:26:56 +02:00
Antony T Curtis
b965d031bb Merge OQGraph3 into MariaDB 5.5.27 2012-09-30 12:14:12 -07: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
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
2037f387ee Commit work for OQGraph v3 
Todo:
 - Add #ifdefs for building in MySQL
 - Lots more testing
 2011-04-12 15:50:32 -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