Commit graph

14305 commits

Author SHA1 Message Date
konstantin@mysql.com
e3663e7659 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/home/kostja/mysql/mysql-5.1-merge
2006-02-02 20:54:07 +03:00
tomas@poseidon.ndb.mysql.com
6e0d64565f Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
into  poseidon.ndb.mysql.com:/home/tomas/mysql51
2006-02-02 16:44:22 +01:00
tomas@poseidon.ndb.mysql.com
ce8308a503 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  poseidon.ndb.mysql.com:/home/tomas/mysql51
2006-02-02 16:19:49 +01:00
tomas@poseidon.ndb.mysql.com
8978db5ec6 added more logging in ndb handler
enable extra logging in ndb handler during test runs
2006-02-02 16:12:18 +01:00
konstantin@mysql.com
92b41ba92a Merge mysql.com:/home/kostja/mysql/tmp_merge
into  mysql.com:/home/kostja/mysql/mysql-5.1-merge
2006-02-02 16:57:34 +03:00
tomas@poseidon.ndb.mysql.com
b40c942509 Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-release
into  poseidon.ndb.mysql.com:/home/tomas/mysql51
2006-02-02 11:13:36 +01:00
konstantin@mysql.com
065f8066d5 Merge mysql.com:/home/kostja/mysql/mysql-5.0-for_merge
into  mysql.com:/home/kostja/mysql/mysql-5.1-merge
2006-02-02 12:03:35 +03:00
stewart@mysql.com
3ca777e443 build fix for solaris 10 sparc -max 2006-02-02 16:14:31 +11:00
tomas@poseidon.ndb.mysql.com
6232190797 bug, added error handling to information_schema files 2006-02-02 00:24:42 +01:00
tomas@poseidon.ndb.mysql.com
bdf72a56fe bug, retry handling in "ndb schema propagation" incorrect 2006-02-01 23:55:04 +01:00
tomas@poseidon.ndb.mysql.com
029fb75cb5 bug, ndb onject on thread unitialized on handlerton call in files information schema 2006-02-01 22:37:25 +01: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
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
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
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
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
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
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
da81ed6d47 Bug 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: : 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
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
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
a2f7fcf87b wl2325, distribution of schema operations between mysql servers 2006-02-01 01:12:11 +01:00
marty@linux.site
c7e17f5512 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  linux.site:/home/marty/MySQL/mysql-5.1-new
2006-01-31 18:58:45 +01:00
tomas@poseidon.ndb.mysql.com
44e572df52 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  poseidon.ndb.mysql.com:/home/tomas/mysql51
2006-01-31 18:58:44 +01:00
tomas@poseidon.ndb.mysql.com
f4f0f1d66c Bug DD: SHOW CREATE TABLE does not show TABLESPACE table_space1 STORAGE DISK 2006-01-31 18:46:44 +01:00
andrey@lmy004.
060122de06 add the sql_mode to the enum with the fields
post-push fix for bug#16407 (sql_mode discarded)
WL#1034 (Internal CRON)
2006-01-31 17:22:38 +01:00
marty@linux.site
0a57f2410b Enable WL#1892 for binlog, wrong signature 2006-01-31 17:11:21 +01:00
marty@linux.site
89aa7c27e6 Enable WL#1892 for binlog 2006-01-31 17:01:14 +01:00
marty@linux.site
d77b26c8c6 Post review fixes 2006-01-31 15:53:35 +01:00
marty@linux.site
d0ede4674c Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  linux.site:/home/marty/MySQL/mysql-5.1-new
2006-01-31 15:47:00 +01:00
tomas@poseidon.ndb.mysql.com
0e70717e4e Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  poseidon.ndb.mysql.com:/home/tomas/mysql51
2006-01-31 15:41:37 +01:00
tomas@poseidon.ndb.mysql.com
933813c0c3 Bug Cluster: Auto Database Push is not working properly 2006-01-31 15:40:26 +01:00
knielsen@mysql.com
0605a8bc39 Merge bk-internal:/home/bk/mysql-5.1-new
into  mysql.com:/usr/local/mysql/x/mysql-5.1-new
2006-01-31 10:48:40 +01:00
marty@linux.site
d03efdfd5b Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  linux.site:/home/marty/MySQL/mysql-5.1-new
2006-01-31 09:30:35 +01:00
tomas@poseidon.ndb.mysql.com
f10a7edff5 Bug , log floods with ndb discover messages
+ fix crashing bug when discovering ndb tables outside select context
2006-01-31 01:37:48 +01:00
knielsen@mysql.com
56d44ff1f9 Merge mysql.com:/usr/local/mysql/mysql-5.1-win-fixes
into  mysql.com:/usr/local/mysql/x/mysql-5.1-new
2006-01-30 17:57:20 +01:00
andrey@lmy004.
0a0304b5e8 Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into lmy004.:/work/mysql-5.1-events_i_s
2006-01-30 17:20:46 +01:00
andrey@lmy004.
08892be32d post-merge fixes of fix for bug#16642 (No I_S.EVENTS table)
WL#1034 (Internal CRON)
2006-01-30 17:12:30 +01:00
andrey@lmy004.
9d7d8767dd post-commit merge 2006-01-30 14:28:48 +01:00
andrey@lmy004.
d847ac54ca fix for bug#16642 (Events: No INFORMATION_SCHEMA.EVENTS table)
post-review change - use pointer instead of copy on the stack.
WL#1034 (Internal CRON)
 This patch adds INFORMATION_SCHEMA.EVENTS table with the following format:
  EVENT_CATALOG  - MYSQL_TYPE_STRING  (Always NULL)
  EVENT_SCHEMA   - MYSQL_TYPE_STRING  (the database)
  EVENT_NAME     - MYSQL_TYPE_STRING  (the name)
  DEFINER        - MYSQL_TYPE_STRING  (user@host)
  EVENT_BODY     - MYSQL_TYPE_STRING  (the body from mysql.event)
  EVENT_TYPE     - MYSQL_TYPE_STRING  ("ONE TIME" | "RECURRING")
  EXECUTE_AT     - MYSQL_TYPE_TIMESTAMP (set for "ONE TIME" otherwise NULL)
  INTERVAL_VALUE - MYSQL_TYPE_LONG    (set for RECURRING otherwise NULL)
  INTERVAL_FIELD - MYSQL_TYPE_STRING  (set for RECURRING otherwise NULL)
  SQL_MODE       - MYSQL_TYPE_STRING  (for now NULL)
  STARTS         - MYSQL_TYPE_TIMESTAMP (starts from mysql.event)
  ENDS           - MYSQL_TYPE_TIMESTAMP (ends from mysql.event)
  STATUS         - MYSQL_TYPE_STRING  (ENABLED | DISABLED)
  ON_COMPLETION  - MYSQL_TYPE_STRING  (NOT PRESERVE | PRESERVE)
  CREATED        - MYSQL_TYPE_TIMESTAMP
  LAST_ALTERED   - MYSQL_TYPE_TIMESTAMP
  LAST_EXECUTED  - MYSQL_TYPE_TIMESTAMP
  EVENT_COMMENT  - MYSQL_TYPE_STRING

  SQL_MODE is NULL for now, because the value is still not stored in mysql.event .
Support will be added as a fix for another bug.

 This patch also adds SHOW [FULL] EVENTS [FROM db] [LIKE pattern]
1. SHOW EVENTS shows always only the events on the same user,
   because the PK of mysql.event is (definer, db, name) several 
   users may have event with the same name -> no information disclosure.
2. SHOW FULL EVENTS - shows the events (in the current db as SHOW EVENTS)
   of all users. The user has to have PROCESS privilege, if not then
   SHOW FULL EVENTS behave like SHOW EVENTS.
3. If [FROM db] is specified then this db is considered.
4. Event names can be filtered with LIKE pattern.
  SHOW EVENTS returns table with the following columns, which are subset of
  the data which is returned by SELECT * FROM I_S.EVENTS
   Db
   Name
   Definer 
   Type
   Execute at
   Interval value
   Interval field 
   Starts 
   Ends
   Status
2006-01-30 13:15:23 +01:00
knielsen@mysql.com
899fc2653d Windows compile fixes in preparation for 5.1.6 beta. 2006-01-30 13:09:08 +01:00
msvensson@neptunus.(none)
44cd491502 Merge neptunus.(none):/home/msvensson/mysql/bug15904/my51-bug15904
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
2006-01-30 11:03:17 +01:00