Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge bk-internal.mysql.com:/home/bk/mysql-5.0 | monty@mysql.com | 2005-08-11 | 6 | -137/+187 |
|\ | |||||
| * | Cleanups during review of new code | monty@mysql.com | 2005-08-11 | 6 | -134/+187 |
* | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0 | dlenev@mysql.com | 2005-08-11 | 8 | -13/+34 |
|\ \ | |||||
| * | | Clumsy but working fix for bug #11973 "SELECT .. INTO var_name; in trigger | dlenev@mysql.com | 2005-08-10 | 8 | -13/+34 |
* | | | Merge xiphis.org:/usr/home/antony/work2/p2-bug10109.3 | acurtis@xiphis.org | 2005-08-10 | 1 | -6/+25 |
|\ \ \ | |||||
| * | | | Bug#10109 | acurtis@xiphis.org | 2005-08-07 | 3 | -15/+38 |
* | | | | Merge mysql.com:/home/psergey/mysql-5.0-bug12228-r4 | sergefp@mysql.com | 2005-08-10 | 5 | -144/+184 |
|\ \ \ \ | |||||
| * | | | | BUG#12228: Post review fixes: Added test case, code cleanup. | sergefp@mysql.com | 2005-08-10 | 4 | -14/+11 |
| * | | | | BUG#12228: Pre-review fixes: Fix coding style, handle the case when we're out... | sergefp@mysql.com | 2005-08-09 | 1 | -2/+9 |
| * | | | | Fix for BUG#12228: SP cache code: | sergefp@mysql.com | 2005-08-08 | 5 | -141/+177 |
* | | | | | A fix and a test case for Bug#12243 "MySQL Server crashes with 2 | konstantin@mysql.com | 2005-08-10 | 1 | -0/+9 |
* | | | | | error message fixed | hf@deer.(none) | 2005-08-10 | 1 | -1/+1 |
* | | | | | Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0 | mskold@mysql.com | 2005-08-10 | 2 | -5/+9 |
|\ \ \ \ \ | |||||
| * | | | | | A fix for Bug#11901 "mysql_stmt_attr_set CURSOR_TYPE_READ_ONLY join in | konstantin@mysql.com | 2005-08-10 | 2 | -5/+9 |
* | | | | | | Merge mysql.com:/usr/local/home/marty/MySQL/mysql-4.1 | mskold@mysql.com | 2005-08-10 | 1 | -0/+9 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | |||||
| * | | | | | Added support for ha_ndbcluster::info(HA_STATUS_AUTO) | mskold@mysql.com | 2005-08-10 | 1 | -0/+9 |
* | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0 | dlenev@mysql.com | 2005-08-10 | 3 | -5/+17 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Fix for bug #12280 "Triggers: crash if flush tables". | dlenev@mysql.com | 2005-08-10 | 3 | -5/+17 |
* | | | | | | | Fix bug #12340 Wrong comparison in ha_innobase::cmp_ref() | evgen@moonbone.local | 2005-08-09 | 1 | -2/+2 |
* | | | | | | | Merged code. | jani@ua141d10.elisa.omakaista.fi | 2005-08-09 | 1 | -29/+22 |
* | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0 | dlenev@mysql.com | 2005-08-09 | 1 | -9/+6 |
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | | | |||||
| * | | | | | | Fixed test that failed on 32 bit systems | monty@mysql.com | 2005-08-09 | 1 | -9/+6 |
* | | | | | | | Fix after merging patch solving bug #10055 "Using stored function with | dlenev@mysql.com | 2005-08-09 | 1 | -1/+1 |
* | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0 | dlenev@mysql.com | 2005-08-09 | 10 | -100/+117 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | |||||
| * | | | | | | Fix for bug #10055 "Using stored function with information_schema causes empty | dlenev@mysql.com | 2005-08-08 | 10 | -100/+117 |
* | | | | | | | ha_innodb.cc: | heikki@hundin.mysql.fi | 2005-08-08 | 1 | -1/+1 |
* | | | | | | | Merge mysql.com:/home/jimw/my/mysql-5.0-6080 | jimw@mysql.com | 2005-08-08 | 2 | -2/+7 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Fix error message when creating a non-string field with a display | jimw@mysql.com | 2005-08-05 | 2 | -2/+7 |
| | |_|_|/ / / | |/| | | | | | |||||
* | | | | | | | Merge mysql.com:/home/jimw/my/mysql-5.0-3094 | jimw@mysql.com | 2005-08-08 | 14 | -30/+101 |
|\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge bk-internal.mysql.com:/home/bk/mysql-5.0 | konstantin@mysql.com | 2005-08-08 | 3 | -2/+7 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | A fix and a test case for Bug#11909 "mysql_stmt_attr_set | konstantin@mysql.com | 2005-08-08 | 3 | -2/+7 |
| * | | | | | | | | Merge mysql.com:/usr/home/bar/mysql-4.1.b10892 | bar@mysql.com | 2005-08-08 | 1 | -4/+8 |
| |\ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ | Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1 | bar@mysql.com | 2005-08-08 | 1 | -4/+8 |
| | |\ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | item.cc: | bar@mysql.com | 2005-08-08 | 1 | -4/+6 |
| | | * | | | | | | | | grant.result, grant.test: | bar@mysql.com | 2005-08-04 | 1 | -4/+6 |
| | * | | | | | | | | | Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-4.1 | igor@rurik.mysql.com | 2005-08-07 | 1 | -4/+9 |
| | |\ \ \ \ \ \ \ \ \ | |||||
| * | \ \ \ \ \ \ \ \ \ | Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0 | sergefp@mysql.com | 2005-08-08 | 1 | -6/+7 |
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / | |/| | | | | | | | | | | |||||
| | * | | | | | | | | | | Fix for BUG#12082 (assert failure when the query fails to get a lock for reco... | sergefp@mysql.com | 2005-07-31 | 1 | -6/+7 |
| * | | | | | | | | | | | Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.0 | igor@rurik.mysql.com | 2005-08-07 | 1 | -5/+10 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ | Manual merge | igor@rurik.mysql.com | 2005-08-07 | 1 | -5/+10 |
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / / / | | | |/| | | | | | | | | | |||||
| | | * | | | | | | | | | | subselect.result: | igor@rurik.mysql.com | 2005-08-07 | 1 | -4/+9 |
| * | | | | | | | | | | | | Merge mysql.com:/home/mydev/mysql-4.1-4100 | ingo@mysql.com | 2005-08-08 | 1 | -0/+17 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / / | | |/| | | | | | | | | | | |||||
| | * | | | | | | | | | | | Merge mysql.com:/home/mydev/mysql-4.1 | ingo@mysql.com | 2005-08-07 | 1 | -3/+2 |
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / | | | |/| | | | | | | | | | |||||
| | * | | | | | | | | | | | Merge mysql.com:/home/mydev/mysql-4.1 | ingo@mysql.com | 2005-08-07 | 3 | -5/+19 |
| | |\ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | Bug#9459 - deadlock with flush with lock, and lock table write | ingo@mysql.com | 2005-08-05 | 1 | -0/+17 |
| | | |_|_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | | | |||||
| * | | | | | | | | | | | | Merge mysql.com:/home/mydev/mysql-5.0 | ingo@mysql.com | 2005-08-08 | 7 | -13/+38 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / / | | |/| | | | | | | | | | | |||||
| | * | | | | | | | | | | | Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0 | sergefp@mysql.com | 2005-08-07 | 7 | -13/+38 |
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | |||||
| | | * | | | | | | | | | | Manual merge | sergefp@mysql.com | 2005-08-07 | 2 | -3/+8 |
| | | |\ \ \ \ \ \ \ \ \ \ | | | | | |_|/ / / / / / / | | | | |/| | | | | | | | | |||||
| | | | * | | | | | | | | | BUG#11869: part2: post-review fixes: | sergefp@mysql.com | 2005-08-07 | 1 | -3/+2 |
| | | | | |/ / / / / / / | | | | |/| | | | | | | | |||||
| | | | * | | | | | | | | Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1 | sergefp@mysql.com | 2005-08-07 | 3 | -5/+19 |
| | | | |\ \ \ \ \ \ \ \ | | | | | |/ / / / / / / | | | | |/| | | | | | | |