summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Bug #12717 yassl: Crashes in "integer.cpp" when compiled with iccmsvensson@neptunus.(none)2005-09-013-20/+38
* Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.0andrey@lmy004.wdf.sap.corp2005-08-165-6/+69
|\
| * fix for bug #12183 "SHOW OPEN TABLES behavior doesn't match grammar"andrey@lmy004.wdf.sap.corp2005-08-165-6/+69
* | Manual mergeigor@rurik.mysql.com2005-08-152-0/+35
|\ \ | |/ |/|
| * subselect.result:igor@rurik.mysql.com2005-08-152-0/+3
| * sql_select.cc:igor@rurik.mysql.com2005-08-153-1/+33
* | Clean up merge from 4.1jimw@mysql.com2005-08-154-4/+18
* | Merge mysql.com:/home/jimw/my/mysql-5.0-12318jimw@mysql.com2005-08-15147-2577/+5383
|\ \
| * \ Merge mysql.com:/home/jimw/my/mysql-5.0-10627jimw@mysql.com2005-08-154-4/+60
| |\ \
| | * | Generate a warning/error when DATE_SUB/ADD() functions calculate a datejimw@mysql.com2005-08-024-4/+60
| * | | Merge mysql.com:/home/jimw/my/mysql-4.1-cleanjimw@mysql.com2005-08-1510-16/+48
| |\ \ \ | | | |/ | | |/|
| | * | Merge mysql.com:/home/jimw/my/mysql-4.1-11688jimw@mysql.com2005-08-153-2/+26
| | |\ \
| | | * | Fix mysql_info() returning bad data in the results of a multi-statementjimw@mysql.com2005-08-103-2/+26
| | * | | Merge mysql.com:/home/jimw/my/mysql-4.1-12235jimw@mysql.com2005-08-151-0/+8
| | |\ \ \
| | | * | | Make sure to clean up temporary files in myisampack even when thejimw@mysql.com2005-08-121-0/+8
| | * | | | Merge mysql.com:/home/jimw/my/mysql-4.1-11796jimw@mysql.com2005-08-151-1/+5
| | |\ \ \ \
| | | * | | | Avoid problems on shutdown by shutting down replication slave threadsjimw@mysql.com2005-08-081-1/+5
| | * | | | | Merge mysql.com:/home/jimw/my/mysql-4.1-12327jimw@mysql.com2005-08-1518-55/+318
| | |\ \ \ \ \
| | | * | | | | BUG#12542: Prevous patch was incorrect. This removed the patch.lars@mysql.com2005-08-151-9/+4
| | * | | | | | Rename rest() macro in my_list.h to list_rest(). (Bug #12327)jimw@mysql.com2005-08-094-4/+5
| | | |_|_|/ / | | |/| | | |
| * | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0monty@mysql.com2005-08-153-0/+20
| |\ \ \ \ \ \
| | * | | | | | Bug#12518acurtis@xiphis.org2005-08-153-0/+20
| * | | | | | | Don't clear warnings for functions or triggersmonty@mysql.com2005-08-152-3/+4
| * | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0monty@mysql.com2005-08-15108-2191/+4326
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | - Removed a non-fatal error when running the Mac OS X 10.4 PackageMaker:lenz@mysql.com2005-08-152-5/+2
| | * | | | | | Merge bk-internal:/home/bk/mysql-5.0serg@sergbook.mysql.com2005-08-154-4/+6
| | |\ \ \ \ \ \
| | | * | | | | | forgotten 'return'serg@sergbook.mysql.com2005-08-142-2/+4
| | | * | | | | | Merge bk-internal:/home/bk/mysql-5.0serg@sergbook.mysql.com2005-08-142-2/+2
| | | |\ \ \ \ \ \
| | | | * | | | | | client/mysql.ccserg@sergbook.mysql.com2005-08-142-2/+2
| | * | | | | | | | Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0evgen@moonbone.local2005-08-152-1/+2
| | |\ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0evgen@moonbone.local2005-08-152-1/+2
| | | |\ \ \ \ \ \ \ \
| | | | * | | | | | | | Fix bug #10802 Index is not used if table using BDB engine on HP-UXevgen@moonbone.local2005-08-152-1/+2
| | * | | | | | | | | | Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0evgen@moonbone.local2005-08-157-33/+92
| | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | | |/| | | | | | | | |
| | | * | | | | | | | | Fix bug #11864 non unique names are allowed in subqueryevgen@moonbone.local2005-08-107-33/+92
| | * | | | | | | | | | table.cc:sanja@hasky.mysql.fi2005-08-132-2/+7
| | | |_|/ / / / / / / | | |/| | | | | | | |
| | * | | | | | | | | Merge abelkin@bk-internal.mysql.com:/home/bk/mysql-5.0sanja@hasky.mysql.fi2005-08-137-53/+236
| | |\ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / | | |/| | | | | | | |
| | | * | | | | | | | item_subselect.cc:sanja@hasky.mysql.fi2005-08-132-20/+28
| | | * | | | | | | | Merge abelkin@bk-internal.mysql.com:/home/bk/mysql-4.1sanja@hasky.mysql.fi2005-08-137-53/+228
| | | |\ \ \ \ \ \ \ \ | | | | | |_|_|/ / / / | | | | |/| | | | | |
| | | | * | | | | | | Merge 50.0.168.192.in-addr.arpa:/Users/bell/mysql/bk/mysql-4.1bell@50.0.168.192.in-addr.arpa2005-08-136-41/+220
| | | | |\ \ \ \ \ \ \
| | | | | * \ \ \ \ \ \ Merge 50.0.168.192.in-addr.arpa:/Users/bell/mysql/bk/mysql-4.1bell@50.0.168.192.in-addr.arpa2005-08-136-41/+220
| | | | | |\ \ \ \ \ \ \
| | | | | | * | | | | | | fixed convertion and handling IN subqueries with rows (BUG#11867)bell@50.0.168.192.in-addr.arpa2005-08-136-41/+220
| | | | * | | | | | | | | sql_parse.cc:tsmith@.mysql.com2005-08-131-4/+9
| | | | | |_|_|_|_|_|/ / | | | | |/| | | | | | |
| | | | * | | | | | | | Merge mysql.com:/space/my/mysql-4.1lenz@mysql.com2005-08-124-7/+16
| | | | |\ \ \ \ \ \ \ \
| | * | | | | | | | | | | after mergeserg@sergbook.mysql.com2005-08-131-1/+1
| | * | | | | | | | | | | mergedserg@sergbook.mysql.com2005-08-1214-106/+224
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / | | |/| | | | | | | | | |
| | | * | | | | | | | | | BUG#12162 - one can start two transactions with the same XID.serg@sergbook.mysql.com2005-08-1211-93/+211
| | | * | | | | | | | | | void handler::print_error(): cleanupserg@serg.mylan2005-08-081-6/+4
| | | * | | | | | | | | | Merge bk-internal:/home/bk/mysql-5.0serg@serg.mylan2005-08-063-7/+9
| | | |\ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | log_event.h:serg@serg.mylan2005-08-061-0/+4
| | | | * | | | | | | | | | Merge bk-internal:/home/bk/mysql-5.0serg@serg.mylan2005-07-312-7/+5
| | | | |\ \ \ \ \ \ \ \ \ \