msvensson@neptunus.(none)
589ccae74c
Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-11-14 09:43:30 +01:00
msvensson@neptunus.(none)
94ea2ef88c
Fix "make dist"
2006-11-14 09:42:01 +01:00
msvensson@neptunus.(none)
48ad8c53ce
Merge bk-internal:/home/bk/mysql-5.0-maint
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-11-14 09:18:46 +01:00
malff/marcsql@weblab.(none)
429b0e6c0f
Bug#23703 (DROP TRIGGER needs an IF EXISTS)
...
This change set implements the DROP TRIGGER IF EXISTS functionality.
This fix is considered a bug and not a feature, because without it,
there is no known method to write a database creation script that can create
a trigger without failing, when executed on a database that may or may not
contain already a trigger of the same name.
Implementing this functionality closes an orthogonality gap between triggers
and stored procedures / stored functions (which do support the DROP IF
EXISTS syntax).
In sql_trigger.cc, in mysql_create_or_drop_trigger,
the code has been reordered to:
- perform the tests that do not depend on the file system (access()),
- get the locks (wait_if_global_read_lock, LOCK_open)
- call access()
- perform the operation
- write to the binlog
- unlock (LOCK_open, start_waiting_global_read_lock)
This is to ensure that all the code that depends on the presence of the
trigger file is executed in the same critical section,
and prevents race conditions similar to the case fixed by Bug 14262 :
- thread 1 executes DROP TRIGGER IF EXISTS, access() returns a failure
- thread 2 executes CREATE TRIGGER
- thread 2 logs CREATE TRIGGER
- thread 1 logs DROP TRIGGER IF EXISTS
The patch itself is based on code contributed by the MySQL community,
under the terms of the Contributor License Agreement (See Bug 18161).
2006-11-13 15:40:22 -07:00
msvensson@neptunus.(none)
39d1a2425b
Merge bk-internal:/home/bk/mysql-5.1-new-maint
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
2006-11-13 21:21:38 +01:00
msvensson@neptunus.(none)
d54846ab3e
Modify search path for mysql_client_test to look in "bin" not to look for "bin",
...
this caused mysql_client_test to fail when running from binary dist
2006-11-13 20:44:22 +01:00
cmiller@zippy.cornsilk.net
fbfeccfe91
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug18761/my51-bug18761
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
2006-11-13 13:19:49 -05:00
cmiller@zippy.cornsilk.net
ff26bf49c8
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug18761/my50-bug18761
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
2006-11-13 13:19:13 -05:00
msvensson@neptunus.(none)
0b60b7d59a
Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-11-13 19:19:02 +01:00
cmiller@zippy.cornsilk.net
6d97850c3b
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug18761/my50-bug18761
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/bug18761/my51-bug18761
2006-11-13 13:17:02 -05:00
cmiller@zippy.cornsilk.net
8471897fbc
Bug#18761: constant expression as UDF parameters not passed in as constant
...
The code that set up data to be passed to user-defined functions was very
old and analyzed the "Type" of the data that was passed into the UDF, when
it really should analyze the "return_type", which is hard-coded for simple
Items and works correctly for complex ones like functions.
---
Added test at Sergei's behest.
2006-11-13 13:13:44 -05:00
msvensson@neptunus.(none)
29d1e3230b
Use mysql-test-run.pl
2006-11-13 19:12:34 +01:00
msvensson@neptunus.(none)
430b493806
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
2006-11-13 18:02:09 +01:00
lars@black.(none)
07ac3d3a95
Merge mysql.com:/home/bk/MERGE/mysql-5.0-merge
...
into mysql.com:/home/bk/MERGE/mysql-5.1-merge
2006-11-13 17:59:51 +01:00
lars@mysql.com/black.(none)
7aa562ad20
Merge mysql.com:/home/bk/MERGE/mysql-4.1-merge
...
into mysql.com:/home/bk/MERGE/mysql-5.0-merge
2006-11-13 17:54:01 +01:00
msvensson@neptunus.(none)
91518b335e
Expect the file "have_mysql_upgrade.result" to contain the
...
result from "require mysql_upgrade"
2006-11-13 16:55:05 +01:00
msvensson@neptunus.(none)
bf8a9e544c
Merge bk-internal:/home/bk/mysql-5.0-maint
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-11-13 16:39:44 +01:00
andrey@example.com
9bfc5f5772
give a bit more time for the execution of the events
2006-11-13 15:28:23 +01:00
gkodinov/kgeorge@rakia.gmz
e347eb1995
Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-4.1-opt
...
into rakia.gmz:/home/kgeorge/mysql/autopush/B19216-4.1-opt
2006-11-13 15:40:19 +02:00
gkodinov/kgeorge@macbook.gmz
cd7613b265
merge 4.1->5.0 of the test suite for bug 19216
2006-11-13 15:37:04 +02:00
msvensson@neptunus.(none)
00a34629ef
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
2006-11-13 13:41:13 +01:00
msvensson@neptunus.(none)
5687847387
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint-mysql_upgrade
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-11-13 13:40:37 +01:00
msvensson@neptunus.(none)
5110d91ec3
Make it possible for .test suites to run "mysql_upgrade"
...
Add new test file mysql_upgrade.test
2006-11-13 13:39:49 +01:00
msvensson@neptunus.(none)
4efc0f8ef4
Merge bk-internal:/home/bk/mysql-5.1-new-maint
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
2006-11-13 13:38:33 +01:00
msvensson@neptunus.(none)
10d4ecfbe6
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
2006-11-13 13:36:50 +01:00
msvensson@neptunus.(none)
3eff32965d
Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-11-13 13:33:33 +01:00
mskold/marty@mysql.com/linux.site
4acc1af12c
bug#21507 I can't create a unique hash index in NDB: Added possibillity to create hash only indexes with NULL valued attributes, but any NULL valued access will become full table scan with pushed condition on index attribute values. 5.1 re-implementation
2006-11-13 12:56:45 +01:00
lars@black.(none)
63c906f749
Merge mysql.com:/home/bkroot/mysql-5.1-new-rpl
...
into mysql.com:/home/bk/MERGE/mysql-5.1-merge
2006-11-13 12:45:31 +01:00
lars@mysql.com/black.(none)
c5d56416ba
Merge mysql.com:/home/bkroot/mysql-5.0-rpl
...
into mysql.com:/home/bk/MERGE/mysql-5.0-merge
2006-11-13 12:44:53 +01:00
lars@mysql.com/black.(none)
de01754c19
Merge mysql.com:/home/bkroot/mysql-4.1-rpl
...
into mysql.com:/home/bk/MERGE/mysql-4.1-merge
2006-11-13 12:44:24 +01:00
msvensson@neptunus.(none)
716621db3f
Make --mem a pure flag. If there is need to specifically set the location
...
use MTR_MEM environment variable
2006-11-13 12:44:12 +01:00
aelkin/elkin@dsl-hkibras-fe30f900-107.dhcp.inet.fi
7b0eb936d1
Merge aelkin@bk-internal.mysql.com:/home/bk/mysql-5.1-rpl
...
into dsl-hkibras-fe30f900-107.dhcp.inet.fi:/home/elkin/MySQL/TEAM/FIXES/merge_50
2006-11-13 12:45:47 +02:00
gkodinov/kgeorge@macbook.gmz
9a41822bdd
Bug #19216 : Client crashes on long SELECT
...
The server sends a number of columns to the client.
It uses a limited "fast" function for that instead of the
general one. This fast function cannot send numbers larger
than 2 bytes.
This causes the client to expect smaller number of columns.
The client writes outside of the allocated memory buffer
as a result.
Fixed the server to use the general function to send column
count.
Fixed the client to check the column count before writing
column data.
2006-11-13 12:28:55 +02:00
dlenev@mockturtle.local
d8aad85fe9
Merge mockturtle.local:/home/dlenev/src/mysql-5.0-bg23651
...
into mockturtle.local:/home/dlenev/src/mysql-5.1-merge
2006-11-13 11:29:40 +03:00
dlenev@mockturtle.local
6fd6e099c9
Merge bk-internal.mysql.com:/home/bk/mysql-5.0-runtime
...
into mockturtle.local:/home/dlenev/src/mysql-5.0-bg23651
2006-11-13 11:15:02 +03:00
dlenev@mockturtle.local
dd1a4f5742
Fix for bug bug#23651 "Server crashes when trigger which uses
...
stored function invoked from different connections".
Invocation of trigger which was using stored function from different
connections caused server crashes (for non-debug server this happened
in highly concurrent environment, but debug server failed on assertion
in relatively simple scenario).
Item_func_sp was not safe to use in triggers (in other words for
re-execution from different threads) as artificial TABLE object
pointed by Item_func_sp::dummy_table referenced incorrect THD
object. To fix the problem we force re-initialization of this
object for each re-execution of statement.
2006-11-13 11:10:49 +03:00
istruewing@chilla.local
502912b8d7
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
...
into chilla.local:/home/mydev/mysql-5.1-axmrg
2006-11-12 14:15:01 +01:00
kostja@bodhi.local
c1f0ef538a
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
...
into bodhi.local:/opt/local/work/mysql-5.1-runtime
2006-11-12 10:56:10 +03:00
kostja@bodhi.local
0f455a81dc
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into bodhi.local:/opt/local/work/mysql-5.0-runtime
2006-11-12 10:55:33 +03:00
kent@c-634072d5.010-2112-6f72651.cust.bredbandsbolaget.se
746ece99e0
Merge mysql.com:/Users/kent/mysql/bk/mysql-5.0
...
into mysql.com:/Users/kent/mysql/bk/mysql-5.1
2006-11-11 14:46:06 +01:00
kent@mysql.com/c-634072d5.010-2112-6f72651.cust.bredbandsbolaget.se
1319f3552c
Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1
...
into mysql.com:/Users/kent/mysql/bk/mysql-5.0
2006-11-11 14:32:10 +01:00
kent@mysql.com/c-634072d5.010-2112-6f72651.cust.bredbandsbolaget.se
cddbb0f817
mysql-test-run.pl:
...
Test for base directory when a RPM install corrected
2006-11-11 14:12:30 +01:00
kostja@bodhi.local
de170fb332
Merge bodhi.local:/opt/local/work/mysql-5.0-runtime
...
into bodhi.local:/opt/local/work/mysql-5.1-runtime
2006-11-11 14:59:14 +03:00
kostja@bodhi.local
0cdaa7c138
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into bodhi.local:/opt/local/work/mysql-5.0-runtime
2006-11-11 14:51:19 +03:00
iggy@rolltop.ignatz42.dyndns.org
3488f21817
Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/mtr_winfix/my41-mtr_winfix
...
into rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-4.1-maint
2006-11-10 15:53:34 -05:00
iggy@rolltop.ignatz42.dyndns.org
b808c8e829
Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/mtr_winfix/my50-mtr_winfix
...
into rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-5.0-maint
2006-11-10 15:52:49 -05:00
iggy@rolltop.ignatz42.dyndns.org
09d305e0b9
Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/mtr_winfix/my50-mtr_winfix
...
into rolltop.ignatz42.dyndns.org:/mnt/storeage/mtr_winfix/my51-mtr_winfix
2006-11-10 15:50:04 -05:00
iggy@rolltop.ignatz42.dyndns.org
82ad2e5e92
Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/mtr_winfix/my41-mtr_winfix
...
into rolltop.ignatz42.dyndns.org:/mnt/storeage/mtr_winfix/my50-mtr_winfix
2006-11-10 15:49:10 -05:00
iggy@rolltop.ignatz42.dyndns.org
73ff367be3
Test Suite failing on Windows because the $opt_report_features variable was not defined before use.
2006-11-10 15:47:11 -05:00
cmiller@zippy.cornsilk.net
501c11cfc5
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-maint
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
2006-11-10 14:51:01 -05:00