summaryrefslogtreecommitdiff
path: root/sql
Commit message (Expand)AuthorAgeFilesLines
* Mergekent@mysql.com2005-11-042-5/+12
|\
| * Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1kent@mysql.com2005-11-042-6/+13
| |\
| | * Makefile.am, configure.in:kent@mysql.com2005-09-242-6/+13
* | | Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0jani@ua141d10.elisa.omakaista.fi2005-11-039-44/+45
|\ \ \
| * \ \ Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0jani@ua141d10.elisa.omakaista.fi2005-11-039-44/+45
| |\ \ \
| | * | | Changes in get_table_type() and mysql_frm_type(). The main problem wasjani@ua141d10.elisa.omakaista.fi2005-11-039-44/+45
* | | | | Merge bk@192.168.21.1:/usr/home/bk/mysql-5.0holyfoot@mysql.com2005-11-038-29/+38
|\ \ \ \ \ | |/ / / /
| * | | | opt_range.cc:evgen@moonbone.local2005-11-031-1/+2
| * | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0konstantin@mysql.com2005-11-038-28/+36
| |\ \ \ \
| | * | | | A fix and a test case for Bug#14210 "Simple query with > operator on konstantin@mysql.com2005-11-038-28/+36
* | | | | | Merge bk@192.168.21.1:/usr/home/bk/mysql-5.0holyfoot@mysql.com2005-11-033-1/+14
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0evgen@moonbone.local2005-11-033-1/+14
| |\ \ \ \ \
| | * | | | | Fix bug #14093 Query takes a lot of time when date format is not validevgen@moonbone.local2005-11-033-1/+14
* | | | | | | Merge bk@192.168.21.1:/usr/home/bk/mysql-5.0holyfoot@mysql.com2005-11-031-1/+1
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Fix for bug #9551 (Show commands fail)hf@deer.(none)2005-10-281-1/+1
* | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0msvensson@neptunus.(none)2005-11-033-32/+59
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge bk@192.168.21.1:/usr/home/bk/mysql-5.0holyfoot@mysql.com2005-11-033-32/+59
| |\ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | |
| | * | | | | | Merge bk@192.168.21.1:/usr/home/bk/mysql-5.0holyfoot@mysql.com2005-11-023-32/+59
| | |\ \ \ \ \ \
| | | * \ \ \ \ \ Merge bk@192.168.21.1:/usr/home/bk/mysql-5.0holyfoot@mysql.com2005-11-023-32/+59
| | | |\ \ \ \ \ \
| | | | * \ \ \ \ \ Conflicts resolvinghf@deer.(none)2005-11-013-32/+59
| | | | |\ \ \ \ \ \
| | | | | * | | | | | Additional fix for bug #13573hf@deer.(none)2005-10-261-9/+8
| | | | | * | | | | | Fix for bug #13573 (wrong data inserted for too big decimals)hf@deer.(none)2005-10-153-23/+51
* | | | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0msvensson@neptunus.(none)2005-11-031-0/+4
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0evgen@moonbone.local2005-11-031-0/+4
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | func_gconcat.result:evgen@moonbone.local2005-11-031-1/+1
| | * | | | | | | | | | Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0evgen@moonbone.local2005-11-021-2/+2
| | |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0evgen@moonbone.local2005-11-021-0/+4
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / | | |/| | | | | | | | | |
| | | * | | | | | | | | | Fix bug #14466 lost sort order in GROUP_CONCAT() in a viewevgen@moonbone.local2005-11-011-0/+4
* | | | | | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0msvensson@neptunus.(none)2005-11-022-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0msvensson@neptunus.(none)2005-11-022-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / | |/| | | | | | | | | | |
| | * | | | | | | | | | | BUG#14514 Creating table with packed key fails silentlymsvensson@neptunus.(none)2005-11-022-2/+2
| | | |_|/ / / / / / / / | | |/| | | | | | | | |
* | | | | | | | | | | | Merge monty@bk-internal.mysql.com:/home/bk/mysql-5.0monty@mysql.com2005-11-021-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
| * | | | | | | | | | | Fix -ansi -pedantic compilation failurekonstantin@mysql.com2005-11-021-2/+2
| | |/ / / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | wait_for_update must unlock mutex.monty@mysql.com2005-11-021-0/+3
* | | | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0monty@mysql.com2005-11-023-6/+4
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Fixed wrong mergemonty@mysql.com2005-11-022-5/+3
| * | | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0monty@mysql.com2005-11-021-2/+2
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | |
| | * | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0monty@mysql.com2005-11-011-2/+2
| | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | Added missing DBUG_ENTER (bug in last push)monty@mysql.com2005-11-011-1/+1
| | | * | | | | | | | | Add missing returnmonty@mysql.com2005-11-011-1/+1
| | | | |/ / / / / / / | | | |/| | | | | | |
* | | | | | | | | | | found problem removedbell@sanja.is.com.ua2005-11-022-1/+3
* | | | | | | | | | | Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0bell@sanja.is.com.ua2005-11-0216-77/+116
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0patg@krsna.patg.net2005-11-017-24/+41
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / /
| | * | | | | | | | | Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0evgen@moonbone.local2005-11-016-24/+38
| | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | sql_update.cc:evgen@moonbone.local2005-11-011-2/+1
| | | * | | | | | | | | Manually mergedevgen@moonbone.local2005-11-016-23/+38
| | | |\ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / | | | |/| | | | | | / / | | | | | |_|_|_|_|/ / | | | | |/| | | | | |
| | | | * | | | | | | Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.1evgen@moonbone.local2005-11-013-7/+14
| | | | |\ \ \ \ \ \ \
| | | | | * | | | | | | Fix bug#14186 select datefield is null not updatedevgen@moonbone.local2005-10-283-7/+14
| | | | * | | | | | | | Review of new pushed codemonty@mysql.com2005-11-014-19/+26
| | * | | | | | | | | | Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.0andrey@lmy004.2005-11-011-0/+3
| | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | | |/| | | | | | | | |