summaryrefslogtreecommitdiff
path: root/sql
Commit message (Expand)AuthorAgeFilesLines
* build break cleanupunknown2007-05-221-5/+3
* Merge malff@bk-internal.mysql.com:/home/bk/mysql-5.1-runtimeunknown2007-05-226-59/+42
|\
| * Bug#21554 (sp_cache.cc: violates C++ aliasing rules)unknown2007-05-226-59/+42
* | Fix for bug#28075 COM_DEBUG crashes mysqldunknown2007-05-214-9/+19
|/
* Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtimeunknown2007-05-193-153/+129
|\
| * Patch changing how ALTER TABLE implementation handles table lockingunknown2007-05-193-153/+129
* | Merge adventure.(none):/home/thek/Development/cpp/bug26277/my51-bug26277unknown2007-05-182-15/+18
|\ \
| * | Bug#26277 User variable returns one type in SELECT @v and other for CREATE as...unknown2007-05-182-15/+18
* | | Merge vajra.(none):/opt/local/work/mysql-5.0-runtimeunknown2007-05-181-3/+10
|\ \ \ | |_|/ |/| |
| * | Bug #27907 "Misleading error message when opening/locking tables"unknown2007-05-181-3/+10
* | | Fix a typo.unknown2007-05-161-2/+2
* | | Make a stab at events_bugs.test failure under valgrind (nounknown2007-05-161-0/+10
* | | Merge vajra.(none):/opt/local/work/mysql-5.0-21483unknown2007-05-161-1/+1
|\ \ \ | |/ /
| * | Fix a failing assert.unknown2007-05-161-1/+1
* | | Correct a merge error.unknown2007-05-161-3/+3
* | | Merge vajra.(none):/opt/local/work/mysql-5.0-21483unknown2007-05-164-78/+181
|\ \ \ | |/ /
| * | Merge bk-internal.mysql.com:/home/bk/mysql-5.0-runtimeunknown2007-05-164-77/+181
| |\ \
| | * | A fix and a test case for unknown2007-05-164-83/+187
| * | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0unknown2007-05-1525-611/+1342
| |\ \ \
| * \ \ \ Merge bk-internal.mysql.com:/data0/bk/mysql-5.0unknown2007-05-1213-27/+102
| |\ \ \ \
| * \ \ \ \ Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-optunknown2007-05-102-0/+5
| |\ \ \ \ \
| | * \ \ \ \ Merge dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.0/mysql-5.0-ndb-bjunknown2007-05-082-0/+5
| | |\ \ \ \ \
| | | * \ \ \ \ Merge lzhou@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb-bjunknown2007-04-182-0/+5
| | | |\ \ \ \ \
* | | | | | | | | A post-merge fix.unknown2007-05-151-1/+1
* | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.1unknown2007-05-1528-685/+1517
|\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtimeunknown2007-05-151-4/+40
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Fix for bug #28415 "Some ALTER TABLE statements no longer work under LOCKunknown2007-05-141-4/+40
| * | | | | | | | | | Merge vajra.(none):/opt/local/work/mysql-5.0-runtimeunknown2007-05-141-1/+1
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | / / / | | | |_|_|_|_|/ / / | | |/| | | | | | |
| | * | | | | | | | Fix a warning.unknown2007-05-141-6/+6
| | * | | | | | | | Added missing DBUG_VOID_RETURN to the sp_head::init_sp_name() method.unknown2007-05-121-0/+2
| | * | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0-runtimeunknown2007-05-1111-184/+653
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | Fix for:unknown2007-05-1111-184/+653
| * | | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtimeunknown2007-05-1111-245/+766
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Fix for:unknown2007-05-1111-245/+766
| * | | | | | | | | | | Merge vajra.(none):/opt/local/work/mysql-5.0-runtimeunknown2007-05-114-25/+13
| |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | | |/| | | | | | | | |
| | * | | | | | | | | | Cleanup: now that we have Lex_input_stream, finish the transitionunknown2007-05-114-25/+13
| | | |_|_|_|_|_|_|/ / | | |/| | | | | | | |
| * | | | | | | | | | Merge vajra.(none):/opt/local/work/mysql-5.0-21483unknown2007-05-102-25/+25
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / /
| | * | | | | | | | | Follow the coding style with class names.unknown2007-05-102-25/+25
| | * | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0-runtimeunknown2007-05-101-0/+1
| | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | Corrected merge error; missing line in debug statement.unknown2007-05-101-0/+1
| * | | | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtimeunknown2007-05-101-0/+1
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Fixed error from merge misstake; missing line in debug statement.unknown2007-05-101-0/+1
| | | |_|/ / / / / / / / | | |/| | | | | | | | |
| * | | | | | | | | | | Merge vajra.(none):/opt/local/work/mysql-5.0-21483unknown2007-05-101-59/+135
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| / / / / / / / / / | | |/ / / / / / / / /
| | * | | | | | | | | No semantical change. Move checks of compatibilityunknown2007-05-101-50/+126
| | |/ / / / / / / /
| | * | | | | | | | Merge adventure.(none):/home/thek/Development/cpp/bug27792/my50-bug27792unknown2007-05-083-5/+21
| | |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Merge adventure.(none):/home/thek/Development/cpp/bug26977/my50-bug26977unknown2007-05-072-3/+19
| | |\ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / | | |/| | | | | | | |
| | * | | | | | | | | Merge weblab.(none):/home/marcsql/TREE/mysql-5.0-baseunknown2007-05-0217-317/+480
| | |\ \ \ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ \ \ Merge adventure.(none):/home/thek/Development/cpp/bug27792/my51-bug27792unknown2007-05-083-5/+21
| |\ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ Merge adventure.(none):/home/thek/Development/cpp/bug27792/my50-bug27792unknown2007-05-083-5/+21
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|/ / / / / / / | | | |/| | | | | | | | |
| | | * | | | | | | | | | 4.1 -> 5.0 Manual merge for Bug #27792 unknown2007-05-083-5/+20
View Lorry Controller Status