mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-17 12:32:27 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
mariadb/storage/maria
History
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
..
unittest MDEV-5120 Test suite test maria-no-logging fails 2014-09-30 20:31:14 +03:00
CMakeLists.txt MDEV-672 : storage/maria and storage/perfschema do not appear to honor WITH_UNIT_TESTS 2012-10-30 23:05:55 +01:00
file_formats.txt
ft_maria.c
ha_maria.cc Merge branch '10.0' into bb-10.1-merge 2014-12-02 22:25:16 +01:00
ha_maria.h MDEV-5314 - Compiling fails on OSX using clang 2014-02-19 14:05:15 +04:00
lockman.c cleanup: remove LF_REQUIRE_PINS, use compile_time_assert() instead of reimplementing it 2013-06-24 20:56:55 +02:00
lockman.h
ma_bitmap.c 10.0-monty merge 2013-07-21 16:39:19 +02:00
ma_blockrec.c Merge with 10.0-base 2014-03-13 16:43:11 +02:00
ma_blockrec.h 5.1 merge 2013-05-20 10:53:04 +02:00
ma_cache.c Temporary commit of 10.0-merge 2013-03-26 00:03:13 +02:00
ma_changed.c lots of post-merge changes 2011-04-25 17:22:25 +02:00
ma_check.c MDEV-6255 DUPLICATE KEY Errors on SELECT .. GROUP BY that uses temporary and filesort. 2014-09-11 22:42:35 +03:00
ma_check_standalone.h MySQL-5.5.35 merge 2014-01-22 15:29:36 +01:00
ma_checkpoint.c compiler warnings 2014-10-01 23:38:26 +02:00
ma_checkpoint.h
ma_checksum.c make 5.1 compiling with modern gcc. 2013-12-20 12:35:47 +02:00
ma_close.c 5.5.39 merge 2014-08-07 18:06:56 +02:00
ma_commit.c Temporary commit of 10.0-merge 2013-03-26 00:03:13 +02:00
ma_commit.h
ma_control_file.c use PSI wrappers in aria and other non-MySQL code 2011-07-13 21:10:18 +02:00
ma_control_file.h
ma_create.c MDEV-5314 - Compiling fails on OSX using clang 2014-02-19 14:05:15 +04:00
ma_dbug.c Fixed lp:925377 "Querying myisam table metadata while 'alter table..enable keys' is running may corrupt the table" 2012-02-28 23:18:52 +02:00
ma_delete.c 10.0-monty merge 2013-07-21 16:39:19 +02:00
ma_delete_all.c merge with 5.3 2011-10-19 21:45:18 +02:00
ma_delete_table.c MDEV-5815 MySQL BUG#11751736: DROP DATABASE STATEMENT SHOULD REMOVE .OLD SUFFIX FROM DATABASE DIRECTORY 2014-03-26 09:32:54 +01:00
ma_dynrec.c Merge with 10.0-base 2014-03-13 16:43:11 +02:00
ma_extra.c MDEV-5314 - Compiling fails on OSX using clang 2014-02-19 14:05:15 +04:00
ma_ft_boolean_search.c MDEV-5314 - Compiling fails on OSX using clang 2014-02-19 14:05:15 +04:00
ma_ft_eval.c
ma_ft_eval.h
ma_ft_nlq_search.c Push a lot of small fixes to get larger parts to compile 2013-05-21 22:00:08 +03:00
ma_ft_parser.c cleanup: use MYF() for mysys flags 2013-01-23 16:18:09 +01:00
ma_ft_stem.c
ma_ft_test1.c
ma_ft_test1.h
ma_ft_update.c 5.3->5.5 merge 2011-11-22 18:04:38 +01:00
ma_ftdefs.h lots of post-merge changes 2011-04-25 17:22:25 +02:00
ma_fulltext.h
ma_info.c Temporary commit of 10.0-merge 2013-03-26 00:03:13 +02:00
ma_init.c my_dir() cleanup 2013-04-07 15:19:45 +02:00
ma_key.c make 5.1 compiling with modern gcc. 2013-12-20 12:35:47 +02:00
ma_key_recover.c Temporary commit of 10.0-merge 2013-03-26 00:03:13 +02:00
ma_key_recover.h
ma_keycache.c merge with 5.3 2011-10-19 21:45:18 +02:00
ma_locking.c MDEV-5314 - Compiling fails on OSX using clang 2014-02-19 14:05:15 +04:00
ma_loghandler.c 10.0-base merge 2014-02-26 15:28:07 +01:00
ma_loghandler.h Fix of compiler errors. 2011-05-16 16:13:34 +03:00
ma_loghandler_lsn.h remove ULL() and LL(), because they're totally unnecessary 2013-04-07 14:00:16 +02:00
ma_norec.c
ma_open.c 5.5.39 merge 2014-08-07 18:06:56 +02:00
ma_packrec.c MDEV-5314 - Compiling fails on OSX using clang 2014-02-19 14:05:15 +04:00
ma_page.c merge with 5.3 2011-10-19 21:45:18 +02:00
ma_pagecache.c Fixed problem with very slow shutdown when using 100,000 MyISAM tables with delay_key_write 2014-07-19 17:46:08 +03:00
ma_pagecache.h Fixed problem with very slow shutdown when using 100,000 MyISAM tables with delay_key_write 2014-07-19 17:46:08 +03:00
ma_pagecaches.c
ma_pagecrc.c MDEV-5314 - Compiling fails on OSX using clang 2014-02-19 14:05:15 +04:00
ma_panic.c merge with 5.3 2011-10-19 21:45:18 +02:00
ma_preload.c lots of post-merge changes 2011-04-25 17:22:25 +02:00
ma_range.c MDEV-5314 - Compiling fails on OSX using clang 2014-02-19 14:05:15 +04:00
ma_recovery.c MDEV-5314 - Compiling fails on OSX using clang 2014-02-19 14:05:15 +04:00
ma_recovery.h Fixed portability problem with partiton_error.test 2011-06-13 12:46:11 +03:00
ma_recovery_util.c merge with 5.3 2011-10-19 21:45:18 +02:00
ma_recovery_util.h
ma_rename.c Fixed lp:947474 "Assertion `table->file->stats.records > 0 || error' failed in join_read_const_table on concurrent SELECT and ALTER, constant Aria table" 2012-03-20 16:04:50 +02:00
ma_rfirst.c
ma_rkey.c merge with 5.3 2011-10-19 21:45:18 +02:00
ma_rlast.c
ma_rnext.c MDEV-6153 Trivial Lintian errors in MariaDB sources: spelling errors and wrong executable bits 2014-05-13 11:53:30 +02:00
ma_rnext_same.c merge with 5.3 2011-10-19 21:45:18 +02:00
ma_rprev.c merge with 5.3 2011-10-19 21:45:18 +02:00
ma_rrnd.c MDEV-736 LP:1004615 - Unexpected warnings "Encountered illegal value '' when converting to DECIMAL" on a query with aggregate functions and GROUP BY 2012-11-17 16:50:15 +01:00
ma_rsame.c merge with 5.3 2011-10-19 21:45:18 +02:00
ma_rsamepos.c
ma_rt_index.c merge with 5.3. 2012-06-04 17:26:11 +02:00
ma_rt_index.h
ma_rt_key.c
ma_rt_key.h
ma_rt_mbr.c Temporary commit of 10.0-merge 2013-03-26 00:03:13 +02:00
ma_rt_mbr.h
ma_rt_split.c compiler warnings 2013-04-14 16:48:16 +02:00
ma_rt_test.c Fixed problem with very slow shutdown when using 100,000 MyISAM tables with delay_key_write 2014-07-19 17:46:08 +03:00
ma_scan.c MDEV-4280: Assertion `empty_size == empty_size_on_page' failure in ma_blockrec.c or ER_NOT_KEYFILE on query with DISTINCT and GROUP BY 2013-05-11 15:55:11 +03:00
ma_search.c Compilation warnings. 2013-05-07 18:26:22 +02:00
ma_servicethread.c fix the include guards and add missing gplv2 headers 2012-02-17 12:19:38 +01:00
ma_servicethread.h fix the include guards and add missing gplv2 headers 2012-02-17 12:19:38 +01:00
ma_sort.c 10.0-base merge 2014-02-03 15:22:39 +01:00
ma_sp_defs.h
ma_sp_key.c lots of post-merge changes 2011-04-25 17:22:25 +02:00
ma_sp_test.c lots of post-merge changes 2011-04-25 17:22:25 +02:00
ma_state.c Fix for MDEV-6493: Assertion `table->file->stats.records > 0 || error' failure, or 'Invalid write' valgrind warnings, or crash on scenario with Aria table, view, LOCK TABLES 2014-07-30 13:27:52 +03:00
ma_state.h MDEV-3999: Valgrind errors 'invalid write' or assorted server crashes on concurrent flow with partitioned Aria tables 2013-05-12 11:29:16 +03:00
ma_static.c Fixed MDEV-3815: Aria engine return "The table is full" (ERROR 1114) inserting record, while MyISAM and InnoDB doesn't 2014-02-11 19:40:33 +02:00
ma_statrec.c merge with 5.3 2011-10-19 21:45:18 +02:00
ma_test1.c Fixed problem with very slow shutdown when using 100,000 MyISAM tables with delay_key_write 2014-07-19 17:46:08 +03:00
ma_test2.c Fixed problem with very slow shutdown when using 100,000 MyISAM tables with delay_key_write 2014-07-19 17:46:08 +03:00
ma_test3.c Fixed problem with very slow shutdown when using 100,000 MyISAM tables with delay_key_write 2014-07-19 17:46:08 +03:00
ma_test_all.res
ma_test_all.sh makes mi_test_all.sh & ma_test_all.sh working (MDEV-285) 2012-09-25 13:45:11 +03:00
ma_test_big.sh
ma_test_force_start.pl MDEV-4447 MariaDB sources should have unix-style line endings everywhere 2014-02-27 12:00:16 +01:00
ma_test_recovery
ma_unique.c Fixed a compiler failure and removed some warnings in windows 2014-03-11 16:53:24 +02:00
ma_update.c 5.3 merge. 2013-05-20 12:36:30 +02:00
ma_write.c 10.0-monty merge 2013-07-21 16:39:19 +02:00
maria_chk.c Fixed problem with very slow shutdown when using 100,000 MyISAM tables with delay_key_write 2014-07-19 17:46:08 +03:00
maria_def.h 5.5.39 merge 2014-08-07 18:06:56 +02:00
maria_dump_log.c merge with 5.3 2011-10-19 21:45:18 +02:00
maria_ftdump.c Fixed problem with very slow shutdown when using 100,000 MyISAM tables with delay_key_write 2014-07-19 17:46:08 +03:00
maria_pack.c Fixed problem with very slow shutdown when using 100,000 MyISAM tables with delay_key_write 2014-07-19 17:46:08 +03:00
maria_read_log.c Fixed problem with very slow shutdown when using 100,000 MyISAM tables with delay_key_write 2014-07-19 17:46:08 +03:00
maria_rename.sh
tablockman.c merge with 5.3 2011-10-19 21:45:18 +02:00
tablockman.h use PSI wrappers in aria and other non-MySQL code 2011-07-13 21:10:18 +02:00
test_pack
trnman.c 10.0-base merge 2014-02-03 15:22:39 +01:00
trnman.h remove ULL() and LL(), because they're totally unnecessary 2013-04-07 14:00:16 +02:00
trnman_public.h