malff/marcsql@weblab.(none)
c2a59c9585
Merge weblab.(none):/home/marcsql/TREE/mysql-5.0-base
...
into weblab.(none):/home/marcsql/TREE/mysql-5.0-rt-merge
2007-06-25 10:32:38 -06:00
thek@adventure.(none)
ccfd0847fc
Merge adventure.(none):/home/thek/Development/cpp/bug28846/my50-bug28846
...
into adventure.(none):/home/thek/Development/cpp/mysql-5.0-runtime
2007-06-22 15:40:35 +02:00
thek@adventure.(none)
3e7c1b1cb1
Bug#28846 Use of undocumented Prepared Statements crashes server
...
ALTER VIEW is currently not supported as a prepared statement
and should be disabled as such as they otherwise could cause server crashes.
ALTER VIEW is currently not supported when called from stored
procedures or functions for related reasons and should also be disabled.
This patch disables these DDL statements and adjusts the appropriate test
cases accordingly.
Additional tests has been added to reflect on the fact that we do support
CREATE/ALTER/DROP TABLE for Prepared Statements (PS), Stored Procedures (SP)
and PS within SP.
2007-06-22 11:55:48 +02:00
tsmith@maint1.mysql.com
9f23427499
Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint
...
into maint1.mysql.com:/data/localhome/tsmith/bk/maint/50
2007-06-22 11:23:12 +02:00
dkatz@damien-katzs-computer.local
a393b215fb
Bug #29138 'kill' fails in pushbuild
...
The reason the "reap;" succeeds unexpectedly is because the query was completing(almost always) and the network buffer was big enough to store the query result (sometimes) on Windows, meaning the response was completely sent before the server thread could be killed.
Therefore we use a much longer running query that doesn't have a chance to fully complete before the reap happens, testing the kill properly.
2007-06-21 21:39:52 -04:00
tsmith@maint1.mysql.com
b8881ebfd4
Merge bk-internal.mysql.com:/home/bk/mysql-5.0-rpl
...
into maint1.mysql.com:/data/localhome/tsmith/bk/maint/50
2007-06-21 20:09:04 +02:00
iggy@amd64.(none)
1378e94aa0
Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint
...
into amd64.(none):/src/bug27029/my50-bug27029
2007-06-21 12:52:20 -04:00
iggy@amd64.(none)
39416f50a5
Bug#27029 alter table ... enable keys crashes mysqld on large table
...
- When creating an index for the sort, the number of rows plus 1 is used
to allocate a buffer. In this test case, the number of rows 4294967295
is the max value of an unsigned integer, so when 1 was added to it, a
buffer of size 0 was allocated causing the crash.
- Create new test suite for this bug's test suite as per QA.
2007-06-21 12:45:56 -04:00
tsmith@maint1.mysql.com
f1e600a78e
Merge maint1.mysql.com:/data/localhome/tsmith/bk/50
...
into maint1.mysql.com:/data/localhome/tsmith/bk/maint/50
2007-06-21 18:28:52 +02:00
lars/lthalmann@dl145j.mysql.com
d0e786b8e9
Merge mysql.com:/nfsdisk1/lars/bk/mysql-5.0
...
into mysql.com:/nfsdisk1/lars/bk/mysql-5.0-rpl
2007-06-21 17:10:35 +02:00
lars/lthalmann@mysql.com/dl145k.mysql.com
fcd859ac77
Test fix
2007-06-21 16:55:52 +02:00
msvensson@pilot.(none)
840344589e
Add name of test that generated the warning to "warnings" file
2007-06-21 16:37:13 +02:00
msvensson@pilot.(none)
c021fc9a92
Merge pilot.(none):/data/msvensson/mysql/bug28769/my50-bug28769
...
into pilot.(none):/data/msvensson/mysql/mysql-5.0-maint
2007-06-21 15:14:00 +02:00
msvensson@pilot.(none)
f3f1c8c18e
Merge pilot.(none):/data/msvensson/mysql/bug28742/my50-bug28742
...
into pilot.(none):/data/msvensson/mysql/mysql-5.0-maint
2007-06-21 14:10:35 +02:00
mats@kindahl-laptop.dnsalias.net
2f74826394
BUG#29030 (DROP USER command that errors still gets written to binary log
...
and replicated):
A DROP USER statement with a non-existing user was correctly written to
the binary log (there might be users that were removed, but not all),
but the error code was not set, which caused the slave to stop with an
error.
The error reporting code was moved to before the statement was logged
to ensure that the error information for the thread was correctly set
up. This works since my_error() will set the fields net.last_errno and
net.last_error for the thread that is reporting the error, and this
will then be picked up when the Query_log_event is created and written
to the binary log.
2007-06-20 14:24:31 +02:00
msvensson@pilot.(none)
4d3f3f676f
Bug#28742 mysql-test-run is very slow on "Stopping All Servers" step
...
- Improve shutdown algorithm
- Wait up to 5 seconds for processes to exit after their port is free
2007-06-20 11:47:55 +02:00
dkatz@damien-katzs-computer.local
bd80d7e465
Merge damien-katzs-computer.local:/Users/dkatz/mysql50
...
into damien-katzs-computer.local:/Users/dkatz/50_win
2007-06-19 18:03:47 -04:00
kostja@bodhi.(none)
325b8835c7
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into bodhi.(none):/opt/local/work/mysql-5.0-runtime
2007-06-19 14:53:13 +04:00
msvensson@pilot.(none)
b8eee54d0b
Merge bk-internal:/home/bk/mysql-5.0-maint
...
into pilot.(none):/data/msvensson/mysql/mysql-5.0-maint
2007-06-19 11:34:54 +02:00
msvensson@pilot.(none)
6c22726ebd
Merge pilot.(none):/data/msvensson/mysql/wl3232/my41-wl3232
...
into pilot.(none):/data/msvensson/mysql/wl3232/my50-wl3232
2007-06-19 11:07:39 +02:00
msvensson@pilot.(none)
caebb719b2
WL#3232 mysqltest, enable --source $variables/<remaining_path_to_file>
...
- Add test case for this already existing feature
2007-06-19 11:06:02 +02:00
msvensson@pilot.(none)
46f0c05afc
Bug#28769 Test case "innodb" fails with --skip-log-bin
...
- Move binlog related tests to binlog_innodb.test
- Remove "source include/have_log_bin.inc" from innodb.test
2007-06-19 09:56:19 +02:00
dkatz@damien-katzs-computer.local
b7a2b41374
Bug #28921 Queries containing UDF functions are cached
...
Fixed runtime to no longer allow the caching of queries with UDF calls.
2007-06-18 17:55:12 -04:00
dkatz@damien-katzs-computer.local
b89e4f9ef2
Bug #29053 SQL_CACHE in UNION causes non-deterministic functions to be cached
...
Changed code to enforce that SQL_CACHE only in the first SELECT is used to turn on caching(as documented), but any SQL_NO_CACHE will turn off caching (not documented, but a useful behaviour, especially for machine generated queries). Added test cases to explicitly test the documented caching behaviour and test cases for the reported bug.
2007-06-18 17:16:20 -04:00
tsmith@maint1.mysql.com
c658464813
Merge maint1.mysql.com:/data/localhome/tsmith/bk/50
...
into maint1.mysql.com:/data/localhome/tsmith/bk/maint/50
2007-06-18 22:11:49 +02:00
lars/lthalmann@dl145h.mysql.com
c5c624a752
Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.0-rpl
...
into mysql.com:/nfsdisk1/lars/MERGE/mysql-5.0-merge
2007-06-18 12:02:39 +02:00
lars/lthalmann@dl145j.mysql.com
519e26e801
Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.0-rpl
...
into mysql.com:/nfsdisk1/lars/MERGE/mysql-5.0-merge
2007-06-18 09:33:43 +02:00
tomas@whalegate.ndb.mysql.com
4547957450
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-engines
2007-06-17 22:06:34 +02:00
tomas@whalegate.ndb.mysql.com
8a08ac40fb
correct test and result
2007-06-17 22:04:01 +02:00
tomas@whalegate.ndb.mysql.com
8eb940de27
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-engines
2007-06-17 19:52:01 +02:00
tomas@whalegate.ndb.mysql.com
b5f30a99f9
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
2007-06-17 19:50:07 +02:00
tomas@whalegate.ndb.mysql.com
9c5183ace9
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-engines
2007-06-17 19:28:01 +02:00
tomas@whalegate.ndb.mysql.com
9e3c14fae3
BUG#27640
...
- correct test and result file
2007-06-17 19:27:20 +02:00
tomas@whalegate.ndb.mysql.com
95ed412809
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-engines
2007-06-17 16:26:35 +02:00
ramil/ram@ramil.myoffice.izhnet.ru
e63f983970
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint
...
into mysql.com:/home/ram/work/b28144/b28144.5.0
2007-06-17 10:10:36 +05:00
istruewing@chilla.local
70600c15d8
Merge chilla.local:/home/mydev/mysql-5.0-amain
...
into chilla.local:/home/mydev/mysql-5.0-axmrg
2007-06-16 11:34:21 +02:00
tsmith@quadxeon.mysql.com
891116551e
binlog.result, binlog.test:
...
Post-merge fix: replace xid=* with XID to isolate from number of transactions
2007-06-15 23:57:53 +02:00
malff/marcsql@weblab.(none)
4b427bde82
Fixed warnings raised from mysqltest (unknown -- commands)
2007-06-15 11:15:22 -06:00
tsmith@quadxeon.mysql.com
73035c274f
Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0-maint
...
into quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/jun14/50
2007-06-15 17:59:04 +02:00
istruewing@chilla.local
676ea58252
Merge chilla.local:/home/mydev/mysql-5.0-amain
...
into chilla.local:/home/mydev/mysql-5.0-axmrg
2007-06-15 17:47:02 +02:00
istruewing@chilla.local
dceae35549
Merge chilla.local:/home/mydev/mysql-5.0-ateam
...
into chilla.local:/home/mydev/mysql-5.0-axmrg
2007-06-15 17:45:50 +02:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
9c9464d566
Fix for bug #28144 : "Slave_IO_Running" differs in replication tests
...
Problem: show slave status may return different Slave_IO_Running values running some tests.
Fix: wait for a certain slave state if needed to get tests more predictable.
2007-06-15 16:09:28 +05:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
44c3524026
Backport of
...
mysql-test/include/wait_for_slave_io_to_stop.inc
mysql-test/include/wait_for_slave_sql_to_stop.inc
mysql-test/include/wait_for_slave_to_start.inc
mysql-test/include/wait_for_slave_to_stop.inc
from 5.1
2007-06-15 13:53:36 +05:00
bar@mysql.com/bar.myoffice.izhnet.ru
caf85332ba
Bug#28862 Extended Latin1 characters get lost in CVS engine
...
Problem: Temporary buffer which is used for quoting and escaping
was initialized to character set utf8, and thus didn't allow
to store data in other character sets.
Fix: changing character set of the buffer to be able to
store any arbitrary sequence of bytes.
2007-06-15 11:19:35 +05:00
tsmith@quadxeon.mysql.com
87fdad4ce8
Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0-build
...
into quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/jun14/50
2007-06-14 23:23:30 +02:00
mskold/marty@linux.site
dea70c74dd
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
...
into mysql.com:/windows/Linux_space/MySQL/mysql-5.0-ndb
2007-06-14 21:58:45 +02:00
tomas@whalegate.ndb.mysql.com
ad81e83c70
Bug #27640 backup id not displayed in the output of "ndb_mgm start backup wait completed"
...
- correction, missing node id
2007-06-14 18:40:32 +02:00
mskold/marty@linux.site
8945183fc3
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
...
into mysql.com:/windows/Linux_space/MySQL/mysql-5.0-ndb
2007-06-14 16:21:52 +02:00
Justin.He/justin.he@dev3-240.dev.cn.tlan
ad88a849c8
Merge jhe@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
...
into dev3-240.dev.cn.tlan:/home/justin.he/mysql/mysql-5.0/bug27640-5.0-ndb
2007-06-14 20:45:12 +08:00
holyfoot/hf@hfmain.(none)
8ccc50b303
Merge bk@192.168.21.1:mysql-5.0
...
into mysql.com:/d2/hf/mrg/mysql-5.0-opt
2007-06-14 16:41:10 +05:00