summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Fix for bug#4912 "mysqld crashs in case a statement is executedkonstantin@mysql.com2004-08-2117-261/+317
| | | | | | | | | | | | | | | | | | | | | | | | | a second time". The bug was caused by incompatibility of negations elimination algorithm and PS: during first statement execute a subtree with negation was replaced with equivalent subtree without NOTs. The problem was that although this transformation was permanent, items of the new subtree were created in execute-local memory. The patch adds means to check if it is the first execute of a prepared statement, and if this is the case, to allocate items in memory of the prepared statement. The implementation: - backports Item_arena from 5.0 - adds Item_arena::is_stmt_prepare(), Item_arena::is_first_stmt_execute(). - deletes THD::allocate_temporary_pool_for_ps_preparing(), THD::free_temporary_pool_for_ps_preparing(); they were redundant. and adds a few invariants: - thd->free_list never contains junk (= freed items) - thd->current_arena is never null. If there is no prepared statement, it points at the thd. The rest of the patch contains mainly mechanical changes and cleanups.
* Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1joreland@mysql.com2004-08-195-5/+28
|\ | | | | | | into mysql.com:/home/jonas/src/mysql-4.1
| * Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1bar@mysql.com2004-08-192-4/+4
| |\ | | | | | | | | | into mysql.com:/usr/home/bar/mysql-4.1
| | * Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1tomas@poseidon.(none)2004-08-192-4/+4
| | |\ | | | | | | | | | | | | into poseidon.(none):/home/tomas/mysql-4.1
| | | * Some platfom compile/build fixes for ndbtomas@poseidon.(none)2004-08-192-4/+4
| | | |
| * | | Bug#5081: UCS2 fields are filled with '0x2020' after extending field lengthbar@mysql.com2004-08-193-1/+24
| |/ /
* | | Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1joreland@mysql.com2004-08-191-1/+1
|\ \ \ | |/ / |/| | | | | into mysql.com:/home/jonas/src/mysql-4.1
| * | Set correct error codejoreland@mysql.com2004-08-191-1/+1
| | |
* | | field.cc:bar@mysql.com2004-08-191-1/+1
|/ / | | | | | | Serg's typo fix :)
* | Merge bk-internal.mysql.com:/home/bk/mysql-4.1/serg@serg.mylan2004-08-192-32/+54
|\ \ | | | | | | | | | into serg.mylan:/usr/home/serg/Abk/mysql-4.1
| * \ Merge gbichot@213.136.52.20:/home/bk/mysql-4.1guilhem@mysql.com2004-08-192-32/+54
| |\ \ | | |/ | |/| | | | into mysql.com:/home/mysql_src/mysql-4.1-874
| | * Very small API change: changing the values in enum enum_shutdown_level;guilhem@mysql.com2004-08-192-32/+54
| | | | | | | | | | | | | | | | | | | | | as this enum is not really usable yet (as MySQL server supports only one shutdown level), and as SHUTDOWN_DEFAULT is still left to 0, this change should disturb no user. Later (in 4.1.4 or 4.1.5) code will be pushed to implement graceful shutdown using this enum.
* | | after merge fixesserg@serg.mylan2004-08-1919-88/+98
| | |
* | | manually mergedserg@serg.mylan2004-08-18107-258/+995
|\ \ \ | |/ / |/| |
| * | Bug 4937: different date -> string conversion when usingserg@serg.mylan2004-08-184-41/+88
| | | | | | | | | | | | SELECT ... UNION and INSERT ... SELECT ... UNION
| * | Merge bk-internal:/home/bk/mysql-4.0/serg@serg.mylan2004-08-187-9/+78
| |\ \ | | | | | | | | | | | | into serg.mylan:/usr/home/serg/Abk/mysql-4.0
| | * | srv0start.c, ut0mem.c, ut0dbg.c, ut0dbg.h, srv0start.h:heikki@hundin.mysql.fi2004-08-187-9/+78
| | | | | | | | | | | | | | | | | | | | | | | | Changes for NetWare to exit the InnoDB gracefully instead of crashing the server (patch by PRam@novell.com, polished a little by Heikki Tuuri) mysqld.cc, ha_innodb.cc: Changes for NetWare to exit the InnoDB gracefully instead of crashing the server (patch by PRam@novell.com, polished a little by Heikki Tuuri)
| * | | use my_vsnprintf() just in caseserg@serg.mylan2004-08-181-1/+3
| |/ / | | | | | | | | | bug#4925
| * | Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0guilhem@mysql.com2004-08-171-1/+1
| |\ \ | | | | | | | | | | | | into mysql.com:/home/mysql_src/mysql-4.0
| | * | Fix for BUG#5073 "--disable-local-infile has no effect if client reads it ↵guilhem@mysql.com2004-08-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | with MYSQL_READ_DEFAULT": that was a forgotten '~' probably.
| * | | Merge heikki@build.mysql.com:/home/bk/mysql-4.0heikki@hundin.mysql.fi2004-08-172-4/+34
| |\ \ \ | | | | | | | | | | | | | | | into hundin.mysql.fi:/home/heikki/mysql-4.0
| | * | | A fix (bug #5055: SQL_SELECT_LIMIT=0 crashes command line client):ram@gw.mysql.r18.ru2004-08-171-4/+7
| | | | | | | | | | | | | | | | | | | | mysql outwits itself.
| | * | | A desperate attempt to comment one place where we do conversions.konstantin@mysql.com2004-08-161-0/+27
| | |/ /
| * | | Merge heikki@build.mysql.com:/home/bk/mysql-4.0heikki@hundin.mysql.fi2004-08-161-0/+24
| |\ \ \ | | |/ / | |/| | | | | | into hundin.mysql.fi:/home/heikki/mysql-4.0
| | * | row0mysql.c:heikki@hundin.mysql.fi2004-08-131-0/+24
| | | | | | | | | | | | | | | | Fix bug: if we RENAME a table, InnoDB forgot to load the foreign key constraints that reference the new table name, and forgot to check that they are compatible with the table
| * | | Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0guilhem@mysql.com2004-08-141-0/+1
| |\ \ \ | | | | | | | | | | | | | | | into mysql.com:/home/mysql_src/mysql-4.0
| | * | | Fix for BUG#5050 "mysql-test-run fails on rpl_trunc_binlog after 'make ↵guilhem@mysql.com2004-08-141-0/+1
| | |/ / | | | | | | | | | | | | | | | | | | | | install'": The binlog files we use for some tests must be installed like other mysql-test/std_data/ files.
| * | | - manual mergelenz@mysql.com2004-08-132-13/+9
| |\ \ \ | | |/ /
| | * | Escaping [] so that darwin[7-8] gets into 'configure' and not darwin7-8guilhem@mysql.com2004-08-132-4/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adding a compilation define so that on recent Darwin mysqld does not react to SIGHUP and SIGQUIT: this fixes a rpl000001 problem on our Powermac G5 machine (popping after an upgrade from 10.3.4 to 10.3.5) and is expected to fix BUG#2030 "relay bin log on slave resets multiple times a second" (i.e. under some Mac OS X Panther versions, mysqld receives many SIGHUP and SIGQUIT). So this fix is more a problem-hider than a real understanding of why mysqld receives so many signals. Note that we saw other problems on this OS where mysqld reacts to Ctrl-Z but apparently only once, where using SSL seems to make the problem more frequent...
| * | | Merge lgrimmer@build.mysql.com:/home/bk/mysql-4.0lenz@mysql.com2004-08-134-2/+98
| |\ \ \ | | |/ / | | | | | | | | into mysql.com:/space/my/mysql-4.0
| | * | Merge vvagin@bk-internal.mysql.com:/home/bk/mysql-4.0vva@eagle.mysql.r18.ru2004-08-133-1/+96
| | |\ \ | | | | | | | | | | | | | | | into eagle.mysql.r18.ru:/home/vva/work/BUG_4358/mysql-4.0
| | | * \ Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.0vva@eagle.mysql.r18.ru2004-08-133-1/+96
| | | |\ \ | | | | | | | | | | | | | | | | | | into eagle.mysql.r18.ru:/home/vva/work/BUG_4358/mysql-4.0
| | | | * | fixed Bug #4358 Problem with HAVING clause that uses aliasvva@eagle.mysql.r18.ru2004-08-123-1/+96
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | from the select list and TEXT field make setup_copy_fields to insert Item_copy_string for blobs in the beginning of the copy_funcs (push_back instead of push_front) the thing is that Item_copy_string::copy for function can call Item_copy_string::val_int for blob via Item_ref. But if Item_copy_string::copy for blob isn't called before, it's value will be wrong. So all the Item_copy_string::copy for blobs should be called before Item_copy_string::copy for functions.
| | * | | | Merge vvagin@bk-internal.mysql.com:/home/bk/mysql-4.0vva@eagle.mysql.r18.ru2004-08-131-1/+2
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | into eagle.mysql.r18.ru:/home/vva/work/BUG_4973/mysql-4.0
| | | * \ \ \ Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.0vva@eagle.mysql.r18.ru2004-08-131-1/+2
| | | |\ \ \ \ | | | | |/ / / | | | |/| | | | | | | | | | into eagle.mysql.r18.ru:/home/vva/work/BUG_4973/mysql-4.0
| | | | * | | fixed Bug #4973 Memory is not released when HEAP table is droppedvva@eagle.mysql.r18.ru2004-08-111-1/+2
| | | | |/ /
| * | | | | - portability fix for SCO Open Server 5.0.7 (thanks to Boyd Gerber)lenz@mysql.com2004-08-121-0/+1
| | | | | |
| * | | | | - Fixed two small version number issues in MySQL-shared-compat.speclenz@mysql.com2004-08-121-2/+2
| | | | | |
| * | | | | - giving a range does not work for platform detection in configure.inlenz@mysql.com2004-08-121-1/+10
| |/ / / / | | | | | | | | | | | | | | | - resorting to having to separate sections for darwin7 and darwin8
| * | | | Merge lgrimmer@build.mysql.com:/home/bk/mysql-4.0lenz@mysql.com2004-08-123-5/+48
| |\ \ \ \ | | | | | | | | | | | | | | | | | | into mysql.com:/space/my/mysql-4.0
| | * | | | Added initial sorting in order to make test case repeatable.ram@gw.mysql.r18.ru2004-08-121-0/+1
| | | | | |
| | * | | | Added initial sorting in order to make test case repeatable. ram@gw.mysql.r18.ru2004-08-121-0/+1
| | | | | |
| | * | | | Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.0ram@gw.mysql.r18.ru2004-08-123-5/+46
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | into gw.mysql.r18.ru:/usr/home/ram/work/4.0.b4898
| | | * | | | A test case (bug #4898: User privileges depending on ORDER BY Settings of ↵ram@gw.mysql.r18.ru2004-08-122-0/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | table db)
| | | * | | | A fix (Bug#4898: User privileges depending on ORDER BY Settings of table db)ram@gw.mysql.r18.ru2004-08-121-5/+13
| | | | | | |
| * | | | | | Merge mysql.com:/space/my/mysql-4.0lenz@mysql.com2004-08-129-16/+73
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | into mysql.com:/space/my/mysql-4.0-build
| | * | | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.0acurtis@pcgem.rdg.cyberkinetica.com2004-08-114-0/+26
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | into pcgem.rdg.cyberkinetica.com:/usr/home/acurtis/work/bug4411
| | | * | | | | Bug#4411acurtis@pcgem.rdg.cyberkinetica.com2004-08-114-0/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix for server hang bug
| | * | | | | | Merge bk-internal:/home/bk/mysql-4.0/serg@serg.mylan2004-08-115-16/+47
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | into serg.mylan:/usr/home/serg/Abk/mysql-4.0
| | | * | | | | | Bug #4797 - 32 bit and 64 bit builds behave differently on int32 overflowserg@serg.mylan2004-08-115-16/+47
| | | | | | | | |
View Lorry Controller Status