summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge mysqldev@production.mysql.com:jimw/mysql-5.0-readlinejimw@mysql.com2005-07-1845-691/+1743
|\
| * Reimplement use of "config_readline.h" to get readline configuration.jimw@mysql.com2005-07-1832-94/+33
| * Upgrade bundled readline to version 5.0.jimw@mysql.com2005-07-1846-721/+1834
* | After-merge fixes.konstantin@mysql.com2005-07-195-11/+13
* | Merge mysql.com:/home/kostja/mysql/mysql-4.1-rootkonstantin@mysql.com2005-07-1916-19/+121
|\ \
| * | Alleviate the autoconf requirement.konstantin@mysql.com2005-07-181-1/+1
| * | Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.1gbichot@production.mysql.com2005-07-184-9/+9
| |\ \
| | * | Fix for BUG#12003 "assertion failure in testsuite (double lock ofgbichot@production.mysql.com2005-07-184-9/+9
| * | | QNX does not know "uint", so the cast is rewritten as "unsigned int".joerg@mysql.com2005-07-181-1/+1
| |/ /
| * | Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.1lenz@mysql.com2005-07-180-0/+0
| |\ \
| | * \ Merge mysql.com:/space/my/mysql-4.1.13-clonelenz@mysql.com2005-07-152-9/+19
| | |\ \
| | * \ \ Merge mysql.com:/space/my/mysql-4.1.13-clonelenz@mysql.com2005-07-142-4/+16
| | |\ \ \
| * | | | | select.result, select.test:igor@rurik.mysql.com2005-07-174-2/+36
| * | | | | Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-4.1igor@rurik.mysql.com2005-07-1692-440/+1534
| |\ \ \ \ \
| | * | | | | Added test for Bug #11521timour@mysql.com2005-07-162-0/+23
| | * | | | | Merge bk-internal:/home/bk/mysql-4.1jimw@mysql.com2005-07-153-1/+30
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge bk-internal:/home/bk/mysql-4.1jimw@mysql.com2005-07-157-51/+112
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ Merge bk-internal:/home/bk/mysql-4.1jimw@mysql.com2005-07-154-4/+24
| | |\ \ \ \ \ \ \
| | | * | | | | | | Fix error in formatting metadata in mysqltest.jimw@mysql.com2005-07-151-2/+2
| | | * | | | | | | Merge mysql.com:/home/jimw/my/mysql-4.1-9979jimw@mysql.com2005-07-153-2/+22
| | | |\ \ \ \ \ \ \
| | | | * | | | | | | Fix spurious permissions problem when CONVERT_TZ() is usedjimw@mysql.com2005-06-173-2/+22
| * | | | | | | | | | Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-4.1igor@igor-inspiron.creware.com2005-07-127-26/+48
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-4.1igor@igor-inspiron.creware.com2005-07-083-2/+25
| |\ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-4.1igor@rurik.mysql.com2005-07-013-2/+25
| | |\ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | olap.result, olap.test:igor@rurik.mysql.com2005-07-013-2/+25
* | | | | | | | | | | | | | Fixed the ucs2 -> eucjpms conversion bug (bug#11717)shuichi@mysql.com2005-07-183-1/+27
| |_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | |
* | | | | | | | | | | | | Fix BUILD/autorun.sh to really bail out on error.konstantin@mysql.com2005-07-181-9/+9
* | | | | | | | | | | | | Fixes to previous changesetmonty@mishka.local2005-07-183-3/+2
* | | | | | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0monty@mishka.local2005-07-1833-469/+315
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Cleanups during reviewmonty@mishka.local2005-07-1833-469/+315
* | | | | | | | | | | | | | Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0evgen@moonbone.local2005-07-183-1/+30
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge moonbone.local:/work/mysql-4.1-bug-11868evgen@moonbone.local2005-07-183-1/+30
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|/ / / / | | |/| | | | | | | | | | | |
| | * | | | | | | | | | | | | Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.1evgen@moonbone.local2005-07-163-1/+30
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|/ / / / | | |/| | | | | | | | | | | |
| | | * | | | | | | | | | | | Fix bug#11868 NOT NULL ref optimization in subquery used in update must be evgen@moonbone.local2005-07-163-1/+30
* | | | | | | | | | | | | | | Merge grichter@bk-internal.mysql.com:/home/bk/mysql-5.0georg@lmy002.wdf.sap.corp2005-07-181-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | fix for bug#11893georg@lmy002.wdf.sap.corp2005-07-161-1/+1
* | | | | | | | | | | | | | | select.test:evgen@moonbone.local2005-07-181-2/+2
* | | | | | | | | | | | | | | Manual mergeevgen@moonbone.local2005-07-180-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Fix bug#11482 4.1.12 produces different resultset for a complex query evgen@moonbone.local2005-07-183-1/+41
| | |_|_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-5.0lenz@mysql.com2005-07-1847-758/+3028
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0patg@krsna.patg.net2005-07-177-559/+2374
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | 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-157-514/+2372
| | | |/ / / / / / / / / / / / / | | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | | func_in.result, func_in.test:igor@rurik.mysql.com2005-07-164-6/+63
| * | | | | | | | | | | | | | | opt_range.cc:igor@rurik.mysql.com2005-07-163-1/+49
| * | | | | | | | | | | | | | | After-merge fixes (4.1 -> 5.0).konstantin@mysql.com2005-07-167-31/+34
| * | | | | | | | | | | | | | | Merge mysql.com:/opt/local/work/mysql-4.1-rootkonstantin@mysql.com2005-07-1610-48/+150
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / / / | | |/| | | | | | | | | | | | |
| | * | | | | | | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1konstantin@mysql.com2005-07-167-51/+112
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|/ / / / / | | |/| | | | | | | | | | | | |
| | | * | | | | | | | | | | | | A fix and a test case for Bug#9359 "Prepared statements take snapshotkonstantin@mysql.com2005-07-167-51/+112
| | | | |_|/ / / / / / / / / / | | | |/| | | | | | | | | | |
| | * | | | | | | | | | | | | Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-4.1reggie@linux.site2005-07-153-1/+41
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / /
View Lorry Controller Status