summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* sql/sql_acl.ccunknown2005-03-237-38/+37
* mergedunknown2005-03-2325-421/+161
|\
| * Merge mysql.com:/data0/mysqldev/my/mysql-5.0-buildunknown2005-03-2211-51/+87
| |\
| | * Hack to ensure that CHAR's created in 5.0 are not converted to VARCHAR even ifunknown2005-03-2211-51/+87
| * | Merge mysql.com:/data0/mysqldev/my/mysql-5.0-buildunknown2005-03-223-3/+19
| |\ \ | | |/ | |/|
| | * BUG#9339 - Updating a column does not work if the table has a UTF-8 VARCHAR p...unknown2005-03-223-3/+19
| * | Merge mysql.com:/data0/mysqldev/my/mysql-5.0-buildunknown2005-03-2216-94/+181
| |\ \ | | |/
| | * Mergeunknown2005-03-2213-90/+176
| | |\
| | | * sql_acl.cc, sql_acl.h, sql_parse.ccunknown2005-03-2213-90/+176
| * | | Merge jwinstead@production.mysql.com:mysql-5.0-buildunknown2005-03-2223-43/+55
| |\ \ \
| * | | | Fix Windows compile warnings, declarations of walk functionsunknown2005-03-224-5/+9
| * | | | Remove references to no-longer-used MySqlManager project filesunknown2005-03-213-297/+0
| * | | | Fix test_libmysqld link problem on Windows.unknown2005-03-212-7/+5
* | | | | Merge bk-internal:/home/bk/mysql-5.0unknown2005-03-234-18/+170
|\ \ \ \ \
| * \ \ \ \ Merge mysql.com:/home/jimw/my/mysql-5.0-5036unknown2005-03-224-18/+170
| |\ \ \ \ \
| | * | | | | Add support for showing table type to mysqlshow command. (Bug #5036)unknown2005-03-154-18/+170
* | | | | | | Merge bk-internal:/home/bk/mysql-5.0unknown2005-03-2280-483/+881
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge mysql.com:/Users/kent/mysql/bk/mysql-5.0-buildunknown2005-03-222-4/+4
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | |
| | * | | | | Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1-buildunknown2005-03-222-4/+4
| | |\ \ \ \ \ | | | |_|_|_|/ | | |/| | | |
| | | * | | | mysql-test-run.sh, mysql-test-run.pl:unknown2005-03-222-4/+4
| * | | | | | Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-03-228-3/+57
| |\ \ \ \ \ \
| | * | | | | | - Added new error message.unknown2005-03-228-3/+57
| * | | | | | | Hack to ensure that CHAR's created in 5.0 are not converted to VARCHAR even i...unknown2005-03-2211-51/+87
| * | | | | | | Merge mysql.com:/M50/build-5.0.3 into mysql.com:/M50/push-5.0unknown2005-03-221-0/+1
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | |
| | * | | | | | Revert the inclusion of 'signal.h' as the module contains 'kill()'.unknown2005-03-221-0/+1
| | | |_|_|_|/ | | |/| | | |
| * | | | | | disabling rpl_timezone.test if --ps-protocol, as binlogging of CONVERT_TZ(,,@...unknown2005-03-222-1/+12
| * | | | | | Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-03-2216-200/+322
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| | * | | | | Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-03-2216-200/+322
| | |\ \ \ \ \
| | | * | | | | Last part of WL#1062: better replication of timezones: no more useunknown2005-03-2216-200/+322
| * | | | | | | Merge mysql.com:/home/cps/mysql/devel/im-failure-fixunknown2005-03-2223-43/+55
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | / / / / | | | |/ / / / | | |/| | | |
| | * | | | | Fix for AIX compilation failure: sacred knowledge of my_global.h nature (it s...unknown2005-03-2223-43/+55
| | | |_|_|/ | | |/| | |
| * | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-03-219-45/+86
| |\ \ \ \ \
| | * | | | | Cleanups during review of codeunknown2005-03-219-45/+86
| * | | | | | Merge hundin.mysql.fi:/home/heikki/mysql-4.1unknown2005-03-213-1/+18
| |\ \ \ \ \ \
| | * | | | | | trx0trx.c:unknown2005-03-211-1/+9
| | * | | | | | Mergeunknown2005-03-211-0/+6
| | |\ \ \ \ \ \
| | | * | | | | | trx0trx.c, trx0trx.h:unknown2005-03-212-1/+15
| | | * | | | | | Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.0unknown2005-03-1716-15/+16
| | | |\ \ \ \ \ \
| | * | \ \ \ \ \ \ Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1-buildunknown2005-03-213-30/+44
| | |\ \ \ \ \ \ \ \ | | | | |_|_|_|_|/ / | | | |/| | | | | |
| | * | | | | | | | A fix for Netware.unknown2005-03-211-0/+3
| | * | | | | | | | Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-03-182-17/+44
| | |\ \ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ \ Merge mysql.com:/Users/kent/mysql/bk/mysql-5.0-buildunknown2005-03-211-2/+2
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / / | | |/| | | | | | | |
| | * | | | | | | | | configure.in:unknown2005-03-211-2/+2
| * | | | | | | | | | Merge mysql.com:/Users/kent/mysql/bk/mysql-5.0-buildunknown2005-03-214-35/+132
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / /
| | * | | | | | | | | Merge mysqldev@production.mysql.com:my/mysql-5.0-buildunknown2005-03-214-35/+132
| | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | init_db.sql:unknown2005-03-211-5/+88
| | | * | | | | | | | | Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1-buildunknown2005-03-213-30/+44
| | | |\ \ \ \ \ \ \ \ \ | | | | | |_|/ / / / / / | | | | |/| | | | | | |
| | | | * | | | | | | | mtr_report.pl:unknown2005-03-213-30/+44
| | | | | |/ / / / / / | | | | |/| | | | | |
| * | | | | | | | | | Merge mysql.com:/M50/build-5.0.3 into mysql.com:/M50/push-5.0unknown2005-03-211-1/+1
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / /
| | * | | | | | | | | Code cleanup: should use 'element_count' here, see include/my_tree.hunknown2005-03-211-1/+1
| | |/ / / / / / / /