summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge of the fix for bug #9681 4.1->5.0unknown2005-04-193-1/+39
|\
| * sql_select.cc:unknown2005-04-193-1/+39
| * Merge jlindstrom@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-04-191-4/+4
| |\
| * | CSC5149 - ndb test programsunknown2005-04-191-2/+2
| * | Merge bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-04-183-69/+108
| |\ \
* | \ \ Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-04-191-5/+5
|\ \ \ \
| * \ \ \ Merge mysql.com:/M50/mysql-5.0 into mysql.com:/M50/push-5.0unknown2005-04-191-5/+5
| |\ \ \ \
| | * | | | As of 5.0.4, all builds will use '--with-big-tables'. Let development builds ...unknown2005-03-301-5/+5
* | | | | | Merge jlindstrom@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-04-191-39/+7
|\ \ \ \ \ \
| * \ \ \ \ \ Merge bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-04-191-39/+7
| |\ \ \ \ \ \
| | * | | | | | Update for VARCHAR and remove 4.1-specific actions.unknown2005-04-181-39/+7
* | | | | | | | Merge changes from 4.1.x to 5.0.x. Only a style changes.unknown2005-04-190-0/+0
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | / | | |_|_|_|_|/ | |/| | | | |
| * | | | | | Style change. Use 1 and 0 instead of true and false.unknown2005-04-191-4/+4
| | |_|_|/ / | |/| | | |
| * | | | | Fixed a bug: deadlock without any locking, simple select and update (Bug #7975).unknown2005-04-182-22/+38
* | | | | | Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-04-181-1/+1
|\ \ \ \ \ \
| * | | | | | view.result:unknown2005-04-181-1/+1
* | | | | | | Fixed Bug#6593, "Inconsistency in handling option prefixes (--skip, --disable...unknown2005-04-191-1/+2
|/ / / / / /
* | | | | | Post merge fix - updated the test results (BUG#9439)unknown2005-04-181-12/+12
* | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-04-183-111/+99
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-04-183-111/+99
| |\ \ \ \ \
| | * | | | | Fixed test results after merging fix for bug #8068 "TIMEDIFF with firstunknown2005-04-181-1/+2
| | * | | | | Manual merge of patch for bug #8068 "TIMEDIFF with first negativeunknown2005-04-183-110/+97
| | |\ \ \ \ \ | | | |_|/ / / | | |/| | | / | | | | |_|/ | | | |/| |
| | | * | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-04-183-69/+108
| | | |\ \ \ | | | | |/ / | | | |/| |
| | | | * | Fix for bug #8068 "TIMEDIFF with first negative argument gives wrong unknown2005-03-283-69/+108
| | | * | | Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-04-173-2/+34
| | | |\ \ \
* | | | | | | ha_innodb.cc:unknown2005-04-181-1/+1
|/ / / / / /
* | | | | | Merge mysql.com:/usr/local/bk/mysql-5.0unknown2005-04-183-2/+53
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Fixed BUG#9902: Crash with simple stored function using user defined variablesunknown2005-04-153-2/+53
* | | | | | Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-04-180-0/+0
|\ \ \ \ \ \
| * \ \ \ \ \ Merge mysql.com:/M50/mysql-5.0 into mysql.com:/M50/clone-5.0.4-buildunknown2005-04-180-0/+0
| |\ \ \ \ \ \
| | * | | | | | mysql.server script fixed to use mysqld_safe by default + lots of minor addit...unknown2005-04-162-21/+97
* | | | | | | | Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-04-172-0/+32
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Merge fix for BUG#9439 from 4.1unknown2005-04-172-0/+32
| |\ \ \ \ \ \ \ | | | |_|_|/ / / | | |/| | | | |
| | * | | | | | Fix for BUG#9439:unknown2005-04-163-2/+34
* | | | | | | | Merge mysql.com:/space/my/mysql-4.1-buildunknown2005-04-171-2/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | / / / | | |_|_|/ / / | |/| | | | |
| * | | | | | Merge mysql.com:/space/my/mysql-4.0-buildunknown2005-04-171-2/+1
| |\ \ \ \ \ \
| | * | | | | | - removed ReadMe.txt from CLEANFILES, as it's cleaned by Docs/Makefile.amunknown2005-04-171-2/+1
* | | | | | | | Post-merge fixesunknown2005-04-173-0/+39
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-04-173-0/+41
| |\ \ \ \ \ \ \
| | * | | | | | | Fix for BUG#9348: when computing union of two intervals set lower bound to unknown2005-04-173-0/+41
* | | | | | | | | Merge mysql.com:/home/mydev/mysql-4.1-bug9188unknown2005-04-161-3/+16
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Merge mysql.com:/home/mydev/mysql-4.1-bug9487unknown2005-04-161-3/+16
| |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge mysql.com:/home/mydev/mysql-4.1unknown2005-04-161-3/+16
| | |\ \ \ \ \ \ \ \ | | | |_|_|/ / / / / | | |/| | | | | | |
| | | * | | | | | | Bug#9487 - myisampack segmentation violation and bus errorunknown2005-04-151-3/+16
* | | | | | | | | | Mergeunknown2005-04-166-11/+88
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | Merge mysql.com:/home/mydev/mysql-4.1unknown2005-04-164-10/+85
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | |
| | * | | | | | | | Merge mysql.com:/home/mydev/mysql-4.1unknown2005-04-154-10/+85
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | Bug#9188 - Corruption Can't open file: 'table.MYI' (errno: 145)unknown2005-04-084-10/+85
| * | | | | | | | | | Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/unknown2005-04-165-18/+24
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / | | |/| | | | | | | |
| * | | | | | | | | | Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/unknown2005-04-165-7/+59
| |\ \ \ \ \ \ \ \ \ \
View Lorry Controller Status