mysql-test/t/rpl000004.test:
Updated test so it would not fail when MyISAM was not default Engine
mysql-test/r/rpl000004.result:
Updated test so it would not fail when MyISAM was not default Engine
mysql-test/extra/rpl_tests/rpl000006.test:
Updated test so that it would not fail when other engines are set as default engine
mysql-test/r/rpl000006.result:
Updated test so that it would not fail when other engines are set as default engine
mysql-test/r/rpl_relay_space_myisam.result:
Rename: mysql-test/r/rpl000005.result -> mysql-test/r/rpl_relay_space_myisam.result
mysql-test/extra/rpl_tests/rpl_sv_relay_space.test:
Had to split the test cases out to use for each engine. Reason being that the data goes applies to ndb in different order. So it has to have its own result file and I want to ensure that it is not used for other tests when ndb is used as default engine. Old test case was called rpl000009.test, so it was renamed as well to give the test more meaning
mysql-test/t/rpl_relay_space_innodb-master.opt:
Wrapper for old test case called rpl000009.test
mysql-test/t/rpl_relay_space_innodb-slave.opt:
Wrapper for old test case called rpl000009.test
mysql-test/t/rpl_relay_space_innodb.test:
Wrapper for old test case called rpl000009.test
mysql-test/t/rpl_relay_space_myisam.test:
Wrapper for old test case called rpl000009.test
mysql-test/t/rpl_ndb_relay_space.test:
Wrapper for old test case called rpl000009.test
mysql-test/r/rpl_ndb_relay_space.result:
Result file for wrapper for old test case called rpl000009.test
mysql-test/r/rpl_relay_space_innodb.result:
Result file for wrapper for old test case called rpl000009.test
mysql-test/r/rpl_relay_space_ndb.result:
Result file for wrapper for old test case called rpl000009.test
mysql-test/t/rpl000009.test:
updated to work when ndb is default engine
mysql-test/r/rpl000009.result:
updated to work when ndb is default engine
mysql-test/t/rpl_LD_INFILE.test:
Plan test cleanup
mysql-test/r/rpl_LD_INFILE.result:
Plan test cleanup
mysql-test/t/rpl_auto_increment-slave.opt:
needed to ensure test does not fail if default engine is specified
mysql-test/extra/rpl_tests/rpl_auto_increment.test:
Sorry, forgot to cleanup from debugging
mysql-test/t/rpl_ndb_auto_inc.test:
New wrapper for NDB
mysql-test/t/rpl_ndb_auto_inc-master.opt:
New wrapper for NDB
mysql-test/r/rpl_ndb_auto_inc.result:
New wrapper for NDB
mysql-test/t/disabled.def:
Updated
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.
mysql-test/r/system_mysql_db.result:
Updated test results after addition of TRIGGER privilege.
mysql-test/t/disabled.def:
Enabled back test system_mysql_db/system_mysql_db_fix tests.
scripts/mysql_fix_privilege_tables.sql:
Corrected addition of TRIGGER privilege.
into mysql.com:/home/kostja/mysql/mysql-5.1-merge
client/mysqltest.c:
Auto merged
mysql-test/r/alter_table.result:
Auto merged
mysql-test/r/create.result:
Auto merged
mysql-test/r/ctype_ucs.result:
Auto merged
mysql-test/r/mysqltest.result:
Auto merged
mysql-test/r/ps.result:
Auto merged
mysql-test/r/sp-error.result:
Auto merged
mysql-test/r/sp.result:
Auto merged
mysql-test/r/type_decimal.result:
Auto merged
mysql-test/r/variables.result:
Auto merged
mysql-test/r/view_grant.result:
Auto merged
mysql-test/t/alter_table.test:
Auto merged
mysql-test/t/create.test:
Auto merged
mysql-test/t/ctype_ucs.test:
Auto merged
mysql-test/t/mysqltest.test:
Auto merged
mysql-test/t/ps.test:
Auto merged
mysql-test/t/sp.test:
Auto merged
sql/ha_berkeley.cc:
Auto merged
sql/sp_head.cc:
Auto merged
sql/sp_head.h:
Auto merged
sql/sql_handler.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/share/errmsg.txt:
Auto merged
mysql-test/mysql-test-run.pl:
SCCS merged
sql/sql_yacc.yy:
Manual merge: resolve the conflict with moved sp_if rule
mysql-test/t/disabled.def:
disabling new test that was added during null-merge from 5.0
the new test innodb_unsafe_binlog will be re-enabled when the
5.1 snapshot for InnoDB is applied. Disabling test rather than
removing files to make future merges easier (removing the files
would cause merge conflicts when the files are re-added in the
5.1 snapshot).
mysql-test/r/ndb_dd_dump.result:
New BitKeeper file ``mysql-test/r/ndb_dd_dump.result''
mysql-test/t/ndb_dd_dump.test:
New BitKeeper file ``mysql-test/t/ndb_dd_dump.test''
into mysql.com:/home/emurphy/src/mysql/bk-clean/mysql-5.1-new-merge
Null-merge InnoDB snapshots from 5.0 to 5.1
storage/innobase/include/lock0lock.h:
Auto merged
mysql-test/r/innodb.result:
null-merge from 5.0
mysql-test/t/innodb.test:
null-merge from 5.0
sql/ha_innodb.cc:
null-merge from 5.0
storage/innobase/include/data0type.h:
null-merge from 5.0
storage/innobase/include/data0type.ic:
null-merge from 5.0
storage/innobase/include/os0file.h:
null-merge from 5.0
storage/innobase/include/row0mysql.h:
null-merge from 5.0
storage/innobase/lock/lock0lock.c:
null-merge from 5.0
storage/innobase/os/os0file.c:
null-merge from 5.0
storage/innobase/row/row0ins.c:
null-merge from 5.0
storage/innobase/row/row0mysql.c:
null-merge from 5.0
storage/innobase/row/row0sel.c:
null-merge from 5.0
storage/innobase/trx/trx0trx.c:
null-merge from 5.0
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.
mysql-test/r/grant.result:
Updated the result file after adding TRIGGER privilege.
mysql-test/r/information_schema.result:
Updated the result file after adding TRIGGER privilege.
mysql-test/r/lowercase_table_grant.result:
Updated the result file after adding TRIGGER privilege.
mysql-test/r/ps.result:
Updated the result file after adding TRIGGER privilege.
mysql-test/r/sp.result:
Updated the result file after adding TRIGGER privilege.
mysql-test/r/trigger-compat.result:
Updated the result file after adding TRIGGER privilege.
mysql-test/r/trigger-grant.result:
Updated the result file after adding TRIGGER privilege.
mysql-test/t/trigger-compat.test:
Grant table-level TRIGGER privilege instead of global SUPER one.
mysql-test/t/trigger-grant.test:
1. Grant table-level TRIGGER privilege instead of global SUPER one.
2. Updated the test case to check that SUPER is required to specify
the user other than the current as a definer.
scripts/mysql_create_system_tables.sh:
Added TRIGGER privilege.
scripts/mysql_fix_privilege_tables.sql:
Added TRIGGER privilege.
sql/sql_acl.cc:
Added TRIGGER privilege.
sql/sql_acl.h:
Added TRIGGER privilege.
sql/sql_show.cc:
Added TRIGGER privilege.
sql/sql_trigger.cc:
Check TRIGGER privilege instead of SUPER.
sql/sql_yacc.yy:
Added TRIGGER privilege.
mysql-test/r/ndb_binlog_ddl_multi.result:
New BitKeeper file ``mysql-test/r/ndb_binlog_ddl_multi.result''
mysql-test/t/ndb_binlog_ddl_multi.test:
New BitKeeper file ``mysql-test/t/ndb_binlog_ddl_multi.test''
into asksasha.com:/reiser-data/mysql-dev/mysql-5.1-new
BitKeeper/etc/ignore:
Added BitKeeper/etc/RESYNC_TREE to the ignore list
client/mysqltest.c:
merged
mysql-test/r/mysqltest.result:
merged
mysql-test/t/mysqltest.test:
merged
WL#1034 (Internal CRON)
mysql-test/r/events.result:
fix result of t/events (post-merge fix of bug #16642)
mysql-test/r/system_mysql_db.result:
fix result(post-merge fix of bug #16642)
mysql-test/t/events.test:
fix test, use --echo instead of select, fix failing create event statement
sql/event_timed.cc:
add a bit more debug information
This bug was fixed through other patches. This test case just shows
that it is fixed.
mysql-test/r/partition_hash.result:
result block for bug #14524
mysql-test/t/partition_hash.test:
test block for bug# 14524
mysql-test/lib/init_db.sql:
Auto merged
scripts/mysql_create_system_tables.sh:
Auto merged
scripts/mysql_fix_privilege_tables.sql:
Auto merged
sql/event.cc:
Auto merged
sql/event.h:
Auto merged
sql/event_executor.cc:
Auto merged
sql/event_priv.h:
Auto merged
sql/event_timed.cc:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
mysql-test/r/events.result:
manual merge
mysql-test/r/system_mysql_db.result:
manual merge
mysql-test/t/events.test:
manual merge
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
mysql-test/lib/init_db.sql:
change the PK - (definer, db, name)
quicker searches when SHOW EVENTS;
allow also different users to have events with the same name ->
no information disclosure
mysql-test/r/events.result:
result of new tests
mysql-test/r/information_schema.result:
result of new tests
mysql-test/r/information_schema_db.result:
result of new tests
mysql-test/r/system_mysql_db.result:
result of new tests
mysql-test/t/events.test:
new tests for information_schema.events
scripts/mysql_create_system_tables.sh:
change the PK of mysql.event to (definer, db, name)
scripts/mysql_fix_privilege_tables.sql:
change the PK of mysql.event to (definer, db, name)
sql/event.cc:
pass around the definer of the event because of the new PK
which is (definer, db, name). It's needed for index searching.
sql/event.h:
- make enum evex_table_field again public so it can be used
in sql_show.cc
- make created and modified ulonglong, because they should be such
- make public evex_open_event_table so it can be used in sql_show.cc
sql/event_executor.cc:
- cosmetics
sql/event_priv.h:
- moved enum evex_table_field and evex_open_event_table()
to event.h (made them therefore public)
sql/event_timed.cc:
- in event_timed::init_definer() always fill this.definer with
the concatenated value of definer_user@definer_host. Makes
later the work easier.
- pass around the definer wherever is needed for searching
(new prototype of evex_db_find_evex_aux)
sql/mysqld.cc:
- add counter for SHOW EVENTS
sql/sql_lex.h:
- register SHOW EVENTS as command
sql/sql_parse.cc:
- handle SCH_EVENTS (I_S.EVENTS like SCH_TRIGGERS)
- make additional check in case of SHOW EVENTS (check for EVENT on
the current database. if it is null check_access() gives appropriate
message back.
sql/sql_show.cc:
- add INFORMATION_SCHEMA.EVENTS and SHOW EVENTS
- I_S.EVENTS.SQL_MODE is NULL for now -> not implemented. Trudy
asked to be added so bug #16642 can be completely closed. There
is another bug report which will fix the lack of storage of
SQL_MODE during event creation.
sql/sql_yacc.yy:
- always call event_timed::init_definer() when CREATE/ALTER/DROP
EVENT but not when just compiling the body of the event because
in this case this operation is not needed, it takes memory and
CPU time and at the end the result is not used. event_timed::definer
is used only on SQLCOM_CREATE/ALTER/DROP_EVENT execution not on
statement compilation.
- add SHOW [FULL] EVENTS [FROM db] [LIKE pattern]
in case of FULL and the user has PROCESS privilege then he will see
also others' events in the current database, otherwise the output
is the same as of SHOW EVENTS. Because the events are per DB only
the events from the current database are shown. pattern is applied
against event name. FROM db is self explanatory.
sql/table.h:
add SCH_EVENTS as part of INFORMATION_SCHEMA
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.
mysql-test/r/partition_pruning.result:
WL# 2986
New results reflecting bitmap being used to determine if a partition is to be
included
mysql-test/t/partition_pruning.test:
WL# 2986
New tests to show bitmap being used in ha_partition
sql/ha_partition.cc:
WL# 2986
Used work from 2682 and removed the partition select code.
Added do {} while loop to any iteration over partitions to now utilise
m_part_info->used_partitions bitmap to determine if a partition should be
used.
sql/ha_partition.h:
WL# 2986
Removed unused member
sql/handler.h:
WL# 2986
Removed unused member
sql/opt_range.cc:
WL# 2986
Added bitmap_clear_all to clear bitmap prior to pruning
DBUG code for testing
sql/sql_partition.cc:
WL# 2986
Changed < to <=, which fixes the problem with edge cases going awry.
mysql-test/t/disabled.def:
blobs: set_null is not enough, must also set empty buffer
sql/ha_ndbcluster.cc:
blobs: set_null is not enough, must also set empty buffer
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
mysql-test/t/partition_mgm_err.test:
Added test block for bug #15820
mysql-test/r/partition_mgm_err.result:
Added result block for test of bug #15820
WL#1034 (Internal CRON)
(not interesting for the Changelog)
mysql-test/r/events.result:
update result
mysql-test/t/events.test:
update test after pull after comit of fix for bug 16419
WL #1034 (Internal CRON)
mysql-test/r/events.result:
update test result
mysql-test/t/events.test:
add tests
sql/event_timed.cc:
- remove stupid check of val_int()
- fix for bug #16419 (Events: can't use timestamp in the schedule)
=> don't use val_int() but only get_date() and use the date!
sql/share/errmsg.txt:
- fix an error message, one more "einen"
sql/sql_yacc.yy:
- handle new return value of event_timed::init_execute_at()
