summaryrefslogtreecommitdiff
path: root/sql
Commit message (Expand)AuthorAgeFilesLines
* Merge osalerma@bk-internal.mysql.com:/home/bk/mysql-5.0osku@127.(none)2005-08-121-21/+44
|\
| * InnoDB: Print more than 300 characters of queries in various error conditions,osku@127.(none)2005-08-121-21/+44
* | Add SLEEP(seconds) function, which always returns 0 after the givenjimw@mysql.com2005-08-115-0/+29
* | Merge bk-internal:/home/bk/mysql-5.0vtkachenko@quadxeon.mysql.com2005-08-114-3/+53
|\ \
| * | set_var.cc, mysqld.cc, ha_innodb.h, ha_innodb.cc, srv0srv.c, srv0srv.h:vtkachenko@quadxeon.mysql.com2005-08-114-3/+53
* | | Merge acurtis@bk-internal.mysql.com:/home/bk/mysql-5.0acurtis@xiphis.org2005-08-111-102/+25
|\ \ \
| * | | Fixed some warning and error messages so that they usejani@ua141d10.elisa.omakaista.fi2005-08-111-102/+25
| |/ /
* | | fix after mergeacurtis@xiphis.org2005-08-111-2/+2
* | | Merge xiphis.org:/usr/home/antony/work2/mysql-4.1acurtis@xiphis.org2005-08-116-11/+30
|\ \ \ | |/ / |/| |
| * | mergebell@51.0.168.192.in-addr.arpa2005-08-112-4/+4
| |\ \
| | * | block using QC in case of having tables locked by LOCK... (BUG#12385)bell@52.0.168.192.in-addr.arpa2005-08-101-2/+5
| | * | Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-4.0patg@krsna.patg.net2005-08-041-2/+14
| | |\ \
| | | * | BUG 11104 (same as changeset 1.1891 on the 5.0 tree, but realised this patg@krsna.patg.net2005-07-311-2/+14
| | * | | ha_innodb.cc:heikki@hundin.mysql.fi2005-08-031-1/+1
| | * | | ha_innodb.cc:heikki@hundin.mysql.fi2005-08-031-1/+2
| | |/ /
| * | | Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1mskold@mysql.com2005-08-101-0/+9
| |\ \ \
| * \ \ \ Merge acurtis@bk-internal.mysql.com:/home/bk/mysql-4.1acurtis@xiphis.org2005-08-093-15/+38
| |\ \ \ \
| * \ \ \ \ Merge rurik.mysql.com:/home/igor/mysql-4.1igor@rurik.mysql.com2005-08-081-0/+2
| |\ \ \ \ \
| | * | | | | subselect.test, subselect.result:igor@rurik.mysql.com2005-08-081-0/+2
| * | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1monty@mysql.com2005-08-092-6/+22
| |\ \ \ \ \ \
| | * | | | | | item_strfunc.cc:patg@krsna.patg.net2005-08-081-2/+14
| | |/ / / / /
| * | | | | | Review of new pushed codemonty@mysql.com2005-08-094-12/+16
| * | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1monty@mysql.com2005-08-083-1/+3
| |\ \ \ \ \ \
| | * | | | | | Fixed compiler warningsmonty@mysql.com2005-07-283-1/+3
* | | | | | | | 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
| | |_|_|/ / / / / / / | |/| | | | | | | | |