summaryrefslogtreecommitdiff
path: root/sql
Commit message (Expand)AuthorAgeFilesLines
* Reapply fix for bug#16372 (Server crashes when test 'conc_sys' is running)kroki@mysql.com2006-05-063-50/+63
* Merge mysql.com:/home/tomash/src/mysql_ab/tmp_mergekroki@mysql.com2006-05-061-0/+2
|\
| * Merge mysql.com:/home/tomash/src/mysql_ab/mysql-4.1kroki@mysql.com2006-05-051-6/+31
| |\
| | * Merge mysql.com:/home/tomash/src/mysql_ab/mysql-4.1kroki@mysql.com2006-05-051-2/+3
| | |\
| | * \ Merge mysql.com:/home/tomash/src/mysql_ab/mysql-4.1kroki@mysql.com2006-05-041-6/+31
| | |\ \
| | | * \ Merge mysql.com:/home/tomash/src/mysql_ab/mysql-4.1kroki@mysql.com2006-05-041-6/+31
| | | |\ \
| | | | * | Bug#16372: Server crashes when test 'conc_sys' is runningkroki@mysql.com2006-04-271-6/+31
| * | | | | Merge mysql.com:/home/tomash/src/mysql_ab/mysql-4.1kroki@mysql.com2006-05-051-2/+3
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| * | | | | Merge mysql.com:/home/tomash/src/mysql_ab/mysql-4.1kroki@mysql.com2006-05-042-8/+21
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| * | | | | Merge mysql.com:/home/tomash/src/mysql_ab/mysql-4.1kroki@mysql.com2006-05-046-45/+79
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| * | | | | Bug#16501: IS_USED_LOCK does not appear to workkroki@mysql.com2006-04-241-0/+2
| | |_|_|/ | |/| | |
* | | | | Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0jani@hundin.mysql.fi2006-05-051-1/+2
|\ \ \ \ \
| * \ \ \ \ Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1jani@ua141d10.elisa.omakaista.fi2006-05-051-1/+2
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| | * | | | Fixed Bug#11324:jani@ua141d10.elisa.omakaista.fi2006-05-041-1/+1
| | * | | | Fix for Bug#11326.jani@ua141d10.elisa.omakaista.fi2006-05-041-1/+2
| | | |_|/ | | |/| |
* | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0monty@mysql.com2006-05-042-3/+8
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Fixed wrong free in sql_view.ccmonty@mysql.com2006-05-042-3/+8
* | | | | Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0jani@hundin.mysql.fi2006-05-045-1/+10
|\ \ \ \ \ | |/ / / /
| * | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0monty@mysql.com2006-05-045-1/+10
| |\ \ \ \
| | * | | | Fixed an (unlikely) memory leakmonty@mysql.com2006-05-041-0/+1
| | * | | | Fixed memory leak in sql_parse.cc (lex_end() was not called)monty@mysql.com2006-05-044-1/+9
* | | | | | Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1jani@ua141d10.elisa.omakaista.fi2006-05-042-6/+24
|\ \ \ \ \ \ | |/ / / / / |/| | / / / | | |/ / / | |/| | |
| * | | | Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-4.1jani@hundin.mysql.fi2006-05-042-5/+30
| |\ \ \ \
| | * \ \ \ Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-4.1tnurnberg@mysql.com2006-05-041-0/+18
| | |\ \ \ \ | | | |_|_|/ | | |/| | |
| | | * | | Bug#19025 4.1 mysqldump doesn't correctly dump "auto_increment = [int]"tnurnberg@mysql.com2006-05-041-0/+18
| | * | | | Merge bk@192.168.21.1:mysql-4.1holyfoot@mysql.com2006-05-041-4/+9
| | |\ \ \ \ | | | |/ / / | | |/| | |
| * | | | | Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-4.1jani@hundin.mysql.fi2006-04-302-8/+3
| |\ \ \ \ \
| | * | | | | Fix for Bug#14515.jani@a193-229-222-105.elisa-laajakaista.fi2006-04-302-8/+3
* | | | | | | Merge rurik.mysql.com:/home/igor/mysql-5.0igor@rurik.mysql.com2006-05-044-6/+20
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |
| * | | | | | Merge bk@192.168.21.1:mysql-5.0holyfoot@mysql.com2006-05-044-6/+20
| |\ \ \ \ \ \
| | * | | | | | merging fixholyfoot@deer.(none)2006-05-031-1/+1
| | * | | | | | mergingholyfoot@mysql.com2006-05-034-1/+10
| | |\ \ \ \ \ \
| | | * | | | | | bug #15860 (SPATIAL keys in INNODB)holyfoot@deer.(none)2006-04-124-1/+10
| | * | | | | | | mergingholyfoot@mysql.com2006-05-031-5/+10
| | |\ \ \ \ \ \ \ | | | | |_|_|_|/ / | | | |/| | | | |
| | | * | | | | | Merge hf@192.168.21.28:work/mysql-4.1.16892holyfoot@mysql.com2006-05-031-4/+9
| | | |\ \ \ \ \ \
| | | | * \ \ \ \ \ Merge mysql.com:/home/hf/work/mysql-4.1.15225holyfoot@mysql.com2006-05-031-4/+9
| | | | |\ \ \ \ \ \
| | | | | * \ \ \ \ \ Merge bk@192.168.21.1:mysql-4.1holyfoot@mysql.com2006-02-201-4/+9
| | | | | |\ \ \ \ \ \
| | | | | | * | | | | | Fix for bug #15225 (ANALYZE temporary has no effect)holyfoot@deer.(none)2005-12-101-4/+9
* | | | | | | | | | | | Post-review changes.igor@rurik.mysql.com2006-05-031-2/+2
* | | | | | | | | | | | Merge rurik.mysql.com:/home/igor/mysql-5.0igor@rurik.mysql.com2006-05-033-41/+71
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Fixed bug #14292: performance degradation for a benchmark query.igor@rurik.mysql.com2006-05-023-41/+71
* | | | | | | | | | | | Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-4.1pekka@mysql.com2006-05-031-1/+3
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / |/| | | | | | | | | / / | | |_|_|_|_|_|_|_|/ / | |/| | | | | | | | |
| * | | | | | | | | | Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1ramil@mysql.com2006-05-021-1/+3
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / | |/| | | | | | | | |
| | * | | | | | | | | Fix for bug #7643: ALTER TABLE fails for CSV, EXAMPLE, ARCHIVE enginesramil@mysql.com2006-04-251-1/+3
| | | |_|_|/ / / / / | | |/| | | | | | |
* | | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0dlenev@mysql.com2006-05-023-32/+66
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | A fix and a test case for Bug#19308 "REPAIR/OPTIMIZE/ANALYZE konstantin@mysql.com2006-04-251-0/+3
| * | | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0-runtimedlenev@mysql.com2006-04-242-32/+63
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Fix for bug#11081 "Using a CONVERT_TZ function in a stored function ordlenev@mysql.com2006-04-242-32/+63
* | | | | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0cmiller@zippy.(none)2006-05-011-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | SECURITY FIXcmiller@zippy.(none)2006-05-011-1/+1