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
kostja@bodhi.(none)
a1fefd4e8d
Disable randomly failing tests:
...
rpl_udf -- Bug#28993 rpl_udf test causes server crash and valgrind
warning in pushbuild
rpl_ndb_circular -- Bug#29233 rpl_ndb_circular fails randomly
ndb_dd_sql_features -- Bug#29102 ndb_dd_sql_features fails in
pushbuild
2007-06-20 16:05:57 +04:00
gkodinov/kgeorge@magare.gmz
49e3ed9ffa
port of the fix for bug 19116 4.1-opt -> 5.0-opt
2007-06-20 13:15:46 +03:00
kostja@bodhi.(none)
9ff8e6d7b5
Fix a typo.
2007-06-20 14:04:53 +04: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
gkodinov/kgeorge@magare.gmz
7ec37ee3be
Merge magare.gmz:/home/kgeorge/mysql/work/B29116-4.1-opt
...
into magare.gmz:/home/kgeorge/mysql/work/B29116-5.0-opt
2007-06-20 12:46:56 +03:00
mats@kindahl-laptop.dnsalias.net
206b2c72ba
Adding missing DROP TABLE statement to ndb_backup_print.test since it
...
causes later tests to fail.
2007-06-20 11:38:51 +02:00
gshchepa/uchum@gleb.loc
88d5d8a268
Merge gleb.loc:/home/uchum/work/bk/5.0-opt-28898
...
into gleb.loc:/home/uchum/work/bk/5.0-opt
2007-06-20 14:22:32 +05:00
gshchepa/uchum@gleb.loc
0bd3dd9a37
metadata.test, metadata.result:
...
Updated test case for bug #28898 . Additional cleanup.
2007-06-20 14:21:48 +05:00
holyfoot/hf@hfmain.(none)
72fd5c0388
Merge mysql.com:/home/hf/work/28839/my50-28839
...
into mysql.com:/home/hf/work/28839/my51-28839
2007-06-20 14:16:55 +05:00
holyfoot/hf@mysql.com/hfmain.(none)
3b08919f6a
Bug #28839 Errors in strict mode silently stop SQL thread if --slave-skip-errors exists.
...
slave_sql thread calls thd->clear_error() to force error to be ignored,
though this method didn't clear thd->killed state, what causes
slave_sql thread to stop.
clear thd->killed state if we ignore an error
2007-06-20 14:05:49 +05:00
gshchepa/uchum@gleb.loc
5d056de5ff
Merge gleb.loc:/home/uchum/work/bk/5.0-opt-28898
...
into gleb.loc:/home/uchum/work/bk/5.0-opt
2007-06-20 13:06:24 +05:00
gshchepa/uchum@gleb.loc
2379f9778d
Fixed bug #28898 .
...
For a join query with GROUP BY and/or ORDER BY and a view reference
in the FROM list the metadata erroneously showed empty table aliases
and database names for the view columns.
2007-06-20 12:25:07 +05:00
gkodinov/kgeorge@magare.gmz
6782e85059
removed undeterministic tests introduced by the fix for bug 26418
2007-06-20 09:54:42 +03:00
dkatz@damien-katzs-computer.local
a197a9aa8a
Merge damien-katzs-computer.local:/Users/dkatz/mysql50
...
into damien-katzs-computer.local:/Users/dkatz/mysql51
2007-06-19 18:18:59 -04: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
mats@kindahl-laptop.dnsalias.net
5dd26788cc
Some test case fixes.
2007-06-19 22:18:16 +02:00
kostja@bodhi.(none)
4fd8158456
Fix a merge mistake.
2007-06-19 18:04:42 +04:00
gkodinov/kgeorge@magare.gmz
e5acb070aa
Merge bk-internal:/home/bk/mysql-5.1-opt
...
into magare.gmz:/home/kgeorge/mysql/autopush/B26418-5.1-opt
2007-06-19 14:30:03 +03:00
gkodinov/kgeorge@magare.gmz
bef15b279b
Bug #26418 : Slave out of sync after
...
CREATE/DROP TEMPORARY TABLE + ROLLBACK on master
The transaction ability of the storage engines of
the tables on the replication master and the replication
slave must generally be the same.
When the storage engine type of the slave is
non-transactional then transactions on the master that
mix update of transactional and non-transactional tables
should be avoided because they will cause inconsistency of
the data between the master's transactional table and the
slave's non-transactional table.
The effect described by this bug is actually expected.
A detailed test case is added (to be merged later to
the updated rpl_ddl.test), as there was no coverage
by the existing tests.
Some code cleanup is also added by this change.
2007-06-19 14:27:53 +03:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
9c0b9f2266
Fix for bug #28772 : rpl_row_until fails in pushbuild
...
Problem: we use 'sleep 2; wait_for_slave_to_stop;' to reach some slave's states
which is buggy, wasteful of time, platform dependant etc.
Fix: use include/wait_for_slave_***.inc's where it's possible instead.
2007-06-19 16:06:11 +05:00
kostja@bodhi.(none)
68632318dc
Manual merge.
2007-06-19 15:02:08 +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
bar@mysql.com/bar.myoffice.izhnet.ru
020eedd446
mtr_report.pl:
...
Ignore warning about file name
having question marks.
2007-06-19 15:34:21 +05:00
gkodinov/kgeorge@magare.gmz
91f3301c03
Bug #29116 : Test "rpl_change_master" returns different
...
counters from relay
Updated the test to return columns vertically.
2007-06-19 13:19:20 +03:00
tomas@whalegate.ndb.mysql.com
027456393e
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-rpl
2007-06-19 11:38:37 +02:00
tomas@whalegate.ndb.mysql.com
b36a87ae91
corrected typo
2007-06-19 11:38:07 +02: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
tomas@whalegate.ndb.mysql.com
9d8fbc462b
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new-rpl
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-rpl
2007-06-19 11:31:52 +02:00
msvensson@pilot.(none)
95cf973862
Merge bk-internal:/home/bk/mysql-5.1-maint
...
into pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint
2007-06-19 11:31:34 +02:00
msvensson@pilot.(none)
e003d8ad3b
Merge bk-internal:/home/bk/mysql-4.1-maint
...
into pilot.(none):/data/msvensson/mysql/mysql-4.1-maint
2007-06-19 11:30:45 +02:00
tomas@whalegate.ndb.mysql.com
04f1913789
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-rpl
2007-06-19 11:26:23 +02:00
tomas@whalegate.ndb.mysql.com
a67e755593
turn off binlogging of the updates during wait for not_readonly
2007-06-19 11:25:19 +02:00
mats@kindahl-laptop.dnsalias.net
1447f6318f
Fixes to tests and test results.
2007-06-19 11:09:22 +02:00
msvensson@pilot.(none)
f52b9d6150
Merge pilot.(none):/data/msvensson/mysql/wl3232/my50-wl3232
...
into pilot.(none):/data/msvensson/mysql/wl3232/my51-wl3232
2007-06-19 11:08:29 +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
thek@adventure.(none)
a0b8394c23
Merge adventure.(none):/home/thek/Development/cpp/bug28211/my51-bug28211
...
into adventure.(none):/home/thek/Development/cpp/mysql-5.1-runtime
2007-06-19 09:13:17 +02:00
dkatz@damien-katzs-computer.local
f9de8dc217
Merge damien-katzs-computer.local:/Users/dkatz/mysql50
...
into damien-katzs-computer.local:/Users/dkatz/mysql51
2007-06-18 20:01:04 -04:00
tomas@whalegate.ndb.mysql.com
6a51e0f8a2
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-rpl
2007-06-18 23:55:48 +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
3f52ef0ee2
Merge maint1.mysql.com:/data/localhome/tsmith/bk/51
...
into maint1.mysql.com:/data/localhome/tsmith/bk/maint/51
2007-06-18 22:13:23 +02: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
tomas@whalegate.ndb.mysql.com
55c6e7b142
check for different error message
2007-06-18 17:57:16 +02:00
thek@adventure.(none)
2da91b2316
Bug#28211 RENAME DATABASE and query cache don't play nicely together
...
When all table blocks were removed from the query cache the client session
hung in a tight loop waiting on an impossible condition while consuming a lot
of CPU.
This patch also corrects an error which caused valid tables to sometimes be
removed from the query cache.
2007-06-18 17:46:29 +02:00
mhansson/martin@linux-st28.site
26371209bf
Merge linux-st28.site:/home/martin/mysql/src/bug28677/my50-bug28677
...
into linux-st28.site:/home/martin/mysql/src/bug28677/my51-bug28677
2007-06-18 17:22:21 +03:00
gshchepa/uchum@gleb.loc
be24ac44cb
Merge gleb.loc:/home/uchum/work/bk/5.1
...
into gleb.loc:/home/uchum/work/bk/5.1-opt
2007-06-18 18:48:20 +05:00
gshchepa/uchum@gleb.loc
f015b4332b
Merge gleb.loc:/home/uchum/work/bk/5.0
...
into gleb.loc:/home/uchum/work/bk/5.0-opt
2007-06-18 18:45:55 +05:00