summaryrefslogtreecommitdiff
path: root/sql/sql_update.cc
Commit message (Expand)AuthorAgeFilesLines
* Merge MySQL->MariaDBmariadb-merge-mysql-5.1.38minusSergey Petrunya2009-09-081-15/+63
|\
| * Merge of the fix for bug #40113 to 5.1.Georgi Kodinov2009-07-131-2/+9
| |\
| | * Bug #40113: Embedded SELECT inside UPDATE or DELETE can timeout Georgi Kodinov2009-07-131-2/+9
| * | auto-merge mysql-5.1-bugteam (local) --> mysql-5.1-bugteamAlfranio Correia2009-06-181-4/+2
| |\ \
| | * | BUG#43929 binlog corruption when max_binlog_cache_size is exceededAlfranio Correia2009-06-181-4/+2
| | | |
| | \ \
| *-. \ \ Merge from 5.0-bugteamStaale Smedseng2009-06-171-1/+1
| |\ \ \ \ | | |_|/ / | |/| | / | | | |/
| | | * Bug #43414 Parenthesis (and other) warnings compiling MySQL Staale Smedseng2009-06-171-1/+1
| | * | Bug #43414 Parenthesis (and other) warnings compiling MySQL Staale Smedseng2009-06-101-1/+1
| | |/
| | * Merge community up to enterprise, thus ending the community-serverChad MILLER2009-05-061-7/+7
| | |\
| | | * Merge 5.0.80 release and 5.0 community. Version left at 5.0.80.clone-5.0.81-buildChad MILLER2009-04-141-1/+1
| | | |\
| | | * \ Merged from 5.0 (enterprise).mysql-5.0.75clone-5.0.75-buildChad MILLER2008-12-171-3/+60
| | | |\ \
| | | * \ \ Merge from 5.0 trunk.Chad MILLER2008-07-141-1/+7
| | | |\ \ \
| | | * \ \ \ Merge chunk from trunk.Chad MILLER2008-07-101-2/+2
| | | |\ \ \ \
| | | * \ \ \ \ Merge bk-internal.mysql.com:/home/bk/mysql-5.0unknown2007-12-101-7/+7
| | | |\ \ \ \ \
| | | | * \ \ \ \ Merge bk-internal.mysql.com:/home/bk/mysql-5.0unknown2007-09-101-7/+7
| | | | |\ \ \ \ \
| | | | | * \ \ \ \ Merge mysqldev@production.mysql.com:my/mysql-5.0-releaseunknown2007-07-021-7/+7
| | | | | |\ \ \ \ \
| | | | | | * \ \ \ \ Merge mysqldev@production.mysql.com:my/mysql-5.0-releaseunknown2007-04-261-7/+7
| | | | | | |\ \ \ \ \
| | * | | | | | | | | | BUG#37145 Killing a statement doing DDL may log binlog event with error code ...He Zhenxing2009-03-271-1/+1
| | | |_|_|_|_|_|_|_|/ | | |/| | | | | | | |
| | * | | | | | | | | BUG#37051 Replication rules not evaluated correctlyHe Zhenxing2009-03-051-1/+1
| | | |_|_|_|_|_|_|/ | | |/| | | | | | |
| * | | | | | | | | BUG#41948 Query_log_event constructor needlessly contortedHe Zhenxing2009-05-301-3/+11
| * | | | | | | | | Merge.Martin Hansson2009-05-131-5/+40
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Bug#43580: Issue with Innodb on multi-table updateMartin Hansson2009-05-051-5/+40
| * | | | | | | | | | bug#44166Sergei Golubchik2009-05-041-3/+3
| |/ / / / / / / / /
* | | | | | | | | | bzr merge from guilhem's maria tree to our local 5.1mariadb-merge-mysql-5.1.34plusMichael Widenius2009-04-251-3/+5
|\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ merge of 5.1-main into 5.1-maria; MyISAM changes are also ported to Maria.Guilhem Bichot2009-03-111-3/+5
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / /
| | * | | | | | | | | Bug #39265: fix for the bug 33699 should be revertedGleb Shchepa2009-02-051-3/+5
| * | | | | | | | | | merge of 5.1-main into 5.1-maria. Myisam->Maria change propagation will follow.Guilhem Bichot2009-02-121-1/+1
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / /
* | | | | | | | | | | Merge with base MySQL 5.1Michael Widenius2009-02-151-1/+1
|\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | |
| * | | | | | | | | | Merge main 5.1 into 5.1-buildJoerg Bruehe2008-12-101-0/+31
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Added "Sun Microsystems, Inc." to copyright headers on files modifiedBuild Team2008-11-101-1/+1
* | | | | | | | | | | | Fixed compiler warnings found by gcc 4.3.2Michael Widenius2009-01-311-1/+1
| |_|/ / / / / / / / / |/| | | | | | | | | |
* | | | | | | | | | | Merge of 5.1-main into 5.1-maria. There were no changes to storage/myisam, my...Guilhem Bichot2008-12-101-1/+1
|\ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Merge of 5.1-main into 5.1-maria. There were no changes to storage/myisam, or...Guilhem Bichot2008-11-211-2/+33
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / /
| * | | | | | | | | | Merged 5.1 with maria 5.1Michael Widenius2008-10-101-7/+11
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge mysql.com:/home/my/mysql-5.1unknown2008-04-281-51/+37
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge janus.mylan:/usr/home/serg/Abk/mysql-5.1unknown2008-02-051-4/+6
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge janus.mylan:/usr/home/serg/Abk/mysql-5.1unknown2007-12-271-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ Merge jani@marvel:/my/bk/mysql-maria.newunknown2007-12-181-1/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | Fixed bug in undo_key_delete; Caused crashed key files in recoveryunknown2007-12-171-1/+1
* | | | | | | | | | | | | | | | Bug #40745: Error during WHERE clause calculation in UPDATEGleb Shchepa2008-11-281-0/+5
* | | | | | | | | | | | | | | | 5.0-bugteam->5.1-bugteam mergeSergey Glukhov2008-11-271-0/+26
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / / / / / / |/| | | | | | | / / / / / / / / | | |_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | Bug#37460 Assertion failed: !table->file || table->file->inited == handler::NONESergey Glukhov2008-11-271-0/+26
* | | | | | | | | | | | | | | manual merge 5.0-5.1.29-rc --> 5.1-5.1.29-rcclone-5.1.29-buildGleb Shchepa2008-10-091-0/+20
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / /
| * | | | | | | | | | | | | | Bug#38499: flush tables and multitable table update withGleb Shchepa2008-10-091-0/+20
* | | | | | | | | | | | | | | manual merge 5.0-5.1.29-rc --> 5.1-5.1.29-rcGleb Shchepa2008-10-081-1/+12
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / /
| * | | | | | | | | | | | | | Bug #38691: segfault/abort in ``UPDATE ...JOIN'' whileGleb Shchepa2008-10-081-1/+12
* | | | | | | | | | | | | | | Bug#34306: Can't make copy of log tables when server binary log is enabledDavi Arnaut2008-09-291-1/+1
| |_|_|_|_|_|/ / / / / / / / |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | Cherry picking patch for BUG#37051He Zhenxing2008-08-261-1/+1
* | | | | | | | | | | | | | Merge fix for BUG#35478 into 5.1Sergey Petrunia2008-07-151-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / /
| * | | | | | | | | | | | | BUG#35478: sort_union() returns bad data when sort_buffer_size is hitSergey Petrunia2008-07-151-2/+2
| | |_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | |