Commit graph

26365 commits

Author SHA1 Message Date
msvensson@neptunus.(none)
a9b3767874 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  neptunus.(none):/home/msvensson/mysql/bug13029/my50-bug13029
2005-09-15 11:24:28 +02:00
msvensson@neptunus.(none)
d61645fe62 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  neptunus.(none):/home/msvensson/mysql/bug12526/my50-bug12526
2005-09-15 11:16:13 +02:00
msvensson@neptunus.(none)
872d85dabe Bug #13029 YaSSL not compatibile w/ JSSE (Java implementation of SSL)
-Applied patch from Todd
2005-09-15 09:46:10 +02:00
msvensson@neptunus.(none)
ae89da95fe Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  neptunus.(none):/home/msvensson/mysql/bug12526/my50-bug12526
2005-09-15 09:12:52 +02:00
ingo@mysql.com
6712aa1a7d Merge mysql.com:/home/mydev/mysql-5.0
into  mysql.com:/home/mydev/mysql-5.0-5000
2005-09-15 09:02:26 +02:00
msvensson@neptunus.(none)
95197f39a2 Bug #12526 yassl: Crashes in "integer.cpp"
- Disable inlining in integer.cp for sparc solaris Cun C++ 5.6
2005-09-15 08:59:29 +02:00
dlenev@mysql.com
ff4a6e139e Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/home/dlenev/src/mysql-5.0-bg12704-2
2005-09-15 05:06:54 +04: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
eric@mysql.com
b4c9c778c3 Merge eherman@bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/home/eric/mysql-5.0-fed-err
2005-09-14 14:46:07 -07:00
eric@mysql.com
92e2936fb9 Merge eherman@bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/home/eric/mysql-5.0-fed-err
2005-09-14 13:52:43 -07: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
ingo@mysql.com
39ae05dfc9 Merge mysql.com:/home/mydev/mysql-5.0
into  mysql.com:/home/mydev/mysql-5.0-5000
2005-09-14 20:57:45 +02: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
eric@mysql.com
63961bcbe9 Per LenZ, changed calculated buffer size to constant and removed some unused variables. 2005-09-14 11:02:33 -07: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
ingo@mysql.com
e0d668baa3 Merge mysql.com:/home/mydev/mysql-5.0
into  mysql.com:/home/mydev/mysql-5.0-5000
2005-09-14 18:22:43 +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
c41970ab75 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:36:09 +03:00
tulin@dl145c.mysql.com
63e187b88f Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
into dl145c.mysql.com:/home/ndbdev/tomas/mysql-5.0
2005-09-14 16:32:44 +02:00
stewart@mysql.com
e51ec754b8 Merge mysql.com:/home/stewart/Documents/MySQL/5.0/main
into  mysql.com:/home/stewart/Documents/MySQL/5.0/bug13136
2005-09-15 00:31:13 +10:00
ingo@mysql.com
e564b723cb Merge mysql.com:/home/mydev/mysql-5.0
into  mysql.com:/home/mydev/mysql-5.0-5000
2005-09-14 16:30:32 +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
stewart@mysql.com
9e5e9603b5 BUG#13136 NdbTCP.cpp compile failure on OSX 10.2
use select if poll is unavailable.
2005-09-15 00:21:25 +10: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
028e892681 Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/M50/mysql-5.0
2005-09-14 15:28:23 +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
jani@a193-229-222-105.elisa-laajakaista.fi
e0b458de91 Fix for Metrowerks compiler. 2005-09-14 16:10:56 +03: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
ee39253467 indentation correction 2005-09-14 13:44:44 +02:00
ingo@mysql.com
18cb2e8388 Merge mysql.com:/home/mydev/mysql-4.1-4100
into  mysql.com:/home/mydev/mysql-5.0-5000
2005-09-14 13:37:16 +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
ingo@mysql.com
a03d57de2d Merge mysql.com:/home/mydev/mysql-5.0
into  mysql.com:/home/mydev/mysql-5.0-5000
2005-09-14 13:27:57 +02:00
tulin@dl145c.mysql.com
1b5eb117f5 (corrected typo in prev patch) Bug #13152 bit fields and fileds that follow become corrupted when dumped from NDB 2005-09-14 13:24:41 +02:00
ingo@mysql.com
6e725adc00 Bug#12920 - key_read_requests counter appears to re-set
After merge fix.
2005-09-14 13:18:16 +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
ingo@mysql.com
dbdc9ded00 Merge mysql.com:/home/mydev/mysql-5.0
into  mysql.com:/home/mydev/mysql-5.0-5000
2005-09-14 13:07:25 +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