kent@mysql.com
ca3e020b3d
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-new
2006-06-27 00:55:30 +02:00
kent@mysql.com
b1d3bd5a7a
Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1-new
...
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-new
2006-06-27 00:13:45 +02:00
kent@mysql.com
748b287cad
Merge mysql.com:/Users/kent/mysql/bk/mysql-4.0
...
into mysql.com:/Users/kent/mysql/bk/mysql-4.1-new
2006-06-26 23:47:14 +02:00
kent@mysql.com
c36dd28676
make_sharedlib_distribution.sh:
...
For compatibility, don't use {..,..} in pattern matching
make_binary_distribution.sh:
Added .dylib and .sl as shared library extensions
2006-06-26 23:44:17 +02:00
jmiller@ndb08.mysql.com
cf58d2b544
Merge jmiller@bk-internal.mysql.com:/home/bk/mysql-5.1
...
into mysql.com:/data0/mysql-5.1
2006-06-26 22:31:31 +02:00
ingo@mysql.com
50477229b4
Merge istruewing@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/nfstmp1/ingo/autopush-75/mysql-5.0
2006-06-26 22:23:04 +02:00
jonas@perch.ndb.mysql.com
4af95eb79c
Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
2006-06-26 20:14:40 +02:00
anozdrin@mysql.com
8f4582db27
Merge mysql.com:/home/alik/MySQL/devel/5.0-tree
...
into mysql.com:/home/alik/MySQL/devel/5.0-rt
2006-06-26 21:58:55 +04:00
ingo@mysql.com
0acdd0f773
Merge istruewing@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/mydev/mysql-5.0-bug16986-main
2006-06-26 19:43:28 +02:00
ingo@mysql.com
d011ac7202
Merge mysql.com:/home/mydev/mysql-5.0--main
...
into mysql.com:/home/mydev/mysql-5.0-bug16986-main
2006-06-26 19:19:12 +02:00
ingo@mysql.com
d27a15a81c
Bug#16986 - Deadlock condition with MyISAM tables
...
Addendum fixes after changing the condition variable
for the global read lock.
The stress test suite revealed some deadlocks. Some were
related to the new condition variable (COND_global_read_lock)
and some were general problems with the global read lock.
It is now necessary to signal COND_global_read_lock whenever
COND_refresh is signalled.
We need to wait for the release of a global read lock if one
is set before every operation that requires a write lock.
But we must not wait if we have locked tables by LOCK TABLES.
After setting a global read lock a thread waits until all
write locks are released.
2006-06-26 19:14:35 +02:00
rburnett@bk-internal.mysql.com
93210b0a28
Merge bk-internal.mysql.com:/data0/bk/mysql-5.1
...
into bk-internal.mysql.com:/data0/bk/mysql-5.1-kt
2006-06-26 16:53:53 +02:00
konstantin@mysql.com
a04bfd8e2a
Merge mysql.com:/opt/local/work/tmp_merge
...
into mysql.com:/opt/local/work/mysql-5.1-runtime
2006-06-26 18:49:20 +04:00
konstantin@mysql.com
5e0a692723
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
...
into mysql.com:/opt/local/work/mysql-5.1-runtime
2006-06-26 18:45:46 +04:00
lars@mysql.com
2a945d77b6
Merge mysql.com:/users/lthalmann/bkroot/mysql-5.0-rpl
...
into mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge
2006-06-26 16:45:32 +02:00
tnurnberg@mysql.com
d5ff4f6882
Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint
...
into mysql.com:/home/tnurnberg/mysql-5.0-maint-18462
2006-06-26 16:15:41 +02:00
knielsen@rt.int.sifira.dk
b6c587695b
Merge mysql.com:/usr/local/mysql/mysql-5.1-pristine
...
into mysql.com:/usr/local/mysql/tmp-5.1
2006-06-26 16:04:06 +02:00
knielsen@mysql.com
3ba774f1d7
BUG#20676: debug warnings about too many lock waiters cause test failure.
...
The 250 simultaneous events all accessing the same table caused the
events_stress test to fail due to debug warnings about too many table
waiters. Fixed by using three different tables.
2006-06-26 15:49:58 +02:00
stewart@mysql.com
78dd9d12bb
BUG#11459 ndb status variables not updated
...
change names of some undocumented ndb status variables to better reflect what
their values mean
2006-06-26 23:31:10 +10:00
jonas@perch.ndb.mysql.com
33339fdf40
ndb - bug#20053
...
make sure we can only drop files from correct file group
2006-06-26 15:08:09 +02:00
jonas@perch.ndb.mysql.com
e9cbae32ea
ndb - bug#20683
...
part 2 - handle safecounter.init() failing in all parts of event code
2006-06-26 12:31:09 +02:00
andrey@lmy004.
23340f3fdd
Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime
...
into lmy004.:/work/mysql-5.1-runtime-bug16992
2006-06-26 12:22:13 +02:00
jonas@perch.ndb.mysql.com
874607884b
Merge perch.ndb.mysql.com:/home/jonas/src/50-work
...
into perch.ndb.mysql.com:/home/jonas/src/51-work
2006-06-26 12:19:29 +02:00
jonas@perch.ndb.mysql.com
02de4368cd
Merge perch.ndb.mysql.com:/home/jonas/src/41-work
...
into perch.ndb.mysql.com:/home/jonas/src/50-work
2006-06-26 12:17:38 +02:00
jonas@perch.ndb.mysql.com
a5e1b01920
ndb - bug#20683
...
part 1 - make sure return code is propagated from request tracker
2006-06-26 12:16:39 +02:00
knielsen@rt.int.sifira.dk
22285bb75a
Merge mysql.com:/usr/local/mysql/mysql-5.1-bug20549
...
into mysql.com:/usr/local/mysql/tmp-5.1
2006-06-26 11:26:24 +02:00
jonas@perch.ndb.mysql.com
50b8eb8538
Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
2006-06-26 10:02:03 +02:00
andrey@lmy004.
d617241c3f
Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime
...
into lmy004.:/work/mysql-5.1-runtime-bug18897
2006-06-26 08:55:49 +02:00
elliot@mysql.com
374495ffd1
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/data0/bk/mysql-5.0-maint
2006-06-26 04:48:16 +02:00
elliot@mysql.com
72e8a44d51
Post merge fix
2006-06-25 16:04:11 -04:00
evgen@sunlight.local
69dadfdbf6
table.cc, func_time.result:
...
After merge fix
2006-06-25 22:56:10 +04:00
elliot@mysql.com
bc2b96fee3
Merge mysql.com:/home/emurphy/src/bk-clean/tmp_merge
...
into mysql.com:/home/emurphy/src/bk-clean/mysql-5.1
2006-06-25 09:59:34 -04:00
kent@mysql.com
b6e89c2b1e
.del-make_win_src_distribution.sh~f80d8fca44e4e5f1:
...
Delete: scripts/make_win_src_distribution.sh
Makefile.am:
Unix and Windows now shares source package
2006-06-25 10:25:00 +02:00
knielsen@mysql.com
b9b25ada28
BUG#20677: Sporadic failure of test case 'ndb_binlog_multi'.
...
Start test case with a dummy table create and drop. This ensures that
NDB event subscription is properly set up before the real test starts,
which otherwise could sometimes cause INSERT events to be lost.
2006-06-25 08:59:44 +02:00
evgen@moonbone.local
48bfc5950b
Manual merge
2006-06-25 01:32:13 +04:00
knielsen@mysql.com
13a67a9fea
Merge knielsen@10.100.52.19:/usr/local/mysql/tmp-5.0
...
into mysql.com:/data0/knielsen/tmp-5.0
2006-06-24 16:44:41 +02:00
knielsen@rt.int.sifira.dk
7491454f78
Merge mysql.com:/usr/local/mysql/tmp-5.0
...
into mysql.com:/usr/local/mysql/tmp-5.1
2006-06-24 13:14:24 +02:00
knielsen@rt.int.sifira.dk
9e1b155e1c
Merge bk-internal:/home/bk/mysql-5.1
...
into mysql.com:/usr/local/mysql/tmp-5.1
2006-06-24 13:12:45 +02:00
knielsen@mysql.com
34cf139bd9
Fix race condition in test case wait_timeout.
...
Sometimes the helper connection (that is watching for the main connection
to time out) would itself time out first, causing the test to fail.
2006-06-24 13:11:09 +02:00
knielsen@mysql.com
f976f27a8f
Build fixes for Windows, Solaris, HPUX, AIX.
2006-06-24 07:45:23 +02:00
rburnett@bk-internal.mysql.com
b1f4ea4555
Merge bk-internal.mysql.com:/data0/bk/mysql-5.1
...
into bk-internal.mysql.com:/data0/bk/mysql-5.1-kt
2006-06-24 06:01:57 +02:00
knielsen@devsrv-b.mysql.com
2e08725994
Merge bk-internal:/home/bk/mysql-5.1
...
into mysql.com:/data0/knielsen/tmp-5.1
2006-06-24 00:12:34 +02:00
elliot@mysql.com
a5181fdcde
Post merge fix.
2006-06-23 17:59:24 -04:00
elliot@mysql.com
d4796d9df6
Merge mysql.com:/home/emurphy/src/bk-clean/tmp_merge
...
into mysql.com:/home/emurphy/src/bk-clean/mysql-5.1
2006-06-23 17:27:54 -04:00
iggy@mysql.com
55bd222b10
Merge mysql.com:/mnt/storeage/mysql-5.0-maint
...
into mysql.com:/mnt/storeage/mysql-5.0-maint_bug20616
2006-06-23 15:38:50 -04:00
iggy@mysql.com
f68b01e347
Bug#20616: drop_temp_table test fails on Windows platform
2006-06-23 12:15:39 -04:00
evgen@moonbone.local
c74cc18789
key.result:
...
After merge fix
2006-06-23 19:36:54 +04:00
andrey@lmy004.
e71ef73d53
Fix for bug #18897 "Events: unauthorized action possible with
...
alter event rename".
ALTER EVENT ... RENAME statement hasn't checked privileges
for the target database. It also caused server crashes when
target database was not specified explicitly and there was
no current database.
This fix adds missing privilege check and check for the case
when target database is not specified explicitly or implicitly.
2006-06-23 17:29:01 +02:00
elliot@mysql.com
d11c890bf1
BUG#20528 Added missing parenthesis to DBUG_PRINT statement
2006-06-23 11:21:57 -04:00
petr@owlet.
f25b7844b2
Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime
...
into mysql.com:/home/cps/mysql/devel/5.1-curs-bug
2006-06-23 18:21:56 +04:00