summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Fix Windows CMake compilation after merge of Magnuses ssl patch.unknown2006-03-164-12/+13
* Fix example storage engine build on Windows.unknown2006-03-161-4/+4
* Merge bk-internal:/home/bk/mysql-5.1-newunknown2006-03-165-6/+9
|\
| * CMake Windows comp_error dependency fix after last push.unknown2006-03-165-6/+9
* | Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-newunknown2006-03-1610-23/+40
|\ \
| * \ Merge acurtis@bk-internal:/home/bk/mysql-5.1-newunknown2006-03-164-2/+24
| |\ \ | | |/ | |/|
| | * Merge xiphis.org:/home/antony/work2/p1-bug14575.1unknown2006-03-164-2/+24
| | |\
| | | * Merge acurtis@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2006-03-161-2/+2
| | | |\
| | | | * Merge shellback.(none):/home/msvensson/mysql/bug18195/my50-bug18195unknown2006-03-161-2/+2
| | | | |\
| | | | | * Bug#18195 MySQL on Windows not built with YaSSL correctlyunknown2006-03-141-2/+2
| | | * | | Bug#14575unknown2006-03-162-6/+72
| | | |/ /
| | | * | Merge kite-hub.kitebird.com:/src/extern/MySQL/bk/mysql-5.0unknown2006-03-141-5/+5
| | | |\ \
| | | * | | sql_select.cc:unknown2006-03-141-1/+1
| | | * | | Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2006-03-143-0/+22
| | | |\ \ \
| | | | * | | Fixed bug#17366: Unchecked Item_int results in server crashunknown2006-03-133-0/+22
| * | | | | | Merge bk-internal:/home/bk/mysql-5.1-newunknown2006-03-166-21/+16
| |\ \ \ \ \ \
| | * | | | | | Fix Windows CMake dependency problem.unknown2006-03-166-21/+16
* | | | | | | | Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-newunknown2006-03-166-18/+99
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | fix for bug 16408 (Events: crash for an event in a procedure)unknown2006-03-166-18/+99
| | |/ / / / / | |/| | | | |
* | | | | | | Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.1-newunknown2006-03-166-10/+41
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | BUG#17772unknown2006-03-166-10/+41
* | | | | | | Merge mysql.com:/usr/local/mysql/mysql-4.1unknown2006-03-161-0/+6
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Fix bug in mysql-test-run.pl in ^C signal handler.unknown2006-03-161-0/+6
| * | | | | | Merge perch.ndb.mysql.com:/home/jonas/src/41-workunknown2006-03-131-2/+2
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2006-03-131-1/+2
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge mysql.com:/home/mydev/mysql-4.1unknown2006-03-109-3/+57
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge mysql.com:/M41/comment-4.1 into mysql.com:/M41/mysql-4.1unknown2006-03-100-0/+0
| |\ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ Merge mysql.com:/home/bkroot/mysql-5.1-newunknown2006-03-1628-31/+43
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / | |/| | | | | | | | |
| * | | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.1-newunknown2006-03-155-0/+43
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | A fix and test case for Bug#16164 "Easter egg":unknown2006-03-155-0/+43
| * | | | | | | | | | | Removed calls to deploy.bat from the build scripts since the cmake scripts ar...unknown2006-03-152-10/+0
| * | | | | | | | | | | Moved cmake scripts into the proper directoriesunknown2006-03-1521-21/+0
| |/ / / / / / / / / /
* | | | | | | | | | | Bug#17400 (RBR: replication of delete and update fails for tables w/o PK):unknown2006-03-161-7/+7
* | | | | | | | | | | Merge mysql.com:/home/bkroot/mysql-5.1-newunknown2006-03-151-6/+8
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Bug#18250 (Truncate table replicate both as statement and as individualunknown2006-03-151-6/+8
* | | | | | | | | | | Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-5.1-newunknown2006-03-151-0/+75
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | README:unknown2006-03-151-0/+75
* | | | | | | | | | | | Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.1-new/unknown2006-03-151-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
| * | | | | | | | | | | sql:unknown2006-03-151-2/+2
* | | | | | | | | | | | xml.result, xml.test:unknown2006-03-153-2/+17
|/ / / / / / / / / / /
* | | | | | | | | | | Merge kite-hub.kitebird.com:/src/extern/MySQL/bk/mysql-5.0-r1.2084unknown2006-03-140-0/+0
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / | |/| | | | | | | | |
| * | | | | | | | | | mysqld.cc:unknown2006-03-141-5/+5
| | |_|_|_|_|_|/ / / | |/| | | | | | | |
* | | | | | | | | | Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.1-newunknown2006-03-1416-33/+335
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fixing test casesunknown2006-03-147-26/+26
| * | | | | | | | | | Manual mergeunknown2006-03-143-4/+5
| * | | | | | | | | | Merge zim.(none):/home/mikael/bug17127unknown2006-03-149-9/+212
| |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.1-newunknown2006-03-149-5/+193
| | |\ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ Merge zim.(none):/home/mikael/bug15961unknown2006-03-146-2/+163
| | | |\ \ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ \ Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.1-newunknown2006-03-146-2/+164
| | | | |\ \ \ \ \ \ \ \ \ \ | | | | | |_|/ / / / / / / / | | | | |/| | | | | | | | |
| | | | | * | | | | | | | | Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.1-newunknown2006-03-136-2/+164
| | | | | |\ \ \ \ \ \ \ \ \