summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge of mysql-5.1-bugteam into mysql-trunk-merge.Davi Arnaut2010-07-2034-172/+147
|\
| * Bug#45288: pb2 returns a lot of compilation warnings on linuxDavi Arnaut2010-07-2034-173/+154
* | Fix tree name.Davi Arnaut2010-07-201-1/+1
* | Merge of mysql-5.1-bugteam into mysql-trunk-merge.Davi Arnaut2010-07-204-12/+4
|\ \ | |/
| * Bug#52514: mysql 5.1 do_abi_check does not compile w/ gcc4.5Davi Arnaut2010-07-204-12/+4
* | Null merge of mysql-5.1-bugteam into mysql-trunk-merge.Davi Arnaut2010-07-200-0/+0
|\ \ | |/
| * Bug#54453: Failing assertion: trx->active_trans when renaming aDavi Arnaut2010-07-205-4/+36
| * Merge of mysql-5.1 into mysql-5.1-bugteam.Davi Arnaut2010-07-19118-700/+7687
| |\
| | * fix tree namesGeorgi Kodinov2010-07-191-3/+3
| | * 5.1.49 push to mysql-5.1MySQL Build Team2010-07-190-0/+0
| | |\
| | | * Null-merge from mysql-5.1.46sp1-releaseunknown2010-07-080-0/+0
| | | |\
| | | | * Backport into build-201006221614-5.1.46sp1sunanda2010-06-237-29/+95
| | | | * Backport into build-201006221614-5.1.46sp1sunanda2010-06-231-37/+37
| | | | * Backport into build-201006221614-5.1.46sp1sunanda2010-06-239-8/+138
| | | | * Backport into build-201006221614-5.1.46sp1MySQL Build Team2010-06-224-8/+34
| | | | * Backport into build-201006221614-5.1.46sp1MySQL Build Team2010-06-223-0/+21
| | | | * Backport into build-201006221614-5.1.46sp1MySQL Build Team2010-06-221-1/+9
| | | | * Backport into 5.1.46sp1:MySQL Build Team2010-06-222-0/+239
| | | | * Backport into build-201006221614-5.1.46sp1MySQL Build Team2010-06-222-2/+72
| | | | * Backport into build-201006221614-5.1.46sp1MySQL Build Team2010-06-221-0/+1
| | | | * Backport into build-201006221614-5.1.46sp1MySQL Build Team2010-06-221-1/+1
| | | | * Backport into build-201006221614-5.1.46sp1MySQL Build Team2010-06-221-1/+9
| | | | * Backport into build-201006221614-5.1.46sp1MySQL Build Team2010-06-221-32/+59
| | | | * Backport into build-201006221614-5.1.46sp1MySQL Build Team2010-06-225-25/+68
| | | | * Set version number for mysql-5.1.46sp1 releaseunknown2010-06-221-1/+1
| | * | | Fix bug #55039 Failing assertion: space_id > 0 in fil0fil.c.unknown2010-07-092-5/+25
| | * | | rko Mdkeld change, revision 3351.14.134 add innodb_plugin to mysql-test-run d...sunanda2010-07-071-0/+1
* | | | | Auto-merge from mysql-trunk-bugfixing.Alexander Nozdrin2010-07-20117-581/+1301
|\ \ \ \ \
| * \ \ \ \ Auto-merge from mysql-trunk-merge.Alexander Nozdrin2010-07-2015-37/+164
| |\ \ \ \ \ | |/ / / / / |/| | | | |
* | | | | | Merge into mysql-trunk-merge..Davi Arnaut2010-07-198-12/+98
|\ \ \ \ \ \
| * \ \ \ \ \ Merge fix for bug #55039 from mysql-5.1-security to mysql-trunk-security.Jimmy Yang2010-07-092-5/+25
| |\ \ \ \ \ \
| | * | | | | | Fix bug #55039 Failing assertion: space_id > 0 in fil0fil.c.Jimmy Yang2010-07-092-5/+25
| * | | | | | | manual merge from mysql-5.1-securityJon Olav Hauglid2010-07-073-5/+37
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Bug #54117 crash in thr_multi_unlock, temporary tableJon Olav Hauglid2010-07-073-0/+27
| | * | | | | | Raise version number after cloning 5.1.49unknown2010-07-061-1/+1
| | | |_|/ / / | | |/| | | |
| * | | | | | Auto-merge from mysql-trunk-security.Alexander Nozdrin2010-07-050-0/+0
| |\ \ \ \ \ \
| | * \ \ \ \ \ Null-merge mysql-5.1-security -> mysql-trunk-securityVasil Dimov2010-07-050-0/+0
| | |\ \ \ \ \ \ | | | |/ / / / /
| | | * | | | | Merge mysql-5.1-innodb -> mysql-5.1-securityVasil Dimov2010-07-04111-693/+7586
| | | |\ \ \ \ \
| | | * \ \ \ \ \ mergeGeorgi Kodinov2010-07-020-0/+0
| | | |\ \ \ \ \ \
| | | | * | | | | | mergeGeorgi Kodinov2010-07-021-3/+3
| | | | * | | | | | mergeGeorgi Kodinov2010-07-020-0/+0
| | | | |\ \ \ \ \ \
| | | * | | | | | | | mergeGeorgi Kodinov2010-07-021-3/+3
| | | * | | | | | | | mergeGeorgi Kodinov2010-07-027-4/+77
| | | |\ \ \ \ \ \ \ \
| | | | * | | | | | | | Change the table name in innodb_bug54044 to lower case to avoidJimmy Yang2010-06-294-6/+6
| | | | * | | | | | | | Fix Bug #54044 Create temporary tables and using innodb crashes.Jimmy Yang2010-06-247-4/+77
| * | | | | | | | | | | Auto-merge from mysql-trunk-merge.Alexander Nozdrin2010-07-056-12/+127
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| | | | | | | | | |
| * | | | | | | | | | | mergeGeorgi Kodinov2010-07-05392-3284/+8739
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Null-merge mysql-5.1-innodb -> mysql-trunk-innodb up toVasil Dimov2010-07-040-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / / / / | | |/| | | | | | | | | |
| | * | | | | | | | | | | Fix bug#54583. This change reverses rsvn:1350 by getting rid of a bogus asser...Sunny Bains2010-06-256-18/+14
| | * | | | | | | | | | | Merge a lost changeset inaam.rana@oracle.com-20100624124843-m7ouqwe5zqcqapn1Vasil Dimov2010-06-250-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \