summaryrefslogtreecommitdiff
path: root/sql
Commit message (Expand)AuthorAgeFilesLines
* Merge bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-08-1222-204/+251
|\
| * Fixes during review of new pushed codeunknown2005-08-1218-67/+67
| * Merge bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-08-116-137/+187
| |\
| | * Cleanups during review of new codeunknown2005-08-116-134/+187
* | | sql_view.cc:unknown2005-08-121-0/+3
* | | Merge rurik.mysql.com:/home/igor/mysql-5.0unknown2005-08-121-2/+5
|\ \ \
| * | | sql_base.cc:unknown2005-08-121-1/+1
| * | | sql_base.cc:unknown2005-08-111-1/+4
* | | | Add SLEEP(seconds) function, which always returns 0 after the givenunknown2005-08-115-0/+29
* | | | Merge bk-internal:/home/bk/mysql-5.0unknown2005-08-114-3/+53
|\ \ \ \ | |/ / / |/| | |
| * | | set_var.cc, mysqld.cc, ha_innodb.h, ha_innodb.cc, srv0srv.c, srv0srv.h:unknown2005-08-114-3/+53
| |/ /
* | | Merge acurtis@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-08-111-102/+25
|\ \ \
| * | | Fixed some warning and error messages so that they useunknown2005-08-111-102/+25
| |/ /
* | | fix after mergeunknown2005-08-111-2/+2
* | | Merge xiphis.org:/usr/home/antony/work2/mysql-4.1unknown2005-08-116-11/+30
|\ \ \ | |/ / |/| |
| * | mergeunknown2005-08-112-4/+4
| |\ \
| | * | block using QC in case of having tables locked by LOCK... (BUG#12385)unknown2005-08-101-2/+5
| | * | Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-4.0unknown2005-08-041-2/+14
| | |\ \
| | | * | BUG 11104 (same as changeset 1.1891 on the 5.0 tree, but realised this unknown2005-07-311-2/+14
| | * | | ha_innodb.cc:unknown2005-08-031-1/+1
| | * | | ha_innodb.cc:unknown2005-08-031-1/+2
| | |/ /
| * | | Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-08-101-0/+9
| |\ \ \
| * \ \ \ Merge acurtis@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-08-093-15/+38
| |\ \ \ \
| * \ \ \ \ Merge rurik.mysql.com:/home/igor/mysql-4.1unknown2005-08-081-0/+2
| |\ \ \ \ \
| | * | | | | subselect.test, subselect.result:unknown2005-08-081-0/+2
| * | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-08-092-6/+22
| |\ \ \ \ \ \
| | * | | | | | item_strfunc.cc:unknown2005-08-081-2/+14
| | |/ / / / /
| * | | | | | Review of new pushed codeunknown2005-08-094-12/+16
| * | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-08-083-1/+3
| |\ \ \ \ \ \
| | * | | | | | Fixed compiler warningsunknown2005-07-283-1/+3
* | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-08-118-13/+34
|\ \ \ \ \ \ \ \
| * | | | | | | | Clumsy but working fix for bug #11973 "SELECT .. INTO var_name; in triggerunknown2005-08-108-13/+34
* | | | | | | | | Merge xiphis.org:/usr/home/antony/work2/p2-bug10109.3unknown2005-08-101-6/+25
|\ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / | |/| | | | | | |
| * | | | | | | | Bug#10109unknown2005-08-073-15/+38
* | | | | | | | | Merge mysql.com:/home/psergey/mysql-5.0-bug12228-r4unknown2005-08-105-144/+184
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | BUG#12228: Post review fixes: Added test case, code cleanup.unknown2005-08-104-14/+11
| * | | | | | | | | BUG#12228: Pre-review fixes: Fix coding style, handle the case when we're out...unknown2005-08-091-2/+9
| * | | | | | | | | Fix for BUG#12228: SP cache code:unknown2005-08-085-141/+177
* | | | | | | | | | A fix and a test case for Bug#12243 "MySQL Server crashes with 2 unknown2005-08-101-0/+9
* | | | | | | | | | error message fixedunknown2005-08-101-1/+1
* | | | | | | | | | Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-08-102-5/+9
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | A fix for Bug#11901 "mysql_stmt_attr_set CURSOR_TYPE_READ_ONLY join inunknown2005-08-102-5/+9
* | | | | | | | | | | Merge mysql.com:/usr/local/home/marty/MySQL/mysql-4.1unknown2005-08-101-0/+9
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | / / / | | |_|_|_|_|_|/ / / | |/| | | | | | | |
| * | | | | | | | | Added support for ha_ndbcluster::info(HA_STATUS_AUTO)unknown2005-08-101-0/+9
* | | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-08-103-5/+17
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fix for bug #12280 "Triggers: crash if flush tables".unknown2005-08-103-5/+17
* | | | | | | | | | | Fix bug #12340 Wrong comparison in ha_innobase::cmp_ref()unknown2005-08-091-2/+2
* | | | | | | | | | | Merged code.unknown2005-08-091-29/+22
* | | | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-08-091-9/+6
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | |
| * | | | | | | | | | Fixed test that failed on 32 bit systemsunknown2005-08-091-9/+6