summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Implementation of WL#2486 -unknown2005-08-1263-1910/+3566
* Merge mysql.com:/space/my/mysql-4.1-buildunknown2005-08-021-2/+5
|\
| * - Fixed the Requires: tag for the server RPM (BUG#12233), make sure to list allunknown2005-08-021-2/+5
* | Fix two test results that were merged out-of-order.unknown2005-08-012-24/+34
* | Merge mysql.com:/home/jimw/my/mysql-4.1-cleanunknown2005-08-019-41/+92
|\ \
| * \ Merge mysql.com:/home/jimw/my/mysql-4.1-9947unknown2005-08-011-12/+10
| |\ \
| | * | Fix max_connections_per_hour handling when the globalunknown2005-06-271-12/+10
| * | | Merge mysql.com:/home/jimw/my/mysql-4.1-11402unknown2005-08-013-3/+8
| |\ \ \
| | * | | Fix multiplication of abs() by a negative value. (Bug #11402)unknown2005-06-223-3/+8
| * | | | Merge mysql.com:/home/jimw/my/mysql-4.1-10724unknown2005-08-017-32/+67
| |\ \ \ \
| | * | | | Don't force column header to @@session.var_name if @@local.var_nameunknown2005-07-257-32/+67
* | | | | | Merge mysql.com:/home/jimw/my/mysql-4.1-cleanunknown2005-08-013-1/+85
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge spachev@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-08-013-1/+85
| |\ \ \ \ \
| | * | | | | updates for BUG#10780 - fixed slave I/O thread running status to No while att...unknown2005-07-294-4/+35
| | * | | | | testcase for bug 10780 was not added in the previous commitunknown2005-07-281-0/+28
| | * | | | | patch for bug 10780unknown2005-07-283-2/+27
| * | | | | | Merge rurik.mysql.com:/home/igor/mysql-4.1unknown2005-07-312-4/+4
| |\ \ \ \ \ \
* | | | | | | | Fix crash in 'INSERT DELAYED' statement that failed due to aunknown2005-08-013-1/+19
* | | | | | | | Fix crash in 'SHOW CREATE FUNCTION' introduced by Monty's lastunknown2005-08-011-3/+1
* | | | | | | | Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-08-014-41/+107
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge mysql.com:/usr/local/home/marty/MySQL/mysql-5.0-releaseunknown2005-08-013-6/+8
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Fix for bug#12021unknown2005-07-313-6/+8
| * | | | | | | | | Fixed handling of NOT LIKE after Item_func::NOTLIKE_FUNC has been removedunknown2005-08-012-35/+99
* | | | | | | | | | Merge aschwenke@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-08-0133-302/+388
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | After merge fixesunknown2005-07-313-16/+12
| * | | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-07-3132-286/+376
| |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ Merge bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-07-3132-286/+376
| | |\ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | Fixes during review of new pushed codeunknown2005-07-3132-297/+385
* | | | | | | | | | | | | Merge aschwenke@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-07-312-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | fixed two bugs that break Windows buildunknown2005-07-292-3/+3
* | | | | | | | | | | | | Merge rurik.mysql.com:/home/igor/dev/mysql-4.1-0unknown2005-07-312-4/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | |
| * | | | | | | | | | | | null_key.result, null_key.test:unknown2005-07-312-4/+4
* | | | | | | | | | | | | Mergeunknown2005-07-313-1/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | |
| * | | | | | | | | | | | Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-07-311-0/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / /
| | * | | | | | | | | | | Fixed bug #12095: a join query with GROUP_CONCAT over a single row table.unknown2005-07-311-0/+1
| * | | | | | | | | | | | fix for bug#12665unknown2005-07-291-0/+1
| | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | |
| * | | | | | | | | | | - fixed a typo in C++Files/client/mysqlclient_ia64.dsp: ctype-cp963.c -> ctyp...unknown2005-07-291-1/+1
| |/ / / / / / / / / /
* | | | | | | | | | | Merge rurik.mysql.com:/home/igor/mysql-5.0unknown2005-07-316-5/+182
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Manual mergeunknown2005-07-281-0/+7
| * | | | | | | | | | Manual mergeunknown2005-07-286-10/+180
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | | | | / / / / / / / | | |_|/ / / / / / / | |/| | | | | | | |
| | * | | | | | | | func_gconcat.result, func_gconcat.test:unknown2005-07-284-2/+69
| | * | | | | | | | null_key.test, null_key.result:unknown2005-07-282-17/+6
| | * | | | | | | | null_key.test, null_key.result:unknown2005-07-282-6/+66
| | * | | | | | | | Manual mergeunknown2005-07-283-1/+64
| | |\ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / | | |/| | | | | | |
| | | * | | | | | | sql_select.cc:unknown2005-07-283-1/+65
| | * | | | | | | | Manually merging 4.1.13a into general 4.1unknown2005-07-280-0/+0
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | Combining zlib security fixes for version 4.1.13a:unknown2005-07-283-6/+7
* | | | | | | | | | | Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0unknown2005-07-3020-125/+427
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | postmerge-fixunknown2005-07-303-25/+14
| * | | | | | | | | | | Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0unknown2005-07-2920-113/+426
| |\ \ \ \ \ \ \ \ \ \ \