elliot@mysql.com
e1759fea1b
Post-merge fixes.
2006-02-02 00:37:42 -05:00
elliot@mysql.com
d843b119d0
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/home/emurphy/src/mysql/bk-clean/mysql-5.1-new-merge
2006-02-01 19:35:15 -05:00
stewart@mysql.com
d5e09711b3
build fix when building with example storage engine.
2006-02-02 11:02:09 +11:00
elliot@mysql.com
9d282e31e4
Merge mysql.com:/home/emurphy/src/mysql/bk-clean/tmp_merge
...
into mysql.com:/home/emurphy/src/mysql/bk-clean/mysql-5.1-new-merge
Null-merge InnoDB snapshots from 5.0 to 5.1
2006-02-01 17:04:44 -05:00
dlenev@mysql.com
e4cf914b31
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/home/dlenev/src/mysql-5.1-merges
2006-02-02 00:05:23 +03:00
mskold@mysql.com
4be67dec39
Disabled ndb_blob
2006-02-01 21:49:15 +01:00
mskold@mysql.com
ff13fc6da6
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new-wl1892
2006-02-01 21:29:21 +01:00
dlenev@mysql.com
ba053272e6
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/home/dlenev/src/mysql-5.1-merges
2006-02-01 22:19:18 +03:00
dlenev@mysql.com
934714442f
Merge mysql.com:/home/dlenev/src/mysql-5.1-bfix
...
into mysql.com:/home/dlenev/src/mysql-5.1-merges
2006-02-01 21:49:11 +03:00
konstantin@mysql.com
e84cf2c782
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/home/kostja/mysql/mysql-5.1-merge
2006-02-01 21:41:33 +03:00
dlenev@mysql.com
730a711f93
Addition to the fix for BUG#9412 "Triggers: should have trigger privilege".
...
When we add new privilege we should update mysql-test/lib/init_db.sql
accordingly.
2006-02-01 21:27:12 +03:00
pekka@mysql.com
8d699b1f28
Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/space/pekka/ndb/version/my51
2006-02-01 18:20:40 +01:00
pekka@mysql.com
d85ee5105b
ndb - wl#2972 fix some mem leaks
2006-02-01 18:09:38 +01:00
konstantin@mysql.com
781cc33d6d
Merge mysql.com:/home/kostja/mysql/mysql-5.0-for_merge2
...
into mysql.com:/home/kostja/mysql/mysql-5.1-merge
2006-02-01 18:56:29 +03:00
konstantin@mysql.com
d02215bbb6
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/home/kostja/mysql/mysql-5.1-merge
2006-02-01 18:43:53 +03:00
mskold@mysql.com
267801e581
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new-wl1892
2006-02-01 14:58:15 +01:00
mskold@mysql.com
1df5f9b37f
Fixes to BLOB replication code for changes to event(now stores own copy of table)
2006-02-01 14:55:56 +01:00
stewart@mysql.com
37f4eba897
Merge mysqldev@production.mysql.com:my/mysql-5.1-release
...
into mysql.com:/home/stewart/Documents/MySQL/5.1/tmp_merge
2006-02-02 00:53:45 +11:00
stewart@mysql.com
72b9f287df
Merge mysql.com:/home/stewart/Documents/MySQL/5.1/wl1359
...
into mysql.com:/home/stewart/Documents/MySQL/5.1/tmp_merge
2006-02-02 00:52:32 +11:00
stewart@mysql.com
d590dd5682
some fixes from review of WL1359.
...
fix up test cases.
2006-02-02 00:47:08 +11:00
knielsen@mysql.com
ccb0b293d9
Merge mysql.com:/data0/mysqldev/my/mysql-5.1-release
...
into mysql.com:/data0/mysqldev/my/mysql-5.1-new
2006-02-01 13:34:28 +01:00
knielsen@mysql.com
8914c415b5
Change 5.1.6 from alpha to beta release
2006-02-01 13:30:56 +01:00
knielsen@mysql.com
8e69d72f71
5.1.6 cloneoff tag and version bump to 5.1.7
2006-02-01 13:28:57 +01:00
konstantin@mysql.com
519707073e
Merge mysql.com:/home/kostja/mysql/mysql-5.0-for_merge1
...
into mysql.com:/home/kostja/mysql/mysql-5.1-merge
2006-02-01 15:24:02 +03:00
tomas@poseidon.ndb.mysql.com
084a0ed822
added check if replication already setup by autodiscover
2006-02-01 13:16:36 +01:00
tomas@poseidon.ndb.mysql.com
128388bca7
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into poseidon.ndb.mysql.com:/home/tomas/mysql51
2006-02-01 13:04:47 +01:00
tomas@poseidon.ndb.mysql.com
622b6a1275
another attempt to make testcase predictable :)
2006-02-01 12:30:36 +01:00
tomas@poseidon.ndb.mysql.com
cf4a32a01d
Bug #16466 DD: SHOW CREATE TABLE does not show TABLESPACE table_space1 STORAGE DISK
...
corrected test case
2006-02-01 12:12:48 +01:00
tomas@poseidon.ndb.mysql.com
da81ed6d47
Bug #16466 DD: SHOW CREATE TABLE does not show TABLESPACE table_space1 STORAGE DISK
...
correction
2006-02-01 12:01:52 +01:00
mskold@mysql.com
8e024290a3
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new-wl1892
2006-02-01 11:57:17 +01:00
tomas@poseidon.ndb.mysql.com
de2c7c72d9
MySQL Bugs: #16466 : DD: SHOW CREATE TABLE does not show TABLESPACE table_space1 STORAGE DISK
2006-02-01 11:56:20 +01:00
mskold@mysql.com
e6fc41a750
Merge with new handling of tables in events
2006-02-01 11:55:26 +01:00
mskold@mysql.com
62c83686a9
Added check for stale table
2006-02-01 11:53:07 +01:00
anozdrin@mysql.com
222f39f4cb
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/mnt/hda4/home/alik/MySQL/devel/5.1-bug9412-latest
2006-02-01 13:32:15 +03:00
anozdrin@mysql.com
0a1f7e921b
Fix for BUG#9412: Triggers: should have trigger privilege.
...
Implement table-level TRIGGER privilege to control access to triggers.
Before this path global SUPER privilege was used for this purpose, that
was the big security problem.
In details, before this patch SUPER privilege was required:
- for the user at CREATE TRIGGER time to create a new trigger;
- for the user at DROP TRIGGER time to drop the existing trigger;
- for the definer at trigger activation time to execute the trigger (if the
definer loses SUPER privilege, all its triggers become unavailable);
This patch changes the behaviour in the following way:
- TRIGGER privilege on the subject table for trigger is required:
- for the user at CREATE TRIGGER time to create a new trigger;
- for the user at DROP TRIGGER time to drop the existing trigger;
- for the definer at trigger activation time to execute the trigger
(if the definer loses TRIGGER privilege on the subject table, all its
triggers on this table become unavailable).
- SUPER privilege is still required:
- for the user at CREATE TRIGGER time to explicitly set the trigger
definer to the user other than CURRENT_USER().
When the server works with database of the previous version (w/o TRIGGER
privilege), or if the database is being upgraded from the previous versions,
TRIGGER privilege is granted to whose users, who have CREATE privilege.
2006-02-01 13:28:45 +03:00
marty@linux.site
a4c389caf3
Wrapped get/set_ndb_share_state with mutex lock
2006-02-01 10:21:48 +01:00
tomas@poseidon.ndb.mysql.com
f90661e443
bug 16996 ndbd nodes crash at api heartbeat failure if event/replication is used
2006-02-01 10:13:27 +01:00
tomas@poseidon.ndb.mysql.com
cdf145c71d
adjust test to give predictable output
2006-02-01 10:07:04 +01:00
stewart@mysql.com
7458f115ed
Merge mysql.com:/home/stewart/Documents/MySQL/5.1/new
...
into mysql.com:/home/stewart/Documents/MySQL/5.1/wl1359
2006-02-01 18:23:34 +11:00
tomas@poseidon.ndb.mysql.com
e58f287f49
ensure repeatability of test case
2006-02-01 02:34:02 +01:00
tomas@poseidon.ndb.mysql.com
d302b0eb50
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into poseidon.ndb.mysql.com:/home/tomas/mysql51
2006-02-01 01:15:01 +01:00
tomas@poseidon.ndb.mysql.com
7ea70d5dc8
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into poseidon.ndb.mysql.com:/home/tomas/mysql51
2006-02-01 01:13:21 +01:00
tomas@poseidon.ndb.mysql.com
a2f7fcf87b
wl2325, distribution of schema operations between mysql servers
2006-02-01 01:12:11 +01:00
sergefp@mysql.com
8eaacf518c
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/home/psergey/mysql-5.1-fix-assert
2006-02-01 02:20:04 +03:00
sergefp@mysql.com
b197e22d4f
Change DBUG_ASSERT(1) to DBUG_ASSERT(0)
2006-02-01 02:19:14 +03:00
mskold@mysql.com
a1d25fd3ed
Merge mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new
...
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new-wl1892
2006-01-31 23:35:23 +01:00
andrey@lmy004.
060ed74abc
Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into lmy004.:/work/mysql-5.1-bug16407
2006-01-31 23:30:36 +01:00
andrey@lmy004.
64e09bad66
sql_mode should be after on_completion and before comment
...
partial fix for bug #16407
WL#1034 (Internal CRON)
2006-01-31 23:29:03 +01:00
mskold@mysql.com
89380f09c2
Propagating DictTabInfo in signal SubTableData for event TE_ALTER
2006-01-31 23:20:48 +01:00
marty@linux.site
aef3ead4bc
Added test case for creating index on disk stored table
2006-01-31 20:11:43 +01:00