summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Bug#9775 - Stored procedures: crash if create function that returns enum or setacurtis@xiphis.org2005-04-205-61/+117
* Bug#7648 - Stored procedure crash when invoking a function that returns a bitacurtis@xiphis.org2005-04-193-3/+32
* Bug#9102 - Stored proccedures: function which returns blob causes crashacurtis@xiphis.org2005-04-196-3/+124
* Post merge fix - updated the test results (BUG#9439)sergefp@mysql.com2005-04-181-12/+12
* Merge bk-internal.mysql.com:/home/bk/mysql-5.0dlenev@mysql.com2005-04-183-111/+99
|\
| * Merge bk-internal.mysql.com:/home/bk/mysql-5.0dlenev@mysql.com2005-04-183-111/+99
| |\
| | * Fixed test results after merging fix for bug #8068 "TIMEDIFF with firstdlenev@brandersnatch.localdomain2005-04-181-1/+2
| | * Manual merge of patch for bug #8068 "TIMEDIFF with first negativedlenev@mysql.com2005-04-183-110/+97
| | |\
| | | * Merge bk-internal.mysql.com:/home/bk/mysql-4.1dlenev@brandersnatch.localdomain2005-04-183-69/+108
| | | |\
| | | | * Fix for bug #8068 "TIMEDIFF with first negative argument gives wrong dlenev@brandersnatch.localdomain2005-03-283-69/+108
| | | * | Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1sergefp@mysql.com2005-04-173-2/+34
| | | |\ \
* | | | | | ha_innodb.cc:heikki@hundin.mysql.fi2005-04-181-1/+1
|/ / / / /
* | | | | Merge mysql.com:/usr/local/bk/mysql-5.0pem@mysql.com2005-04-183-2/+53
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Fixed BUG#9902: Crash with simple stored function using user defined variablespem@mysql.comhem.se2005-04-153-2/+53
* | | | | Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0joerg@mysql.com2005-04-180-0/+0
|\ \ \ \ \
| * \ \ \ \ Merge mysql.com:/M50/mysql-5.0 into mysql.com:/M50/clone-5.0.4-buildjoerg@mysql.com2005-04-180-0/+0
| |\ \ \ \ \
| | * | | | | mysql.server script fixed to use mysqld_safe by default + lots of minor addit...petr@mysql.com2005-04-162-21/+97
* | | | | | | Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0sergefp@mysql.com2005-04-172-0/+32
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Merge fix for BUG#9439 from 4.1sergefp@mysql.com2005-04-172-0/+32
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | |
| | * | | | | Fix for BUG#9439:sergefp@mysql.com2005-04-163-2/+34
* | | | | | | Merge mysql.com:/space/my/mysql-4.1-buildlenz@mysql.com2005-04-171-2/+1
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | / / | | |_|_|/ / | |/| | | |
| * | | | | Merge mysql.com:/space/my/mysql-4.0-buildlenz@mysql.com2005-04-171-2/+1
| |\ \ \ \ \
| | * | | | | - removed ReadMe.txt from CLEANFILES, as it's cleaned by Docs/Makefile.amlenz@mysql.com2005-04-171-2/+1
* | | | | | | Post-merge fixessergefp@mysql.com2005-04-173-0/+39
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1sergefp@mysql.com2005-04-173-0/+41
| |\ \ \ \ \ \
| | * | | | | | Fix for BUG#9348: when computing union of two intervals set lower bound to sergefp@mysql.com2005-04-173-0/+41
* | | | | | | | Merge mysql.com:/home/mydev/mysql-4.1-bug9188ingo@mysql.com2005-04-161-3/+16
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge mysql.com:/home/mydev/mysql-4.1-bug9487ingo@mysql.com2005-04-161-3/+16
| |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ Merge mysql.com:/home/mydev/mysql-4.1ingo@mysql.com2005-04-161-3/+16
| | |\ \ \ \ \ \ \ | | | |_|_|/ / / / | | |/| | | | | |
| | | * | | | | | Bug#9487 - myisampack segmentation violation and bus erroringo@mysql.com2005-04-151-3/+16
* | | | | | | | | Mergeingo@mysql.com2005-04-166-11/+88
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Merge mysql.com:/home/mydev/mysql-4.1ingo@mysql.com2005-04-164-10/+85
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| | * | | | | | | Merge mysql.com:/home/mydev/mysql-4.1ingo@mysql.com2005-04-154-10/+85
| | |\ \ \ \ \ \ \
| | | * | | | | | | Bug#9188 - Corruption Can't open file: 'table.MYI' (errno: 145)ingo@mysql.com2005-04-084-10/+85
| * | | | | | | | | Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/serg@serg.mylan2005-04-165-18/+24
| |\ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / | | |/| | | | | | |
| * | | | | | | | | Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/serg@serg.mylan2005-04-165-7/+59
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ mergedserg@serg.mylan2005-04-161-1/+0
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / / | | |/| | | | | | | |
| | * | | | | | | | | BUG#9922 - INSERT SELECT with UNIONs allows concurrent INSERTsserg@serg.mylan2005-04-152-1/+1
| | * | | | | | | | | Merge bk-internal:/home/bk/mysql-4.0/serg@serg.mylan2005-04-143-2/+8
| | |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.0lenz@mysql.com2005-04-141-13/+13
| | |\ \ \ \ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ \ \ \ Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/serg@serg.mylan2005-04-143-0/+5
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | |
| | * | | | | | | | | | | mergedserg@serg.mylan2005-04-143-0/+5
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / / / | | | |/| | | | | | | | |
| | | * | | | | | | | | | TRUNCATE is always a transaction on itself. pretent we're in auto-commit modeserg@serg.mylan2005-04-143-2/+8
* | | | | | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0monty@mishka.local2005-04-166-19/+99
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge rurik.mysql.com:/home/igor/mysql-5.0igor@rurik.mysql.com2005-04-156-19/+99
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | subselect.result, subselect.test:igor@rurik.mysql.com2005-04-153-0/+46
| | * | | | | | | | | | | | | subselect.result, subselect.test:igor@rurik.mysql.com2005-04-155-19/+53
* | | | | | | | | | | | | | | Set bindir, datadir & others if --basedir is given. This ensures that one onl...monty@mishka.local2005-04-161-9/+23
* | | | | | | | | | | | | | | Added more rows to test to get predictable resultsmonty@mishka.local2005-04-164-17/+73
* | | | | | | | | | | | | | | Merge with 4.1monty@mishka.local2005-04-168-18/+77
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / |/| | | | | | | | / / / / / / | | |_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | |