df@kahlann.erinye.com
064b77a890
Merge kahlann.erinye.com:/home/df/mysql/build/mysql-5.1-build-work1-testcases-20061
...
into kahlann.erinye.com:/home/df/mysql/build/mysql-5.1-build-work
2007-01-22 16:37:27 +01:00
df@kahlann.erinye.com
9ed4299e22
Merge kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-work1-testcases-20061
...
into kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-work
2007-01-22 16:35:36 +01:00
df@kahlann.erinye.com
1b8b33bf83
Merge kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-work-24780
...
into kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-work
2007-01-22 16:34:22 +01:00
df@kahlann.erinye.com
5fe6fc1d2f
Merge kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build-work-24780
...
into kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build-work
2007-01-22 16:33:37 +01:00
df@kahlann.erinye.com
c124372550
after-merge fix
2007-01-22 16:32:57 +01:00
df@kahlann.erinye.com
58bf072264
Merge kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build-work1-testcases-20061
...
into kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build-work
2007-01-22 16:30:53 +01:00
svoj@mysql.com/june.mysql.com
afaebb6d62
BUG#24401 - MySQL server crashes if you try to retrieve data from
...
corrupted table
Accessing a table with corrupted column definition results in server
crash.
This is fixed by refusing to open such tables. Affects MyISAM only.
No test case, since it requires crashed table.
2007-01-22 16:34:58 +04:00
df@kahlann.erinye.com
02bfa163f0
Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.0-build
...
into kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build
2007-01-22 12:46:38 +01:00
joerg@trift2.
9e46e0aa74
Merge trift2.:/MySQL/M50/mysql-5.0
...
into trift2.:/MySQL/M50/push-5.0
2007-01-22 10:32:22 +01:00
brian@zim.(none)
b2bfd35378
Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-arch
...
into zim.(none):/home/brian/mysql/archive-newformat-5.1
2007-01-21 11:43:37 -08:00
brian@zim.(none)
068d7c8203
Just adding support for a "minor" version number.
2007-01-21 11:41:00 -08:00
baker@bk-internal.mysql.com
42345b83c3
Merge bk-internal.mysql.com:/data0/bk/mysql-5.1
...
into bk-internal.mysql.com:/data0/bk/mysql-5.1-arch
2007-01-21 02:21:23 +01:00
brian@zim.(none)
4b58f41481
Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-arch
...
into zim.(none):/home/brian/mysql/archive-newformat-5.1
2007-01-20 17:21:22 -08:00
brian@zim.(none)
dee24c66ba
1) New dirty state for files (need this for longterm fast recovery)
...
2) We now store shortest and longest row information.
3) archive_reader can now check and backup files (even if they are hot)
4) We now record longest and shortest row information for stats.
2007-01-20 17:19:54 -08:00
cmiller@zippy.cornsilk.net
02bed038bb
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint-topush
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint-topush
2007-01-20 09:34:01 -05:00
dlenev@mockturtle.local
92704745f7
Merge bk-internal.mysql.com:/home/bk/mysql-5.0-runtime
...
into mockturtle.local:/home/dlenev/src/mysql-5.0-bg25044
2007-01-20 14:10:20 +03:00
dlenev@mockturtle.local
8f23e65b00
Fixed test case for bug #25044 "ALTER TABLE ... ENABLE KEYS acquires
...
global 'opening tables' lock." after merging it into 5.1 tree.
2007-01-20 14:08:53 +03:00
jonas@perch.ndb.mysql.com
68efcc062b
Merge perch.ndb.mysql.com:/home/jonas/src/51-work
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
2007-01-20 03:02:39 +01:00
jonas@perch.ndb.mysql.com
162aa18e15
ndb - Fix bug when sending NODE_VERSION_REP
2007-01-20 03:01:37 +01:00
dlenev@mockturtle.local
83bcfa2541
Merge mockturtle.local:/home/dlenev/src/mysql-5.0-bg25044
...
into mockturtle.local:/home/dlenev/src/mysql-5.1-bg25044
2007-01-19 23:23:45 +03:00
dlenev@mockturtle.local
7b1a94ef78
Fix for bug #25044 "ALTER TABLE ... ENABLE KEYS acquires global 'opening
...
tables' lock."
Execution of ALTER TABLE ... ENABLE KEYS on a table (which can take rather
long time) prevented concurrent execution of all statements using tables.
The problem was caused by the fact that we were holding LOCK_open mutex
during whole duration of this statement and particularly during call
to handler::enable_indexes(). This behavior was introduced as part of the
fix for bug 14262 "SP: DROP PROCEDURE|VIEW (maybe more) write to binlog
too late (race cond)"
The patch simply restores old behavior. Note that we can safely do this as
this operation takes exclusive lock (similar to name-lock) which blocks both
DML and DDL on the table being altered.
It also introduces mysql-test/include/wait_show_pattern.inc helper script
which is used to make test-case for this bug robust enough.
2007-01-19 23:15:59 +03:00
iggy@recycle.(none)
205f7a0583
Merge recycle.(none):/src/bug22807/my50-bug22807
...
into recycle.(none):/src/mysql-5.0-maint
2007-01-19 13:20:52 -05:00
iggy@recycle.(none)
0343fd801c
Merge recycle.(none):/src/bug22807/my51-bug22807
...
into recycle.(none):/src/mysql-5.1-maint
2007-01-19 13:19:12 -05:00
iggy@recycle.(none)
d6d5195cbd
Merge recycle.(none):/src/bug22807/my50-bug22807
...
into recycle.(none):/src/bug22807/my51-bug22807
2007-01-19 13:11:03 -05:00
iggy@recycle.(none)
d3e6cb6b3b
Bug#22807 mysql_upgrade fails when called with a basedir-path containing spaces
...
- Corrected compiler warnings and performance problems with new
dynstr_append_os_quoted function.
2007-01-19 13:09:48 -05:00
jonas@perch.ndb.mysql.com
9bef4afe9f
Merge perch.ndb.mysql.com:/home/jonas/src/51-work
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
2007-01-19 19:00:12 +01:00
kroki/tomash@moonlight.home
6b19250759
Merge moonlight.home:/home/tomash/src/mysql_ab/mysql-5.1
...
into moonlight.home:/home/tomash/src/mysql_ab/mysql-5.1-bug25211
2007-01-19 20:04:05 +03:00
cmiller@zippy.cornsilk.net
80e1798521
Add missing version delimiter.
2007-01-19 11:30:40 -05:00
cmiller@zippy.cornsilk.net
aaa7257b02
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
2007-01-19 11:10:38 -05:00
jonas@perch.ndb.mysql.com
372cbc1def
ndb - bug#19645
...
fix some more sp100 hang cases
2007-01-19 17:01:52 +01:00
kroki/tomash@moonlight.home
68a4db3503
BUG#25211: events_bugs.test fails on sapsrv1
...
The problem was that the events_bugs test could randomly fail due to
races in the test case.
The solution is to replace fixed sleeps with reliable polling of a
certain state to settle. For that, a new auxiliary script
include/wait_condition.inc is used, that allows waiting for a given
query to return true.
2007-01-19 18:33:48 +03:00
cmiller@zippy.cornsilk.net
20faa77a5f
Rearrange disable_warnings to enclose the warning emitters properly.
2007-01-19 10:33:07 -05:00
jonas@perch.ndb.mysql.com
1c62054244
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
2007-01-19 15:05:28 +01:00
cmiller@zippy.cornsilk.net
e297ac6699
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
2007-01-19 09:03:32 -05:00
jonas@perch.ndb.mysql.com
c8f5f7483b
Merge perch.ndb.mysql.com:/home/jonas/src/51-work
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
2007-01-19 15:02:29 +01:00
jonas@perch.ndb.mysql.com
31824a1329
Merge perch.ndb.mysql.com:/home/jonas/src/50-work
...
into perch.ndb.mysql.com:/home/jonas/src/51-work
2007-01-19 15:00:49 +01:00
cmiller@zippy.cornsilk.net
85eb07ff98
Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
2007-01-19 08:56:33 -05:00
cmiller@zippy.cornsilk.net
a8ff939d83
The rpl tree added a test case, and another source added a warning,
...
and combined, they add a platform-specific warning. The warnings
are not the goal of the test, in any case.
2007-01-19 08:56:06 -05:00
istruewing@chilla.local
2a0ca5df8c
Merge chilla.local:/home/mydev/mysql-5.0-bug24607
...
into chilla.local:/home/mydev/mysql-5.1-bug24607
2007-01-19 13:08:09 +01:00
istruewing@chilla.local
8b77bd979d
After merge fix
2007-01-19 13:06:22 +01:00
kaa@polly.local
4b36a96ed5
Merge polly.local:/tmp/maint/bug23814/my51-bug23814
...
into polly.local:/home/kaa/src/maint/mysql-5.1-maint
2007-01-19 14:29:18 +03:00
msvensson@pilot.mysql.com
6c86a309f5
Update result file to 5.1 format
2007-01-19 12:18:18 +01:00
kaa@polly.local
71a292cac1
Fix for the bug #23814 "mysqlimport crashes"
...
mysqlimport.c declared the opt_use_threads variable as my_bool, but the corresponding option was defined as GET_UINT. The problem only occured on architectures with strict alignment rules.
2007-01-19 14:14:11 +03:00
msvensson@pilot.mysql.com
a15a7d3791
Merge pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-engines
...
into pilot.mysql.com:/home/msvensson/mysql/mysql-5.1-engines
2007-01-19 12:04:55 +01:00
msvensson@pilot.mysql.com
009324b12b
Use $MYSQLTESTVARDIR
2007-01-19 12:03:03 +01:00
joerg@trift2.
9d4f594ac9
cmd-line-utils/readline/undo.c : Replace an "uint" cast by the expanded "unsigned int" (compile problem on QNX).
2007-01-19 11:58:29 +01:00
tomas@poseidon.mysql.com
9ca0af92b1
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb
...
into poseidon.mysql.com:/home/tomas/mysql-5.1-new-ndb
2007-01-19 11:36:39 +01:00
tomas@poseidon.mysql.com
9c8ab666b0
Bug#25387 ndb: dbug assert in reference counting for event operations
...
- on blob part execute failure, must leave in state executin, and await dropEventOperation
2007-01-19 11:35:00 +01:00
msvensson@pilot.mysql.com
4dbfac2a5c
Merge pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint
...
into pilot.mysql.com:/home/msvensson/mysql/mysql-5.1-new-maint
2007-01-19 11:12:24 +01:00
msvensson@pilot.mysql.com
b1a9115d88
Merge bk-internal:/home/bk/mysql-5.0-maint
...
into pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint
2007-01-19 11:11:34 +01:00