summaryrefslogtreecommitdiff
path: root/sql
Commit message (Expand)AuthorAgeFilesLines
* Merge mysql.com:/home/kostja/mysql/mysql-4.1-rootkonstantin@mysql.com2005-07-195-8/+15
|\
| * Fix for BUG#12003 "assertion failure in testsuite (double lock ofgbichot@production.mysql.com2005-07-182-2/+2
| * select.result, select.test:igor@rurik.mysql.com2005-07-172-2/+2
| * Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-4.1igor@rurik.mysql.com2005-07-1622-125/+282
| |\
| | * Merge bk-internal:/home/bk/mysql-4.1jimw@mysql.com2005-07-151-1/+6
| | |\
| | * \ Merge bk-internal:/home/bk/mysql-4.1jimw@mysql.com2005-07-155-50/+70
| | |\ \
| | * \ \ Merge bk-internal:/home/bk/mysql-4.1jimw@mysql.com2005-07-151-2/+3
| | |\ \ \
| | | * \ \ Merge mysql.com:/home/jimw/my/mysql-4.1-9979jimw@mysql.com2005-07-151-2/+3
| | | |\ \ \
| | | | * | | Fix spurious permissions problem when CONVERT_TZ() is usedjimw@mysql.com2005-06-171-2/+3
| * | | | | | Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-4.1igor@igor-inspiron.creware.com2005-07-121-13/+20
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-4.1igor@igor-inspiron.creware.com2005-07-081-2/+2
| |\ \ \ \ \ \ \
| | * | | | | | | olap.result, olap.test:igor@rurik.mysql.com2005-07-011-2/+2
* | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0monty@mishka.local2005-07-1814-30/+39
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Cleanups during reviewmonty@mishka.local2005-07-1814-30/+39
* | | | | | | | | | Merge moonbone.local:/work/mysql-4.1-bug-11868evgen@moonbone.local2005-07-181-1/+6
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
| * | | | | | | | | Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.1evgen@moonbone.local2005-07-161-1/+6
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
| | * | | | | | | | Fix bug#11868 NOT NULL ref optimization in subquery used in update must be evgen@moonbone.local2005-07-161-1/+6
* | | | | | | | | | Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0patg@krsna.patg.net2005-07-173-482/+1193
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Federated Storage Engine, bug 9925 "Federated query processor (step 2 or step...patg@radha.local2005-07-173-276/+233
| * | | | | | | | | | This is the same patch as 1.1937, with small variable declaration changes, m...patg@krsna.patg.net2005-07-153-437/+1191
* | | | | | | | | | | func_in.result, func_in.test:igor@rurik.mysql.com2005-07-162-5/+21
* | | | | | | | | | | opt_range.cc:igor@rurik.mysql.com2005-07-161-1/+2
* | | | | | | | | | | After-merge fixes (4.1 -> 5.0).konstantin@mysql.com2005-07-164-11/+7
* | | | | | | | | | | Merge mysql.com:/opt/local/work/mysql-4.1-rootkonstantin@mysql.com2005-07-166-48/+86
|\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | |
| * | | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1konstantin@mysql.com2005-07-165-50/+70
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / | |/| | | | | | | | |
| | * | | | | | | | | A fix and a test case for Bug#9359 "Prepared statements take snapshotkonstantin@mysql.com2005-07-165-50/+70
| | | |/ / / / / / / | | |/| | | | | | |
| * | | | | | | | | Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-4.1reggie@linux.site2005-07-151-1/+19
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / /
| | * | | | | | | | Fix bug#11482 4.1.12 produces different resultset for a complex query evgen@moonbone.local2005-07-161-1/+19
| | | |_|_|_|_|/ / | | |/| | | | | |
* | | | | | | | | post merge changes: added safe_charset_converter to other static functionsbell@sanja.is.com.ua2005-07-162-0/+34
* | | | | | | | | Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0bell@sanja.is.com.ua2005-07-168-43/+99
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | |
| * | | | | | | | stop evaluation constant functions in WHERE (BUG#4663)bell@sanja.is.com.ua2005-07-168-41/+97
* | | | | | | | | Merge linux.site:/home/reggie/bk/bug7403reggie@linux.site2005-07-151-1/+7
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| * | | | | | | | Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-4.1reggie@linux.site2005-07-151-1/+7
| |\ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | |
| | * | | | | | | added a comment referring to the bug reportreggie@linux.site2005-07-151-0/+6
| | * | | | | | | Bug #7403 error "Forcing close of thread 1 user: 'xxx'"reggie@linux.site2005-07-141-1/+1
| * | | | | | | | Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1tomas@poseidon.ndb.mysql.com2005-07-151-4/+8
| |\ \ \ \ \ \ \ \
* | | | | | | | | | Fixed BUG#9538: SProc: Creation fails if we try to SET system variablepem@mysql.com2005-07-151-0/+6
* | | | | | | | | | Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0tomas@poseidon.ndb.mysql.com2005-07-151-4/+8
|\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0tomas@poseidon.ndb.mysql.com2005-07-151-4/+8
| |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ Mergetomas@poseidon.ndb.mysql.com2005-07-151-4/+8
| | |\ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / | | | |/| | | | | | | |
| | | * | | | | | | | | Merge poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-releasetomas@poseidon.ndb.mysql.com2005-07-151-4/+8
| | | |\ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | Jim's fix for the #10443.ramil@mysql.com2005-07-151-4/+8
* | | | | | | | | | | | | Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0ramil@mysql.com2005-07-151-1/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | NO_DEFAULT_VALUE_FLAG and BLOB_FLAG combinedramil@mysql.com2005-07-151-2/+2
| * | | | | | | | | | | | a fix (bug #9881: ALTER TABLE gives wrong error message with sql-mode TRADITI...ramil@mysql.com2005-07-151-1/+2
* | | | | | | | | | | | | Improve a comment.konstantin@mysql.com2005-07-151-2/+12
|/ / / / / / / / / / / /
* | | | | | | | | | | | Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0bell@sanja.is.com.ua2005-07-151-3/+31
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | take into account table lock mode when opening table:bell@sanja.is.com.ua2005-07-151-3/+31
* | | | | | | | | | | | Post-merge fixes.konstantin@mysql.com2005-07-151-1/+1
* | | | | | | | | | | | Merge mysql.com:/opt/local/work/mysql-4.1-rootkonstantin@mysql.com2005-07-152-13/+15
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / | |/| | | | | | | | | |