summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Bug #12717 yassl: Crashes in "integer.cpp" when compiled with iccmsvensson@neptunus.(none)2005-09-013-20/+38
| | | | - Temporary fix, disable x86 assembler.
* Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.0andrey@lmy004.wdf.sap.corp2005-08-165-6/+69
|\ | | | | | | into lmy004.wdf.sap.corp:/work/mysql-5.0-clean
| * fix for bug #12183 "SHOW OPEN TABLES behavior doesn't match grammar"andrey@lmy004.wdf.sap.corp2005-08-165-6/+69
| | | | | | | | (after review commit)
* | Manual mergeigor@rurik.mysql.com2005-08-152-0/+35
|\ \ | |/ |/|
| * subselect.result:igor@rurik.mysql.com2005-08-152-0/+3
| | | | | | | | | | | | Added missing drop statement subselect.test: Added missing drop statement.
| * sql_select.cc:igor@rurik.mysql.com2005-08-153-1/+33
| | | | | | | | | | | | | | | | | | | | Fixed bug #11479. The JOIN::reinit method cannot call setup_tables after the optimization phase since this function removes some optimization settings for joined tables. E.g. it resets values of the null_row flag to 0. subselect.result, subselect.test: Added a test case for bug #11479.
* | 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
|\ \ | | | | | | | | | into mysql.com:/home/jimw/my/mysql-5.0-clean
| * \ Merge mysql.com:/home/jimw/my/mysql-5.0-10627jimw@mysql.com2005-08-154-4/+60
| |\ \ | | | | | | | | | | | | into mysql.com:/home/jimw/my/mysql-5.0-clean
| | * | Generate a warning/error when DATE_SUB/ADD() functions calculate a datejimw@mysql.com2005-08-024-4/+60
| | | | | | | | | | | | | | | | that is outside the acceptable date range. (Bug #10627)
| * | | Merge mysql.com:/home/jimw/my/mysql-4.1-cleanjimw@mysql.com2005-08-1510-16/+48
| |\ \ \ | | | |/ | | |/| | | | | into mysql.com:/home/jimw/my/mysql-5.0-clean
| | * | Merge mysql.com:/home/jimw/my/mysql-4.1-11688jimw@mysql.com2005-08-153-2/+26
| | |\ \ | | | | | | | | | | | | | | | into mysql.com:/home/jimw/my/mysql-4.1-clean
| | | * | Fix mysql_info() returning bad data in the results of a multi-statementjimw@mysql.com2005-08-103-2/+26
| | | | | | | | | | | | | | | | | | | | query that mixed statements that do and do not return info. (Bug #11688)
| | * | | Merge mysql.com:/home/jimw/my/mysql-4.1-12235jimw@mysql.com2005-08-151-0/+8
| | |\ \ \ | | | | | | | | | | | | | | | | | | into mysql.com:/home/jimw/my/mysql-4.1-clean
| | | * | | Make sure to clean up temporary files in myisampack even when thejimw@mysql.com2005-08-121-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | -T option is used. (Bug #12235)
| | * | | | Merge mysql.com:/home/jimw/my/mysql-4.1-11796jimw@mysql.com2005-08-151-1/+5
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/jimw/my/mysql-4.1-clean
| | | * | | | Avoid problems on shutdown by shutting down replication slave threadsjimw@mysql.com2005-08-081-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | after normal connection threads. (Bug #11796)
| | * | | | | Merge mysql.com:/home/jimw/my/mysql-4.1-12327jimw@mysql.com2005-08-1518-55/+318
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/jimw/my/mysql-4.1-clean
| | | * | | | | 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
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/my/mysql-5.0
| | * | | | | | Bug#12518acurtis@xiphis.org2005-08-153-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "COLUMN_DEFAULT has wrong value if NOT NULL is set" Show NULL instead of empty string when no default value is set
| * | | | | | | Don't clear warnings for functions or triggersmonty@mysql.com2005-08-152-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed failing test
| * | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0monty@mysql.com2005-08-15108-2191/+4326
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | | | | | | | | | into mysql.com:/home/my/mysql-5.0
| | * | | | | | - Removed a non-fatal error when running the Mac OS X 10.4 PackageMaker:lenz@mysql.com2005-08-152-5/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CFBundleShortVersionString in Info.plist may not include a version suffix like "-beta" (BUG#12584) - Minor cleanup: removed two unused keys from Info.plist: IFMajorVersion and IFMinorVersion
| | * | | | | | Merge bk-internal:/home/bk/mysql-5.0serg@sergbook.mysql.com2005-08-154-4/+6
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | into sergbook.mysql.com:/usr/home/serg/Abk/mysql-5.0
| | | * | | | | | 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
| | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into sergbook.mysql.com:/usr/home/serg/Abk/mysql-5.0
| | | | * | | | | | client/mysql.ccserg@sergbook.mysql.com2005-08-142-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysql default port cleanup (it's set in libmysql.c, NOT in my_getopt) configure.in autoconf 2.52 is enough to build mysql-5.0
| | * | | | | | | | Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0evgen@moonbone.local2005-08-152-1/+2
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into moonbone.local:/work/mysql-5.0-bug-11864
| | | * \ \ \ \ \ \ \ Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0evgen@moonbone.local2005-08-152-1/+2
| | | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into moonbone.local:/work/mysql-5.0-bug-10802
| | | | * | | | | | | | Fix bug #10802 Index is not used if table using BDB engine on HP-UXevgen@moonbone.local2005-08-152-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | HP-UX compiler was generating code which makes wrong conversion from double to ulonglong which results in not using index in some cases. Changed type cast operators odrer with which generated code makes proper conversion.
| | * | | | | | | | | | Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0evgen@moonbone.local2005-08-157-33/+92
| | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | into moonbone.local:/work/mysql-5.0-bug-11864
| | | * | | | | | | | | Fix bug #11864 non unique names are allowed in subqueryevgen@moonbone.local2005-08-107-33/+92
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Column names weren't checked for uniqueness for subqueries. Code for names uniqueness checking used for view creation moved into separate function named check_duplicate_names(). It's called on preparation of subqueries to check uniqueness of names. If duplicate names are found then error is raised.
| | * | | | | | | | | | table.cc:sanja@hasky.mysql.fi2005-08-132-2/+7
| | | |_|/ / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | remove unneeded multitable_view assignment sql_view.cc: fix potential memorry overrun in ref_array asssign multitable_view in time of view creation (BUG#12569)
| | * | | | | | | | | Merge abelkin@bk-internal.mysql.com:/home/bk/mysql-5.0sanja@hasky.mysql.fi2005-08-137-53/+236
| | |\ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / | | |/| | | | | | | | | | | | | | | | | | | into hasky.mysql.fi:/home/sanja/work-merge-5.0
| | | * | | | | | | | item_subselect.cc:sanja@hasky.mysql.fi2005-08-132-20/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | postmerge fix subselect.result: new 5.0 result (postmerge)
| | | * | | | | | | | Merge abelkin@bk-internal.mysql.com:/home/bk/mysql-4.1sanja@hasky.mysql.fi2005-08-137-53/+228
| | | |\ \ \ \ \ \ \ \ | | | | | |_|_|/ / / / | | | | |/| | | | | | | | | | | | | | | | | into hasky.mysql.fi:/home/sanja/work-merge-5.0
| | | | * | | | | | | 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
| | | | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 50.0.168.192.in-addr.arpa:/Users/bell/mysql/bk/work-bug2-4.1
| | | | | * \ \ \ \ \ \ 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
| | | | | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 50.0.168.192.in-addr.arpa:/Users/bell/mysql/bk/work-bug2-4.1
| | | | | | * | | | | | | 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
| | | | | |_|_|_|_|_|/ / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't skip SET command even if --replicate-wild* says to. E.g., SET ONE_SHOT TIME_ZONE = 'XYZ' should be executed (BUG #12542)
| | | | * | | | | | | | Merge mysql.com:/space/my/mysql-4.1lenz@mysql.com2005-08-124-7/+16
| | | | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/space/my/mysql-4.1-merge
| | * | | | | | | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now we keep all active XID's in a hash
| | | * | | | | | | | | | 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
| | | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into serg.mylan:/usr/home/serg/Abk/mysql-5.0
| | | | * | | | | | | | | | log_event.h:serg@serg.mylan2005-08-061-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | extra safety for OPTIONS_WRITTEN_TO_BIN_LOG
| | | | * | | | | | | | | | Merge bk-internal:/home/bk/mysql-5.0serg@serg.mylan2005-07-312-7/+5
| | | | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into serg.mylan:/usr/home/serg/Abk/mysql-5.0
View Lorry Controller Status