joerg@trift2.
8592dfd90d
Makefile.am : Add "embedded" tests to the "test-bt" target.
2007-05-24 15:20:06 +02:00
ramil/ram@ramil.myoffice.izhnet.ru
0bdeffd875
Merge mysql.com:/home/ram/work/b26842/b26842.5.0
...
into mysql.com:/home/ram/work/b26842/b26842.5.1
2007-05-24 15:42:46 +05:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
2c759bd45f
Fix for
...
bug #26842 : master binary log contains invalid queries - replication fails
bug #12826 : Possible to get inconsistent slave using SQL syntax Prepared Statements
Problem:
binlogging PS' we may produce syntacticly incorrect queries in the binlog replacing
some parameters with variable names (instead of variable values).
E.g. in the reported case of "limit ?" clause: replacing "?" with "@var"
produces "limit @var" which is not a correct SQL syntax.
Also it may lead to different query execution on slave if we
set and use a variable in the same statement, e.g.
"insert into t1 values (@x:=@x+1, ?)"
Fix: make the stored statement string created upon its execution use variable values
(instead of names) to fill placeholders.
2007-05-24 15:35:43 +05:00
msvensson@pilot.blaudden
7327f42060
Merge pilot.blaudden:/home/msvensson/mysql/bug28521/my51-bug28521
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-new-maint
2007-05-24 12:31:48 +02:00
msvensson@pilot.blaudden
cca2c53113
Merge pilot.blaudden:/home/msvensson/mysql/bug27438/my51-bug27438
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-new-maint
2007-05-24 12:05:04 +02:00
msvensson@pilot.blaudden
a99fe7f3d6
Merge pilot.blaudden:/home/msvensson/mysql/bug27438/my50-bug27438
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
2007-05-24 12:04:03 +02:00
msvensson@pilot.blaudden
4698a61ec4
Merge pilot.blaudden:/home/msvensson/mysql/bug27438/my50-bug27438
...
into pilot.blaudden:/home/msvensson/mysql/bug27438/my51-bug27438
2007-05-24 12:03:55 +02:00
msvensson@pilot.blaudden
93b1fe65d8
Bug#26664 test suite times out on OS X 64bit
...
- The "mysql client in mysqld"(which is used by
replication and federated) should use alarms instead of setting
socket timeout value if the rest of the server uses alarm. By
always calling 'my_net_set_write_timeout'
or 'my_net_set_read_timeout' when changing the timeout value(s), the
selection whether to use alarms or timeouts will be handled by
ifdef's in those two functions.
- Move declaration of 'vio_timeout' into "vio_priv.h"
2007-05-24 11:21:27 +02:00
df@pippilotta.erinye.com
a390ac46a9
Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.1-build
...
into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
2007-05-24 09:29:12 +02:00
df@pippilotta.erinye.com
2120cb89e0
Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
...
into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
2007-05-24 09:28:30 +02:00
df@pippilotta.erinye.com
d542298098
Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work
...
into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
2007-05-24 09:27:53 +02:00
df@pippilotta.erinye.com
7459b4fca5
Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1
...
into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
2007-05-24 09:26:05 +02:00
df@pippilotta.erinye.com
d29eaed81a
Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0
...
into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
2007-05-24 09:22:00 +02:00
df@pippilotta.erinye.com
918d90d516
Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
...
into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work
2007-05-24 09:12:29 +02:00
ramil/ram@ramil.myoffice.izhnet.ru
6224867b16
Merge mysql.com:/home/ram/work/mysql-5.0-maint
...
into mysql.com:/home/ram/work/b28509/b28509.5.0
2007-05-23 16:31:22 +05:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
d221363c29
after-merge fix: adjusted test results.
2007-05-23 15:49:17 +05:00
msvensson@shellback.(none)
61ed6da11f
Merge shellback.(none):/home/msvensson/mysql/mysql-4.1-maint
...
into shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
2007-05-23 12:20:11 +02:00
msvensson@shellback.(none)
b34660a877
Merge bk-internal:/home/bk/mysql-4.1-maint
...
into shellback.(none):/home/msvensson/mysql/mysql-4.1-maint
2007-05-23 12:15:25 +02:00
msvensson@shellback.(none)
933afe6cb4
Bug#27396 Wrong check for root priveledge
...
- Check that filemode was set to 0000
2007-05-23 12:13:49 +02:00
joerg@trift2.
fb47cb1c82
Merge trift2.:/MySQL/M50/push-5.0
...
into trift2.:/MySQL/M51/push-5.1
2007-05-23 12:02:48 +02:00
df@pippilotta.erinye.com
77e1e678d3
Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
...
into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
2007-05-23 10:51:27 +02:00
df@pippilotta.erinye.com
a70903b7f8
Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0.42
...
into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
2007-05-23 10:49:26 +02:00
ramil/ram@ramil.myoffice.izhnet.ru
1f9b403b45
Merge mysql.com:/home/ram/work/mysql-5.0-maint
...
into mysql.com:/home/ram/work/b28509/b28509.5.0
2007-05-23 13:48:31 +05:00
ramil/ram@ramil.myoffice.izhnet.ru
3d940b1478
Merge mysql.com:/home/ram/work/b28509/b28509.5.0
...
into mysql.com:/home/ram/work/b28509/b28509.5.1
2007-05-23 13:47:34 +05:00
ramil/ram@ramil.myoffice.izhnet.ru
7ed9851230
Merge mysql.com:/home/ram/work/mysql-5.1-maint
...
into mysql.com:/home/ram/work/b23810/b23810.5.1
2007-05-23 13:16:07 +05:00
svoj@june.mysql.com
64d34f6e22
Merge mysql.com:/home/svoj/devel/mysql/merge/mysql-5.0-engines
...
into mysql.com:/home/svoj/devel/mysql/merge/mysql-5.1-engines
2007-05-23 12:42:17 +05:00
svoj@june.mysql.com
442969fd16
Merge mysql.com:/home/svoj/devel/bk/mysql-5.1
...
into mysql.com:/home/svoj/devel/mysql/merge/mysql-5.1-engines
2007-05-23 12:41:30 +05:00
svoj@june.mysql.com
43b2dc188f
Merge mysql.com:/home/svoj/devel/mysql/merge/mysql-4.1-engines
...
into mysql.com:/home/svoj/devel/mysql/merge/mysql-5.0-engines
2007-05-23 12:40:12 +05:00
svoj@mysql.com/june.mysql.com
122167bb4b
Merge mysql.com:/home/svoj/devel/bk/mysql-5.0
...
into mysql.com:/home/svoj/devel/mysql/merge/mysql-5.0-engines
2007-05-23 12:39:33 +05:00
svoj@mysql.com/june.mysql.com
a4ddc22621
Merge mysql.com:/home/svoj/devel/bk/mysql-4.1
...
into mysql.com:/home/svoj/devel/mysql/merge/mysql-4.1-engines
2007-05-23 12:38:34 +05:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
794100ce7e
Fix for bug #23810 : Server crashes on various "show status ..." commands
...
We access some variable values using casts like *(long *) buff
that may cause crashes on some platforms (e.g. solaris 64) if buff is
not properly aligned.
Fix: align the buffer used.
2007-05-23 12:15:47 +05:00
df@pippilotta.erinye.com
f8433465a2
Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
...
into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work
2007-05-23 08:40:39 +02:00
ramil/ram@ramil.myoffice.izhnet.ru
822b1d40b0
Merge mysql.com:/home/ram/work/b21476/b21476.5.0
...
into mysql.com:/home/ram/work/b21476/b21476.5.1
2007-05-23 08:52:33 +05:00
tomas@whalegate.ndb.mysql.com
2ff938d21c
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
2007-05-22 23:28:19 +02:00
tomas@whalegate.ndb.mysql.com
b789452743
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-4.1-ndb
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
2007-05-22 23:21:55 +02:00
tomas@whalegate.ndb.mysql.com
a4934466c0
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
2007-05-22 23:21:32 +02:00
tomas@whalegate.ndb.mysql.com
481b314e9a
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
2007-05-22 23:20:40 +02:00
tomas@whalegate.ndb.mysql.com
7b2c430f58
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-4.1
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-4.1-ndb
2007-05-22 23:19:45 +02:00
joerg@trift2.
b8e3fb1333
Merge trift2.:/MySQL/M50/bug26609-5.0
...
into trift2.:/MySQL/M50/push-5.0
2007-05-22 20:02:23 +02:00
tomas@whalegate.ndb.mysql.com
2c715f1ad4
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-telco-gca
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
2007-05-22 17:57:48 +02:00
tomas@whalegate.ndb.mysql.com
b46c826aee
Bug #28593 cluster backup scans in acc index order, bad for disk data
...
- change to scan in tup and disk order (if applicable)
2007-05-22 17:53:07 +02:00
joerg@trift2.
49dc9c5971
Merge trift2.:/MySQL/M50/bug26609-5.0
...
into trift2.:/MySQL/M51/bug26609-5.1
2007-05-22 17:51:51 +02:00
joerg@trift2.
1185004419
Add the "row_lock" test suite to the (to be) release build test run.
2007-05-22 17:21:22 +02:00
joerg@trift2.
b0677f1ddc
scripts/make_binary_distribution.sh :
...
Include all the additional test suites in the binary packages ("tar.gz").
This is the tar.gz part of the fixes for bug#26609; for RPMs it is already done.
2007-05-22 17:06:47 +02:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
f1ae9793a7
Fix for bug #21476 : stack overflow crashes server; error-message stack reservation too small
...
Increase STACK_BUFF_ALLOC to avoid execution_constants test failure on the hpita2.
2007-05-22 11:16:29 +05:00
tsmith@quadxeon.mysql.com
6ddf4785bb
Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/50
...
into quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/51
2007-05-21 21:03:03 +02:00
tsmith@quadxeon.mysql.com
b3a84ddd89
Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/41
...
into quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/50
2007-05-21 20:55:10 +02:00
tsmith@quadxeon.mysql.com
f8ac268e58
Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1-build
...
into quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/51
2007-05-21 20:53:15 +02:00
tsmith@quadxeon.mysql.com
672237f5b5
Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/51
...
into quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/51
2007-05-21 20:51:31 +02:00
tsmith@quadxeon.mysql.com
99488b31b9
Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/50
...
into quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/50
2007-05-21 20:50:08 +02:00