summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0bar@mysql.com2006-01-123-7/+76
|\
| * Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0sergefp@mysql.com2006-01-123-7/+76
| |\
| | * Fix typo bug in previous csetsergefp@mysql.com2006-01-121-1/+1
| | * BUG#16166, "Can't use index_merge with FORCE INDEX": adjust the heurstics che...sergefp@mysql.com2006-01-123-7/+76
* | | sql_show.cc:bar@mysql.com2006-01-121-3/+6
* | | ctype_utf8.result:bar@mysql.com2006-01-121-8/+8
* | | Merge mysql.com:/usr/home/bar/mysql-4.1.b15581bar@mysql.com2006-01-123-3/+21
|\ \ \ | |/ / |/| |
| * | Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1bar@mysql.com2006-01-123-3/+21
| |\ \
| | * | Bug#15581: COALESCE function truncates mutli-byte TINYTEXT valuesbar@mysql.com2005-12-193-3/+21
* | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0anozdrin@mysql.com2006-01-127-53/+32
|\ \ \ \
| * | | | Fix for BUG#15103: SHOW TRIGGERS: small output alignment problem.anozdrin@mysql.com2006-01-127-53/+32
* | | | | Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-5.0reggie@linux.site2006-01-111-9/+11
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | simple Windows compile fixes.reggie@linux.site2006-01-111-9/+11
* | | | | Merge mysql.com:/opt/local/work/mysql-4.1-rootkonstantin@mysql.com2006-01-114-37/+39
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | A fix for Bug#13944 "libmysqlclient exporting sha1_result function":konstantin@mysql.com2006-01-114-37/+39
* | | | | Merge bk-internal:/home/bk/mysql-5.0knielsen@mysql.com2006-01-113-42/+29
|\ \ \ \ \
| * \ \ \ \ Merge neptunus.(none):/home/msvensson/mysql/wl2930_fixup/my50-wl2930_fixupmsvensson@neptunus.(none)2006-01-113-42/+29
| |\ \ \ \ \
| | * | | | | Add comments that groups and describes the initsmsvensson@neptunus.(none)2006-01-111-4/+9
| | * | | | | Remove obsolete commentmsvensson@neptunus.(none)2006-01-111-1/+0
| | * | | | | Fix problem with strange printout of line numbers, detected on aix52, but exi...msvensson@neptunus.(none)2006-01-112-16/+17
| | * | | | | Disable code for "let" to assign each column from query to it's own variablemsvensson@neptunus.(none)2006-01-113-22/+4
* | | | | | | Merge mysql.com:/usr/local/mysql/mysql-5.0-sol10-sparc-a-fixknielsen@mysql.com2006-01-113-10/+1
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | BUG#16282: Remove unused gcc.cpp linker input that causes failure in make -j.knielsen@mysql.com2006-01-083-10/+1
* | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0anozdrin@mysql.com2006-01-1117-43/+175
|\ \ \ \ \ \ \
| * | | | | | | Fix for BUG#15110: mysqldump --triggers: does not include DEFINER clauseanozdrin@mysql.com2006-01-1117-43/+175
* | | | | | | | Merge istruewing@bk-internal.mysql.com:/home/bk/mysql-5.0ingo@mysql.com2006-01-100-0/+0
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | |
| * | | | | | | Merge mysql.com:/home/mydev/mysql-5.0ingo@mysql.com2006-01-100-0/+0
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| | * | | | | | Merge mysql.com:/home/mydev/mysql-4.1-bug5390ingo@mysql.com2006-01-100-0/+0
| | |\ \ \ \ \ \
* | | \ \ \ \ \ \ Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0jani@hasky.mysql.fi2006-01-102-11/+14
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Changed function prototype.jani@ua141d10.elisa.omakaista.fi2006-01-101-1/+1
| * | | | | | | | Fixed refresh_status function.jani@ua141d10.elisa.omakaista.fi2006-01-102-10/+13
| | |_|_|/ / / / | |/| | | | | |
* | | | | | | | Post-merge changesaivanov@mysql.com2006-01-101-1/+0
* | | | | | | | Merge mysql.com:/home/alexi/dev/mysql-4.1-15805aivanov@mysql.com2006-01-102-30/+10
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | / / / | | |_|_|/ / / | |/| | | | |
| * | | | | | Commenting out testcases which cause type_time.test failure.aivanov@mysql.com2006-01-102-30/+10
| * | | | | | Merge rurik.mysql.com:/home/igor/mysql-4.1igor@rurik.mysql.com2006-01-093-2/+24
| |\ \ \ \ \ \
| | * \ \ \ \ \ Merge msvensson@bk-internal.mysql.com:/home/bk/mysql-4.1msvensson@devsrv-b.mysql.com2006-01-090-0/+0
| | |\ \ \ \ \ \ | | | | |/ / / / | | | |/| | | |
| | | * | | | | Merge mysql.com:/home/mydev/mysql-4.1ingo@mysql.com2006-01-090-0/+0
| | | |\ \ \ \ \
| | | | * \ \ \ \ Merge mysql.com:/home/mydev/mysql-4.0-bug5390ingo@mysql.com2006-01-090-0/+0
| | | | |\ \ \ \ \
| | | | | * \ \ \ \ Merge mysql.com:/home/mydev/mysql-4.0ingo@mysql.com2005-12-278-27/+169
| | | | | |\ \ \ \ \
| | * | | | \ \ \ \ \ Merge msvensson@10.100.68.5:/home/msvensson/mysql/bug15598/my41-bug15598msvensson@devsrv-b.mysql.com2006-01-093-2/+24
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | |/| | | | | | | |
* | | | | | | | | | | Fix for crashing mysqltestmsvensson@neptunus.(none)2006-01-101-1/+1
| |_|_|_|_|_|/ / / / |/| | | | | | | | |
* | | | | | | | | | Merge aelkin@bk-internal.mysql.com:/home/bk/mysql-5.0aelkin@mysql.com2006-01-103-0/+72
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ |/| | | | | | | | |
| * | | | | | | | | BUG#9483 test was overworked to account reviews finally to leave only REVOKE ...aelkin@mysql.com2006-01-103-0/+72
* | | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0msvensson@neptunus.(none)2006-01-1021-803/+1217
|\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0msvensson@neptunus.(none)2006-01-0921-803/+1217
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | |
| | * | | | | | | | | Improved error message for failing with wrong errormsvensson@neptunus.(none)2005-12-292-8/+9
| | * | | | | | | | | Avoid implicit commits by using a different connection when creating/dropping...msvensson@neptunus.(none)2005-12-201-17/+57
| | * | | | | | | | | Store the each column from a multi column result set into a separate variable.msvensson@neptunus.(none)2005-12-203-14/+109
| | * | | | | | | | | Remove confusing printouts from expected to fail "system" commandsmsvensson@neptunus.(none)2005-12-133-4/+12
| | * | | | | | | | | Remove confusing printoutmsvensson@neptunus.(none)2005-12-131-6/+0