summaryrefslogtreecommitdiff
path: root/sql
Commit message (Expand)AuthorAgeFilesLines
* merge from latest 5.5Guilhem Bichot2011-05-2122-248/+646
|\
| * Manual merge of patch for Bug#11749345 (formerly known as bug#38813)Dmitry Shulga2011-05-211-158/+188
| |\
| | * Fixed bug#11749345 (formerly bug#38813) - increasing memory consumptionDmitry Shulga2011-05-201-140/+180
| | * Bug#11764633 : 57491: THD->MAIN_DA.IS_OK() ASSERT IN EMBEDDEDMayank Prasad2011-05-183-0/+28
| * | mergeMikael Ronström2011-05-195-2/+36
| |\ \
| | * | merge from 5.1 for bug#11764633Mayank Prasad2011-05-183-0/+28
| | * | 5.1 -> 5.5 mergeSergey Glukhov2011-05-181-2/+7
| | |\ \ | | | |/
| | | * Bug#12403504 AFTER FIX FOR #11889186 : ASSERTION FAILED: DELSUM+(INT) Y/4-TEM...Sergey Glukhov2011-05-181-2/+7
| * | | mergeMikael Ronström2011-05-182-15/+10
| |\ \ \
| | * | | Removed variables no longer needed in plugins, moved to methods insteadMikael Ronstrom2011-05-132-15/+10
| * | | | Split up unlink_thd in several functionsMikael Ronström2011-05-181-7/+32
| |/ / /
| * | | mergeMikael Ronström2011-05-121-2/+5
| |\ \ \
| * \ \ \ mergeMikael Ronström2011-05-1220-83/+342
| |\ \ \ \
| * \ \ \ \ mergeMikael Ronstrom2011-05-0411-172/+391
| |\ \ \ \ \
| * | | | | | Fixed error in mergeMikael Ronstrom2011-04-201-1/+1
| * | | | | | Fixed missing change of thd_unlock_connection_data to thd_unlock_thread_countMikael Ronstrom2011-04-201-1/+1
| * | | | | | Merge 5.5Mikael Ronström2011-04-1561-479/+1319
| |\ \ \ \ \ \
| * | | | | | | Changed name to better reflect function logic in accordance with WL#5788Mikael Ronström2011-04-151-2/+2
| * | | | | | | Use C++ manner for unused param instead of C mannerMikael Ronström2011-04-151-4/+2
| * | | | | | | Further review fixesMikael Ronstrom2011-03-041-3/+3
| * | | | | | | More review fixesMikael Ronstrom2011-03-043-6/+9
| * | | | | | | Changed prefix from ES_ to STMT_ on Query arena stateMikael Ronstrom2011-03-046-31/+32
| * | | | | | | Removed no longer needed header filesMikael Ronstrom2011-03-041-2/+0
| * | | | | | | Added comment on how to expand the use of the debug sync framework for schedulerMikael Ronstrom2011-03-041-0/+4
| * | | | | | | mergeMikael Ronstrom2011-03-0430-506/+333
| |\ \ \ \ \ \ \
| * | | | | | | | More work on interfacesMikael Ronström2011-02-162-0/+40
| * | | | | | | | Defined private interface to THD variables, first step to plugin APIMikael Ronström2011-02-161-0/+196
| * | | | | | | | Added setters to scheduler interfaceMikael Ronström2011-02-102-3/+15
| * | | | | | | | more fixes of scheduler interface changesMikael Ronström2011-02-102-14/+10
| * | | | | | | | Simplifications of server interface to schedulerMikael Ronström2011-02-102-5/+13
| * | | | | | | | Remove no longer needed things for DBUG handling in thread pool pluginsMikael Ronström2011-02-101-5/+0
| * | | | | | | | Simplify interface to connect methods in serverMikael Ronström2011-02-102-11/+30
| * | | | | | | | mergeMikael Ronström2011-02-1037-326/+535
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Fixed such that debug_sync can be used by plugins on WindowsMikael Ronström2011-02-032-2/+2
| * | | | | | | | | BUG#59549, Fix compiler errors on Windows, step 5Mikael Ronstrom2011-01-242-10/+15
| * | | | | | | | | mergeMikael Ronstrom2011-01-2011-67/+97
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | BUG#59549, fix compiler error on Windows, step 2Mikael Ronstrom2011-01-207-32/+32
| * | | | | | | | | | BUG#59549, fix compiler error on WindowsMikael Ronstrom2011-01-172-10/+10
| * | | | | | | | | | merge to mysql-5.5Mikael Ronstrom2011-01-149-48/+116
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ mergeMikael Ronstrom2011-01-1217-106/+205
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ mergeMikael Ronstrom2011-01-04153-5013/+8636
| |\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Added support in DEBUG_SYNC framework for actions when THD object isn't activ...Mikael Ronstrom2010-11-091-9/+19
| * | | | | | | | | | | | | Added reporting of fsync to THD wait interfaceMikael Ronstrom2010-10-281-3/+15
| * | | | | | | | | | | | | Added THD wait state for MASTER POS WAITMikael Ronstrom2010-10-281-0/+4
| * | | | | | | | | | | | | Added more wait states for THD wait serviceMikael Ronstrom2010-10-274-1/+25
* | | | | | | | | | | | | | Merge from 5.1.Guilhem Bichot2011-05-2129-127/+123
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | Fix for BUG#11755168 '46895: test "outfile_loaddata" fails (reproducible)'.Guilhem Bichot2011-05-1626-133/+128
| | |_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | |
| * | | | | | | | | | | | auto-mergeTatjana Azundris Nuernberg2011-05-1229-268/+755
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ Merge from mysql-5.1.57-releaseKaren Langford2011-05-064-29/+183
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | Bug#11867664: Fix server crashes on update with join on partitioned table.karen.langford@oracle.com2011-04-121-1/+9