~bradley-tokutek/+junk/mysql-5.1-for-tokutek : changes

~bradley-tokutek/+junk/mysql-5.1-for-tokutek » Changes from revision 2859

From Revision 2859 to 2840

Rev	Summary	Authors	Date
2859	Patches to MySQL to make the TokuDB handlerton work. Patches to MySQL to make the TokuDB handlerton work.	Bradley C. Kuszmaul	14 years ago
2858	Bug #44290: explain crashes for subquery with distinct in Bug #44290: explain crashes for subquery with distinct in SQL_SELECT::test_quick_select The crash was caused by an incomplete cleanup of JOIN_TAB::select during the filesort of rows for GROUP BY clause inside a subquery. Queries where a quick index access is replaced with filesort was was affected. For example: SELECT 1 FROM (SELECT COUNT(DISTINCT c1) FROM t1 WHERE c2 IN (1, 1) AND c3 = 2 GROUP BY c2) x Quick index access related data in the SQL_SELECT::test_quick_select function was inconsistent after an incomplete cleanup. This function has been completed to prevent crashes in the SQL_SELECT::test_quick_select function.	Gleb Shchepa	14 years ago
2857	Merge main 5.1 into 5.1-build Merge main 5.1 into 5.1-build 165 changesets with 23 conflicts: Text conflict in mysql-test/r/lock_multi.result Text conflict in mysql-test/t/lock_multi.test Text conflict in mysql-test/t/mysqldump.test Text conflict in sql/item_strfunc.cc Text conflict in sql/log.cc Text conflict in sql/log_event.cc Text conflict in sql/parse_file.cc Text conflict in sql/slave.cc Text conflict in sql/sp.cc Text conflict in sql/sp_head.cc Text conflict in sql/sql_acl.cc Text conflict in sql/sql_base.cc Text conflict in sql/sql_class.cc Text conflict in sql/sql_crypt.cc Text conflict in sql/sql_db.cc Text conflict in sql/sql_lex.cc Text conflict in sql/sql_parse.cc Text conflict in sql/sql_select.cc Text conflict in sql/sql_table.cc Text conflict in sql/sql_view.cc Text conflict in storage/innobase/handler/ha_innodb.cc Text conflict in storage/myisam/mi_packrec.c Text conflict in tests/mysql_client_test.c Updates to Innobase, taken from main 5.1: bzr: ERROR: Some change isn't sane: File mysql-test/r/innodb-semi-consistent.result is owned by Innobase and should not be updated. File mysql-test/t/innodb-semi-consistent.test is owned by Innobase and should not be updated. File storage/innobase/handler/ha_innodb.cc is owned by Innobase and should not be updated. File storage/innobase/ibuf/ibuf0ibuf.c is owned by Innobase and should not be updated. File storage/innobase/include/row0mysql.h is owned by Innobase and should not be updated. File storage/innobase/include/srv0srv.h is owned by Innobase and should not be updated. File storage/innobase/include/trx0trx.h is owned by Innobase and should not be updated. File storage/innobase/include/trx0trx.ic is owned by Innobase and should not be updated. File storage/innobase/lock/lock0lock.c is owned by Innobase and should not be updated. File storage/innobase/page/page0cur.c is owned by Innobase and should not be updated. File storage/innobase/row/row0mysql.c is owned by Innobase and should not be updated. File storage/innobase/row/row0sel.c is owned by Innobase and should not be updated. File storage/innobase/srv/srv0srv.c is owned by Innobase and should not be updated. File storage/innobase/trx/trx0trx.c is owned by Innobase and should not be updated. (Set env var 'ALLOW_UPDATE_INNOBASE_OWNED' to override.)	Joerg Bruehe	14 years ago
2856	Upmerge the fix of an error message typo Upmerge the fix of an error message typo (in "scripts/make_win_bin_dist") from 5.0 into 5.1	Joerg Bruehe	15 years ago
2855	Merge some merge changesets from 5.0 up into 5.1-build Merge some merge changesets from 5.0 up into 5.1-build (code changes have already been merged separately). Use this occasion to fix the branch name in the configuration file.	Joerg Bruehe	15 years ago
2854	Merge a tool change needed for cluster ("CGE") builds Merge a tool change needed for cluster ("CGE") builds to achieve the correct package names ("scripts/make_binary_distribution.sh").	Joerg Bruehe	15 years ago
2853	Merge the 5.1.31sp1 release back into the mainline. Merge the 5.1.31sp1 release back into the mainline. True to our way of doing QSP versions, this doesn't include any new changes but just backports of some important bug fixes that were also contained in version 5.1.32.	Joerg Bruehe	15 years ago
2852	auto-merge auto-merge	Timothy Smith	15 years ago
2851	merge -5.0 into -5.1 (minor conflicts resolved) merge -5.0 into -5.1 (minor conflicts resolved)	Timothy Smith	15 years ago
2850	auto-merge -build into -bugteam auto-merge -build into -bugteam	Timothy Smith	15 years ago
2849	Bug#29248 - MyISAMchk & MyISAMpack failing with * wildcard o... Bug#29248 - MyISAMchk & MyISAMpack failing with * wildcard on Windows platform - Link against setargv.obj for wild-card expansion.	Ignacio Galarza	15 years ago
2848	bookkeeping bookkeeping	Bernt M. Johnsen	15 years ago
2847	bookkeeping bookkeeping	Bernt M. Johnsen	15 years ago
2846	Bug 43355 merged from 5.1 gca Bug 43355 merged from 5.1 gca	Bernt M. Johnsen	15 years ago
2845	null-merge 5.0-bugteam --> 5.1-bugteam (backport of bug 3734... null-merge 5.0-bugteam --> 5.1-bugteam (backport of bug 37348 fix to 5.0)	Gleb Shchepa	15 years ago
2844	auto merge auto merge	Georgi Kodinov	15 years ago
2843	auto merge auto merge	Georgi Kodinov	15 years ago
2842	merged 5.1-main -> 5.1-bugteam merged 5.1-main -> 5.1-bugteam	Georgi Kodinov	15 years ago
2841	Fix for bug#42944: partition not pruned correctly Fix for bug#42944: partition not pruned correctly Problem: we don't prune a LESS THAN partition if MAXVALUE is given and given value is equal to a LESS THAN value. Fix: prune partitions in such cases.	Ramil Kalimullin	15 years ago
2840	Bug #39852 bug in mysql_setpermission Bug #39852 bug in mysql_setpermission mysql_setpermission is modified to honor the $db variable as suggested when doing a REVOKE ALL for menu option 7.	Staale Smedseng	15 years ago

Older »