summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Fixed failing tests for not 32 bit intel machinesmonty@mysql.com2005-05-167-13/+25
* Mergepetr@mysql.com2005-05-1628-190/+1218
|\
| * post-review fixespetr@mysql.com2005-05-1624-440/+467
| * mergepetr@mysql.com2005-04-2115-41/+1042
| |\
| | * WL#2246 "IM: Add ability to change instance options, add server logs handling...petr@mysql.com2005-04-0915-47/+1052
* | | Portability fix (for 64 bit intel)monty@mishka.local2005-05-151-0/+2
* | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0monty@mishka.local2005-05-141-1/+1
|\ \ \
| * | | Don't enable binlogs by default as this gives too many warningsmonty@mishka.local2005-05-141-1/+1
* | | | More post-merge fixes.konstantin@mysql.com2005-05-142-8/+12
* | | | A post-merge fix.konstantin@mysql.com2005-05-141-4/+4
* | | | Manual merge (again)konstantin@mysql.com2005-05-1415-14/+94
|\ \ \ \ | |/ / / |/| | |
| * | | Fix a valgrind warning: memcpy does not allow its arguments to overlap.konstantin@mysql.com2005-05-141-2/+5
| * | | Fix wrong format specifier in error messages.konstantin@mysql.com2005-05-142-2/+2
| * | | Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/serg@serg.mylan2005-05-132-2/+3
| |\ \ \
| | * | | sql/ha_blackhole.ccserg@serg.mylan2005-05-132-2/+3
| * | | | Merge bk-internal:/home/bk/mysql-4.1jimw@mysql.com2005-05-131-1/+1
| |\ \ \ \
| | * \ \ \ Merge mysql.com:/home/jimw/my/mysql-4.1-9603jimw@mysql.com2005-05-131-1/+1
| | |\ \ \ \
| | | * | | | Eliminate gcc 4.0 warning in libedit code. (Bug #9603)jimw@mysql.com2005-05-071-1/+1
| * | | | | | row0mysql.c:heikki@hundin.mysql.fi2005-05-131-2/+10
| |/ / / / /
| * | | | | added prototype for mysql_set_character_set functiongeorg@lmy002.wdf.sap.corp2005-05-131-0/+1
| * | | | | added function mysql_set_character_set (reviewed by Monty)georg@lmy002.wdf.sap.corp2005-05-132-0/+31
| | |/ / / | |/| | |
| * | | | If the system is under high load 'show full processlist' might report the mleich@mysql.com2005-05-122-8/+9
| * | | | Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1kent@mysql.com2005-05-103-2/+3
| |\ \ \ \
| | * \ \ \ Merge bk-internal.mysql.com:/home/bk/mysql-4.1msvensson@neptunus.(none)2005-05-101-0/+1
| | |\ \ \ \
| | | * | | | Fix for Ingomsvensson@neptunus.(none)2005-05-101-0/+1
| | * | | | | ctype-big5.c:bar@noter.(none)2005-05-102-2/+2
| * | | | | | Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1kent@mysql.com2005-05-102-1/+7
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | Makefile.am, configure.in:kent@mysql.com2005-05-102-1/+7
| * | | | | | Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1bar@mysql.com2005-05-103-1/+29
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| | * | | | | bug#10344: some string function fail for UCS2bar@noter.(none)2005-05-103-1/+29
* | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0monty@mishka.local2005-05-1329-178/+306
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge bk-internal.mysql.com:/home/bk/mysql-5.0monty@mishka.local2005-05-1329-178/+306
| |\ \ \ \ \ \ \
| | * | | | | | | concurrent-insert can now be set to 2 for concurrent inserts when there is ho...monty@mishka.local2005-05-1329-178/+306
* | | | | | | | | Fixup from 4.1 to 5.0 mergejimw@mysql.com2005-05-131-1/+1
* | | | | | | | | Add missing commas to errmsg.ckonstantin@mysql.com2005-05-131-3/+3
* | | | | | | | | Mergekonstantin@mysql.com2005-05-133-1/+3
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Fix for valgrind bug in decimal codehf@deer.(none)2005-05-131-1/+1
| * | | | | | | | Add myself to the list of users who don't automatically check outkonstantin@mysql.com2005-05-131-0/+1
* | | | | | | | | Merge book.sanja.is.com.ua:/Users/bell/mysql/bk/mysql-5.0bell@book.sanja.is.com.ua2005-05-138-23/+130
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Merge book.sanja.is.com.ua:/Users/bell/mysql/bk/mysql-5.0bell@book.sanja.is.com.ua2005-05-098-23/+130
| |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge book.sanja.is.com.ua:/Users/bell/mysql/bk/mysql-5.0bell@book.sanja.is.com.ua2005-05-098-23/+130
| | |\ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ mergebell@book.sanja.is.com.ua2005-05-098-23/+130
| | | |\ \ \ \ \ \ \ \
| | | | * | | | | | | | Item::fix_field need correct pointer on item reference to chnge it if itis ne...bell@book.sanja.is.com.ua2005-05-098-23/+130
* | | | | | | | | | | | Fixed bug 10465.jani@a193-229-222-105.elisa-laajakaista.fi2005-05-123-1/+25
* | | | | | | | | | | | --default-extra-file handling code fix.ramil@mysql.com2005-05-121-2/+2
* | | | | | | | | | | | fix (Bug #8295 and #8296: varchar and varbinary conversion)ramil@mysql.com2005-05-124-3/+19
* | | | | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0konstantin@mysql.com2005-05-129-93/+293
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | A fix and test case for Bug#9478 "mysql_stmt_attr_set mysql_stmt_execute"konstantin@mysql.com2005-05-129-93/+293
* | | | | | | | | | | | | Manual mergeigor@rurik.mysql.com2005-05-1012-64/+77
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Many files:igor@rurik.mysql.com2005-05-1012-64/+80