summaryrefslogtreecommitdiff
path: root/include
Commit message (Collapse)AuthorAgeFilesLines
* Implement some code review fixes for the fix for Bug#27430 kostja@bodhi.(none)2008-05-181-0/+3
| | | | "Crash in subquery code when in PS and table DDL changed after PREPARE"
* Merge bk-internal.mysql.com:/home/bk/mysql-5.1kostja@bodhi.(none)2008-04-191-1/+1
|\ | | | | | | into bodhi.(none):/opt/local/work/mysql-5.1-27430
| * Tentative implementation ofkostja@dipika.(none)2008-04-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | WL#4165 Prepared statements: validation WL#4166 Prepared statements: automatic re-prepare Fixes Bug#27430 Crash in subquery code when in PS and table DDL changed after PREPARE Bug#27690 Re-execution of prepared statement after table was replaced with a view crashes Bug#27420 A combination of PS and view operations cause error + assertion on shutdown The basic idea of the patch is to keep track of table metadata between prepared statement prepare and execute. If some table used in the statement has changed, the prepared statement is re-prepared before execution. See WL#4165 and WL#4166 contents and comments in the code for details of the implementation.
* | Merge bk-internal:/home/bk/mysql-5.1gkodinov/kgeorge@magare.gmz2008-03-3111-75/+260
|\ \ | | | | | | | | | into magare.gmz:/home/kgeorge/mysql/work/merge-build-5.1-bugteam
| * | Fixed problem with non-synchronous error listsgkodinov/kgeorge@magare.gmz2008-03-282-3/+13
| | | | | | | | | | | | | | | | | | in perror and handler descriptors (BUG#25177) Fixed problem of masking mysql error by system error in perror (BUG#23028)
| * | Merge a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-mainjani@a88-113-38-195.elisa-laajakaista.fi2008-03-2811-73/+248
| |\ \ | | |/ | |/| | | | into a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-marvel
| | * Merge a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-mainjani@a88-113-38-195.elisa-laajakaista.fi2008-03-2611-73/+248
| | |\ | | | | | | | | | | | | into a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-marvel
| | | * Merge a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-mainjani@a88-113-38-195.elisa-laajakaista.fi2008-03-132-6/+8
| | | |\ | | | | | | | | | | | | | | | into a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-marvel
| | | * \ Merge a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-mainjani@a88-113-38-195.elisa-laajakaista.fi2008-03-0711-73/+248
| | | |\ \ | | | | | | | | | | | | | | | | | | into a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-marvel
| | | | * \ Merge hynda.mysql.fi:/home/my/mysql-5.1-mainjani@hynda.mysql.fi2008-02-2711-73/+248
| | | | |\ \ | | | | | | | | | | | | | | | | | | | | | into hynda.mysql.fi:/home/my/mysql-5.1-marvel
| | | | | * | Fixed a previous patch.jani@hynda.mysql.fi2008-02-181-1/+3
| | | | | | |
| | | | | * | Merge hynda.mysql.fi:/home/my/mysql-5.1-mainjani@hynda.mysql.fi2008-02-1510-72/+245
| | | | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | into hynda.mysql.fi:/home/my/mysql-5.1-marvel
| | | | | | * \ Merge a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-mainjani@a88-113-38-195.elisa-laajakaista.fi2008-02-0810-71/+244
| | | | | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | into a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-marvel
| | | | | | | * \ Merge a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-mainjani@a88-113-38-195.elisa-laajakaista.fi2007-12-0710-71/+244
| | | | | | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-marvel
| | | | | | | | * \ Merge hynda.mysql.fi:/home/my/mysql-5.1-mainjani@hynda.mysql.fi2007-11-2610-74/+246
| | | | | | | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into hynda.mysql.fi:/home/my/mysql-5.1-marvel
| | | | | | | | | * \ Merge hynda.mysql.fi:/home/my/mysql-5.1-mainjani@hynda.mysql.fi2007-11-0810-74/+246
| | | | | | | | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into hynda.mysql.fi:/home/my/mysql-5.1-marvel
| | | | | | | | | | * | Fixes to merge between 5.1-main and 5.1-marveljani@hynda.mysql.fi2007-10-152-7/+9
| | | | | | | | | | | |
| | | | | | | | | | * | Moved a lot of old bug fixes and safe cleanups from Maria 5.1 tree to 5.1monty@mysql.com/narttu.mysql.fi2007-10-119-69/+239
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Reserver namespace and place in frm for TABLE_CHECKSUM and PAGE_CHECKSUM create options - Added syncing of directory when creating .frm files - Portability fixes - Added missing cast that could cause bugs - Code cleanups - Made some bit functions inline - Moved things out of myisam.h to my_handler.h to make them more accessable - Renamed some myisam variables and defines to make them more globaly usable (as they are used outside of MyISAM) - Fixed bugs in error conditions - Use compiler time asserts instead of run time - Fixed indentation HA_EXTRA_PREPARE_FOR_DELETE -> HA_EXTRA_PREPARE_FOR_DROP as the old name was wrong (Added a define for old value to ensure we don't break any old code) Added HA_EXTRA_PREPARE_FOR_RENAME as a signal for rename (before we used a DROP signal which is wrong) - Initialize error messages early to get better errors when mysqld or an engine fails to start - Fix windows bug that query_performance_frequency was not initialized if registry code failed - thread_stack -> my_thread_stack_size
* | | | | | | | | | | | Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.1gkodinov/kgeorge@magare.gmz2008-03-281-0/+31
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | into magare.gmz:/home/kgeorge/mysql/work/merge-5.1-bugteam
| * | | | | | | | | | | Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.1gkodinov/kgeorge@magare.gmz2008-03-281-0/+31
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into magare.gmz:/home/kgeorge/mysql/work/merge-5.1-bugteam
| | * | | | | | | | | | | Fix for Bug #27944 Filtering THD::client capabilitiesandrey@whirlpool.hristov.com2008-03-251-0/+31
| | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The server used to trust blindly information from the client about its capabilities. During the connection handshake the server sends information about what it supports and then the client sends back a set of capabilities which cover all of the server's or less. Before this changeset the server didn't check whether the flags sent by the client were valid for the server. For example, if the server doesn't support compressed protocol but the client does and sends that bit turned on, the server didn't check it. The change make the server code less error prone to problems related to the value of THD::client_capabilities. Clearly there is no vulnerability being fixed but this is a maintainenance fix to prevent misusage in the future.
* | | | | | | | | | | | Merge mysql.com:/misc/mysql/mysql-5.1tnurnberg@white.intern.koehntopp.de2008-03-272-4/+2
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/misc/mysql/mysql-5.1-opt
| * | | | | | | | | | | Merge host.loc:/home/uchum/work/mysql-5.1gshchepa/uchum@host.loc2008-03-272-4/+2
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into host.loc:/home/uchum/work/5.1-opt
| | * \ \ \ \ \ \ \ \ \ \ Merge magare.gmz:/home/kgeorge/mysql/autopush/B26461-5.0-optgkodinov/kgeorge@magare.gmz2008-03-212-4/+2
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | into magare.gmz:/home/kgeorge/mysql/work/B26461-5.1-opt
| | | * | | | | | | | | | Bug #26461: Intrinsic data type bool (1 byte) redefined to BOOL (4 bytes)gkodinov/kgeorge@macbook.gmz2008-03-212-4/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The bool data type was redefined to BOOL (4 bytes on windows). Removed the #define and fixed some of the warnings that were uncovered by this. Note that the fix also disables 2 warnings : 4800 : 'type' : forcing value to bool 'true' or 'false' (performance warning) 4805: 'operation' : unsafe mix of type 'type' and type 'type' in operation These warnings will be handled in a separate bug, as they are performance related or bogus. Fixed to int the return type of functions that return more than 2 distinct values.
* | | | | | | | | | | | | Merge trift2.:/MySQL/M51/mysql-5.1joerg@trift2.2008-03-272-71/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | into trift2.:/MySQL/M51/push-5.1
| * | | | | | | | | | | | Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1tsmith@rhel5-ia64-a.mysql.com2008-03-272-71/+5
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into rhel5-ia64-a.mysql.com:/data0/tsmith/build/51
| | * \ \ \ \ \ \ \ \ \ \ \ Merge trift2.:/MySQL/M51/mysql-5.1joerg@trift2.2008-03-252-71/+5
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | into trift2.:/MySQL/M51/push-5.1
| | | * | | | | | | | | | | Merge trift2.:/MySQL/M51/mysql-5.1joerg@trift2.2008-03-142-6/+8
| | | |\ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | into trift2.:/MySQL/M51/push-5.1
| | | * | | | | | | | | | | Merge trift2.:/MySQL/M51/mysql-5.1joerg@trift2.2008-03-052-71/+5
| | | |\ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|/ / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | into trift2.:/MySQL/M51/push-5.1
| | | | * | | | | | | | | | Merge alf.(none):/src/macro_bugs/my50-macro_bugsiggy@alf.(none)2008-02-281-2/+2
| | | | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into alf.(none):/src/macro_bugs/my51-macro_bugs
| | | | | * | | | | | | | | | Bug #24992 Enabling Shared Memory support on Windows x64 causes client to failiggy@alf.(none)2008-02-281-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Mistaken macro defintions cause mysys to read packets in the wrong order.
| | | | * | | | | | | | | | | Merge alf.(none):/src/macro_bugs/my50-macro_bugsiggy@alf.(none)2008-02-272-71/+5
| | | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / | | | | | | | | / / / / / / / | | | | | |_|_|/ / / / / / / | | | | |/| | | | | | | | | into alf.(none):/src/macro_bugs/my51-macro_bugs
| | | | | * | | | | | | | | Bug #23839 Multiple declarations of macrosiggy@alf.(none)2008-02-272-60/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Remove duplicate macro defintions.
* | | | | | | | | | | | | | Merge stella.local:/home2/mydev/mysql-5.1-amainistruewing@stella.local2008-03-261-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | into stella.local:/home2/mydev/mysql-5.1-axmrg
| * | | | | | | | | | | | | Merge stella.local:/home2/mydev/mysql-5.1-amainistruewing@stella.local2008-03-261-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | into stella.local:/home2/mydev/mysql-5.1-axmrg
| | * | | | | | | | | | | | Manual mergeistruewing@stella.local2008-03-142-6/+8
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|/ / / / / / / / | | | |/| | | | | | | | | |
| | * | | | | | | | | | | | Merge ↵antony@pcg5ppc.xiphis.org2008-03-071-1/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | pcg5ppc.xiphis.org:/Network/Servers/anubis.xiphis.org/home/antony/work/mysql-5.1-engines into pcg5ppc.xiphis.org:/Network/Servers/anubis.xiphis.org/home/antony/work/merge.20080307/mysql-5.1
| | | * | | | | | | | | | | Bug#34598acurtis/antony@xiphis.org/ltamd64.xiphis.org2008-02-191-1/+1
| | | | |_|_|_|/ / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "crash on hpita: Invalid address alignment" Replace dangerous pointer arithmetic - it may occurr where sizeof(int) is less than size of machine alignment requirement.
* | | | | | | | | | | | | Merge quad.opbmk:/mnt/raid/alik/MySQL/devel/5.1anozdrin/alik@quad.opbmk2008-03-252-7/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | into quad.opbmk:/mnt/raid/alik/MySQL/devel/5.1-rt-merged
| * | | | | | | | | | | | Merge mysql.com:/Users/davi/mysql/mysql-5.0-runtimedavi@endora.local2008-03-191-4/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/Users/davi/mysql/mysql-5.1-runtime
| | * | | | | | | | | | | | Bug#30960 processlist state '*** DEAD ***' on recent 5.0.48 windows buildsdavi@mysql.com/endora.local2008-03-191-4/+4
| | | |_|_|_|_|/ / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The problem is that unimplemented WIN32 version of pthread_kill is returning ESRCH no matter the arguments, causing calls to mysqld_list_processes to set the procinfo to dead because pthread_kill returns non zero. The dead procinfo would show up on a second invocation of show processlist.
| | * | | | | | | | | | | Merge bk@192.168.21.1:mysql-5.0-optholyfoot/hf@hfmain.(none)2008-02-271-0/+1
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/hf/work/25097/my50-25097
| | * | | | | | | | | | | Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.0-rplmkindahl@dl145h.mysql.com2008-01-301-0/+6
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into dl145h.mysql.com:/data0/mkindahl/mysql-5.0-rpl-merge
| * | \ \ \ \ \ \ \ \ \ \ \ Merge kpettersson@bk-internal.mysql.com:/home/bk/mysql-5.1-runtimethek@adventure.(none)2008-03-181-3/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | into adventure.(none):/home/thek/Development/cpp/mysql-5.1-runtime
| | * | | | | | | | | | | | Bug#25175 Too much memory used by MySQL grant systemthek@adventure.(none)2008-03-181-3/+4
| | | |_|_|/ / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Each time the server reloads privileges containing table grants, the system will allocate too much memory than needed because of badly chosen growth prediction in the underlying dynamic arrays. This patch introduces a new signature to the hash container initializer which enables a much more pessimistic approach in favour for more efficient memory useage. This patch was supplied by Google Inc.
* | | | | | | | | | | | | Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.1mkindahl@dl145h.mysql.com2008-03-142-6/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | into dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl
| * | | | | | | | | | | | Merge kaamos.(none):/data/src/mysql-5.1kaa@kaamos.(none)2008-03-122-6/+8
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | into kaamos.(none):/data/src/opt/mysql-5.1-opt
| | * | | | | | | | | | | Merge bk@192.168.21.1:mysql-5.1-optholyfoot/hf@hfmain.(none)2008-02-271-0/+1
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/hf/work/25097/my51-25097
| | | * \ \ \ \ \ \ \ \ \ \ Merge mysql.com:/home/hf/work/25097/my50-25097holyfoot/hf@hfmain.(none)2008-02-271-0/+1
| | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | |_|/ / / / / / / / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/hf/work/25097/my51-25097
View Lorry Controller Status