summaryrefslogtreecommitdiff
path: root/sql
Commit message (Expand)AuthorAgeFilesLines
* mergendbdev@dl145b.mysql.com2005-06-141-3/+1
|\
| * func_if.result, func_if.test:igor@igor-inspiron.creware.com2005-06-131-3/+1
| * Merge igor-inspiron.creware.com:/home/igor/mysql-4.1igor@igor-inspiron.creware.com2005-06-131-6/+6
| |\
| * \ Merge mysql.com:/home/bkroot/mysql-4.1lars@mysql.com2005-06-131-0/+32
| |\ \
| | * \ Merge mysql.com:/home/bkroot/mysql-4.1lars@mysql.com2005-06-071-0/+32
| | |\ \
* | | \ \ Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.0igor@igor-inspiron.creware.com2005-06-131-6/+6
|\ \ \ \ \
| * \ \ \ \ Merge igor-inspiron.creware.com:/home/igor/dev/mysql-4.1-0igor@igor-inspiron.creware.com2005-06-131-6/+6
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| | * | | | ctype_utf8.test, ctype_utf8.result:igor@igor-inspiron.creware.com2005-06-131-6/+6
* | | | | | ha_innodb.cc:heikki@hundin.mysql.fi2005-06-131-29/+29
|/ / / / /
* | | | | Merge mysql.com:/home/bkroot/mysql-5.0 into mysql.com:/home/bk/mysql-5.0lars@mysql.com2005-06-131-0/+32
|\ \ \ \ \
| * \ \ \ \ Merge mysqldev@production.mysql.com:my/mysql-5.0-releaselars@mysql.com2005-06-082-2/+2
| |\ \ \ \ \
| * \ \ \ \ \ Merge mysql.com:/home/bkroot/mysql-5.0 into mysql.com:/home/bk/mysql-5.0lars@mysql.com2005-06-071-0/+32
| |\ \ \ \ \ \
| | * \ \ \ \ \ Merge mysql.com:/home/bkroot/mysql-5.0 into mysql.com:/home/bk/mysql-5.0lars@mysql.com2005-06-071-0/+32
| | |\ \ \ \ \ \
| | | * \ \ \ \ \ Merge mysql.com:/home/bkroot/mysql-5.0 into mysql.com:/home/bk/mysql-5.0lars@mysql.com2005-06-071-0/+32
| | | |\ \ \ \ \ \
| | | | * \ \ \ \ \ Merge b6883-mysql-4.1 -> 5.0lars@mysql.com2005-06-071-0/+32
| | | | |\ \ \ \ \ \ | | | | | | |_|_|_|/ | | | | | |/| | | |
| | | | | * | | | | Merge mysql.com:/home/bkroot/mysql-4.1lars@mysql.com2005-06-071-0/+32
| | | | | |\ \ \ \ \
| | | | | | * | | | | BUG#6883: Changed comment, stylelars@mysql.com2005-06-071-4/+4
| | | | | | * | | | | BUG#6883: Added tests for create/drop temporary table, UNLOCK TABLESlars@mysql.com2005-06-011-4/+16
| | | | | | * | | | | BUG#6883: Added implicit commit for CREATE TABLE, TRUNCATE TABLE and DROP/CRE...lars@mysql.com2005-05-271-0/+20
* | | | | | | | | | | Merge mysql.com:/home/jimw/my/mysql-4.1-cleanjimw@mysql.com2005-06-101-3/+5
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / | |/| | | | | | | | |
| * | | | | | | | | | Merge mysql.com:/home/jimw/my/mysql-4.1-9500jimw@mysql.com2005-06-101-3/+5
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Fix problem with handling of lower_case_table_name == 2 whenjimw@mysql.com2005-06-081-3/+5
* | | | | | | | | | | | Merge bk-internal:/home/bk/mysql-5.0serg@serg.mylan2005-06-103-118/+63
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | bug#11225 - distinct.test failsserg@serg.mylan2005-06-101-2/+2
| * | | | | | | | | | | | Merge bk-internal:/home/bk/mysql-5.0serg@serg.mylan2005-06-106-9/+57
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge bk-internal:/home/bk/mysql-5.0serg@serg.mylan2005-06-094-23/+43
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge bk-internal:/home/bk/mysql-5.0serg@serg.mylan2005-06-096-51/+54
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge bk-internal:/home/bk/mysql-5.0serg@serg.mylan2005-06-092-116/+61
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | sql/mysql_priv.hserg@serg.mylan2005-06-092-116/+61
| | | |_|_|_|_|_|_|/ / / / / / / | | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Post-merge fix.pem@mysql.comhem.se2005-06-101-0/+1
* | | | | | | | | | | | | | | | Merge mysql.com:/usr/local/bk/mysql-5.0pem@mysql.com2005-06-1084-964/+1241
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Merge mysql.com:/home/jimw/my/mysql-5.0-10543jimw@mysql.com2005-06-093-6/+53
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | Additional tweak to fix for bug #10543, to prevent a change injimw@mysql.com2005-06-021-0/+4
| | * | | | | | | | | | | | | | | Fix partial keys when converting VARCHAR to TEXT. (Bug #10543)jimw@mysql.com2005-05-253-6/+49
| * | | | | | | | | | | | | | | | Merge mysql.com:/home/jimw/my/mysql-4.1-cleanjimw@mysql.com2005-06-091-0/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / / / / / / / / | | |/| | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | Merge mysql.com:/home/jimw/my/mysql-4.1-10566jimw@mysql.com2005-06-091-0/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | Increase limit of partial key length in MEMORY storage enginejimw@mysql.com2005-05-241-0/+1
| * | | | | | | | | | | | | | | | Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.0brian@brian-akers-computer.local2005-06-094-23/+43
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / / / / / / / / | | |/| | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | Merge acurtis@bk-internal.mysql.com:/home/bk/mysql-5.0acurtis@xiphis.org2005-06-094-23/+43
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / / / / / / / / | | |/| | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | Mergeacurtis@xiphis.org2005-06-094-23/+43
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / | | | | | | | / / / / / / / / / / | | | | |_|_|/ / / / / / / / / / | | | |/| | | | | | | | | | | |
| | | | * | | | | | | | | | | | Bug#11028 Crash on create table likeacurtis@xiphis.org2005-06-091-5/+10
| | | | * | | | | | | | | | | | Fix for bug#10732: Set SQL_MODE to NULL gives garbled error messagegluh@eagle.intranet.mysql.r18.ru2005-06-091-0/+3
| | | | | |_|_|/ / / / / / / / | | | | |/| | | | | | | | | |
| | | | * | | | | | | | | | | Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-4.1reggie@mdk10.(none)2005-06-071-5/+5
| | | | |\ \ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | | BUG# 10181-mysqld.exe crash with an access vioation after INSERT INTO mysql.hostreggie@mdk10.(none)2005-05-311-4/+4
| | | | | * | | | | | | | | | | Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-4.1reggie@mdk10.(none)2005-05-311-1/+1
| | | | | |\ \ \ \ \ \ \ \ \ \ \
| | | | | | * | | | | | | | | | | Bug #10181 mysqld.exe crash with an access violation after INSERT INTO mysql....reggie@mdk10.(none)2005-05-261-1/+1
| | | | * | | | | | | | | | | | | Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/serg@serg.mylan2005-06-071-15/+27
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|_|_|_|_|_|_|_|/ | | | | |/| | | | | | | | | | | |
| | | | | * | | | | | | | | | | | bug#5373: handler READ NEXT w/o HANDLER READ [FIRST]serg@serg.mylan2005-06-071-15/+27
| | | | | | |_|_|_|_|_|_|_|/ / / | | | | | |/| | | | | | | | | |
| * | | | | | | | | | | | | | | Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.0brian@brian-akers-computer.local2005-06-092-3/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.0brian@brian-akers-computer.local2005-06-092-3/+3
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \