summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Manual merge (again)unknown2005-05-1415-14/+94
|\
| * Fix a valgrind warning: memcpy does not allow its arguments to overlap.unknown2005-05-141-2/+5
| * Fix wrong format specifier in error messages.unknown2005-05-142-2/+2
| * Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/unknown2005-05-132-2/+3
| |\
| | * sql/ha_blackhole.ccunknown2005-05-132-2/+3
| * | Merge bk-internal:/home/bk/mysql-4.1unknown2005-05-131-1/+1
| |\ \
| | * \ Merge mysql.com:/home/jimw/my/mysql-4.1-9603unknown2005-05-131-1/+1
| | |\ \
| | | * | Eliminate gcc 4.0 warning in libedit code. (Bug #9603)unknown2005-05-071-1/+1
| * | | | row0mysql.c:unknown2005-05-131-2/+10
| |/ / /
| * | | added prototype for mysql_set_character_set functionunknown2005-05-131-0/+1
| * | | added function mysql_set_character_set (reviewed by Monty)unknown2005-05-132-0/+31
| | |/ | |/|
| * | If the system is under high load 'show full processlist' might report the unknown2005-05-122-8/+9
| * | Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-05-103-2/+3
| |\ \
| | * \ Merge bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-05-101-0/+1
| | |\ \
| | | * | Fix for Ingounknown2005-05-101-0/+1
| | * | | ctype-big5.c:unknown2005-05-102-2/+2
| * | | | Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-05-102-1/+7
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Makefile.am, configure.in:unknown2005-05-102-1/+7
| * | | | Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-05-103-1/+29
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | bug#10344: some string function fail for UCS2unknown2005-05-103-1/+29
* | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-05-1329-178/+306
|\ \ \ \ \
| * \ \ \ \ Merge bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-05-1329-178/+306
| |\ \ \ \ \
| | * | | | | concurrent-insert can now be set to 2 for concurrent inserts when there is ho...unknown2005-05-1329-178/+306
* | | | | | | Fixup from 4.1 to 5.0 mergeunknown2005-05-131-1/+1
* | | | | | | Add missing commas to errmsg.cunknown2005-05-131-3/+3
* | | | | | | Mergeunknown2005-05-133-1/+3
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Fix for valgrind bug in decimal codeunknown2005-05-131-1/+1
| * | | | | | Add myself to the list of users who don't automatically check outunknown2005-05-131-0/+1
* | | | | | | Merge book.sanja.is.com.ua:/Users/bell/mysql/bk/mysql-5.0unknown2005-05-138-23/+130
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Merge book.sanja.is.com.ua:/Users/bell/mysql/bk/mysql-5.0unknown2005-05-098-23/+130
| |\ \ \ \ \ \
| | * \ \ \ \ \ Merge book.sanja.is.com.ua:/Users/bell/mysql/bk/mysql-5.0unknown2005-05-098-23/+130
| | |\ \ \ \ \ \
| | | * \ \ \ \ \ mergeunknown2005-05-098-23/+130
| | | |\ \ \ \ \ \
| | | | * | | | | | Item::fix_field need correct pointer on item reference to chnge it if itis ne...unknown2005-05-098-23/+130
* | | | | | | | | | Fixed bug 10465.unknown2005-05-123-1/+25
* | | | | | | | | | --default-extra-file handling code fix.unknown2005-05-121-2/+2
* | | | | | | | | | fix (Bug #8295 and #8296: varchar and varbinary conversion)unknown2005-05-124-3/+19
* | | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-05-129-93/+293
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | A fix and test case for Bug#9478 "mysql_stmt_attr_set mysql_stmt_execute"unknown2005-05-129-93/+293
* | | | | | | | | | | Manual mergeunknown2005-05-1012-64/+77
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Many files:unknown2005-05-1012-64/+80
* | | | | | | | | | | Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-05-103-22/+96
|\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-05-103-22/+96
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Bug#10018: use INFORMATION_SCHEMA works, but show tables in it returns errorunknown2005-05-101-3/+16
| | * | | | | | | | | | | Fix for bug #10018:use INFORMATION_SCHEMA works, but show tables in it return...unknown2005-05-063-22/+83
* | | | | | | | | | | | | comment change (post-review of "replication of triggers"). Btw date_formats s...unknown2005-05-101-4/+4
* | | | | | | | | | | | | Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-05-104-9/+96
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-05-1099-697/+835
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-05-074-9/+96
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | Dmitri please review. Fix for BUG#10417 "CREATE TRIGGER not written to binlog":unknown2005-05-064-9/+96
* | | | | | | | | | | | | | | Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-05-103-1/+35
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
View Lorry Controller Status