summaryrefslogtreecommitdiff
path: root/sql
Commit message (Expand)AuthorAgeFilesLines
* Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-02-233-5/+41
|\
| * Fix for bug #7217: information_schema: columns are varbinary() instead of tim...unknown2005-02-233-5/+41
* | Fixed Bug#Server crash due to 'flush status' in various tests.unknown2005-02-232-5/+5
|/
* Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-02-231-2/+6
|\
| * Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-02-221-2/+6
| |\
| | * Fix for bug #7476: crash on SELECT * FROM INFORMATION_SCHEMA.TABLES(after rev...unknown2005-02-221-2/+6
* | | Mergeunknown2005-02-223-32/+90
|\ \ \
| * \ \ Merge mysql.com:/home/jimw/my/mysql-4.1-7989unknown2005-02-221-12/+10
| |\ \ \
| | * | | Clean up fix for Bug #7989 by avoiding extra memory copy, and adding someunknown2005-02-181-12/+10
| * | | | Merge bk-internal:/home/bk/mysql-4.1unknown2005-02-2216-32/+94
| |\ \ \ \
| * \ \ \ \ Merge mysql.com:/home/jimw/my/mysql-4.1-8475unknown2005-02-181-11/+22
| |\ \ \ \ \
| | * | | | | Log each slow query in a multi-statement query to the slow query log.unknown2005-02-171-11/+22
| * | | | | | Clean up merge for fix for Bug #8350.unknown2005-02-181-16/+41
| |\ \ \ \ \ \
| | * | | | | | Fix per-hour user connection limits by making sure that the number ofunknown2005-02-081-16/+40
| * | | | | | | Fix merge of fix for Bug #4872.unknown2005-02-181-2/+23
| |\ \ \ \ \ \ \
| | * | | | | | | When calling initgroups(), set a flag that the segfault handler checksunknown2005-02-161-0/+22
* | | | | | | | | Merge mysql.com:/home/bkroot/mysql-5.0 into mysql.com:/home/bk/mysql-5.0unknown2005-02-232-4/+11
|\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge bk-internal:/home/bk/mysql-5.0unknown2005-02-232-4/+11
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | forget savepoints at the end of transactionunknown2005-02-221-1/+2
| | * | | | | | | | | copy-paste fixedunknown2005-02-221-3/+3
| | * | | | | | | | | 64-bit safe address->string conversionunknown2005-02-221-3/+9
* | | | | | | | | | | Merge mysql.com:/home/bkroot/mysql-5.0 into mysql.com:/home/bk/mysql-5.0unknown2005-02-225-5/+27
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Manual merge 4.1->5.0unknown2005-02-221-10/+30
| * | | | | | | | | | Merge 4.1->5.0unknown2005-02-225-35/+37
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / / | | |/| | | | | | | |
| | * | | | | | | | | Merge mysql.com:/home/bkroot/mysql-4.1 into mysql.com:/home/bk/b6676-4.1unknown2005-02-221-1/+6
| | |\ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ Merge mysql.com:/home/bkroot/mysql-4.1 into mysql.com:/home/bk/b6676-4.1unknown2005-02-221-1/+4
| | | |\ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ Merge mysql.com:/home/bkroot/mysql-4.1 into mysql.com:/home/bk/b6676-4.1unknown2005-02-221-1/+6
| | | |\ \ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ \ Merge mysql.com:/home/bkroot/mysql-4.1 into mysql.com:/home/bk/b6676-4.1unknown2005-02-221-1/+6
| | | | |\ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | BUG#6676: Added comment for the fixunknown2005-02-211-0/+5
| | | | | * | | | | | | | | | BUG#6676: Derivation of user variables should be of derivation "IMPLICIT"unknown2005-02-211-1/+1
| | | | | | |_|_|_|_|/ / / / | | | | | |/| | | | | | | |
| | * | | | | | | | | | | | Merge lthalmann@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-02-225-2/+20
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|/ / / / / / / / | | | |/| | | | | | | | | |
| | | * | | | | | | | | | | Merge mysql.com:/home/bkroot/mysql-4.1 into mysql.com:/home/bk/b8297-4.1unknown2005-02-221-1/+4
| | | |\ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / | | | |/| | | | | | | | | |
| | | | * | | | | | | | | | BUG#8297: If query is filtered on slave, do not put it in general log.unknown2005-02-171-1/+4
| | | | | |/ / / / / / / / | | | | |/| | | | | | | |
| | | * | | | | | | | | | Merge mysql.com:/home/bkroot/mysql-4.1 into mysql.com:/home/bk/b6662-4.1unknown2005-02-224-1/+16
| | | |\ \ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / / / | | | |/| | | | | | | | |
| | | | * | | | | | | | | BUG#6662: Changes after Guilhems and Sergs reviewunknown2005-02-224-5/+7
| | | | * | | | | | | | | BUG#6662: Importing mysqldumps should not show any warnings of level "notes".unknown2005-02-214-1/+14
| | | | |/ / / / / / / /
* | | | | | | | | | | | Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-02-222-5/+5
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Coding style fixes according to Sergei's feedbackunknown2005-02-221-4/+4
| * | | | | | | | | | | Fix for BUG#8397 (second commit after review): unknown2005-02-221-1/+1
| | |_|_|/ / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-02-227-13/+43
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | After merge fixesunknown2005-02-221-4/+10
| * | | | | | | | | | Merge with 4.1unknown2005-02-227-10/+34
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | | | | | | | | | / / | | |_|_|_|_|_|_|/ / | |/| | | | | | | |
| | * | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-02-222-7/+13
| | |\ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ Merge 51.0.168.192.in-addr.arpa:/Users/bell/mysql/bk/mysql-4.1unknown2005-02-221-5/+5
| | | |\ \ \ \ \ \ \ \ | | | | |/ / / / / / /
| | | | * | | | | | | A user variable are now always have IMPLICIT coercibility,unknown2005-02-221-5/+5
| | | * | | | | | | | Merge 51.0.168.192.in-addr.arpa:/Users/bell/mysql/bk/mysql-4.1unknown2005-02-221-2/+8
| | | |\ \ \ \ \ \ \ \ | | | | |/ / / / / / / | | | |/| | | | | | |
| | | | * | | | | | | removed wrong distinct UNION detection (BUG#6565)unknown2005-02-141-2/+8
| | * | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-02-228-19/+42
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | |/| | | | | | | |
| | | * | | | | | | | Backport my_strntod() from 5.0unknown2005-02-228-19/+42
| | * | | | | | | | | field.cc:unknown2005-02-221-1/+11
| | |/ / / / / / / /