mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-17 20:42:30 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
175481 commits 2784 branches 343 tags 1.6 GiB
Commit graph

83 commits

Author SHA1 Message Date
Sergei Golubchik
932646b1ff Merge branch '10.1' into 10.2 2016-06-30 16:38:05 +02:00
Sergey Vojtovich
7ecb304996 Code cleanups 
- unused TABLE_SHARE::deleting and TABLE_LIST::deleting flags were removed
- kill_delayed_threads_for_table() and intern_close_table() are now private
  methods of table cache
- removed free_share flag of closefrm(): it was never used for temporary
  tables and was rarely useful for regular tables
 2016-06-10 17:37:12 +04:00
Sergei Golubchik
87e3e67f43 Merge branch '10.0' into 10.1 2016-05-04 15:23:26 +02:00
Vladislav Vaintroub
673efd0648 MDEV-10015 Fix oqgraph compilation on Windows 2016-05-03 15:18:55 +02:00
Andrew McDonnell
23b1b69b10 Comment from https://github.com/MariaDB/server/pull/153 2016-04-24 18:15:20 +02:00
Andrew McDonnell
6651005e62 Fix for MDEV-8206, as per Jira comments of 2015-11-16 and 2015-11-30 2016-04-24 18:15:20 +02:00
Sergei Golubchik
3b0c7ac1f9 Merge branch '10.0' into 10.1 2016-03-21 13:02:53 +01:00
Sergei Golubchik
d158ba62f7 ASAN error in OQGraph engine 
Fixed more cases for MDEV-6282
 2016-03-21 11:43:19 +01:00
Sergei Golubchik
3fdc6140a3 update plugins' maturity levels 2016-03-18 22:05:23 +01:00
Andrew McDonnell
59b6b99ce3 Added regression test for MDEV_5871 2016-02-17 21:46:32 +04:00
Sergei Golubchik
5091a4ba75 Merge tag 'mariadb-10.0.19' into 10.1 2015-06-01 15:51:25 +02:00
Andrew McDonnell
a235504b75 Ensure VERBOSE_DEBUG is off by default 2015-02-28 22:43:18 +10:30
Andrew McDonnell
2b9aba3b55 Updated (C) message to 2015, and changelog 2015-02-28 22:43:04 +10:30
Andrew McDonnell
c65f323836 Fixed more cases for MDEV-6282 2015-02-28 22:37:06 +10:30
Andrew McDonnell
e32dafe778 Hopefully finally fixes MDEV-6282, MDEV-5748 and MDEV-6345 2015-02-28 22:37:06 +10:30
Andrew McDonnell
f8e0f1a823 Minor code cleanup: validation of options to member function. 2015-02-28 22:37:05 +10:30
Andrew McDonnell
fbcabb24ce Fixed minor spelling mistake. 2015-02-28 22:37:05 +10:30
Andrew McDonnell
a657abd63f Added extra debug to support MDEV-6282 
Conflicts:
	storage/oqgraph/ha_oqgraph.cc
 2015-02-28 22:37:04 +10:30
Andrew McDonnell
79246ebfe9 Partial code tidy: move plugin description to end with other items, and added status variable for debug. 2015-02-28 22:37:03 +10:30
Andrew McDonnell
13e30c0063 Removed dead code and support for dead (<10.0.5) versions of mariadb 
Conflicts:
	storage/oqgraph/ha_oqgraph.cc

Conflicts:
	storage/oqgraph/ha_oqgraph.cc
 2015-02-28 22:37:03 +10:30
Andrew McDonnell
abf1e259f6 Partial whitespace cleanup. 
Conflicts:
	storage/oqgraph/ha_oqgraph.cc

Conflicts:
	storage/oqgraph/ha_oqgraph.cc
 2015-02-28 22:29:43 +10:30
Andrew McDonnell
1973c00970 Update 2014 (C) message 2015-02-28 22:02:58 +10:30
Sergei Golubchik
69d700ace3 MDEV-5871 support assisted discovery in oqgraph v3 2014-12-04 10:41:52 +01:00
Sergei Golubchik
2ef0312cd9 oqgraph cleanup: remove casts 2014-12-04 10:41:52 +01:00
Sergei Golubchik
853077ad7e Merge branch '10.0' into bb-10.1-merge 
Conflicts:
	.bzrignore
	VERSION
	cmake/plugin.cmake
	debian/dist/Debian/control
	debian/dist/Ubuntu/control
	mysql-test/r/join_outer.result
	mysql-test/r/join_outer_jcl6.result
	mysql-test/r/null.result
	mysql-test/r/old-mode.result
	mysql-test/r/union.result
	mysql-test/t/join_outer.test
	mysql-test/t/null.test
	mysql-test/t/old-mode.test
	mysql-test/t/union.test
	packaging/rpm-oel/mysql.spec.in
	scripts/mysql_config.sh
	sql/ha_ndbcluster.cc
	sql/ha_ndbcluster_binlog.cc
	sql/ha_ndbcluster_cond.cc
	sql/item_cmpfunc.h
	sql/lock.cc
	sql/sql_select.cc
	sql/sql_show.cc
	sql/sql_update.cc
	sql/sql_yacc.yy
	storage/innobase/buf/buf0flu.cc
	storage/innobase/fil/fil0fil.cc
	storage/innobase/include/srv0srv.h
	storage/innobase/lock/lock0lock.cc
	storage/tokudb/CMakeLists.txt
	storage/xtradb/buf/buf0flu.cc
	storage/xtradb/fil/fil0fil.cc
	storage/xtradb/include/srv0srv.h
	storage/xtradb/lock/lock0lock.cc
	support-files/mysql.spec.sh
 2014-12-02 22:25:16 +01:00
Sergei Golubchik
1b75bed00f 5.5.40+ merge 2014-10-09 10:30:11 +02:00
Sergei Golubchik
74a552d5dc cleanup: remove table->status from some engines 
from engines that we don't need to merge from
a third-party repository on a regular basis
 2014-10-01 23:38:26 +02:00
Michael Widenius
44428d397c Fixed compiler warning. Now MariaDB 10.0 compiles without warnings for me. 
(Except Instantiation notices from oqgraph that I don't know what to do with)
 2014-10-01 13:03:50 +03:00
Michael Widenius
caca6b9907 Fixed warnings 
storage/oqgraph/ha_oqgraph.cc:
  Fixed compiler warning
storage/xtradb/handler/ha_innodb.cc:
  Ifdef:ed note used function
 2014-09-30 20:12:59 +03:00
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