mkindahl@dl145h.mysql.com
69fdf6794a
Updating result file.
2008-02-04 13:19:29 +01:00
mkindahl@dl145h.mysql.com
1604acd9bf
Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.0-rpl-merge
...
into dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl-merge
2008-02-04 12:33:28 +01:00
mkindahl@dl145h.mysql.com
ed698cf596
Fixes to make rpl_user test pass in pushbuild.
2008-02-04 12:22:37 +01:00
mkindahl@dl145h.mysql.com
d6fd94f77b
More fixes to remove test failures in pushbuild.
2008-02-04 12:12:03 +01:00
mkindahl@dl145h.mysql.com
ec9d14f844
Yet more changes to fix the merge clone.
2008-02-04 08:43:22 +01:00
mkindahl@dl145h.mysql.com
ff40ccb8d7
Masking out some more errors and warnings that are benign.
2008-02-04 07:15:14 +01:00
mkindahl@dl145h.mysql.com
e493906588
Minor fix to make rpl_loaddata_map pass without warnings.
2008-02-04 06:49:15 +01:00
mkindahl@dl145h.mysql.com
dc96cb21bf
Removing expected errors from slave from the warnings file.
2008-02-03 18:43:05 +01:00
mkindahl@dl145h.mysql.com
221ef88c6a
Bug #34244 Test ndb_binlog_log_bin fails for 'drop table if
...
exists t1,t2,t3'
Bug #34245 Test ndb_binlog_multi fails for 'CREATE TABLE'
Bug #34246 Test rpl_ndb_transaction fails with 'Failed to create
'mysql/ndb_apply_status'
Tests cases didn't wait for cluster to come up due to a typo
in have_multi_ndb.inc.
2008-02-03 11:48:45 +01:00
mkindahl@dl145h.mysql.com
c35112de8c
Disabling various tests and reporting bugs for them.
2008-02-02 08:15:36 +01:00
mkindahl@dl145h.mysql.com
064eec03d1
Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.0-rpl-merge
...
into dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl-merge
2008-02-01 20:28:30 +01:00
mkindahl@dl145h.mysql.com
04273b3d5f
Fixes to make tests pass in pushbuild.
2008-02-01 20:26:39 +01:00
cbell/Chuck@mysql_cab_desk.
1ab703f093
Merge cbell@bk-internal.mysql.com:/home/bk/mysql-5.0-rpl-merge
...
into mysql_cab_desk.:D:/source/c++/mysql-5.0-rpl-merge
2008-02-01 14:01:21 -05:00
cbell/Chuck@mysql_cab_desk.
7db07f95fb
BUG#32205 : Replaying statements from mysqlbinlog fails with a syntax error, replicates fine
...
This patch adds code to convert the path for LOAD DATA INFILE
events to a Unix path which is needed for running mysql client
on Windows.
2008-02-01 13:11:03 -05:00
mkindahl@dl145h.mysql.com
1e5fa89dde
Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.0-rpl-merge
...
into dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl-merge
2008-02-01 17:57:22 +01:00
mkindahl@dl145h.mysql.com
e00096a1a7
Again blanking out some numbers in file names that is dependent
...
on the context.
2008-02-01 17:26:28 +01:00
thek@adventure.(none)
83428ce932
Merge kpettersson@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime
...
into adventure.(none):/home/thek/Development/cpp/mysql-5.1-runtime
2008-02-01 17:00:54 +01:00
mkindahl@dl145h.mysql.com
20a5cc259b
Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.0-rpl-merge
...
into dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl-merge
2008-02-01 15:38:14 +01:00
mkindahl@dl145h.mysql.com
4f7ad14be0
Fixes to make tests pass in pushbuild.
2008-02-01 15:34:34 +01:00
anozdrin/alik@quad.
9450412f28
Fix merge.
2008-02-01 17:23:46 +03:00
thek@adventure.(none)
b77bb8ec84
* Manual merge fix.
2008-02-01 14:33:36 +01:00
mkindahl@dl145h.mysql.com
7abc1dda10
Fixes to makes tests pass on Windows and vanilla build.
2008-02-01 14:27:23 +01:00
thek@adventure.(none)
9fc16fbfc0
Merge adventure.(none):/home/thek/Development/cpp/bug33201/my50-bug33201
...
into adventure.(none):/home/thek/Development/cpp/bug33201/my51-bug33201
2008-02-01 14:14:37 +01:00
thek@adventure.(none)
323e9a4c53
Bug#33201 Crash occurs when granting update privilege on one column of a view
...
When issuing a column level grant on a table which require pre-locking the
server crashed.
The reason behind the crash was that data structures used by the lock api
wasn't properly reinitialized in the case of a column level grant.
2008-02-01 14:10:46 +01:00
mkindahl@dl145h.mysql.com
74afc4afa7
Re-creating binlog_start_comment.test to make sure that changes
...
are propagated from earlier versions.
2008-02-01 13:49:28 +01:00
mkindahl@dl145h.mysql.com
22affb3326
Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.0-rpl-merge
...
into dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl-merge
2008-02-01 13:28:11 +01:00
mkindahl@dl145h.mysql.com
294571f083
Various fixes to make tests pass on Windows.
2008-02-01 13:18:27 +01:00
mkindahl@dl145h.mysql.com
470b4137ae
Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.0-rpl-merge
...
into dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl-merge
2008-02-01 12:15:23 +01:00
mkindahl@dl145h.mysql.com
cc807b927a
Merge mkindahl@bk-internal.mysql.com:/home/bk/mysql-5.1-rpl-merge
...
into dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl-merge
2008-02-01 12:10:28 +01:00
mkindahl@dl145h.mysql.com
d85f474f75
Committing premature delete (the file will be deleted in a soon-to-come cset).
...
.del-strict_autoinc_4bdb.result:
Delete: mysql-test/r/strict_autoinc_4bdb.result
strict_autoinc_4bdb.result:
Rename: BitKeeper/deleted/.del-strict_autoinc_4bdb.result -> mysql-test/r/strict_autoinc_4bdb.result
2008-02-01 12:07:17 +01:00
mkindahl@dl145h.mysql.com
5ef8a06c1b
Fixing result files to make tests pass in pushbuild.
2008-02-01 12:00:28 +01:00
anozdrin/alik@quad.
1852fb971e
Merge quad.:/mnt/raid/alik/MySQL/devel/5.1
...
into quad.:/mnt/raid/alik/MySQL/devel/5.1-rt-merged
2008-02-01 13:55:39 +03:00
mkindahl@bk-internal.mysql.com
8b0091ff53
Deleting Berkeley DB test files since BDB is not distributed with 5.1.
...
.del-bdb_notembedded.test:
Delete: mysql-test/t/bdb_notembedded.test
.del-strict_autoinc_4bdb.result:
Delete: mysql-test/r/strict_autoinc_4bdb.result
.del-bdb_notembedded.result:
Delete: mysql-test/r/bdb_notembedded.result
2008-02-01 11:47:56 +01:00
anozdrin/alik@quad.
dcb0012173
Fix merge.
2008-02-01 13:47:11 +03:00
anozdrin/alik@quad.
9b4306b8eb
Merge quad.:/mnt/raid/alik/MySQL/devel/5.0-rt
...
into quad.:/mnt/raid/alik/MySQL/devel/5.1-rt-merged
2008-02-01 13:29:27 +03:00
mkindahl@dl145h.mysql.com
15b74eb7bf
Changes to make tests pass on vanilla build.
2008-02-01 10:46:02 +01:00
hezx@mail.hezx.com
4371a7888d
Merge zhe@bk-internal.mysql.com:/home/bk/mysql-5.1-new-rpl
...
into mail.hezx.com:/media/sda3/work/mysql/bkwork/bug33862_failed_drop_user/5.1
2008-02-01 10:27:03 +08:00
mkindahl@dl145h.mysql.com
4c95b29614
Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.1
...
into dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl-merge
2008-01-31 17:46:50 +01:00
aelkin/andrei@mysql1000.(none)
de7e6d2565
failure in 5.1 tree for rpl_server_id caused by the wrong offset in
...
the include file.
fixed with correcting the offset.
2008-01-31 18:26:04 +02:00
aelkin/andrei@mysql1000.(none)
8e45696765
bug#32971 manual merge of two tests results
2008-01-31 18:12:58 +02:00
mkindahl@dl145h.mysql.com
7cfdd60045
Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.0
...
into dl145h.mysql.com:/data0/mkindahl/mysql-5.0-rpl-merge
2008-01-31 16:15:46 +01:00
aelkin/andrei@mysql1000.(none)
e06d0c7983
Merge mysql1000.(none):/mnt/nb/home/elkin/MySQL/TEAM/FIXES/5.1/bug32971-error_propag_slave
...
into mysql1000.(none):/home/andrei/MySQL/FIXES/5.1/bug32971-rbr_error_prop
2008-01-31 17:02:29 +02:00
mkindahl@dl145h.mysql.com
2d9c3b715d
Fixes to make tests pass on pushbuild.
2008-01-31 15:53:47 +01:00
skozlov/ksm@mysql.com/virtop.(none)
7a82a059a9
Test case for bug#12691
2008-01-31 16:23:27 +03:00
aelkin/elkin@koti.dsl.inet.fi
c9461608e7
Bug #32971 No user level error message from slave sql thread when ER_NO_DEFAULT_FOR_FIELD
...
The error message due to lack of the default value for an extra field
was not as informative as it should be.
Fixed with improving the scheme of gathering, propagating and reporting
errors in applying rows events.
The scheme is in the following.
Any kind of error of processing of a row event incidents are to be
registered with my_error().
In the end Rows_log_event::do_apply_event() invokes rli->report() with the
message to display consisting of all the errors.
This mimics `show warnings' displaying.
A simple test checks three errors in processing an event.
Two hunks - a user level error and pushing it into the list -
have been devoted to already fixed Bug@31702.
Some open issues relating to this artifact listed on BUG@21842 page and
on WL@3679.
Todo: to synchronize the statement in the tests comments on Update and Delete
events may not stop when an extra field does not have a default with wl@3228 spec.
2008-01-31 14:54:03 +02:00
mkindahl@dl145h.mysql.com
6aacc6415a
Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.0-rpl-merge
...
into dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl-merge
2008-01-31 12:32:48 +01:00
mkindahl@dl145h.mysql.com
10b194d272
Changes to fix tests in pushbuild.
2008-01-31 12:17:40 +01:00
hezx@mail.hezx.com
43c4a4c359
Post merge fix
2008-01-31 16:51:55 +08:00
mkindahl@dl145h.mysql.com
b8428d1560
Fixes to make code compile on Windows.
2008-01-31 07:19:29 +01:00
kostja@dipika.(none)
917c7952ba
Fix a build failure (embedded server).
2008-01-30 23:04:55 +03:00