summaryrefslogtreecommitdiff
path: root/sql
Commit message (Expand)AuthorAgeFilesLines
* Backport of WL #2934: Make/find library for doing float/double Alexey Kopytov2009-12-229-317/+118
* Manual merge from mysql-next-mr.Alexander Nozdrin2009-12-1725-505/+629
|\
| * Merge mysql-next-mr (revno 2939) --> mysql-next-mr-marcMarc Alff2009-12-1712-59/+143
| |\
| * \ Merge mysql-next-mr (revno 2942) --> mysql-next-mr-marcMarc Alff2009-12-1645-865/+1450
| |\ \
| * | | Merge cleanupMarc Alff2009-12-1114-26/+27
| * | | Merge mysql-next-mr (revno 2936) --> mysql-next-mr-marcMarc Alff2009-12-1157-597/+1616
| |\ \ \
| * | | | WL#2360 Performance schemaMarc Alff2009-12-0925-490/+613
* | | | | 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
|\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | |
| * | | | | | | Merge to latest mysql-next-mrMikael Ronstrom2009-12-1645-865/+1450
| |\ \ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | |
| * | | | | | | MergeMikael Ronstrom2009-12-1470-2159/+2533
| |\ \ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | |
| * | | | | | | Fixed an issue where STOP SLAVE generated a warning to error log which test c...Mikael Ronstrom2009-12-141-2/+15
| * | | | | | | Merged in WL#5138Mikael Ronstrom2009-11-279-55/+119
| |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ Merge WL#5138 to mysql-next-mrMikael Ronstrom2009-11-2755-772/+743
| | |\ \ \ \ \ \ \
| | * | | | | | | | WL#5138, Fixed according to code review comments from DaviMikael Ronstrom2009-11-246-12/+32
| | * | | | | | | | WL#5138, fixed review commentsMikael Ronstrom2009-11-236-25/+15
| | * | | | | | | | WL#5138, reverted some review fixesMikael Ronstrom2009-11-202-3/+3
| | * | | | | | | | WL#5138, review fixesMikael Ronstrom2009-11-203-12/+12
| | * | | | | | | | WL#5138 merged to mysql-next-mrMikael Ronstrom2009-11-206-44/+97
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | Backported my_atomic from 6.0-codebase and added support for 64-bit atomics t...Mikael Ronstrom2009-10-126-44/+97
| * | | | | | | | | | Merged in WL#4949Mikael Ronstrom2009-11-271-0/+2
| |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ MergeMikael Ronstrom2009-11-2029-616/+241
| | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / /
| | * | | | | | | | | | WL#4949, Remove use of LOCK_alarm by instead using SO_SNDTIME0/SO_RCVTIME0Mikael Ronstrom2009-11-121-0/+2
| * | | | | | | | | | | Merge WL#5137 to mysql-next-mrMikael Ronstrom2009-11-271-2/+7
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / | |/| | | | | | | | | |
| | * | | | | | | | | | WL#5137, Remove hash calculation from LOCK_open in open_tableMikael Ronstrom2009-11-201-2/+7
| | |\ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / | | |/| | | | | | | | |
| | | * | | | | | | | | Review comments for LOCK_open patchMikael Ronstrom2009-11-101-6/+6
| | | * | | | | | | | | A minor change to MySQL's hash where calculation of hash can be done separate...Mikael Ronstrom2009-10-091-2/+7
| | | | |/ / / / / / / | | | |/| | | | | | |
* | | | | | | | | | | 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