summaryrefslogtreecommitdiff
path: root/sql
Commit message (Expand)AuthorAgeFilesLines
* Merge with 4.1unknown2004-12-2258-343/+818
|\
| * Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2004-12-211-0/+16
| |\
| | * Fix for BUG#6825: When calculating Item_func_neg::max_length, add 1 for '-'.unknown2004-12-171-0/+16
| * | added config parameter Group on connectionunknown2004-12-202-14/+51
| * | Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2004-12-181-5/+0
| |\ \
| | * | Fix for BUG#7358: removing warning reporting of mysqldump 4.1.8 when calling ...unknown2004-12-171-5/+0
| * | | Merge Bug#7391 from 4.0unknown2004-12-182-10/+20
| |\ \ \
| | * | | Simplify code during reviewunknown2004-12-181-8/+2
| | * | | Remove bogus linesunknown2004-12-181-7/+0
| | * | | Bug#7391 - Multi-table UPDATE security regressionunknown2004-12-181-0/+20
| | * | | Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.0unknown2004-12-112-1/+14
| | |\ \ \
| | | * | | Fix for BUG#6976:unknown2004-12-112-1/+14
| * | | | | mergeunknown2004-12-1769-738/+1772
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| | * | | | Very minor fixes for Seconds_Behind_Master column of SHOW SLAVE STATUS.unknown2004-12-162-14/+18
| | * | | | Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2004-12-163-22/+74
| | |\ \ \ \ | | | |_|_|/ | | |/| | |
| | | * | | A change of behaviour of Seconds_Behind_Master from SHOW SLAVE STATUS. It's g...unknown2004-12-163-22/+74
| | * | | | Making 4.1 tree compile with -ansi -pedanticunknown2004-12-162-2/+2
| | * | | | Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2004-12-142-3/+11
| | |\ \ \ \
| | | * | | | bug#6275 "client_test" fail in 4.1.7 make testunknown2004-12-142-3/+11
| | * | | | | A quick fix for bug #7257: Crash in default tests: 'subselect'unknown2004-12-141-2/+2
| | |/ / / /
| | * | | | Bug#7242unknown2004-12-141-0/+23
| | * | | | Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2004-12-142-2/+8
| | |\ \ \ \ | | | |/ / /
| | | * | | Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2004-12-132-2/+8
| | | |\ \ \
| | | | * \ \ Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2004-12-132-2/+8
| | | | |\ \ \
| | | | | * | | correcting --expire_logs_days description in mysqld --helpunknown2004-12-131-1/+2
| | | | | * | | Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2004-12-031-1/+6
| | | | | |\ \ \
| | | | | | * | | Fix for BUG#6671 "mysqlbinlog does not show thread_id for LOAD DATA INFILE"unknown2004-12-031-1/+6
| | * | | | | | | * Added comments and one assertunknown2004-12-1412-19/+35
| | * | | | | | | Merge of fix for BUG#6976 continued: pulling in some Item_ref changes from 5.0unknown2004-12-146-32/+50
| | * | | | | | | Merged fixes for BUG#6976 and BUG#7079unknown2004-12-131-0/+4
| | * | | | | | | Merged (will need a post-merge fix)unknown2004-12-136-7/+29
| | |\ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | |
| | | * | | | | | Merging fix for BUG#6976 from 4.0 to 4.1 unknown2004-12-136-6/+29
| | * | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1unknown2004-12-138-69/+64
| | |\ \ \ \ \ \ \ | | | |_|/ / / / / | | |/| | | | | |
| | | * | | | | | WL#2274 - INSERT..SELECT..UPDATEunknown2004-12-138-69/+64
| | | |/ / / / /
| | * | | | | | comment of class eddedunknown2004-12-131-0/+4
| | * | | | | | fixed parameter to avoid accessing unallocated memoryunknown2004-12-131-1/+1
| | * | | | | | initialize variables (addition for BUG#7079)unknown2004-12-131-2/+2
| | * | | | | | Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1unknown2004-12-134-18/+76
| | |\ \ \ \ \ \ | | | |/ / / / / | | |/| | | | |
| | | * | | | | fixed optimized SOME subqueryunknown2004-12-131-4/+4
| | | * | | | | new reference which refer to current value not to result used for resolving...unknown2004-12-113-14/+72
| | * | | | | | Fix for BUG#5837 merged from 4.0unknown2004-12-112-4/+16
| | |\ \ \ \ \ \ | | | | |_|_|/ / | | | |/| | | |
| | | * | | | | Fix for BUG#5837 - attempt 3.unknown2004-12-112-4/+16
| | * | | | | | sql/password.c: check for buffer overflow in check_scramble_323 (BUG#7187)unknown2004-12-111-2/+3
| | * | | | | | Mergeunknown2004-12-101-1/+1
| | |\ \ \ \ \ \
| | | * \ \ \ \ \ manually mergedunknown2004-12-102-9/+11
| | | |\ \ \ \ \ \ | | | | |/ / / / / | | | | | / / / / | | | | |/ / / / | | | |/| | | |
| | * | | | | | dict0dict.c, log.cc:unknown2004-12-101-10/+8
| | * | | | | | Mergeunknown2004-12-101-8/+10
| | |\ \ \ \ \ \ | | | | |/ / / / | | | |/| | | |
| | | * | | | | dict0dict.h, dict0dict.c, ha_innodb.cc:unknown2004-12-101-0/+5
| | | * | | | | Merge bk-internal:/home/bk/mysql-4.0/unknown2004-12-072-10/+12
| | | |\ \ \ \ \ | | | | |_|_|_|/ | | | |/| | | |
| | | | * | | | two fixes for potential security bugsunknown2004-12-072-10/+12