Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge mysql.com:/home/kostja/mysql/mysql-4.1-root | konstantin@mysql.com | 2005-07-19 | 5 | -8/+15 |
|\ | |||||
| * | Fix for BUG#12003 "assertion failure in testsuite (double lock of | gbichot@production.mysql.com | 2005-07-18 | 2 | -2/+2 |
| * | select.result, select.test: | igor@rurik.mysql.com | 2005-07-17 | 2 | -2/+2 |
| * | Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-4.1 | igor@rurik.mysql.com | 2005-07-16 | 22 | -125/+282 |
| |\ | |||||
| | * | Merge bk-internal:/home/bk/mysql-4.1 | jimw@mysql.com | 2005-07-15 | 1 | -1/+6 |
| | |\ | |||||
| | * \ | Merge bk-internal:/home/bk/mysql-4.1 | jimw@mysql.com | 2005-07-15 | 5 | -50/+70 |
| | |\ \ | |||||
| | * \ \ | Merge bk-internal:/home/bk/mysql-4.1 | jimw@mysql.com | 2005-07-15 | 1 | -2/+3 |
| | |\ \ \ | |||||
| | | * \ \ | Merge mysql.com:/home/jimw/my/mysql-4.1-9979 | jimw@mysql.com | 2005-07-15 | 1 | -2/+3 |
| | | |\ \ \ | |||||
| | | | * | | | Fix spurious permissions problem when CONVERT_TZ() is used | jimw@mysql.com | 2005-06-17 | 1 | -2/+3 |
| * | | | | | | Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-4.1 | igor@igor-inspiron.creware.com | 2005-07-12 | 1 | -13/+20 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-4.1 | igor@igor-inspiron.creware.com | 2005-07-08 | 1 | -2/+2 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | olap.result, olap.test: | igor@rurik.mysql.com | 2005-07-01 | 1 | -2/+2 |
* | | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0 | monty@mishka.local | 2005-07-18 | 14 | -30/+39 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Cleanups during review | monty@mishka.local | 2005-07-18 | 14 | -30/+39 |
* | | | | | | | | | | Merge moonbone.local:/work/mysql-4.1-bug-11868 | evgen@moonbone.local | 2005-07-18 | 1 | -1/+6 |
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ | |/| | | | | | | | | |||||
| * | | | | | | | | | Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.1 | evgen@moonbone.local | 2005-07-16 | 1 | -1/+6 |
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ | |/| | | | | | | | | |||||
| | * | | | | | | | | Fix bug#11868 NOT NULL ref optimization in subquery used in update must be | evgen@moonbone.local | 2005-07-16 | 1 | -1/+6 |
* | | | | | | | | | | Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0 | patg@krsna.patg.net | 2005-07-17 | 3 | -482/+1193 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Federated Storage Engine, bug 9925 "Federated query processor (step 2 or step... | patg@radha.local | 2005-07-17 | 3 | -276/+233 |
| * | | | | | | | | | | This is the same patch as 1.1937, with small variable declaration changes, m... | patg@krsna.patg.net | 2005-07-15 | 3 | -437/+1191 |
* | | | | | | | | | | | func_in.result, func_in.test: | igor@rurik.mysql.com | 2005-07-16 | 2 | -5/+21 |
* | | | | | | | | | | | opt_range.cc: | igor@rurik.mysql.com | 2005-07-16 | 1 | -1/+2 |
* | | | | | | | | | | | After-merge fixes (4.1 -> 5.0). | konstantin@mysql.com | 2005-07-16 | 4 | -11/+7 |
* | | | | | | | | | | | Merge mysql.com:/opt/local/work/mysql-4.1-root | konstantin@mysql.com | 2005-07-16 | 6 | -48/+86 |
|\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | | | |||||
| * | | | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1 | konstantin@mysql.com | 2005-07-16 | 5 | -50/+70 |
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / | |/| | | | | | | | | | |||||
| | * | | | | | | | | | A fix and a test case for Bug#9359 "Prepared statements take snapshot | konstantin@mysql.com | 2005-07-16 | 5 | -50/+70 |
| | | |/ / / / / / / | | |/| | | | | | | | |||||
| * | | | | | | | | | Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-4.1 | reggie@linux.site | 2005-07-15 | 1 | -1/+19 |
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |||||
| | * | | | | | | | | Fix bug#11482 4.1.12 produces different resultset for a complex query | evgen@moonbone.local | 2005-07-16 | 1 | -1/+19 |
| | | |_|_|_|_|/ / | | |/| | | | | | | |||||
* | | | | | | | | | post merge changes: added safe_charset_converter to other static functions | bell@sanja.is.com.ua | 2005-07-16 | 2 | -0/+34 |
* | | | | | | | | | Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0 | bell@sanja.is.com.ua | 2005-07-16 | 8 | -43/+99 |
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | | | |||||
| * | | | | | | | | stop evaluation constant functions in WHERE (BUG#4663) | bell@sanja.is.com.ua | 2005-07-16 | 8 | -41/+97 |
* | | | | | | | | | Merge linux.site:/home/reggie/bk/bug7403 | reggie@linux.site | 2005-07-15 | 1 | -1/+7 |
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | |||||
| * | | | | | | | | Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-4.1 | reggie@linux.site | 2005-07-15 | 1 | -1/+7 |
| |\ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | | | |||||
| | * | | | | | | | added a comment referring to the bug report | reggie@linux.site | 2005-07-15 | 1 | -0/+6 |
| | * | | | | | | | Bug #7403 error "Forcing close of thread 1 user: 'xxx'" | reggie@linux.site | 2005-07-14 | 1 | -1/+1 |
| * | | | | | | | | Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 | tomas@poseidon.ndb.mysql.com | 2005-07-15 | 1 | -4/+8 |
| |\ \ \ \ \ \ \ \ | |||||
* | | | | | | | | | | Fixed BUG#9538: SProc: Creation fails if we try to SET system variable | pem@mysql.com | 2005-07-15 | 1 | -0/+6 |
* | | | | | | | | | | Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 | tomas@poseidon.ndb.mysql.com | 2005-07-15 | 1 | -4/+8 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ | Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 | tomas@poseidon.ndb.mysql.com | 2005-07-15 | 1 | -4/+8 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ | Merge | tomas@poseidon.ndb.mysql.com | 2005-07-15 | 1 | -4/+8 |
| | |\ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / | | | |/| | | | | | | | | |||||
| | | * | | | | | | | | | Merge poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-release | tomas@poseidon.ndb.mysql.com | 2005-07-15 | 1 | -4/+8 |
| | | |\ \ \ \ \ \ \ \ \ | |||||
| | | | * | | | | | | | | | Jim's fix for the #10443. | ramil@mysql.com | 2005-07-15 | 1 | -4/+8 |
* | | | | | | | | | | | | | Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0 | ramil@mysql.com | 2005-07-15 | 1 | -1/+2 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | NO_DEFAULT_VALUE_FLAG and BLOB_FLAG combined | ramil@mysql.com | 2005-07-15 | 1 | -2/+2 |
| * | | | | | | | | | | | | a fix (bug #9881: ALTER TABLE gives wrong error message with sql-mode TRADITI... | ramil@mysql.com | 2005-07-15 | 1 | -1/+2 |
* | | | | | | | | | | | | | Improve a comment. | konstantin@mysql.com | 2005-07-15 | 1 | -2/+12 |
|/ / / / / / / / / / / / | |||||
* | | | | | | | | | | | | Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0 | bell@sanja.is.com.ua | 2005-07-15 | 1 | -3/+31 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | | | |||||
| * | | | | | | | | | | | take into account table lock mode when opening table: | bell@sanja.is.com.ua | 2005-07-15 | 1 | -3/+31 |
* | | | | | | | | | | | | Post-merge fixes. | konstantin@mysql.com | 2005-07-15 | 1 | -1/+1 |
* | | | | | | | | | | | | Merge mysql.com:/opt/local/work/mysql-4.1-root | konstantin@mysql.com | 2005-07-15 | 2 | -13/+15 |
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / | |/| | | | | | | | | | |