summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge bk-internal.mysql.com:/home/bk/mysql-4.1unknown2004-12-3014-10/+3011
|\
| * Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2004-12-3012-3/+3008
| |\
| | * Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2004-12-303-3/+19
| | |\
| | | * Merge mysql.com:/M41/mysql-4.1 into mysql.com:/M41/push-4.1unknown2004-12-303-3/+19
| | | |\
| | | | * Clean up the handling of "server" and "client" directories, while still avoid...unknown2004-12-303-3/+19
| | * | | Many files:unknown2004-12-309-0/+2989
| | |/ /
| * | | Fix func_concat.result: allow -0.00 to be converted to string both with and w...unknown2004-12-302-7/+3
| |/ /
* | | Fix for bug #6914 "Problems using time()/date() output in expressions".unknown2004-12-303-0/+26
|/ /
* | srv0start.c:unknown2004-12-291-0/+27
* | Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2004-12-284-29/+39
|\ \
| * | client/mysqldump.cunknown2004-12-281-28/+15
| * | Merge mysql.com:/home/timka/mysql/src/4.1-virginunknown2004-12-283-1/+24
| |\ \ | | |/ | |/|
| | * Fix for BUG#7455.unknown2004-12-283-1/+24
* | | Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2004-12-285-43/+214
|\ \ \ | |/ /
| * | row0mysql.c:unknown2004-12-271-36/+69
| * | Merge heikki@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2004-12-274-7/+145
| |\ \
| | * \ Merge lthalmann@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2004-12-274-7/+145
| | |\ \
| | | * | WL#2319 V2: Exclude tables from dumpunknown2004-12-274-7/+145
| | | |/
| * | | Mergeunknown2004-12-270-0/+0
| |\ \ \ | | |/ / | |/| |
| | * | row0mysql.c:unknown2004-12-271-34/+66
* | | | - make sure that MYSQL_VERSION_ID created by "configure" does not contain anyunknown2004-12-271-1/+1
|/ / /
* | | row0mysql.c:unknown2004-12-271-0/+6
* | | Merge hundin.mysql.fi:/home/heikki/mysql-4.0unknown2004-12-272-5/+37
|\ \ \ | |/ / | | / | |/ |/|
| * row0ins.c:unknown2004-12-272-5/+37
* | Merge mysql.com:/home/timka/mysql/src/4.1-virginunknown2004-12-274-0/+20
|\ \
| * | Fix for BUG#7377. This fix adds the same implementation for ha_myisammgr::ind...unknown2004-12-274-0/+20
* | | mergeunknown2004-12-271-12/+3
|\ \ \ | | |/ | |/|
| * | A fix (bug #5652: [patch] tcpwrapper support is broken on systems using an un...unknown2004-12-241-12/+3
* | | sql_table.cc:unknown2004-12-271-1/+5
* | | ha_innodb.cc:unknown2004-12-271-11/+9
* | | row0mysql.c:unknown2004-12-271-1/+1
* | | ha_innodb.cc, row0ins.c, fil0fil.c:unknown2004-12-273-3/+3
* | | Merge heikki@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2004-12-2713-104/+321
|\ \ \
| * | | Many files:unknown2004-12-2713-104/+321
* | | | Merge rurik.mysql.com:/home/igor/mysql-4.1unknown2004-12-264-12/+71
|\ \ \ \ | |/ / / |/| | |
| * | | subselect.result, subselect.test:unknown2004-12-262-0/+19
| * | | subselect.result, subselect.test:unknown2004-12-254-12/+52
| | |/ | |/|
* | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1/unknown2004-12-242-31/+8
|\ \ \
| * | | better fix for bug#7242 (crash in prepared INSERT ... UPDATE)unknown2004-12-242-31/+8
* | | | additional 4.0 -> 4.1 merge !!unknown2004-12-251-1/+0
* | | | 4.0 -> 4.1 mergeunknown2004-12-243-5/+18
|\ \ \ \ | | |_|/ | |/| |
| * | | Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.0unknown2004-12-233-26/+69
| |\ \ \
| * | | | Fix for a bug #7495unknown2004-12-233-25/+15
| * | | | A fix for the bug #7495unknown2004-12-223-2/+26
* | | | | Manual merge of changes making GRANTs, which change SSL attributes and/orunknown2004-12-233-26/+72
|\ \ \ \ \ | | |/ / / | |/| / / | |_|/ / |/| | |
| * | | Make GRANTs, which change SSL attributes and/or user limits,unknown2004-12-233-26/+69
| |/ /
* | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1/unknown2004-12-237-54/+109
|\ \ \
| * \ \ Merge mysql.com:/home/wax/mysql/mysql-4.1unknown2004-12-232-6/+7
| |\ \ \
| | * | | Take charsets from the source directory rather thanunknown2004-12-232-6/+7
| * | | | fix indentationunknown2004-12-235-48/+64