summaryrefslogtreecommitdiff
path: root/sql/sql_base.cc
Commit message (Expand)AuthorAgeFilesLines
* Manual merge from mysql-trunk.Alexander Nozdrin2009-12-111-76/+85
|\
| * Manual merge from mysql-trunk-merge.Alexander Nozdrin2009-11-061-1/+12
| |\
| * \ Manual merge from mysql-next-mr.Alexander Nozdrin2009-11-021-4/+5
| |\ \
| | * | Bug#35428 When selecting from INFORMATION_SCHEMA tables, incomplete metadataSergey Glukhov2009-10-231-1/+3
| | * | Automerge from mysql-next-mr.Alexander Nozdrin2009-10-221-33/+25
| | |\ \
| | * | | Back-port from 6.0 of the fix forGuilhem Bichot2009-10-191-3/+2
| * | | | Merge from mysql-next-mr.Alexander Nozdrin2009-10-231-33/+25
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Merge from mysql-trunk-merge.Alexander Nozdrin2009-10-191-2/+4
| | |\ \ \
| | * \ \ \ Manual merge from mysql-trunk-merge.Alexander Nozdrin2009-10-141-31/+21
| | |\ \ \ \ | | | |_|/ / | | |/| | |
| * | | | | Merge with next-mr-runtime.Konstantin Osipov2009-10-221-1/+1
| |\ \ \ \ \
| | * \ \ \ \ AutomergeKristofer Pettersson2009-10-191-59/+60
| | |\ \ \ \ \
| | * | | | | | Bug#27145 EXTRA_ACL troublesKristofer Pettersson2009-10-191-1/+1
| | | |/ / / / | | |/| | | |
| * | | | | | Backport of revno 2630.28.10, 2630.28.31, 2630.28.26, 2630.33.1,Konstantin Osipov2009-10-221-0/+1
| | |/ / / / | |/| | | |
| * | | | | Backport of:Konstantin Osipov2009-10-141-58/+59
| * | | | | Backport of:Konstantin Osipov2009-10-141-1/+1
| |/ / / /
| * | | | Merge mysql-next-mr --> mysql-trunk-signalMarc Alff2009-09-171-8/+11
| |\ \ \ \
| * | | | | WL#2110 (SIGNAL)Marc Alff2009-09-101-12/+18
* | | | | | mergeKristofer Pettersson2009-11-201-1/+6
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Bug#45613 handle failures from my_hash_insertKristofer Pettersson2009-11-201-1/+6
| | |_|_|/ | |/| | |
* | | | | Manual Merge2009-11-031-0/+1
|\ \ \ \ \
| * | | | | BUG#48216 Replication fails on all slaves after upgrade to 5.0.86 on master2009-11-031-0/+1
| * | | | | Bug #43414 Parenthesis (and other) warnings compiling MySQLStaale Smedseng2009-08-281-4/+2
* | | | | | BUG#42829: manually merged approved bzr bundle from bug report.Luis Soares2009-11-011-1/+11
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | BUG#42829: binlogging enabled for all schemas regardless ofLuis Soares2009-09-241-1/+11
| | |_|/ / | |/| | |
* | | | | Bug #43029: FORCE INDEX FOR ORDER BY is ignored when join Georgi Kodinov2009-10-071-2/+4
| |_|_|/ |/| | |
* | | | auto-mergeIngo Struewing2009-10-021-31/+17
|\ \ \ \
| * | | | Bug #45677 Slave stops with Duplicate entry for key PRIMARY when using trigger2009-10-011-31/+17
| |/ / /
* | | | WL#4259 - Debug Sync FacilityIngo Struewing2009-09-291-0/+4
|/ / /
* | | merge mysql-5.0-bugteam --> mysql-5.1-bugteamAlfranio Correia2009-08-281-8/+11
|\ \ \ | |/ / | | / | |/ |/|
| * auto-merge mysql-5.0-bugteam (local) --> mysql-5.0-bugteamAlfranio Correia2009-08-281-7/+12
| |\
| | * BUG#46861 Auto-closing of temporary tables broken by replicate-rewrite-dbAlfranio Correia2009-08-271-7/+12
* | | automergeGeorgi Kodinov2009-07-161-1/+7
|\ \ \ | |/ /
| * | Bug #46003 and bug #46034: backported the fixes from azalea.Georgi Kodinov2009-07-161-1/+7
* | | Bug#45266: Uninitialized variable lead to an empty result.Evgeny Potemkin2009-06-261-0/+1
* | | Bug#44834 strxnmov is expected to behave as you'd expectSergey Glukhov2009-06-191-3/+3
| | |
| \ \
*-. \ \ Merge from 5.0-bugteamStaale Smedseng2009-06-171-22/+21
|\ \ \ \ | | |/ /
| | * | Bug #43414 Parenthesis (and other) warnings compiling MySQL Staale Smedseng2009-06-171-19/+19
| * | | Bug #43414 Parenthesis (and other) warnings compiling MySQL Staale Smedseng2009-06-101-19/+19
| |/ /
| * | Merge community up to enterprise, thus ending the community-serverChad MILLER2009-05-061-15/+15
| |\ \
| | * \ Merge 5.0.80 release and 5.0 community. Version left at 5.0.80.Chad MILLER2009-04-141-6/+6
| | |\ \
| | * \ \ Merged from 5.0 (enterprise).Chad MILLER2008-12-171-6/+35
| | |\ \ \
| | * \ \ \ Merge from 5.0 trunk.Chad MILLER2008-07-141-1/+1
| | |\ \ \ \
| | * \ \ \ \ Merge chunk from trunk.Chad MILLER2008-07-101-2/+6
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge chunk from trunk.Chad MILLER2008-07-101-1/+30
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ Merge bk-internal.mysql.com:/home/bk/mysql-5.0cmiller@zippy.cornsilk.net2007-12-101-15/+15
| | |\ \ \ \ \ \ \
| | | * \ \ \ \ \ \ Merge bk-internal.mysql.com:/home/bk/mysql-5.0cmiller@zippy.cornsilk.net2007-09-101-15/+15
| | | |\ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ Merge mysqldev@production.mysql.com:my/mysql-5.0-releasecmiller@zippy.cornsilk.net2007-07-021-15/+15
| | | | |\ \ \ \ \ \ \
| | | | | * \ \ \ \ \ \ Merge mysqldev@production.mysql.com:my/mysql-5.0-releasecmiller@zippy.cornsilk.net2007-04-261-15/+15
| | | | | |\ \ \ \ \ \ \
| * | | | | \ \ \ \ \ \ \ Auto mergeHe Zhenxing2009-04-081-26/+38
| |\ \ \ \ \ \ \ \ \ \ \ \
* | | | | | | | | | | | | | BUG#41948 Query_log_event constructor needlessly contortedHe Zhenxing2009-05-301-2/+3