mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-21 22:34:18 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
89757 commits 2781 branches 343 tags 1.6 GiB
Commit graph

1407 commits

Author SHA1 Message Date
Rich Prohaska
48a6883b34 #258 support deferred XA recovery with discard of prepared txns and dirty shutdown of the FT environment 2014-07-09 15:50:15 -04:00
Rich Prohaska
28833bd162 #257 disable missing field initializer warning 2014-07-03 08:44:51 -04:00
Rich Prohaska
4df66169f2 #256 only force MDL X for certain alter table operations 2014-07-03 08:44:40 -04:00
Rich Prohaska
3a030fac86 #257 disable missing field initializer warning 2014-07-02 13:27:37 -04:00
Michael Widenius
bd2117d154 Automatic merge from 5.5 
Fixed 2 failing tests by replacing result files
 2014-08-19 21:35:14 +03:00
Sergei Golubchik
6fb17a0601 5.5.39 merge 2014-08-07 18:06:56 +02:00
Sergei Golubchik
a4ab2431a2 fix tokudb version 2014-08-05 20:22:57 +02:00
Rich Prohaska
ca032f3e82 #256 only force MDL X for certain alter table operations 2014-06-26 15:24:47 -04:00
Sergei Golubchik
787ec31778 MDEV-6248 GUI-friendly cmake options to enable/disable plugins 
* Introduce a set of PLUGIN_xxx cmake options with values
  NO, STATIC, DYNAMIC, AUTO, YES (abort if plugin is not compiled)
* Deprecate redundant and ambiguous WITH_xxx, WITH_PLUGIN_xxx,
  WITH_xxx_STORAGE_ENGINE, WITHOUT_xxx, WITHOUT_PLUGIN_xxx,
  WITHOUT_xxx_STORAGE_ENGINE
* Actually check whether a plugin is disabled (DISABLED keyword was
  always present, but it was ignored until now).
* Support conditionally disabled plugins - keyword ONLY_IF
* Use ONLY_IF for conditionally skipping plugins, instead of
  doing MYSQL_ADD_PLUGIN conditionally as before. Because if
  MYSQL_ADD_PLUGIN isn't done at all, PLUGIN_xxx=YES cannot work.
 2014-06-23 17:39:13 +02:00
Rich Prohaska
e8f1ef3975 #252 fix the MDEV-6324 fix 2014-06-13 14:46:38 -04:00
Rich Prohaska
4a993fc93f #252 fix the MDEV-6324 fix 2014-06-13 14:43:36 -04:00
Rich Prohaska
eb00a1221e #250 reset thd proc info in end_bulk_insert to fix invalid proc info pointer inside of a deleted ha_tokudb object 2014-06-13 12:06:05 -04:00
Rich Prohaska
814f0dd173 #250 reset thd proc info in end_bulk_insert to fix invalid proc info pointer inside of a deleted ha_tokudb object 2014-06-13 12:05:36 -04:00
Sergei Golubchik
f61f36b386 Merge branch '10.0' into 10.1 
Conflicts:
	CMakeLists.txt
	VERSION
Modified:
	.gitignore
 2014-06-13 16:10:25 +02:00
Rich Prohaska
8a1406b4e3 #252 fix MDEV-6324 uninit var in discover3 2014-06-10 18:56:29 -04:00
Rich Prohaska
f16b3122ab #252 fix MDEV-6324 uninit var in discover3 2014-06-10 18:55:57 -04:00
unknown
b1886e2bff merge of MDEV-6047 2014-06-09 13:47:20 +03:00
unknown
4cd676cbd9 MDEV-6047: Make exists_to_in optimization ON by default 2014-06-09 13:42:21 +03:00
Sergey Petrunya
ee6f400fe1 MDEV-5976: TokuDB: Wrong query result using mrr=on 
- Key_value_records_iterator::get_next() should pass pointer to the key 
  to handler->ha_index_next_same().  Because of a typo bug, pointer-to-pointer
  was passed instead in certain cases.
 2014-06-06 21:28:42 +04:00
Sergei Golubchik
d8edb88cb1 revert tokudb changes that caused crashes 2014-06-06 00:09:17 +02:00
Sergei Golubchik
e27c338634 5.5.38 merge 2014-06-06 00:07:27 +02:00
Rich Prohaska
280cac9fe1 #250 restore proc info to valid pointers in commit, abort, analyze, and optimize 2014-06-04 12:08:43 -04:00
Rich Prohaska
2f948975f6 #250 restore proc info to valid pointers in commit, abort, analyze, and optimize 2014-06-04 10:44:15 -04:00
Michael Widenius
414e8388bf Fixed compiler warnings 
mysys/psi_noop.c:
  Fixed wrong prototype
sql/rpl_gtid.cc:
  Added #ifndef to hide not used variable
storage/connect/connect.cc:
  Added volatile to avoid compiler warning in gcc 4.8.1
storage/connect/filamvct.cpp:
  Added volatile to avoid compiler warning in gcc 4.8.1
storage/maria/ma_checkpoint.c:
  Removed cast to avoid compiler warning
storage/myisam/mi_delete_table.c:
  Added attribute to avoid compiler warning
storage/tokudb/ha_tokudb.cc:
  Use LINT_INIT_STRUCT to avoid compiler warnings
storage/tokudb/hatoku_hton.cc:
  Use LINT_INIT_STRUCT to avoid compiler warnings
storage/tokudb/tokudb_card.h:
  Use LINT_INIT_STRUCT to avoid compiler warnings
storage/tokudb/tokudb_status.h:
  Use LINT_INIT_STRUCT to avoid compiler warnings
 2014-06-04 13:23:00 +03:00
Sergei Golubchik
2673910654 mark tokudb in 5.5 as MariaDB_PLUGIN_MATURITY_GAMMA, not MariaDB_PLUGIN_MATURITY_ALPHA. 2014-06-03 10:58:03 +02:00
Rich Prohaska
768b7b41cb #225 fix tokudb store lock to fix lock tables crash 2014-06-01 16:57:53 -04:00
Rich Prohaska
39ef408165 #225 fix tokudb store lock to fix lock tables crash 2014-06-01 12:48:53 -04:00
Rich Prohaska
083764f033 #225 hot optimize for 5.6 and 10.0 using alter recreate 2014-06-01 07:50:32 -04:00
Rich Prohaska
454e974ce4 #225 hot optimize for 5.6 and 10.0 using alter recreate 2014-06-01 07:49:28 -04:00
Rich Prohaska
676c38a886 #245 use row estimate parameter to start_bulk_insert to decide if a loader is used 2014-05-31 12:16:56 -04:00
Rich Prohaska
bf21d6334d #245 use row estimate parameter to start_bulk_insert to decide if a loader is used 2014-05-31 11:11:36 -04:00
Sergei Golubchik
69bb48b89b disable unstable tokudb tests 2014-05-31 10:16:25 +02:00
Rich Prohaska
cb0ae1663a #241 unique key check should avoid relocking keys if the table is already prelocked by the loader 2014-05-29 07:41:46 -04:00
Rich Prohaska
e7496641ce #241 unique key check should avoid relocking keys if the table is already prelocked by the loader 2014-05-29 07:41:16 -04:00
Sergei Golubchik
eef1201bcc set version to 10.1.0 2014-05-25 17:17:50 +02:00
Jan Lindström
1016ee9d77 Merge 10.0 -> 10.1 2014-05-24 21:37:21 +03:00
Rich Prohaska
c1c2d0e5aa #206 merge mariadb 10.0.11 changes 2014-05-20 09:47:19 -04:00
Rich Prohaska
2006f3bf58 #206 merge mariadb 10.0.11 changes 2014-05-14 14:43:44 -04:00
Rich Prohaska
67ec3f3075 #221 fix tokudb::estimate_num_rows 2014-05-13 13:25:44 -04:00
Rich Prohaska
f39c22282a #221 fix tokudb::estimate_num_rows 2014-05-13 08:56:06 -04:00
Rich Prohaska
e2fa4abda1 #232 compile in jemalloc detector 2014-05-12 06:35:42 -04:00
Rich Prohaska
39b08e0222 #232 compile in jemalloc detector 2014-05-10 15:53:31 -04:00
Sergei Golubchik
56f64f796e TokuDB: enable online alter for partitioned tabled 2014-05-09 14:53:32 +02:00
Sergei Golubchik
d3e2e1243b 5.5 merge 2014-05-09 12:35:11 +02:00
Sergey Petrunya
0eb84da147 Merge 10.0 -> 10.1 2014-05-08 13:09:15 +04:00
Sergei Golubchik
99027efd14 post-fix for the merge of "Bug#16216513 INPLACE ALTER DISABLED FOR PARTITIONED TABLES" 
make this innodb-only patch work for other engines as well
 2014-05-08 10:25:09 +02:00
Rich Prohaska
2c992d641b #228 use thd_get/set_ha_data for tokudb_trx data 2014-05-07 15:22:14 -04:00
Rich Prohaska
c636dd5287 #226 delete CMakeLists.in, no longer used 2014-05-07 15:21:46 -04:00
Rich Prohaska
b0493252e0 #228 use thd_get/set_ha_data for tokudb_trx data 2014-05-07 08:20:41 -04:00
Rich Prohaska
5624a03c83 #226 delete CMakeLists.in, no longer used 2014-05-06 13:17:49 -04:00