summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge bk-internal.mysql.com:/home/bk/mysql-5.0monty@mysql.com2005-08-117-197/+250
|\
| * Cleanups during review of new codemonty@mysql.com2005-08-117-194/+250
* | Merge bk-internal.mysql.com:/home/bk/mysql-5.0dlenev@mysql.com2005-08-1110-13/+70
|\ \
| * | Clumsy but working fix for bug #11973 "SELECT .. INTO var_name; in triggerdlenev@mysql.com2005-08-1010-13/+70
* | | Merge xiphis.org:/usr/home/antony/work2/p2-bug10109.3acurtis@xiphis.org2005-08-103-6/+45
|\ \ \
| * | | Bug#10109acurtis@xiphis.org2005-08-075-15/+58
* | | | Merge mysql.com:/home/psergey/mysql-5.0-bug12228-r4sergefp@mysql.com2005-08-1011-146/+260
|\ \ \ \
| * | | | BUG#12228: Post review fixes: Added test case, code cleanup.sergefp@mysql.com2005-08-106-14/+79
| * | | | 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-089-143/+185
* | | | | A fix and a test case for Bug#12243 "MySQL Server crashes with 2 konstantin@mysql.com2005-08-105-12/+82
* | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0konstantin@mysql.com2005-08-101-10/+16
|\ \ \ \ \
| * | | | | Fix coding style.konstantin@mysql.com2005-08-101-10/+16
* | | | | | Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-5.0reggie@linux.site2005-08-104-64/+42
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | changes to IM code that came from Petr's reviewreggie@linux.site2005-08-093-7/+7
| * | | | | fixed assignments to meet server coding guidelinesreggie@linux.site2005-08-091-3/+3
| * | | | | changes to IM that came from Petr and JimW's review.reggie@linux.site2005-08-093-63/+41
* | | | | | error message fixedhf@deer.(none)2005-08-101-1/+1
* | | | | | Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0mskold@mysql.com2005-08-103-5/+132
|\ \ \ \ \ \
| * | | | | | A fix for Bug#11901 "mysql_stmt_attr_set CURSOR_TYPE_READ_ONLY join inkonstantin@mysql.com2005-08-103-5/+132
* | | | | | | 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-107-9/+57
|\ \ \ \ \ \ \
| * | | | | | | Fix for bug #12280 "Triggers: crash if flush tables".dlenev@mysql.com2005-08-107-9/+57
* | | | | | | | Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0evgen@moonbone.local2005-08-103-2/+20
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix bug #12340 Wrong comparison in ha_innobase::cmp_ref()evgen@moonbone.local2005-08-093-2/+20
* | | | | | | | | Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-5.0reggie@monster.2005-08-093-0/+7
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Some changes to project filesreggie@monster.2005-08-093-0/+7
| | |_|_|/ / / / / | |/| | | | | | |
* | | | | | | | | removing trailing spacesreggie@linux.site2005-08-091-3/+3
* | | | | | | | | small corrections to the IM.reggie@linux.site2005-08-092-14/+15
|/ / / / / / / /
* | | | | | | | Added missing cast.jani@ua141d10.elisa.omakaista.fi2005-08-091-1/+1
|/ / / / / / /
* | | | | | | Merged code.jani@ua141d10.elisa.omakaista.fi2005-08-091-29/+22
* | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0dlenev@mysql.com2005-08-093-11/+9
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| * | | | | | Fixed test that failed on 32 bit systemsmonty@mysql.com2005-08-093-11/+9
* | | | | | | 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-0915-106/+156
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Fix for bug #10055 "Using stored function with information_schema causes emptydlenev@mysql.com2005-08-0815-106/+157
* | | | | | | ha_innodb.cc:heikki@hundin.mysql.fi2005-08-081-1/+1
* | | | | | | Merge mysql.com:/home/jimw/my/mysql-5.0-11570jimw@mysql.com2005-08-082-3/+3
|\ \ \ \ \ \ \
| * | | | | | | Replace host column when testing 'SHOW PROCESSLIST' since it isjimw@mysql.com2005-07-212-3/+3
* | | | | | | | Fix error code in some tests because of mergejimw@mysql.com2005-08-083-3/+3
* | | | | | | | Merge mysql.com:/home/jimw/my/mysql-5.0-6080jimw@mysql.com2005-08-087-5/+26
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix error message when creating a non-string field with a displayjimw@mysql.com2005-08-057-5/+26
* | | | | | | | | Merge mysql.com:/home/jimw/my/mysql-5.0-3094jimw@mysql.com2005-08-0830-41/+547
|\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge bk-internal.mysql.com:/home/bk/mysql-5.0konstantin@mysql.com2005-08-084-2/+127
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | A fix and a test case for Bug#11909 "mysql_stmt_attr_set konstantin@mysql.com2005-08-084-2/+127
| * | | | | | | | | | grant.result:bar@mysql.com2005-08-081-0/+3
| * | | | | | | | | | Merge mysql.com:/usr/home/bar/mysql-4.1.b10892bar@mysql.com2005-08-082-4/+15
| |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1bar@mysql.com2005-08-083-4/+18
| | |\ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | item.cc:bar@mysql.com2005-08-081-4/+6