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

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

2859. By Bradley C. Kuszmaul on 2009-06-04

Patches to MySQL to make the TokuDB handlerton work.

2858. By Gleb Shchepa <email address hidden> on 2009-05-13

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.

2857. By Jörg Brühe on 2009-05-08

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.)

2856. By Jörg Brühe on 2009-04-14

Upmerge the fix of an error message typo
(in "scripts/make_win_bin_dist")
from 5.0 into 5.1

2855. By Jörg Brühe on 2009-04-14

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.

2854. By Jörg Brühe on 2009-04-14

Merge a tool change needed for cluster ("CGE") builds
to achieve the correct package names ("scripts/make_binary_distribution.sh").

2853. By Jörg Brühe on 2009-04-11

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.

2852. By Timothy Smith <email address hidden> on 2009-04-02

auto-merge

2851. By Timothy Smith <email address hidden> on 2009-04-02

merge -5.0 into -5.1 (minor conflicts resolved)

2850. By Timothy Smith <email address hidden> on 2009-04-02

auto-merge -build into -bugteam