summaryrefslogtreecommitdiff
path: root/sql
Commit message (Expand)AuthorAgeFilesLines
* Merge bk-internal.mysql.com:/home/bk/mysql-5.0monty@mysql.com2005-08-116-137/+187
|\
| * Cleanups during review of new codemonty@mysql.com2005-08-116-134/+187
* | Merge bk-internal.mysql.com:/home/bk/mysql-5.0dlenev@mysql.com2005-08-118-13/+34
|\ \
| * | Clumsy but working fix for bug #11973 "SELECT .. INTO var_name; in triggerdlenev@mysql.com2005-08-108-13/+34
* | | Merge xiphis.org:/usr/home/antony/work2/p2-bug10109.3acurtis@xiphis.org2005-08-101-6/+25
|\ \ \
| * | | Bug#10109acurtis@xiphis.org2005-08-073-15/+38
* | | | Merge mysql.com:/home/psergey/mysql-5.0-bug12228-r4sergefp@mysql.com2005-08-105-144/+184
|\ \ \ \
| * | | | BUG#12228: Post review fixes: Added test case, code cleanup.sergefp@mysql.com2005-08-104-14/+11
| * | | | BUG#12228: Pre-review fixes: Fix coding style, handle the case when we're out...sergefp@mysql.com2005-08-091-2/+9
| * | | | Fix for BUG#12228: SP cache code:sergefp@mysql.com2005-08-085-141/+177
* | | | | A fix and a test case for Bug#12243 "MySQL Server crashes with 2 konstantin@mysql.com2005-08-101-0/+9
* | | | | error message fixedhf@deer.(none)2005-08-101-1/+1
* | | | | Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0mskold@mysql.com2005-08-102-5/+9
|\ \ \ \ \
| * | | | | A fix for Bug#11901 "mysql_stmt_attr_set CURSOR_TYPE_READ_ONLY join inkonstantin@mysql.com2005-08-102-5/+9
* | | | | | Merge mysql.com:/usr/local/home/marty/MySQL/mysql-4.1mskold@mysql.com2005-08-101-0/+9
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Added support for ha_ndbcluster::info(HA_STATUS_AUTO)mskold@mysql.com2005-08-101-0/+9
* | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0dlenev@mysql.com2005-08-103-5/+17
|\ \ \ \ \ \
| * | | | | | Fix for bug #12280 "Triggers: crash if flush tables".dlenev@mysql.com2005-08-103-5/+17
* | | | | | | Fix bug #12340 Wrong comparison in ha_innobase::cmp_ref()evgen@moonbone.local2005-08-091-2/+2
* | | | | | | Merged code.jani@ua141d10.elisa.omakaista.fi2005-08-091-29/+22
* | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0dlenev@mysql.com2005-08-091-9/+6
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| * | | | | | Fixed test that failed on 32 bit systemsmonty@mysql.com2005-08-091-9/+6
* | | | | | | Fix after merging patch solving bug #10055 "Using stored function withdlenev@mysql.com2005-08-091-1/+1
* | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0dlenev@mysql.com2005-08-0910-100/+117
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Fix for bug #10055 "Using stored function with information_schema causes emptydlenev@mysql.com2005-08-0810-100/+117
* | | | | | | ha_innodb.cc:heikki@hundin.mysql.fi2005-08-081-1/+1
* | | | | | | Merge mysql.com:/home/jimw/my/mysql-5.0-6080jimw@mysql.com2005-08-082-2/+7
|\ \ \ \ \ \ \
| * | | | | | | Fix error message when creating a non-string field with a displayjimw@mysql.com2005-08-052-2/+7
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge mysql.com:/home/jimw/my/mysql-5.0-3094jimw@mysql.com2005-08-0814-30/+101
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge bk-internal.mysql.com:/home/bk/mysql-5.0konstantin@mysql.com2005-08-083-2/+7
| |\ \ \ \ \ \ \
| | * | | | | | | A fix and a test case for Bug#11909 "mysql_stmt_attr_set konstantin@mysql.com2005-08-083-2/+7
| * | | | | | | | Merge mysql.com:/usr/home/bar/mysql-4.1.b10892bar@mysql.com2005-08-081-4/+8
| |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1bar@mysql.com2005-08-081-4/+8
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | item.cc:bar@mysql.com2005-08-081-4/+6
| | | * | | | | | | | grant.result, grant.test:bar@mysql.com2005-08-041-4/+6
| | * | | | | | | | | Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-4.1igor@rurik.mysql.com2005-08-071-4/+9
| | |\ \ \ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ \ \ Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0sergefp@mysql.com2005-08-081-6/+7
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / | |/| | | | | | | | | |
| | * | | | | | | | | | Fix for BUG#12082 (assert failure when the query fails to get a lock for reco...sergefp@mysql.com2005-07-311-6/+7
| * | | | | | | | | | | Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.0igor@rurik.mysql.com2005-08-071-5/+10
| |\ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ Manual mergeigor@rurik.mysql.com2005-08-071-5/+10
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / / / | | | |/| | | | | | | | |
| | | * | | | | | | | | | subselect.result:igor@rurik.mysql.com2005-08-071-4/+9
| * | | | | | | | | | | | Merge mysql.com:/home/mydev/mysql-4.1-4100ingo@mysql.com2005-08-081-0/+17
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / / | | |/| | | | | | | | | |
| | * | | | | | | | | | | Merge mysql.com:/home/mydev/mysql-4.1ingo@mysql.com2005-08-071-3/+2
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / | | | |/| | | | | | | | |
| | * | | | | | | | | | | Merge mysql.com:/home/mydev/mysql-4.1ingo@mysql.com2005-08-073-5/+19
| | |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | Bug#9459 - deadlock with flush with lock, and lock table writeingo@mysql.com2005-08-051-0/+17
| | | |_|_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | |
| * | | | | | | | | | | | Merge mysql.com:/home/mydev/mysql-5.0ingo@mysql.com2005-08-087-13/+38
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / / | | |/| | | | | | | | | |
| | * | | | | | | | | | | Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0sergefp@mysql.com2005-08-077-13/+38
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | |
| | | * | | | | | | | | | Manual mergesergefp@mysql.com2005-08-072-3/+8
| | | |\ \ \ \ \ \ \ \ \ \ | | | | | |_|/ / / / / / / | | | | |/| | | | | | | |
| | | | * | | | | | | | | BUG#11869: part2: post-review fixes:sergefp@mysql.com2005-08-071-3/+2
| | | | | |/ / / / / / / | | | | |/| | | | | | |
| | | | * | | | | | | | Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1sergefp@mysql.com2005-08-073-5/+19
| | | | |\ \ \ \ \ \ \ \ | | | | | |/ / / / / / / | | | | |/| | | | | | |