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
pekka@sama.ndb.mysql.com
bbc26ea51f
Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.1-ndb
...
into sama.ndb.mysql.com:/export/space/pekka/ndb/version/my51-ndb
2008-02-01 00:18:30 +01:00
pekka@sama.ndb.mysql.com
60446a30c9
ndb - bug#34107 - post-merge
2008-02-01 00:07:15 +01:00
pekka@sama.ndb.mysql.com
f67d3aa67e
Merge sama.ndb.mysql.com:/export/space/pekka/ndb/version/my50-bug34107
...
into sama.ndb.mysql.com:/export/space/pekka/ndb/version/my51-bug34107
2008-01-31 23:46:07 +01:00
pekka@sama.ndb.mysql.com
256f6e31d8
ndb - bug#34107 - ndb api test case
2008-01-31 23:15:07 +01: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
svoj@april.(none)
6053cfc5e6
Merge mysql.com:/home/svoj/devel/mysql/BUG22989/mysql-5.0-engines
...
into mysql.com:/home/svoj/devel/mysql/BUG22989/mysql-5.1-engines
2008-01-31 19:24:24 +04: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
mskold/marty@mysql.com/quadfish.(none)
3b1556a7e0
Fixed support for specifying explicit database
2008-01-31 16:00:06 +01:00
mkindahl@dl145h.mysql.com
2d9c3b715d
Fixes to make tests pass on pushbuild.
2008-01-31 15:53:47 +01:00
svoj@mysql.com/april.(none)
3b5c25ba65
BUG#22989 - START SLAVE causes Error on COM_REGISTER_SLAVE: 1105
...
'Wrong parameters to functi
START SLAVE reports vague error when it fails to register on master:
"Wrong parameters to function register_slave".
If master failed to register slave because of too long
'report-host'/'report-user'/'report-password', return better error
messages:
"Failed to register slave: too long 'report-host'"
"Failed to register slave: too long 'report-user'"
"Failed to register slave; too long 'report-password'"
No test case for this fix.
2008-01-31 18:51:20 +04:00
pekka@sama.ndb.mysql.com
1ccf00f00a
Merge sama.ndb.mysql.com:/export/space/pekka/ndb/version/my50-bug34107
...
into sama.ndb.mysql.com:/export/space/pekka/ndb/version/my51-bug34107
2008-01-31 14:47:50 +01:00
pekka@sama.ndb.mysql.com
e2f23fb8d9
Merge sama.ndb.mysql.com:/export/space/pekka/ndb/version/my50-ndb
...
into sama.ndb.mysql.com:/export/space/pekka/ndb/version/my50-bug34107
2008-01-31 14:24:10 +01:00
skozlov/ksm@mysql.com/virtop.(none)
7a82a059a9
Test case for bug#12691
2008-01-31 16:23:27 +03:00
pekka@sama.ndb.mysql.com
2b78957875
ndb - bug#34107 patch 2, ndb api
2008-01-31 13:58:29 +01:00
pekka@sama.ndb.mysql.com
ccb79bb8ee
ndb - bug#34107 patch 1, kernel
2008-01-31 13:56:12 +01: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
mattiasj@witty.ndb.mysql.com
1dfeec5ced
Merge witty.ndb.mysql.com:/Users/mattiasj/clones/mysql-5.1-bug30459
...
into witty.ndb.mysql.com:/Users/mattiasj/clones/mysql-5.1-topush
2008-01-31 10:11:19 +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
mkindahl@dl145h.mysql.com
5367b13823
Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.0-rpl-merge
...
into dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl-merge
2008-01-30 20:29:17 +01:00
tomas@whalegate.ndb.mysql.com
ad76077675
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb-merge
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb-merge
2008-01-30 19:41:49 +01:00
sven@riska.(none)
772ff3d43a
Merge riska.(none):/home/sven/bktip/5.1-new-rpl
...
into riska.(none):/home/sven/bk/b32434-version_replication/5.1-new-rpl
2008-01-30 19:40:12 +01:00
mkindahl@dl145h.mysql.com
b9b38cb576
Disabling rpl_transaction test for non-debug builds.
2008-01-30 18:24:28 +01:00
mkindahl@dl145h.mysql.com
7552798971
Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl
...
into dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl-merge
2008-01-30 17:46:37 +01:00
mkindahl@dl145h.mysql.com
31355747d2
Fixing return value.
2008-01-30 17:35:25 +01:00
svoj@mysql.com/april.(none)
f2040f48c4
BUG#33871 - Duplicate "would" in Fulltext Stopwords
...
Code cleanup: removed duplicate stopword.
2008-01-30 20:14:35 +04:00
kostja@dipika.(none)
b46ce80902
A fix and a test case for Bug#34166 Server crash in SHOW OPEN TABLES and
...
pre-locking.
The crash was caused by an implicit assumption in check_table_access() that
table_list parameter is always a part of lex->query_tables.
When iterating over the passed list of tables, check_table_access() used
to stop only when lex->query_tables_last_not_own was reached.
In case of pre-locking, lex->query_tables_last_own is not NULL and points
to some element of lex->query_tables. When the parameter
of check_table_access() was not part of lex->query_tables, loop invariant
could never be violated and a crash would happen when the current table
pointer would point beyond the end of the provided list.
The fix is to change the signature of check_table_access() to also accept
a numeric limit of loop iterations, similarly to check_grant(), and
supply this limit in all places when we want to check access of tables
that are outside lex->query_tables, or just want to check access to one table.
2008-01-30 18:27:41 +03:00
mkindahl@dl145h.mysql.com
2a864d1fd7
Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl
...
into dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl-merge
2008-01-30 16:14:14 +01:00
mkindahl@dl145h.mysql.com
59d027c610
.del-show_binlog_events2.inc:
...
Delete: mysql-test/include/show_binlog_events2.inc
2008-01-30 16:11:39 +01:00