summaryrefslogtreecommitdiff
path: root/sql
Commit message (Expand)AuthorAgeFilesLines
* Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.1Sinisa@sinisa.nasamreza.org2005-05-241-1/+1
|\
| * Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.1Sinisa@sinisa.nasamreza.org2005-05-181-1/+1
| |\
| | * Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.1Sinisa@sinisa.nasamreza.org2005-05-181-1/+1
| | |\
| | | * union.result:Sinisa@sinisa.nasamreza.org2005-04-261-1/+1
* | | | Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-4.1jani@ua141d10.elisa.omakaista.fi2005-05-241-0/+1
|\ \ \ \
| * | | | Added a test case for Bug#8009.jani@ua141d10.elisa.omakaista.fi2005-05-241-0/+1
* | | | | Merge acurtis@bk-internal.mysql.com:/home/bk/mysql-4.1acurtis@xiphis.org2005-05-241-0/+13
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Add commentsacurtis@xiphis.org2005-05-241-0/+7
| * | | | Bug#7241 - Invalid response when DELETE .. USING and LOCK TABLES used.acurtis@xiphis.org2005-05-241-0/+6
* | | | | Merge mysql.com:/home/bkroot/mysql-4.1 into mysql.com:/home/bk/c4944-4.1lars@mysql.com2005-05-231-0/+1
|\ \ \ \ \
| * | | | | BUG#10687 - Merge engine fails under Windowsreggie@mdk10.(none)2005-05-231-1/+1
| * | | | | Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-4.1reggie@mdk10.(none)2005-05-231-1/+1
| |\ \ \ \ \ | | |/ / / /
| * | | | | BUG# 10687: Merge engine fails under Windowsreggie@mdk10.(none)2005-05-231-2/+2
| * | | | | BUG# 10687 - MERGE engine fails under Windowsreggie@mdk10.(none)2005-05-191-2/+3
* | | | | | Merge mysql.com:/home/bkroot/mysql-4.1 into mysql.com:/home/bk/c4944-4.1lars@mysql.com2005-05-231-1/+1
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | BUG# 9148: Denial of servicereggie@mdk10.(none)2005-05-201-1/+1
| |/ / / /
* | | | | Merge mysql.com:/home/bkroot/mysql-4.1 into mysql.com:/home/bk/c4944-4.1lars@mysql.com2005-05-202-26/+23
|\ \ \ \ \ | |/ / / /
| * | | | This fixed a compile problem on Windowsreggie@mdk10.(none)2005-05-191-1/+1
| * | | | Merge mysql.com:/usr/home/ram/work/mysql-4.1-buildramil@mysql.com2005-05-191-25/+22
| |\ \ \ \
| | * | | | hf's fix for bug #10626 ( gis.test fails)ramil@mysql.com2005-05-191-25/+22
* | | | | | Merge mysql.com:/home/bkroot/mysql-4.1 into mysql.com:/home/bk/c4944-4.1lars@mysql.com2005-05-191-3/+30
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | CSC#4944: Adding File_size to output of SHOW BINARY lOGSlars@mysql.com2005-05-191-3/+30
| | |/ / / | |/| | |
* | | | | Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/serg@serg.mylan2005-05-193-6/+79
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | after merge fixserg@serg.mylan2005-05-191-1/+1
| * | | | mergedserg@serg.mylan2005-05-183-6/+79
| |\ \ \ \
| | * \ \ \ Merge bk-internal:/home/bk/mysql-4.0/serg@serg.mylan2005-05-181-4/+6
| | |\ \ \ \
| | | * | | | udf: when banning paths from soname in CREATE FUNCTION, check for \ on windows.serg@serg.mylan2005-05-181-4/+6
| | * | | | | Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.0sergefp@mysql.com2005-05-151-2/+72
| | |\ \ \ \ \
| | | * | | | | Fix for BUG#10095: {wrong query results because of incorrect constant propaga...sergefp@mysql.com2005-05-151-2/+72
| | * | | | | | Fixed compiler failuremonty@mysql.com2005-05-141-0/+1
* | | | | | | | Merge mysql.com:/home/mydev/mysql-4.1ingo@mysql.com2005-05-184-3/+9
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | |
| * | | | | | | Bug#10400 - Improperly-defined MERGE table crashes with INSERT ... ON DUPLICA...ingo@mysql.com2005-05-184-3/+9
* | | | | | | | olap.result, olap.test:igor@rurik.mysql.com2005-05-181-3/+3
| |_|_|_|_|/ / |/| | | | | |
* | | | | | | sql_yacc.yy:igor@rurik.mysql.com2005-05-181-0/+1
| |/ / / / / |/| | | | |
* | | | | | Merge book.sanja.is.com.ua:/Users/bell/mysql/bk/mysql-4.1bell@book.sanja.is.com.ua2005-05-171-1/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | relaxed DBUG_ASSERT in Item_int_with_ref::new_item() to "any constant" (BUG#1...bell@book.sanja.is.com.ua2005-05-161-1/+1
* | | | | | Fix memory leakmonty@mysql.com2005-05-161-1/+1
* | | | | | Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1sergefp@mysql.com2005-05-161-4/+6
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Some improvement in Item_int_with_ref class comment. sergefp@mysql.com2005-05-161-4/+6
* | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1monty@mysql.com2005-05-144-4/+5
|\ \ \ \ \ \
| * | | | | | Fix wrong format specifier in error messages.konstantin@mysql.com2005-05-142-2/+2
| |/ / / / /
| * | | | | sql/ha_blackhole.ccserg@serg.mylan2005-05-132-2/+3
* | | | | | After merge fixesmonty@mysql.com2005-05-142-2/+2
* | | | | | Merge with 4.0monty@mysql.com2005-05-144-41/+65
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Change create_field->offset to store offset from start of fields, independent...monty@mysql.com2005-05-133-56/+65
| * | | | | Merge acurtis@bk-internal.mysql.com:/home/bk/mysql-4.0antony@ltantony.mysql.com2005-05-082-9/+21
| |\ \ \ \ \
| | * \ \ \ \ Merge ltantony.mysql.com:/usr/home/antony/work2/p4-bug8191antony@ltantony.mysql.com2005-05-081-3/+4
| | |\ \ \ \ \
| | | * | | | | Bug#8191 - SELECT INTO OUTFILE insists on FROM clauseantony@ltantony.mysql.com2005-05-081-3/+4
| | * | | | | | Bug#6236antony@ltantony.mysql.com2005-05-081-6/+17
| | |/ / / / /
| * | | | | | Merge bk-internal:/home/bk/mysql-4.0mwagner@ultrafly.mysql.com2005-05-071-0/+5
| |\ \ \ \ \ \