summaryrefslogtreecommitdiff
path: root/sql
Commit message (Expand)AuthorAgeFilesLines
* Merge with 4.1unknown2005-01-1511-36/+89
|\
| * Merge bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-01-151-2/+3
| |\
| | * func_gconcat.result, func_gconcat.test:unknown2005-01-151-2/+3
| * | Mergeunknown2005-01-151-0/+2
| |\ \ | | |/ | |/|
| | * Fixed possible access to unintialized memory in filesort when using many buffersunknown2005-01-151-0/+2
| | * ha_innodb.cc:unknown2005-01-131-2/+7
| | * Merge marko@bk-internal.mysql.com:/home/bk/mysql-4.0unknown2005-01-131-0/+2
| | |\
| | | * InnoDB: Use system-supplied tmpfile() on Netware, as there is nounknown2005-01-121-0/+2
| * | | Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/unknown2005-01-141-6/+18
| |\ \ \
| | * | | limit HEAP table size with max_heap_table_size, better estimation for mem_per...unknown2005-01-141-6/+18
| * | | | Merge marko@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-01-1426-146/+196
| |\ \ \ \
| | * \ \ \ Merge bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-01-142-28/+11
| | |\ \ \ \
| | | * \ \ \ Merge bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-01-132-28/+11
| | | |\ \ \ \ | | | | |/ / / | | | |/| | |
| | | | * | | Fix for bug #7586 "TIMEDIFF for sec+microsec not working properly".unknown2005-01-121-20/+10
| | | | * | | Fix for bug #7418 "TIMESTAMP not always converted to DATETIME in MAXDBunknown2005-01-111-8/+1
| | * | | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-01-144-7/+25
| | |\ \ \ \ \
| | | * \ \ \ \ Merge bk-internal:/home/bk/mysql-4.1unknown2005-01-131-2/+7
| | | |\ \ \ \ \
| | | | * | | | | ha_innodb.cc:unknown2005-01-131-2/+7
| | | * | | | | | Merge jwinstead2@wwwtst1.mysql.com:mysql-4.1-7235unknown2005-01-131-2/+6
| | | |\ \ \ \ \ \
| | | | * | | | | | Show the index type even for indexes using the default index type inunknown2005-01-081-2/+6
| | | * | | | | | | Merge mysql.com:/home/jimw/my/mysql-4.1-bdb-initunknown2005-01-131-0/+2
| | | |\ \ \ \ \ \ \
| | | | * | | | | | | Fix small memory leak that occured when BerkeleyDB failed to initialize.unknown2005-01-121-0/+2
| | | * | | | | | | | Merge jwinstead2@wwwtst1.mysql.com:mysql-4.1-7774unknown2005-01-131-3/+10
| | | |\ \ \ \ \ \ \ \ | | | | |_|_|/ / / / / | | | |/| | | | | | |
| | | | * | | | | | | Small fix for Field_str::store() to avoid trying to read past beginningunknown2005-01-131-1/+1
| | | | * | | | | | | Fix conversion of floating point values to character fields when theunknown2005-01-131-3/+10
| | * | | | | | | | | Fix bug in INSERT DELAYED with prepared statementsunknown2005-01-143-1/+34
| | * | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-01-135-17/+67
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / /
| | | * | | | | | | | bug#7284: strnxfrm returns different results for equal stringsunknown2005-01-132-13/+4
| | | | |_|_|/ / / / | | | |/| | | | | |
| | * | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-01-117-26/+34
| | |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Merge bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-01-107-58/+50
| | |\ \ \ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ \ \ Merge marko@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-01-1229-351/+545
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / / | | |/| | | | | | | | |
| * | | | | | | | | | | Merge marko@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2004-12-202-14/+51
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge marko@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2004-12-201-0/+2
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | InnoDB: Fixed bugs in the padding and trimming of trailing spacesunknown2004-12-171-0/+2
* | | | | | | | | | | | | | Changed interface for my_strntod() to make it more general and more portableunknown2005-01-155-30/+47
* | | | | | | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-01-134-54/+58
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Fix accesses to uninitialized memory (found by valgrind)unknown2005-01-134-54/+58
* | | | | | | | | | | | | | | Manual merge.unknown2005-01-133-10/+13
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | Add logging of COM_EXECUTE in the general query log.unknown2005-01-132-2/+5
| * | | | | | | | | | | | | | Minor clean up.unknown2005-01-121-8/+7
| | |_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-01-122-11/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-01-122-11/+7
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | Make index_merge code call handler::extra(HA_EXTRA_RETRIEVE_PRIMARY_KEY) if it unknown2004-12-232-11/+7
* | | | | | | | | | | | | | | | Mergeunknown2005-01-124-4/+42
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | logging_ok:unknown2005-01-122-5/+5
| * | | | | | | | | | | | | | | | Merge bk-internal:/home/bk/mysql-5.0unknown2005-01-084-4/+42
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | Many files:unknown2005-01-084-4/+31
| | * | | | | | | | | | | | | | | | set_var.cc, mysqld.cc, ha_innodb.h, innodb.test, innodb.result:unknown2005-01-053-0/+11
* | | | | | | | | | | | | | | | | | manual mergeunknown2005-01-121-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Merge mysql.com:/home/kostja/work/mysql-4.0-6761unknown2005-01-121-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | / / | | | |_|_|_|_|_|_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | | | | | |