summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-01-182-7/+7
|\
| * Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-01-182-7/+7
| |\
| | * ps_7ndb.result, ps_6bdb.result:unknown2005-01-182-7/+7
* | | Merge mysql.com:/home/dlenev/src/mysql-4.1-mergesunknown2005-01-183-7/+22
|\ \ \ | |/ / |/| |
| * | Added test for bug #7884 "Able to add invalid unique index on TIMESTAMPunknown2005-01-182-0/+15
| * | Manual merge of fix for bug #7884 "Able to add invalid unique index onunknown2005-01-181-7/+7
| |\ \
| | * \ Merge bk-internal.mysql.com:/home/bk/mysql-4.0unknown2005-01-181-7/+7
| | |\ \
| | | * | Clean up in implementation of f_is_geom()/f_is_bitfield()/f_is_enum()unknown2005-01-181-7/+7
| | * | | Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.0unknown2005-01-181-0/+3
| | |\ \ \
* | | \ \ \ Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-01-183-11/+46
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Added possibility to use --error <name> instead of --error <number>unknown2005-01-183-11/+46
* | | | | | After-merge clean-upunknown2005-01-1810-47/+47
* | | | | | mergeunknown2005-01-182-3/+6
|\ \ \ \ \ \ | |/ / / / / |/| / / / / | |/ / / /
| * | | | 1. Item now uses my_charset_bin by default,unknown2005-01-1813-56/+59
* | | | | Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-01-185-76/+64
|\ \ \ \ \
| * \ \ \ \ Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-01-183-30/+19
| |\ \ \ \ \
| | * \ \ \ \ Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-01-183-30/+19
| | |\ \ \ \ \
| | | * | | | | bug #7981: SHOW GLOBAL STATUS crashes server(fix after review)unknown2005-01-181-1/+0
| | | * | | | | Fix for bug #7981: SHOW GLOBAL STATUS crashes serverunknown2005-01-183-30/+20
| * | | | | | | compile error: moved inlineunknown2005-01-181-45/+45
| |/ / / / / /
| * | | | | | Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-01-181-1/+0
| |\ \ \ \ \ \
| | * | | | | | compile bug fixunknown2005-01-181-1/+0
* | | | | | | | Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-01-185-174/+187
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-01-185-174/+187
| |\ \ \ \ \ \ \
| | * | | | | | | Post-review fixes for the previous cset. No code behavior changes.unknown2005-01-181-3/+8
| | * | | | | | | Fixes in opt_range.cc: ROR plan choice codeunknown2005-01-175-176/+184
* | | | | | | | | Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-01-181-1/+1
|\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge mysql.com:/home/kostja/work/mysql-4.1-rootunknown2005-01-181-1/+1
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | / / / / | | | |_|_|/ / / / | | |/| | | | | |
| | * | | | | | | Fix 'make distclean' goal.unknown2005-01-181-1/+1
| | * | | | | | | Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-01-181-0/+5
| | |\ \ \ \ \ \ \
* | | | | | | | | | slave.cc:unknown2005-01-181-1/+2
|/ / / / / / / / /
* | | | | | | | | Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-01-181-0/+5
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | |
| * | | | | | | | Merge mysql.com:/home/mysql_src/mysql-4.1-cleanunknown2005-01-181-0/+5
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | / / / / | | |_|_|/ / / / | |/| | | | | |
| | * | | | | | Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-01-187-6/+41
| | |\ \ \ \ \ \
| | * | | | | | | Fix for BUG#7965 "Slave_IO_State Stuck at 'Checking Master Version'":unknown2005-01-171-0/+5
* | | | | | | | | compile error fixunknown2005-01-181-2/+2
* | | | | | | | | Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-01-1820-41/+180
|\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge mysql.com:/space/my/mysql-4.1 into mysql.com:/space/my/mysql-5.0unknown2005-01-181-1/+1
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | / / / / / | | | |_|/ / / / / | | |/| | | | | |
| | * | | | | | | Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-01-1810-7/+52
| | |\ \ \ \ \ \ \ | | | | |/ / / / / | | | |/| | | | |
| | * | | | | | | Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-01-171-1/+1
| | |\ \ \ \ \ \ \
| | | * \ \ \ \ \ \ Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-01-171-1/+1
| | | |\ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ Merge mysql.com:/space/my/mysql-4.0unknown2005-01-171-1/+1
| | | | |\ \ \ \ \ \ \ | | | | | | |_|_|/ / / | | | | | |/| | | | |
| | | | | * | | | | | - Enabled the handling of architecture extensions e.g. "-64bit" when buildingunknown2005-01-171-1/+1
| * | | | | | | | | | Merge mysql.com:/usr/home/bar/mysql-4.1unknown2005-01-183-1/+26
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / | | |/| | | | | | | |
| | * | | | | | | | | #7874: CONCAT() gives wrong results mixing latin1 field and utf8 string literalsunknown2005-01-183-1/+26
| * | | | | | | | | | After merge fixesunknown2005-01-182-40/+8
| * | | | | | | | | | Merge with global treeunknown2005-01-1811-23/+83
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / /
| | * | | | | | | | | Merge mysql.com:/home/my/mysql-4.0 into mysql.com:/home/my/mysql-4.1unknown2005-01-181-0/+3
| | |\ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|/ / | | | |/| | | | | | |
| | | * | | | | | | | Anoter fix for moved IO_CACHE objectunknown2005-01-181-0/+3
| | | | |_|_|/ / / / | | | |/| | | | | |
| | * | | | | | | | Fixed new bug that caused symlink test to failunknown2005-01-182-4/+7
View Lorry Controller Status