Commit graph

8197 commits

Author SHA1 Message Date
sergefp@mysql.com
60f2321b51 Merge 2006-02-05 23:49:32 +03:00
pekka@mysql.com
738db4f1a2 ndb - rbr blobs works now (or again) 2006-02-05 19:11:11 +01:00
aelkin@mysql.com
0c95fd2376 Merge mysql.com:/usr_rh9/home/elkin.rh9/MySQL/Merge/tmp_merge
into  mysql.com:/usr_rh9/home/elkin.rh9/MySQL/Merge/5.1-new
2006-02-04 11:06:17 +02:00
konstantin@mysql.com
a55b7a9f13 A post-merge fix. 2006-02-03 23:21:17 +03:00
konstantin@mysql.com
5e03bf7f93 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/home/kostja/mysql/mysql-5.1-merge
2006-02-03 21:10:03 +03:00
konstantin@mysql.com
9f0bb47f87 Merge mysql.com:/home/kostja/mysql/tmp_merge
into  mysql.com:/home/kostja/mysql/mysql-5.1-merge
2006-02-02 23:27:06 +03:00
dlenev@mysql.com
36e9bd0344 Merge mysql.com:/home/dlenev/src/mysql-5.1-bfix
into  mysql.com:/home/dlenev/src/mysql-5.1-merges
2006-02-02 22:12:06 +03: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
dlenev@mysql.com
3fc6cf1494 Merge mysqldev@production.mysql.com:my/mysql-5.1-release/
into  mysql.com:/home/dlenev/src/mysql-5.1-bfix
2006-02-02 13:53:35 +03:00
dlenev@mysql.com
5845476009 Yet another addition to the fix for BUG#9412 "Triggers: should have trigger
privilege".

Corrected addition of TRIGGER privilege by "mysql_fix_privilege_tables" script.
Problem with it should have been caught by system_mysql_db/system_mysql_db_fix
tests but they were disabled. Enabled them back.
2006-02-02 13:36:07 +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
tomas@poseidon.ndb.mysql.com
92ffe8cf0d Bug #16753 DD: mysqldump does not support Cluster Disk Data backups 2006-02-02 10:56:04 +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
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
tomas@poseidon.ndb.mysql.com
8c024b9072 Bug #16753 DD: mysqldump does not support Cluster Disk Data backups 2006-02-02 00:52:58 +01: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
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
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
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
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
de2c7c72d9 MySQL Bugs: #16466: DD: SHOW CREATE TABLE does not show TABLESPACE table_space1 STORAGE DISK 2006-02-01 11:56:20 +01: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
tomas@poseidon.ndb.mysql.com
cdf145c71d adjust test to give predictable output 2006-02-01 10:07:04 +01: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
a2f7fcf87b wl2325, distribution of schema operations between mysql servers 2006-02-01 01:12:11 +01:00
marty@linux.site
aef3ead4bc Added test case for creating index on disk stored table 2006-01-31 20:11:43 +01:00
mskold@mysql.com
3ef12423c5 Merge marty@192.168.123.145:MySQL/mysql-5.1-new
into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new-wl1892
2006-01-31 18:58:46 +01:00
mskold@mysql.com
8c73ef0923 Updated tests for WL#1892 2006-01-31 18:31:37 +01:00
andrey@lmy004.
2a60c11fef partial fix for bug#16407 (sql_mode not regarded)
add sql_mode to mysql.event
WL#1034 (Internal CRON)
2006-01-31 16:01:27 +01:00
sasha@asksasha.com
9a7690483a post-merge fix 2006-01-31 05:07:48 -07:00
sasha@asksasha.com
144490850a Merge spachev@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  asksasha.com:/reiser-data/mysql-dev/mysql-5.1-new
2006-01-30 20:58:17 -07:00
sasha@asksasha.com
fdefc7e03d #WL3026 - replace_regex in mysqltest 2006-01-30 20:35:33 -07:00
reggie@linux.site
0479012e3e Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  linux.site:/home/reggie/work/mysql-5.1
2006-01-30 11:47:56 -06: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
reggie@linux.site
d190fcfdcf BUG# 14524 - Partitions: crash if blackhole
This bug was fixed through other patches.  This test case just shows 
that it is fixed.
2006-01-30 10:07:39 -06:00
tomas@poseidon.ndb.mysql.com
061488eca3 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  poseidon.ndb.mysql.com:/home/tomas/mysql51
2006-01-30 17:07:37 +01:00
tomas@poseidon.ndb.mysql.com
15e0955666 added --core option in mysql-test-run for ndb 2006-01-30 17:06:31 +01:00
andrey@lmy004.
9d7d8767dd post-commit merge 2006-01-30 14:28:48 +01:00
svoj@april.(none)
a718127744 Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  april.(none):/home/svoj/devel/mysql/BUG16722/mysql-5.1-new
2006-01-30 16:28:51 +04: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
patg@govinda.patg.net
148b13b00c Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  govinda.patg.net:/home/patg/mysql-build/mysql-5.1-new-wl2986
2006-01-28 16:24:38 -08:00
patg@govinda.patg.net
437368e417 WL# 2986
Final patch
-----------

This WL is about using this bitmap in all parts of the partition handler.
Thus for:
rnd_init/rnd_next
index_init/index_next and all other variants of index scans
read_range_... the various range scans implemented in the partition handler.

Also use those bitmaps in the various other calls that currently loop over all
partitions.
2006-01-28 16:22:32 -08:00
joerg@debian.(none)
c81862cc77 Merge 2006-01-28 10:37:22 +01:00
rburnett@production.mysql.com
c61ee0fb40 Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  production.mysql.com:/usersnfs/rburnett/mysql-5.1-bug15820
2006-01-27 16:42:43 +01:00
rburnett@production.mysql.com
0f6c55eeee BUG#15820 - Can create table with 1 partition, then doing ALTER .. ADD PARTITION crashes
It is ok for a partitioned table to have only 1 partition.  This test is just to show that
doing the ALTER TABLE ADD PARTITION doesn't crash the server.

partition_mgm_err.result:
  Added result block for test of bug #15820
partition_mgm_err.test:
  Added test block for bug #15820
2006-01-27 16:41:53 +01:00
konstantin@mysql.com
3b500fc3ab Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/opt/local/work/mysql-5.1-merge1
2006-01-27 14:07:08 +03:00