summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge bk-internal.mysql.com:/home/bk/mysql-5.0-runtimedlenev@mysql.com2006-05-096-107/+201
|\
| * Fix for bugs#12472/#15137 'CREATE TABLE ... SELECT ... which explicitlydlenev@mysql.com2006-05-096-107/+201
* | Fix for bug #17260 "Multiple invocations of triggers or stored functionsdlenev@mysql.com2006-05-061-66/+85
* | Fix race condition of concurrent RENAME and SHOW TABLES which causedkroki@mysql.com2006-05-061-1/+7
* | Merge mysql.com:/home/tomash/src/mysql_ab/mysql-5.0kroki@mysql.com2006-05-043-0/+90
|\ \
| * \ Merge mysql.com:/home/tomash/src/mysql_ab/mysql-5.0kroki@mysql.com2006-05-043-0/+90
| |\ \
| | * \ Merge mysql.com:/home/tomash/src/mysql_ab/mysql-5.0kroki@mysql.com2006-04-213-0/+90
| | |\ \
| | | * | Bug#6951: Triggers/Traditional: SET @ result wrongkroki@mysql.com2006-04-193-0/+90
* | | | | Bug#15463: EXPLAIN SELECT..INTO hangs the client (QB, command line)kroki@mysql.com2006-05-034-5/+29
|/ / / /
* | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0dlenev@mysql.com2006-05-0210-41/+241
|\ \ \ \
| * | | | A fix and a test case for Bug#19308 "REPAIR/OPTIMIZE/ANALYZE konstantin@mysql.com2006-04-256-9/+143
| * | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0-runtimedlenev@mysql.com2006-04-244-32/+98
| |\ \ \ \
| | * | | | Fix for bug#11081 "Using a CONVERT_TZ function in a stored function ordlenev@mysql.com2006-04-244-32/+98
* | | | | | Fix a bunch of non-Linux compile failures.knielsen@mysql.com2006-05-025-4/+50
* | | | | | Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0holyfoot@mysql.com2006-05-021-1/+1
|\ \ \ \ \ \
| * | | | | | Win build fixholyfoot@deer.(none)2006-05-021-1/+1
* | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0cmiller@zippy.(none)2006-05-019-23/+220
|\ \ \ \ \ \ \
| * | | | | | | SECURITY FIXcmiller@zippy.(none)2006-05-019-23/+220
* | | | | | | | Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0kent@mysql.com2006-05-011-24/+20
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Mergekent@mysql.com2006-05-011-24/+20
| |\ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | |
| | * | | | | | | mysql.spec.sh:kent@mysql.com2006-05-011-15/+11
| | * | | | | | | Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1kent@mysql.com2006-04-291-2/+7
| | |\ \ \ \ \ \ \
| | | * | | | | | | config-win.h:kent@mysql.com2006-04-291-2/+7
| | * | | | | | | | configure.in:kent@mysql.com2006-04-291-2/+2
| | |/ / / / / / /
| | * | | | | | | mysql.spec.sh:kent@mysql.com2006-04-291-15/+57
| | * | | | | | | Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1kent@mysql.com2006-04-294-13/+127
| | |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1kent@mysql.com2006-04-287-30/+39
| | |\ \ \ \ \ \ \ \
* | | \ \ \ \ \ \ \ \ Merge bk-internal:/home/bk/mysql-5.0jimw@mysql.com2006-05-013-2/+6
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0holyfoot@mysql.com2006-05-013-2/+6
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Fix for Win buildholyfoot@deer.(none)2006-05-013-2/+6
* | | | | | | | | | | | Merge mysql.com:/home/jimw/my/mysql-5.0-18607jimw@mysql.com2006-05-011-1/+2
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Bug #18607: LOAD DATA FROM MASTER fails because of INFORMATION_SCHEMA databasejimw@mysql.com2006-04-211-1/+2
* | | | | | | | | | | | | Merge mysql.com:/home/jimw/my/mysql-5.0-18312jimw@mysql.com2006-05-011-4/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Bug #18312: mysqltest: --sleep=0 doesn't disable sleepjimw@mysql.com2006-04-211-4/+5
* | | | | | | | | | | | | Merge zippy.(none):/home/cmiller/work/mysql/merge/tmp_mergecmiller@zippy.(none)2006-05-013-10/+122
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / |/| | | | | / / / / / / / | | |_|_|_|/ / / / / / / | |/| | | | | | | | | |
| * | | | | | | | | | | BUG#19145: mysqld crashes if you set the default value of an enum field to NULLelliot@mysql.com2006-04-283-10/+122
| * | | | | | | | | | | Merge msvensson@bk-internal.mysql.com:/home/bk/mysql-4.1msvensson@devsrv-b.mysql.com2006-04-286-29/+38
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / | | |/| | | | | | | | |
| * | | | | | | | | | | Merge msvensson@bk-internal.mysql.com:/home/bk/mysql-4.1msvensson@devsrv-b.mysql.com2006-04-281-1/+1
| |\ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ Merge msvensson@bk-internal.mysql.com:/home/bk/mysql-5.0msvensson@devsrv-b.mysql.com2006-04-281-1/+10
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0kent@mysql.com2006-04-281-1/+10
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | mysql.spec.sh:kent@mysql.com2006-04-281-1/+10
* | | | | | | | | | | | | | | Merge msvensson@bk-internal.mysql.com:/home/bk/mysql-5.0msvensson@devsrv-b.mysql.com2006-04-286-39/+42
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / /
| * | | | | | | | | | | | | | Merge lsmy3.wdf.sap.corp:/data/users/gkodinov/mysql-4.1-B18492gkodinov@lsmy3.wdf.sap.corp2006-04-286-39/+42
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / / / / | | |/| | | | | | | | | | | |
| | * | | | | | | | | | | | | BUG#18492: mysqld reports ER_ILLEGAL_REFERENCE in --ps-protocolgkodinov@lsmy3.wdf.sap.corp2006-04-286-29/+38
| | | |_|/ / / / / / / / / / | | |/| | | | | | | | | | |
* | | | | | | | | | | | | | Bug#18818 configure: No longer finds OpenSSL on Mac OS Xmsvensson@neptunus.(none)2006-04-282-3/+5
* | | | | | | | | | | | | | Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1msvensson@neptunus.(none)2006-04-280-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / / | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1msvensson@neptunus.(none)2006-04-271-3/+5
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ Merge bk-internal.mysql.com:/home/bk/mysql-4.1msvensson@neptunus.(none)2006-04-261-3/+5
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ Merge bk-internal.mysql.com:/home/bk/mysql-4.1msvensson@neptunus.(none)2006-04-241-3/+5
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | Bug#18818 configure: No longer finds OpenSSL on Mac OS Xmsvensson@neptunus.(none)2006-04-191-3/+5