ndbdev@dl145c.mysql.com
dc595c9b1d
merge
2005-09-15 07:36:47 +02:00
pekka@mysql.com
81d8cc1e84
ndb - wl#2624 re-commit due to bk problem
2005-09-15 02:33:28 +02:00
dlenev@mysql.com
2a96aa110f
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/dlenev/src/mysql-5.0-bg12704-2
2005-09-15 03:57:59 +04:00
dlenev@mysql.com
e231ebe5fb
Fix for bug #12704 "Server crashes during trigger execution".
...
This bug occurs when some trigger for table used by DML statement is created
or changed while statement was waiting in lock_tables(). In this situation
prelocking set which we have calculated becames invalid which can easily lead
to errors and even in some cases to crashes.
With proposed patch we no longer silently reopen tables in lock_tables(),
instead caller of lock_tables() becomes responsible for reopening tables and
recalculation of prelocking set.
2005-09-15 03:56:09 +04:00
ndbdev@dl145c.mysql.com
44a6b536d2
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1
...
into dl145c.mysql.com:/home/ndbdev/tomas/mysql-5.1
2005-09-15 00:16:37 +02:00
pappa@c-0d08e253.1238-1-64736c10.cust.bredbandsbolaget.se
b636832ba1
Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.1
...
into c-0d08e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/mysql-5.1
2005-09-14 18:16:36 -04:00
pappa@c-0d08e253.1238-1-64736c10.cust.bredbandsbolaget.se
1494ef61c7
Bug #13154 :
...
Used AND when modulo should have been used to calculate partition id
for PARTITION BY KEY and SUBPARTITION BY KEY
2005-09-14 18:15:40 -04:00
elliot@mysql.com
f3030c3411
Updated test results for view test.
2005-09-14 16:27:55 -04:00
elliot@mysql.com
588af40cda
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/emurphy/src/bk-clean/mysql-5.0
2005-09-14 16:16:04 -04:00
bell@sanja.is.com.ua
87a8fb4807
fixed portability
2005-09-14 23:12:01 +03:00
elliot@mysql.com
86882cc8f9
Merge mysql.com:/home/emurphy/src/work/mysql-5.0-bug-12870
...
into mysql.com:/home/emurphy/src/bk-clean/mysql-5.0
2005-09-14 14:44:48 -04:00
elliot@mysql.com
8e7e17166c
BUG#12870 (CREATE PROCEDURE followed by ROLLBACK is not replicated)
...
Fixed by making CREATE/ALTER/DROP PROCEDURE cause implicit commit.
2005-09-14 14:42:39 -04:00
aivanov@mysql.com
a42b5000ca
Merge mysql.com:/home/alexi/mysql-5.0
...
into mysql.com:/home/alexi/dev/mysql-5.0-13000
2005-09-14 20:32:59 +04:00
aivanov@mysql.com
53e90b53bc
Fixed BUG#12963, BUG#13000: wrong VIEW creation with DAYNAME(),
...
DAYOFWEEK(), and WEEKDAY().
2005-09-14 20:25:00 +04:00
tulin@dl145c.mysql.com
ea4161baed
merge
2005-09-14 17:58:20 +02:00
tulin@dl145c.mysql.com
b127139206
Bug #13179 partition info in mysqldump makes it hard to use dump in different sized cluster
2005-09-14 17:30:23 +02:00
tulin@dl145c.mysql.com
129c98179b
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into dl145c.mysql.com:/home/ndbdev/tomas/mysql-5.0
2005-09-14 17:27:01 +02:00
bell@sanja.is.com.ua
d1c4241aa5
Merge abelkin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-owner2-5.0
2005-09-14 17:28:28 +03:00
bell@sanja.is.com.ua
2fce07b08b
postmerge fix
2005-09-14 17:27:33 +03:00
tulin@dl145c.mysql.com
cde15356a8
Merge dl145c.mysql.com:/home/ndbdev/tomas/mysql-5.0
...
into dl145c.mysql.com:/home/ndbdev/tomas/mysql-5.1
2005-09-14 15:49:08 +02:00
tulin@dl145c.mysql.com
e1383ab4c4
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into dl145c.mysql.com:/home/ndbdev/tomas/mysql-5.0
2005-09-14 15:47:15 +02:00
tulin@dl145c.mysql.com
a8eb0f176b
enabled mysqldump hex-blob option for bit fields
2005-09-14 15:46:31 +02:00
joerg@mysql.com
49f8424f6c
Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/M50/mysql-5.0
2005-09-14 15:24:52 +02:00
joerg@mysql.com
734895c73c
Merge mysql.com:/M50/upward-5.0 into mysql.com:/M51/merge-5.1
2005-09-14 15:05:01 +02:00
joerg@mysql.com
3d457c3ba1
Merge mysql.com:/M41/upward-4.1 into mysql.com:/M50/merge-5.0
2005-09-14 14:34:45 +02:00
joerg@mysql.com
b4d4e7a306
Improve error / process handling in the Perl script to run the test suite (patch supplied by Kent).
2005-09-14 13:55:53 +02:00
tulin@dl145c.mysql.com
80da104ea5
merge
2005-09-14 13:37:52 +02:00
tulin@dl145c.mysql.com
f1e6ee04bc
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into dl145c.mysql.com:/home/ndbdev/tomas/mysql-5.0
2005-09-14 13:27:57 +02:00
joerg@mysql.com
eee616d122
Minor output format change of the Perl test suite script (align with the shell script).
2005-09-14 13:12:30 +02:00
petr@mysql.com
c1348ec13a
Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/cps/mysql/trees/mysql-5.0-virgin
2005-09-14 14:54:48 +04:00
bell@sanja.is.com.ua
4a18f890e6
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-owner2-5.0
2005-09-14 13:37:40 +03:00
tulin@dl145c.mysql.com
415ec2bf89
Bug #13152 bit fields and fileds that follow become corrupted when dumped from NDB tables
2005-09-14 11:41:36 +02:00
bell@sanja.is.com.ua
9388f7277c
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-owner2-5.0
2005-09-14 12:26:09 +03:00
bell@sanja.is.com.ua
3f160eed87
postmerge fix
2005-09-14 12:24:14 +03:00
pem@mysql.com
f698d25b3a
Merge mysql.com:/usr/local/bk/mysql-5.0
...
into mysql.com:/usr/home/pem/mysql-5.0
2005-09-14 10:54:52 +02:00
pem@mysql.com
9cf77e404e
Post-review fix for BUG#12712: SET AUTOCOMMIT should fail within SP/functions/triggers
2005-09-14 10:54:02 +02:00
petr@mysql.com
d019da7dd8
Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/cps/mysql/trees/mysql-5.0-virgin
2005-09-14 12:42:23 +04:00
bell@sanja.is.com.ua
914b961d01
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-owner2-5.0
2005-09-14 11:07:04 +03:00
bell@sanja.is.com.ua
71ffbbf81b
part 1 (ver 2, postreview fix) of WL#2787
...
view definer information syntax/storage/replication
fixed SOURCE field of .frm
2005-09-14 10:53:09 +03:00
gluh@mysql.com
5549bc3329
Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/gluh/MySQL/Bugs/5.0.cml
2005-09-14 12:46:03 +05:00
msvensson@neptunus.(none)
fb63290635
Merge neptunus.(none):/home/msvensson/mysql/bug10713_new/my50-bug10713_new
...
into neptunus.(none):/home/msvensson/mysql/bug10713_new/my51-bug10713_new
2005-09-14 09:43:56 +02:00
pem@mysql.com
d825ed1a6b
Merge mysql.com:/usr/local/bk/mysql-5.0
...
into mysql.com:/usr/home/pem/mysql-5.0
2005-09-14 09:43:02 +02:00
msvensson@neptunus.(none)
d5ae0825d9
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/bug10713_new/my50-bug10713_new
2005-09-14 09:35:56 +02:00
gluh@mysql.com
2184915127
Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/gluh/MySQL/Bugs/5.0.cml
2005-09-14 12:11:19 +05:00
eric@mysql.com
ef06401549
Improvement to federated for BUG#12659
...
Now many direct references to my_error() have been removed.
2005-09-13 23:31:17 -07:00
msvensson@neptunus.(none)
7d78749320
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/bug10713_new/my50-bug10713_new
2005-09-14 08:10:18 +02:00
petr@mysql.com
5a097459f1
Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/cps/mysql/trees/mysql-5.0-virgin
2005-09-14 07:30:04 +04:00
petr@mysql.com
e8946265fc
fix for Bug #12979 Stored procedures: crash if inout decimal parameter
2005-09-14 07:25:32 +04:00
monty@mishka.mysql.fi
31d8027e94
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mishka.mysql.fi:/home/my/mysql-5.0
2005-09-14 04:18:38 +03:00
monty@mishka.mysql.fi
e7d7b2c757
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mishka.mysql.fi:/home/my/mysql-5.0
2005-09-14 03:18:05 +03:00