dlenev@mockturtle.local
8a5db3e974
Small adjustment after merging fix for bug#23651 "Server crashes when
...
trigger which uses stored function invoked from different connections"
into 5.1.
2006-11-13 14:30:12 +03: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
kostja@bodhi.local
f5d2077061
Merge bk-internal.mysql.com:/home/bk/mysql-5.0-runtime
...
into bodhi.local:/opt/local/work/mysql-5.1-runtime
2006-11-12 23:48:59 +03: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
joerg@trift2.
a19a5b5f03
Merge trift2.:/M50/mysql-5.0
...
into trift2.:/MySQL/M50/push-5.0
2006-11-10 20:24:05 +01:00
joerg@trift2.
ca06382435
Merge trift2.:/MySQL/M50/push-5.0
...
into trift2.:/MySQL/M51/push-5.1
2006-11-10 20:02:33 +01:00
tsmith@quadxeon.mysql.com
ce805aff3f
Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/50
...
into quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/51
2006-11-10 19:41:47 +01:00
tsmith@quadxeon.mysql.com
82b6712a27
Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1
...
into quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/51
2006-11-10 19:39:26 +01:00
tsmith@quadxeon.mysql.com
b2da711fbf
Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/50
2006-11-10 19:38:07 +01:00
joerg@trift2.
e47f753a85
Merge trift2.:/MySQL/M50/bug24023-5.0
...
into trift2.:/MySQL/M50/push-5.0
2006-11-10 19:11:26 +01:00
joerg@trift2.
32d9fdaa98
Merge trift2.:/MySQL/M41/push-4.1
...
into trift2.:/MySQL/M50/push-5.0
2006-11-10 19:07:52 +01:00
joerg@trift2.
743ab0c6a4
Merge trift2.:/MySQL/M41/bug17194-4.1
...
into trift2.:/MySQL/M41/push-4.1
2006-11-10 15:54:58 +01:00
joerg@trift2.
2ab3d0bfb4
Merge trift2.:/MySQL/M41/clone-4.1
...
into trift2.:/MySQL/M41/push-4.1
2006-11-10 15:52:53 +01:00
df@kahlann.erinye.com
a185c4f6ea
Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into kahlann.erinye.com:/home/df/mysql/build/mtr-4.1
2006-11-10 14:49:07 +01:00
df@kahlann.erinye.com
403ecf18c6
Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into kahlann.erinye.com:/home/df/mysql/build/mtr-5.0
2006-11-10 14:44:01 +01:00
df@kahlann.erinye.com
abd8eeaaa7
Merge kahlann.erinye.com:/home/df/mysql/build/mtr-5.0
...
into kahlann.erinye.com:/home/df/mysql/build/51
2006-11-10 13:27:50 +01:00
df@kahlann.erinye.com
59e33edf22
Merge kahlann.erinye.com:/home/df/mysql/build/mtr-4.1
...
into kahlann.erinye.com:/home/df/mysql/build/mtr-5.0
2006-11-10 13:14:21 +01:00
df@kahlann.erinye.com
f1764fa99f
add --report-features to mysql-test-run.pl
2006-11-10 13:12:08 +01:00
petr/cps@outpost.site
e06f74f9f9
Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into outpost.site:/home/cps/mysql/trees/4.1-runtime-bug9191
2006-11-10 15:05:38 +03:00
ted@ted.mysql.internal
1c8a6cfc37
Merge ted.mysql.internal:/home/ted/src/mysql/50-gca
...
into ted.mysql.internal:/home/ted/src/mysql/mysql-5.1-new-maint
2006-11-10 07:23:42 +03:00
ted@ted.mysql.internal
bc9ca699fb
Memory allocation bug fixed
2006-11-10 07:21:10 +03:00
kent@c-634072d5.010-2112-6f72651.cust.bredbandsbolaget.se
ef9f68a7c9
Merge mysql.com:/Users/kent/mysql/bk/lic/my51-lic
...
into mysql.com:/Users/kent/mysql/bk/mysql-5.1
2006-11-10 02:45:34 +01:00
kent@c-634072d5.010-2112-6f72651.cust.bredbandsbolaget.se
040f95494d
Merge mysql.com:/Users/kent/mysql/bk/lic/my50-lic
...
into mysql.com:/Users/kent/mysql/bk/lic/my51-lic
2006-11-10 02:36:29 +01:00
kent@mysql.com/c-634072d5.010-2112-6f72651.cust.bredbandsbolaget.se
54f6fc07b9
Merge mysql.com:/Users/kent/mysql/bk/lic/my50-lic
...
into mysql.com:/Users/kent/mysql/bk/mysql-5.0
2006-11-10 02:35:01 +01:00
kent@mysql.com/c-634072d5.010-2112-6f72651.cust.bredbandsbolaget.se
264beeff86
Merge mysql.com:/Users/kent/mysql/bk/lic/my41-lic
...
into mysql.com:/Users/kent/mysql/bk/lic/my50-lic
2006-11-10 02:28:31 +01:00
kent@mysql.com/c-634072d5.010-2112-6f72651.cust.bredbandsbolaget.se
f893128839
mysql-test-run.sh:
...
Added --force-restart pseudo server argument to shell version as well
2006-11-10 02:22:33 +01:00
joerg@trift2.
dce6efd035
mysql-test/install_test_db.sh
...
Adapt to the different path of the server program, if installation was by RPM.
Missing in the first changeset for bug#17194.
2006-11-09 17:43:31 +01:00
tsmith@quadxeon.mysql.com
8f92859ec6
Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1-maint
...
into quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/inno/51
2006-11-09 07:56:25 +01:00
tsmith@quadxeon.mysql.com
03d07ea337
Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/inno/50
...
into quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/inno/51
2006-11-09 05:25:45 +01:00
tsmith@quadxeon.mysql.com
e9b42a4b27
Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/inno/41
...
into quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/inno/50
2006-11-09 05:21:56 +01:00
tsmith@quadxeon.mysql.com
c2aca91b7f
This ChangeSet must be null-merged to 5.0. Applied innodb-4.1-ss33
...
Fixes:
- Bug #24089 : Race condition in fil_flush_file_spaces()
2006-11-09 05:03:35 +01:00
tsmith@quadxeon.mysql.com
f1e0cf9d28
This ChangeSet must be null-merged to 5.1. Applied innodb-5.0-ss982, -ss998, -ss1003
...
Fixes:
- Bug #15815 : Very poor performance with multiple queries running concurrently
- Bug #22868 : 'Thread thrashing' with > 50 concurrent conns under an upd-intensive workloadw
- Bug #23769 : Debug assertion failure with innodb_locks_unsafe_for_binlog
- Bug #24089 : Race condition in fil_flush_file_spaces()
2006-11-09 05:02:37 +01:00
tsmith@quadxeon.mysql.com
18080530d7
Applied innodb-5.1-ss1004
...
Fixes:
- Bug #15815 : Very poor performance with multiple queries running concurrently
- Bug #22868 : 'Thread thrashing' with > 50 concurrent conns under an upd-intensive workloadw
- Bug #24089 : Race condition in fil_flush_file_spaces()
2006-11-09 05:01:19 +01:00
tsmith@quadxeon.mysql.com
a77dde8635
Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/50
...
into quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/51
2006-11-09 00:54:21 +01:00
tsmith@quadxeon.mysql.com
41117b1226
Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/41
...
into quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/50
2006-11-09 00:53:22 +01:00
tsmith@quadxeon.mysql.com
246ec19117
Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/g41
...
into quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/41
2006-11-09 00:47:48 +01:00
tsmith@quadxeon.mysql.com
a7b142446f
Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/50
...
into quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/51
2006-11-09 00:38:34 +01:00
tsmith@quadxeon.mysql.com
9e3e6a7c0b
Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/g51
...
into quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/51
2006-11-09 00:28:31 +01:00
tsmith@quadxeon.mysql.com
f663ba45e5
Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/g50
...
into quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/50
2006-11-09 00:26:22 +01:00
msvensson@neptunus.(none)
d18ee2dee7
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
2006-11-09 00:17:52 +01:00
msvensson@neptunus.(none)
f032a223b7
Fix warnings and NetWare compile failure
2006-11-09 00:17:22 +01:00
msvensson@neptunus.(none)
feba324016
Merge bk-internal:/home/bk/mysql-5.1-new-maint
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
2006-11-08 23:24:43 +01:00