summaryrefslogtreecommitdiff
path: root/sql
Commit message (Expand)AuthorAgeFilesLines
* Merge next-4284 -> next-4284-merge.Konstantin Osipov2010-02-031-0/+2
|\
| * Fix for bug #50784 "MDL: Assertion `m_tickets.is_empty() ||Dmitry Lenev2010-02-031-0/+2
* | Merge next-mr -> next-4284.Konstantin Osipov2010-02-0378-8869/+6778
|\ \ | |/ |/|
| * Manual merge of WL#4738 from mysql-next-mr: Alexey Kopytov2009-12-2877-8890/+6798
| |\
| | * don't show --ssl* option if ssl is not compiled inSergei Golubchik2009-12-252-7/+15
| | * backport typos foundSergei Golubchik2009-12-231-3/+2
| | * fixed "engine not found" error in open_binary_frmSergei Golubchik2009-12-232-2/+3
| | * minimal changes to errmst-utf8.txt (mostly whitespace) to match 6.0-codebase ...Sergei Golubchik2009-12-221-6/+6
| | * WL#4738 streamline/simplify @@variable creation processSergei Golubchik2009-12-2277-8882/+6782
* | | Merge next-mr -> next-4284. Konstantin Osipov2010-02-0216-358/+266
|\ \ \ | |/ /
| * | Auto-merge from mysql-next-mr.Alexander Nozdrin2009-12-256-35/+140
| |\ \ | | |/
| | * Auto-merge from mysql-next-mr.Alexander Nozdrin2009-12-1955-966/+1573
| | |\
| | * \ mergeVladislav Vaintroub2009-12-185-1/+56
| | |\ \
| | | * | BUG#49591, Fixed version string in SHOW CREATE TABLE to accomodate for column...Mikael Ronstrom2009-12-175-1/+56
| | | * | Auto-merge from mysql-trunk.Alexander Nozdrin2009-12-1648-846/+1581
| | | |\ \
| | | * \ \ merge (and including the fix for bug#48939 since that was not included in mys...Mattias Jonsson2009-12-151-2/+2
| | | |\ \ \
| | * | | | | Backport of fix for bug#35020Martin Hansson2009-12-171-34/+84
| * | | | | | Addendum to the backport patch for WL#2934:Alexey Kopytov2009-12-251-15/+17
| * | | | | | Backport of WL #2934: Make/find library for doing float/double Alexey Kopytov2009-12-229-317/+118
| | |_|_|_|/ | |/| | | |
* | | | | | Merge next-mr -> next-4284.Konstantin Osipov2010-02-0234-403/+802
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Manual merge from mysql-next-mr.Alexander Nozdrin2009-12-1725-505/+629
| |\ \ \ \ \
| * \ \ \ \ \ Manual merge from mysql-trunk-merge.Alexander Nozdrin2009-12-175-3/+40
| |\ \ \ \ \ \
| | * \ \ \ \ \ Manual merge from mysql-5.1-bugteam. Re-enabled binlog.binlog_index.Alexey Kopytov2009-12-171-1/+1
| | |\ \ \ \ \ \
| | | * \ \ \ \ \ merge mysql-5.1-bugteam (local) --> mysql-5.1-bugteamAlfranio Correia2009-12-171-6/+6
| | | |\ \ \ \ \ \
| | | | * | | | | | BUG#49638 binlog_index fails in mysql-trunk-mergeAlfranio Correia2009-12-161-6/+6
| | * | | | | | | | Automerge from mysql-5.1-bugteam to mysql-trunk-merge.Alexey Kopytov2009-12-174-2/+39
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / /
| | | * | | | | | | merge to mysql-5.1-bugteamSatya B2009-12-171-1/+13
| | | |\ \ \ \ \ \ \
| | | | * | | | | | | Bug#47650: using group by with rollup without indexesMartin Hansson2009-12-171-1/+13
| | | * | | | | | | | merge mysql-5.0-bugteam to mysql-5.1-bugteamSatya B2009-12-172-0/+16
| | | |\ \ \ \ \ \ \ \ | | | | |/ / / / / / / | | | |/| | | | | | |
| | | | * | | | | | | Fix for Bug#37408 - Compressed MyISAM files should not require/use mmap()Satya B2009-12-172-1/+18
| | | * | | | | | | | Auto-merge.Ramil Kalimullin2009-12-171-1/+10
| | | |\ \ \ \ \ \ \ \ | | | | |/ / / / / / / | | | | | / / / / / / | | | | |/ / / / / / | | | |/| | | | | |
| | | | * | | | | | Fix for bug#49465: valgrind warnings and incorrect live checksum...Ramil Kalimullin2009-12-171-1/+10
| | | | * | | | | | Bug #48709: Assertion failed in sql_select.cc:11782:Georgi Kodinov2009-12-151-0/+5
| * | | | | | | | | Auto-merge from mysql-next-mr-summit0.3.Alexander Nozdrin2009-12-1612-59/+143
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Auto-merge from mysql-trunk-merge.Alexander Nozdrin2009-12-162-3/+3
| |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | |/| | | | | | | |
| | * | | | | | | | | Manual merge from mysql-5.1.Alexander Nozdrin2009-12-162-3/+3
| | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | Fix for bug#49517: Inconsistent behavior while using Ramil Kalimullin2009-12-152-3/+3
| | | * | | | | | | | | Bug #48985: show create table crashes if previous access to the table Georgi Kodinov2009-12-151-1/+1
| | | * | | | | | | | | Bug#49489: Uninitialized cache led to a wrong result.Georgi Kodinov2009-12-151-1/+1
| | | * | | | | | | | | Bug #49480: WHERE using YEAR columns returns unexpected resultsGeorgi Kodinov2009-12-152-102/+51
| * | | | | | | | | | | Manual merge from mysql-trunk-merge.Alexander Nozdrin2009-12-1632-398/+760
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | | | | | | | | / / / / | | |_|_|_|_|_|/ / / / | |/| | | | | | | | |
| | * | | | | | | | | Manual merge of mysql-5.1-bugteam into mysql-trunk-merge.Alexey Kopytov2009-12-1618-101/+239
| | |\ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / | | | |/| | | | | | |
| | | * | | | | | | | Bug #48709: Assertion failed in sql_select.cc:11782:Georgi Kodinov2009-12-151-0/+5
| | | * | | | | | | | Bug #48995 abort missing DBUG_RETURN or .. in function "check_key_in_view"Jon Olav Hauglid2009-12-151-1/+1
| | | * | | | | | | | bug#49536 - deadlock on rotate_and_purge when using expire_logs_daysHe Zhenxing2009-12-151-6/+17
| | | * | | | | | | | Bug #34628 LOAD DATA CONCURRENT INFILE drops CONCURRENT in binary logunknown2009-12-152-1/+5
| | | * | | | | | | | correction to the earlier merging: s/return/DBUG_RETURN/Andrei Elkin2009-12-141-1/+1
| | | * | | | | | | | merging 5.0-bt -> 5.1-bt to local branch with bug@47210Andrei Elkin2009-12-143-7/+9
| | | |\ \ \ \ \ \ \ \ | | | | | |_|/ / / / / | | | | |/| | | | | |
| | | | * | | | | | | merging 5.0-bt to local branch with bug@47210Andrei Elkin2009-12-1420-247/+602
| | | | |\ \ \ \ \ \ \
| | | | * | | | | | | | Bug #47210 first execution of "start slave until" stops too early Andrei Elkin2009-11-122-7/+9
View Lorry Controller Status