2005-04-05 02:08:12 +02:00
|
|
|
# Can't test with embedded server
|
|
|
|
|
-- source include/not_embedded.inc
|
2005-04-04 21:43:58 +02:00
|
|
|
|
2009-03-03 21:34:18 +01:00
|
|
|
# Save the initial number of concurrent sessions
|
|
|
|
|
--source include/count_sessions.inc
|
|
|
|
|
|
2005-11-24 05:17:38 +01:00
|
|
|
--disable_warnings
|
|
|
|
|
drop database if exists mysqltest;
|
This changeset is largely a handler cleanup changeset (WL#3281), but includes fixes and cleanups that was found necessary while testing the handler changes
Changes that requires code changes in other code of other storage engines.
(Note that all changes are very straightforward and one should find all issues
by compiling a --debug build and fixing all compiler errors and all
asserts in field.cc while running the test suite),
- New optional handler function introduced: reset()
This is called after every DML statement to make it easy for a handler to
statement specific cleanups.
(The only case it's not called is if force the file to be closed)
- handler::extra(HA_EXTRA_RESET) is removed. Code that was there before
should be moved to handler::reset()
- table->read_set contains a bitmap over all columns that are needed
in the query. read_row() and similar functions only needs to read these
columns
- table->write_set contains a bitmap over all columns that will be updated
in the query. write_row() and update_row() only needs to update these
columns.
The above bitmaps should now be up to date in all context
(including ALTER TABLE, filesort()).
The handler is informed of any changes to the bitmap after
fix_fields() by calling the virtual function
handler::column_bitmaps_signal(). If the handler does caching of
these bitmaps (instead of using table->read_set, table->write_set),
it should redo the caching in this code. as the signal() may be sent
several times, it's probably best to set a variable in the signal
and redo the caching on read_row() / write_row() if the variable was
set.
- Removed the read_set and write_set bitmap objects from the handler class
- Removed all column bit handling functions from the handler class.
(Now one instead uses the normal bitmap functions in my_bitmap.c instead
of handler dedicated bitmap functions)
- field->query_id is removed. One should instead instead check
table->read_set and table->write_set if a field is used in the query.
- handler::extra(HA_EXTRA_RETRIVE_ALL_COLS) and
handler::extra(HA_EXTRA_RETRIEVE_PRIMARY_KEY) are removed. One should now
instead use table->read_set to check for which columns to retrieve.
- If a handler needs to call Field->val() or Field->store() on columns
that are not used in the query, one should install a temporary
all-columns-used map while doing so. For this, we provide the following
functions:
my_bitmap_map *old_map= dbug_tmp_use_all_columns(table, table->read_set);
field->val();
dbug_tmp_restore_column_map(table->read_set, old_map);
and similar for the write map:
my_bitmap_map *old_map= dbug_tmp_use_all_columns(table, table->write_set);
field->val();
dbug_tmp_restore_column_map(table->write_set, old_map);
If this is not done, you will sooner or later hit a DBUG_ASSERT
in the field store() / val() functions.
(For not DBUG binaries, the dbug_tmp_restore_column_map() and
dbug_tmp_restore_column_map() are inline dummy functions and should
be optimized away be the compiler).
- If one needs to temporary set the column map for all binaries (and not
just to avoid the DBUG_ASSERT() in the Field::store() / Field::val()
methods) one should use the functions tmp_use_all_columns() and
tmp_restore_column_map() instead of the above dbug_ variants.
- All 'status' fields in the handler base class (like records,
data_file_length etc) are now stored in a 'stats' struct. This makes
it easier to know what status variables are provided by the base
handler. This requires some trivial variable names in the extra()
function.
- New virtual function handler::records(). This is called to optimize
COUNT(*) if (handler::table_flags() & HA_HAS_RECORDS()) is true.
(stats.records is not supposed to be an exact value. It's only has to
be 'reasonable enough' for the optimizer to be able to choose a good
optimization path).
- Non virtual handler::init() function added for caching of virtual
constants from engine.
- Removed has_transactions() virtual method. Now one should instead return
HA_NO_TRANSACTIONS in table_flags() if the table handler DOES NOT support
transactions.
- The 'xxxx_create_handler()' function now has a MEM_ROOT_root argument
that is to be used with 'new handler_name()' to allocate the handler
in the right area. The xxxx_create_handler() function is also
responsible for any initialization of the object before returning.
For example, one should change:
static handler *myisam_create_handler(TABLE_SHARE *table)
{
return new ha_myisam(table);
}
->
static handler *myisam_create_handler(TABLE_SHARE *table, MEM_ROOT *mem_root)
{
return new (mem_root) ha_myisam(table);
}
- New optional virtual function: use_hidden_primary_key().
This is called in case of an update/delete when
(table_flags() and HA_PRIMARY_KEY_REQUIRED_FOR_DELETE) is defined
but we don't have a primary key. This allows the handler to take precisions
in remembering any hidden primary key to able to update/delete any
found row. The default handler marks all columns to be read.
- handler::table_flags() now returns a ulonglong (to allow for more flags).
- New/changed table_flags()
- HA_HAS_RECORDS Set if ::records() is supported
- HA_NO_TRANSACTIONS Set if engine doesn't support transactions
- HA_PRIMARY_KEY_REQUIRED_FOR_DELETE
Set if we should mark all primary key columns for
read when reading rows as part of a DELETE
statement. If there is no primary key,
all columns are marked for read.
- HA_PARTIAL_COLUMN_READ Set if engine will not read all columns in some
cases (based on table->read_set)
- HA_PRIMARY_KEY_ALLOW_RANDOM_ACCESS
Renamed to HA_PRIMARY_KEY_REQUIRED_FOR_POSITION.
- HA_DUPP_POS Renamed to HA_DUPLICATE_POS
- HA_REQUIRES_KEY_COLUMNS_FOR_DELETE
Set this if we should mark ALL key columns for
read when when reading rows as part of a DELETE
statement. In case of an update we will mark
all keys for read for which key part changed
value.
- HA_STATS_RECORDS_IS_EXACT
Set this if stats.records is exact.
(This saves us some extra records() calls
when optimizing COUNT(*))
- Removed table_flags()
- HA_NOT_EXACT_COUNT Now one should instead use HA_HAS_RECORDS if
handler::records() gives an exact count() and
HA_STATS_RECORDS_IS_EXACT if stats.records is exact.
- HA_READ_RND_SAME Removed (no one supported this one)
- Removed not needed functions ha_retrieve_all_cols() and ha_retrieve_all_pk()
- Renamed handler::dupp_pos to handler::dup_pos
- Removed not used variable handler::sortkey
Upper level handler changes:
- ha_reset() now does some overall checks and calls ::reset()
- ha_table_flags() added. This is a cached version of table_flags(). The
cache is updated on engine creation time and updated on open.
MySQL level changes (not obvious from the above):
- DBUG_ASSERT() added to check that column usage matches what is set
in the column usage bit maps. (This found a LOT of bugs in current
column marking code).
- In 5.1 before, all used columns was marked in read_set and only updated
columns was marked in write_set. Now we only mark columns for which we
need a value in read_set.
- Column bitmaps are created in open_binary_frm() and open_table_from_share().
(Before this was in table.cc)
- handler::table_flags() calls are replaced with handler::ha_table_flags()
- For calling field->val() you must have the corresponding bit set in
table->read_set. For calling field->store() you must have the
corresponding bit set in table->write_set. (There are asserts in
all store()/val() functions to catch wrong usage)
- thd->set_query_id is renamed to thd->mark_used_columns and instead
of setting this to an integer value, this has now the values:
MARK_COLUMNS_NONE, MARK_COLUMNS_READ, MARK_COLUMNS_WRITE
Changed also all variables named 'set_query_id' to mark_used_columns.
- In filesort() we now inform the handler of exactly which columns are needed
doing the sort and choosing the rows.
- The TABLE_SHARE object has a 'all_set' column bitmap one can use
when one needs a column bitmap with all columns set.
(This is used for table->use_all_columns() and other places)
- The TABLE object has 3 column bitmaps:
- def_read_set Default bitmap for columns to be read
- def_write_set Default bitmap for columns to be written
- tmp_set Can be used as a temporary bitmap when needed.
The table object has also two pointer to bitmaps read_set and write_set
that the handler should use to find out which columns are used in which way.
- count() optimization now calls handler::records() instead of using
handler->stats.records (if (table_flags() & HA_HAS_RECORDS) is true).
- Added extra argument to Item::walk() to indicate if we should also
traverse sub queries.
- Added TABLE parameter to cp_buffer_from_ref()
- Don't close tables created with CREATE ... SELECT but keep them in
the table cache. (Faster usage of newly created tables).
New interfaces:
- table->clear_column_bitmaps() to initialize the bitmaps for tables
at start of new statements.
- table->column_bitmaps_set() to set up new column bitmaps and signal
the handler about this.
- table->column_bitmaps_set_no_signal() for some few cases where we need
to setup new column bitmaps but don't signal the handler (as the handler
has already been signaled about these before). Used for the momement
only in opt_range.cc when doing ROR scans.
- table->use_all_columns() to install a bitmap where all columns are marked
as use in the read and the write set.
- table->default_column_bitmaps() to install the normal read and write
column bitmaps, but not signaling the handler about this.
This is mainly used when creating TABLE instances.
- table->mark_columns_needed_for_delete(),
table->mark_columns_needed_for_delete() and
table->mark_columns_needed_for_insert() to allow us to put additional
columns in column usage maps if handler so requires.
(The handler indicates what it neads in handler->table_flags())
- table->prepare_for_position() to allow us to tell handler that it
needs to read primary key parts to be able to store them in
future table->position() calls.
(This replaces the table->file->ha_retrieve_all_pk function)
- table->mark_auto_increment_column() to tell handler are going to update
columns part of any auto_increment key.
- table->mark_columns_used_by_index() to mark all columns that is part of
an index. It will also send extra(HA_EXTRA_KEYREAD) to handler to allow
it to quickly know that it only needs to read colums that are part
of the key. (The handler can also use the column map for detecting this,
but simpler/faster handler can just monitor the extra() call).
- table->mark_columns_used_by_index_no_reset() to in addition to other columns,
also mark all columns that is used by the given key.
- table->restore_column_maps_after_mark_index() to restore to default
column maps after a call to table->mark_columns_used_by_index().
- New item function register_field_in_read_map(), for marking used columns
in table->read_map. Used by filesort() to mark all used columns
- Maintain in TABLE->merge_keys set of all keys that are used in query.
(Simplices some optimization loops)
- Maintain Field->part_of_key_not_clustered which is like Field->part_of_key
but the field in the clustered key is not assumed to be part of all index.
(used in opt_range.cc for faster loops)
- dbug_tmp_use_all_columns(), dbug_tmp_restore_column_map()
tmp_use_all_columns() and tmp_restore_column_map() functions to temporally
mark all columns as usable. The 'dbug_' version is primarily intended
inside a handler when it wants to just call Field:store() & Field::val()
functions, but don't need the column maps set for any other usage.
(ie:: bitmap_is_set() is never called)
- We can't use compare_records() to skip updates for handlers that returns
a partial column set and the read_set doesn't cover all columns in the
write set. The reason for this is that if we have a column marked only for
write we can't in the MySQL level know if the value changed or not.
The reason this worked before was that MySQL marked all to be written
columns as also to be read. The new 'optimal' bitmaps exposed this 'hidden
bug'.
- open_table_from_share() does not anymore setup temporary MEM_ROOT
object as a thread specific variable for the handler. Instead we
send the to-be-used MEMROOT to get_new_handler().
(Simpler, faster code)
Bugs fixed:
- Column marking was not done correctly in a lot of cases.
(ALTER TABLE, when using triggers, auto_increment fields etc)
(Could potentially result in wrong values inserted in table handlers
relying on that the old column maps or field->set_query_id was correct)
Especially when it comes to triggers, there may be cases where the
old code would cause lost/wrong values for NDB and/or InnoDB tables.
- Split thd->options flag OPTION_STATUS_NO_TRANS_UPDATE to two flags:
OPTION_STATUS_NO_TRANS_UPDATE and OPTION_KEEP_LOG.
This allowed me to remove some wrong warnings about:
"Some non-transactional changed tables couldn't be rolled back"
- Fixed handling of INSERT .. SELECT and CREATE ... SELECT that wrongly reset
(thd->options & OPTION_STATUS_NO_TRANS_UPDATE) which caused us to loose
some warnings about
"Some non-transactional changed tables couldn't be rolled back")
- Fixed use of uninitialized memory in ha_ndbcluster.cc::delete_table()
which could cause delete_table to report random failures.
- Fixed core dumps for some tests when running with --debug
- Added missing FN_LIBCHAR in mysql_rm_tmp_tables()
(This has probably caused us to not properly remove temporary files after
crash)
- slow_logs was not properly initialized, which could maybe cause
extra/lost entries in slow log.
- If we get an duplicate row on insert, change column map to read and
write all columns while retrying the operation. This is required by
the definition of REPLACE and also ensures that fields that are only
part of UPDATE are properly handled. This fixed a bug in NDB and
REPLACE where REPLACE wrongly copied some column values from the replaced
row.
- For table handler that doesn't support NULL in keys, we would give an error
when creating a primary key with NULL fields, even after the fields has been
automaticly converted to NOT NULL.
- Creating a primary key on a SPATIAL key, would fail if field was not
declared as NOT NULL.
Cleanups:
- Removed not used condition argument to setup_tables
- Removed not needed item function reset_query_id_processor().
- Field->add_index is removed. Now this is instead maintained in
(field->flags & FIELD_IN_ADD_INDEX)
- Field->fieldnr is removed (use field->field_index instead)
- New argument to filesort() to indicate that it should return a set of
row pointers (not used columns). This allowed me to remove some references
to sql_command in filesort and should also enable us to return column
results in some cases where we couldn't before.
- Changed column bitmap handling in opt_range.cc to be aligned with TABLE
bitmap, which allowed me to use bitmap functions instead of looping over
all fields to create some needed bitmaps. (Faster and smaller code)
- Broke up found too long lines
- Moved some variable declaration at start of function for better code
readability.
- Removed some not used arguments from functions.
(setup_fields(), mysql_prepare_insert_check_table())
- setup_fields() now takes an enum instead of an int for marking columns
usage.
- For internal temporary tables, use handler::write_row(),
handler::delete_row() and handler::update_row() instead of
handler::ha_xxxx() for faster execution.
- Changed some constants to enum's and define's.
- Using separate column read and write sets allows for easier checking
of timestamp field was set by statement.
- Remove calls to free_io_cache() as this is now done automaticly in ha_reset()
- Don't build table->normalized_path as this is now identical to table->path
(after bar's fixes to convert filenames)
- Fixed some missed DBUG_PRINT(.."%lx") to use "0x%lx" to make it easier to
do comparision with the 'convert-dbug-for-diff' tool.
Things left to do in 5.1:
- We wrongly log failed CREATE TABLE ... SELECT in some cases when using
row based logging (as shown by testcase binlog_row_mix_innodb_myisam.result)
Mats has promised to look into this.
- Test that my fix for CREATE TABLE ... SELECT is indeed correct.
(I added several test cases for this, but in this case it's better that
someone else also tests this throughly).
Lars has promosed to do this.
BitKeeper/etc/ignore:
added mysys/test_bitmap
include/base64.h:
Removed my_global.h, as this must be included first in any program
include/heap.h:
Added heap_reset() (Required by new handler interface)
include/my_base.h:
Removed HA_EXTRA_RESET. MySQL will now call ::reset() instead of ::extra(HA_EXTRA_RESET).
HA_EXTRA_RETRIVE_ALL_COLS and HA_EXTRA_RETRIVE_PRIMARY key are deleted as the column bitmaps makes these unnecessary
include/my_bitmap.h:
Remove my_pthread.h (should be included at upper level)
Introduced my_bitmap_map typedef to make it the bitmap handling more like a black box
Added bitmap_is_overlapping(), bitmap_test_and_clear(), bitmap_copy() and bitmap_cmp()
Made bitmap_set_bit(), bitmap_flip_bit(), bitmap_clear_bit() return void
include/myisam.h:
Added mi_reset() (Required by new handler interface)
include/myisammrg.h:
Added myrg_reset() (Required by new handler interface)
include/mysql_com.h:
Added flag FIELD_IN_ADD_INDEX to be able to remove Field->add_index
mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test:
Added testing of CREATE ... SELECT in a mixed environment
(This found some bugs that Mats is going to fix shortly)
mysql-test/install_test_db.sh:
Simplify ldata usage
Added --tmpdir=. option to mysqld bootstrap (Removed some warnings when TMPDIR was wrongly set)
mysql-test/mysql-test-run.pl:
Added --tmpdir=. to bootstrap
mysql-test/mysql-test-run.sh:
Use copy instead of INSTALL_DB for master and slave databases.
(Speeds up startup time a lot!)
Remove snapshot directories at startup (removes some strange warnings)
mysql-test/r/binlog_row_mix_innodb_myisam.result:
Added testing of CREATE ... SELECT in a mixed environment
(This found some bugs that Mats is going to fix shortly)
mysql-test/r/binlog_stm_mix_innodb_myisam.result:
Added testing of CREATE ... SELECT in a mixed environment
mysql-test/r/create.result:
Some extra tests of warnings and number of tables opened by CREATE ... SELECT
mysql-test/r/federated.result:
Drop some left over tables
Added testing of multiple table update and multiple table delete (with and without keys)
mysql-test/r/func_gconcat.result:
Enable some disabled tests (converted them slightly to be predictable)
mysql-test/r/func_time.result:
Added drop of test function
mysql-test/r/innodb_mysql.result:
Added tests for CREATE ... SELECT
mysql-test/r/insert.result:
More tests
Added testing of duplicate columns in insert
mysql-test/r/loaddata.result:
Added testing LOAD DATA ... SET ...
mysql-test/r/multi_update.result:
Test multi updates and deletes using primary key and without
mysql-test/r/ndb_index_unique.result:
Better error message
mysql-test/r/ndb_replace.result:
New correct result after fixing REPLACE handling with NDB
mysql-test/r/rpl_ddl.result:
Now we don't get these (wrong) warnings anymore
mysql-test/r/view_grant.result:
Drop used views
mysql-test/t/create.test:
Some extra tests of warnings and number of tables opened by CREATE ... SELECT
mysql-test/t/federated.test:
Drop some left over tables
Added testing of multiple table update and multiple table delete (with and without keys)
mysql-test/t/func_gconcat.test:
Enable some disabled tests (converted them slightly to be predictable)
mysql-test/t/func_time.test:
Added drop of test function
mysql-test/t/innodb_mysql.test:
Added tests for CREATE ... SELECT
mysql-test/t/insert.test:
More tests
Added testing of duplicate columns in insert
mysql-test/t/loaddata.test:
Added testing LOAD DATA ... SET ...
mysql-test/t/multi_update.test:
Test multi updates and deletes using primary key and without
mysql-test/t/view_grant.test:
Drop used views
mysql-test/valgrind.supp:
Added supression of not needed warnings when printing stack trace
mysys/base64.c:
Include my_global.h first
mysys/my_bitmap.c:
Added bitmap_is_overlapping(), bitmap_test_and_clear() and bitmap_copy()
Changed logic of bitmap handling to be a bit more efficent (Did this together with Mikael Ronström)
Now the 'extra, not used bits' in the bitmap are assumed to have a 'random value' and the bitmap functions are free to change them whenever needed.
Changed how mutex is allocated to make 'bitmap_free()' function simpler.
mysys/thr_lock.c:
Added 0x before thread pointers (for easier comparison of DBUG traces)
sql/event.cc:
Ensure 'use_all_columns()' is used for event tables
Don't print warning that event table is damaged if it doesn't exists.
sql/field.cc:
Added ASSERT_COLUMN_MARKED_FOR_WRITE in all store() methods and ASSERT_COLUMN_MARKED_FOR_READ in all val() methods to catch wrong setting if table->read_set and table->write_set
(Rest of changes are only indentation cleanups)
sql/field.h:
Removed Field->query_id (replaced by table->read_set and table->write_set)
Removed Field->fieldnr (use Field->field_index instead)
Removed Field->add_index (Use Field->flags instead)
Add Field->part_of_key_not_clustered (for usage in opt_range.cc)
sql/filesort.cc:
Added paramater sort_postion to filesort() to force sorting by position instead of storing all fields in the result set.
This allowed me to remove checking of sql_command.
Create a temporary column bitmap for fields that are used by the sorting process.
Use column bitmaps instead of query_id
sql/ha_berkeley.cc:
Update to 'newer' table handler interface
sql/ha_berkeley.h:
Update to 'newer' table handler interface
sql/ha_federated.cc:
Update to 'newer' table handler interface
Only read columns that are needed from remote server.
In case of eq ranges, don't generate two conditions in the WHERE clause
(this can still be optimized, but would require a bigger code change)
Use 'simpler to use' XXXX_LEN' macros
A bit simpler logic in ::write_row() when creating statements.
In update, only include test of fields actually read.
(This greatly simplifies the queries sent by the federated engine)
Similar changes done for delete_row()
sql/ha_federated.h:
Update to 'newer' table handler interface
Changed XXX_LEN macros to use sizeof(...)-1, to simplify usage in ha_federated.cc
Added HA_PRIMARY_KEY_REQUIRED_FOR_DELETE to tell MySQL to read all primary key columns in case of DELETE
sql/ha_heap.cc:
Update to 'newer' table handler interface
sql/ha_heap.h:
Update to 'newer' table handler interface
sql/ha_innodb.cc:
Update to 'newer' table handler interface
- Update innobase_create_handler() to new interface
- Removed HA_NOT_EXACT_COUNT (not needed)
- Renamed HA_PRIMARY_KEY_ALLOW_RANDOM_ACCESS to HA_PRIMARY_KEY_REQUIRED_FOR_POSITION.
- Prefixed base status variables with 'stats'
- Use table column bitmaps instead of ha_get_bit_in_read_set()
- Added ::reset(), with code from ::extra(HA_EXTRA_RESET)
- Removed HA_EXTRA_RETRIVE_ALL_COLS and HA_EXTRA_RETRIEVE_PRIMARY_KEY as
the table->read_set and table->write_set bitmaps now are accurate
sql/ha_innodb.h:
Update to 'newer' table handler interface
- table_flags are now ulonglong
- Added reset() method
- Removed not needed ha_retrieve_all_cols() and ha_retrieve_all_pk() columns.
- Made build_template() a class function to be able to easier access class variables
sql/ha_myisam.cc:
Update to 'newer' table handler interface
sql/ha_myisam.h:
Update to 'newer' table handler interface
sql/ha_myisammrg.cc:
Update to 'newer' table handler interface
sql/ha_myisammrg.h:
Update to 'newer' table handler interface
sql/ha_ndbcluster.cc:
Update to 'newer' table handler interface
Fixed use_blob_value() to be accurate
In ::complemented_read() we have to check both the read and write bitmap as the old code did mark all changed columns also in the read map
Correct dumping of field data with DBUG_DUMP
Prefix addresses in DBUG_PRINT with 0x
Fixed usage of not initialized memory
Update to use field->flags & FIELD_IN_ADD_INDEX instead of field->add_index.
sql/ha_ndbcluster.h:
Update to 'newer' table handler interface
sql/ha_ndbcluster_binlog.cc:
Mark usage of all columns in ndbcluster binlog tables
false -> FALSE, true -> TRUE
Use table->s->all_set instead of creating a temporary bitmap.
sql/ha_partition.cc:
Update to 'newer' table handler interface
Added memroot to initialise_partitions() and related functions to get faster memory allocation.
partition_create_handler() is now responsible for initialisation of the partition object
Some trivial optimizations and indentation fixes
Ensure that table_flags() are up to date
Removed documentation for removed HA_EXTRA flags
Fixed 'strange' usage of m_file[i] in new_handlers_from_part_info()that worked in current code 'by chance'
sql/ha_partition.h:
Update to 'newer' table handler interface
sql/handler.cc:
create_xxx handler now takes MEMROOT as an argument to simplify memory allocation.
Much simpler get_new_handler()
(Initialization of the object is now handled by the create method for the engine)
Moved all allocation of bitmap handling to the TABLE object (in table.cc)
Added column_bitmaps_signal() to signal column usage changes.
Changed binlog_log_row() to use the exiusting all_set bitmap in the table object.
Added ha_reset() function to test that the file object is ok at end of statement and call handler::reset()
Added use_hidden_primary_key() to signal handler that we we are going to read and update + delete the row and the handler should thus remember the position for the row
sql/handler.h:
Added HA_NO_TRANSACTIONS, HA_PARTIAL_COLUMN_READ, HA_REQUIRES_KEY_COLUMNS_FOR_DELETE,HA_PRIMARY_KEY_REQUIRED_FOR_DELETE and HA_HAS_RECORDS
Removed HA_NOT_EXACT_COUNT, HA_READ_RND_SAME
HA_DUPP_POS -> HA_DUPLICATE_POS
HA_NOT_EXACT_COUNT replaced by HA_STATS_RECORDS_IS_EXACT, HA_HAS_RECORDS and records()
HA_PRIMARY_KEY_ALLOW_RANDOM_ACCESS renamed to HA_PRIMARY_KEY_REQUIRED_FOR_POSITION
Added future row type 'ROW_TYPE_PAGES'
Added MEM_ROOT to handlerton 'create' function
Added ha_statistics, a structure for all status variable in the base handler class.
Moved all status variables in the handler class into a stats structs to improve readability.
ha_table_flags() is now a cached (not virtual) version of table_flags()
reset() doesn't anymore call extra(HA_EXTRA_RESET) but is a function of it's own.
Renamed dupp_ref to dup_ref
Renamed not used handler::sortkey
Moved read_set and write_set to TABLE structure
handler::init() function added for cacheing of virtual constants from engine.
sql/item.cc:
Added register_field_in_read_map() for marking used columns in expression.
This is used by filesort() for creating an optimal column bitmap while retrieving columns for sorting.
Initalize value.cs_info.character_set_client to fix core dump bug with --debug
set_query_id -> mark_used_columns
Mark used columns in read_set OR write_set.
sql/item.h:
Removed reset_query_id_processor() as it's not needed anymore.
Added register_field_in_read_map()
Added extra argument to Item::walk() to indicate if we should also
traverse sub queries.
sql/item_cmpfunc.cc:
Temporary mark used columns to be read/writable
Update Item::walk to new interface
sql/item_cmpfunc.h:
Added extra argument to Item::walk() to indicate if we should also traverse sub queries.
sql/item_func.cc:
Update Item::walk() to new interface
table_flags() -> ha_table_flags()
sql/item_func.h:
Update Item::walk() to new interface
sql/item_row.cc:
Update Item::walk() to new interface
sql/item_row.h:
Update Item::walk() to new interface
sql/item_strfunc.h:
Update Item::walk() to new interface
sql/item_subselect.cc:
Added Item_subselect::walk()
(It was a bug it was missing before. Not sure what kind of bugs this could have caused)
sql/item_subselect.h:
Update Item::walk() to new interface
sql/item_sum.cc:
Update Item::walk() to new interface
Updates for new handler interace
sql/item_sum.h:
Update Item::walk() to new interface
sql/key.cc:
Updates for new handler interace
sql/log.cc:
Mark all columns used for log tables
Split options flag
Ensured that second argument to trans_register_ha is a bool
sql/log_event.cc:
Fixed comments to be withing 79 characters
Use OPTION_KEEP_LOG instead of OPTION_STATUS_NO_TRANS_UPDATE to remove wrong warnings
Updates for new handler interface
Use 0x%lx instead of %p (portability problem)
sql/mysql_priv.h:
Added OPTION_KEEP_LOG to indicate that we should replicate the binlog even on rollback
Removed not used 'conds' argument to setup_tables
sql/mysqld.cc:
Indentation fixes and removed old comment
sql/opt_range.cc:
Update to new handler and bitmap interface.
Fixed calls to cp_buffer_from_ref() and walk() (new argument).
Create new temporary bitmaps for ror scans.
(Needed because of handler changes and to get more accurate column bitmaps than before)
Remove not needed file->ha_reset() call before file->close().
Some trivial optimization and indentation fixes.
Use Field->part_of_key_not_clustered() to check if field is part of a key, instead of looping over all key parts.
Added flag 'in_ror_merged_scan' to allow ::get_next() to know that we need a special column bitmap to only fetch pointer to record.
This is needed because ror scan uses the same TABLE object but different file objects, which creates problem for the column bitmap handling.
(This is a temporary solution. A better one would be to allocate an own TABLE object for ROR scans)
Optimized bitmap handling in ror scans:
- Start bitmap at position 0, not 1
- Use same bitmap size as in TABLE
- Use table->read_set and table->write_set to create column bitmaps instead of looping over all fields in table
sql/opt_range.h:
Added 'in_ror_merged_scan' to indicate if we are doing a ROR scan
Added temporary column bitmaps used in ROR scans
sql/opt_sum.cc:
Added get_ext_record_count() which is used in COUNT() optimization if handler has HA_HAS_RECORDS
Note that we don't call this if handler has HA_STATS_RECORDS_IS_EXACT set.
sql/protocol.cc:
We need to mark columns as readable in ::store() as we sometimes return default value for fields to the user
sql/records.cc:
Updates for new handler interface
sql/set_var.cc:
Handle splitting OPTION_STATUS_NO_TRANS_UPDATE to two flags
sql/share/errmsg.txt:
Fixed wrong
sql/sp.cc:
Mark that we are using all columns for the proc table
Update call to setup_tables() to use new prototype
sql/sp_head.cc:
Removed QQ comment
sql/spatial.cc:
Removed wrong QQ comment
sql/sql_acl.cc:
Mark that we need all columns for acl tables
Supply memroot to some 'new' calls.
Indentation fixes
sql/sql_base.cc:
set_query_id removed
Ensure we call ha_reset() at end of each statement
Mark read columns in read_set and changed columns in write_set (Before all columns was marked in read set)
Fixed marking of some columns that was not proplerly marked before
Maintain in TABLE->merge_keys set of all keys that are used in some way
Removed not used 'conds' argument from setup_tables()
Remove not used setting of 'dupp_field' in insert_fields()
Added missing FN_LIBCHAR in mysql_rm_tmp_tables()
(This has probably caused us to not properly remove temporary files after crash)
sql/sql_bitmap.h:
Added is_overlapping()
sql/sql_class.cc:
Slow_logs was not properly initialized, which could maybe cause extra/lost entries in slow log.
set_query_id -> mark_used_columns
Simpler variable usage in pack_row() (cleanup)
Moved some variable declartion at start of function for better code readability
sql/sql_class.h:
Added enum_mark_columns
Updated comments
Renamed dupp_field -> dup_field
Added virtual function 'can_rollback_data()' to select_insert() to be used in CREATE ... SELECT to optimize use of OPTION_STATUS_NO_TRANS_UPDATE.
(This fixes a bug in CREATE ... SELECT where we did give wrong warnings when using non transacational tables)
sql/sql_delete.cc:
Updates to new handler interface
Call table->mark_columns_needed_for_delete() to allow us to put additional columns in column usage maps if handler so requires.
Call table->prepare_for_position() to tell handler that we are going to call ha_position().
Removed call to free_io_cache(). (io_cache is now removed in ha_reset()).
Fixed calls to setup_tables()
sql/sql_do.cc:
Update call to setup_fields()
sql/sql_handler.cc:
Tell handler tables to always read all columns.
Use temporary column map when storing value in field for later index usage
sql/sql_help.cc:
Makr all used fields to be read
Update call to setup_fields()
sql/sql_insert.cc:
Tell handler we are going to update the auto_increment column
dupp_field -> dup_field
Set column usage bits for timestamp field.
Call table->mark_columns_needed_for_insert() and table->mark_auto_increment_column()
Removed not used argument from mysql_prepare_insert_check_table().
If we get an duplicate row on insert, change column map to read and write all columns while retrying the operatation.
This is required by the definition of REPLACE and also ensures that fields that are only part of UPDATE are properly handled.
This fixed a bug in NDB and REPLACE where REPLACE wrongly copied some column values from the replaced row.
Setup new bitmaps for delayed insert rows
Remove reseting of next_number_fields as it will be reset on next call to handler_insert()
Fixed usage of thd->options and OPTION_STATUS_NO_TRANS_UPDATE.
The issue was that one should not to reset this flag as it may be set by a previous statement.
The way it was now used caused us to loose some warnings and get other wrong warnings when using non transactional tables mixed with transactional.
I fixed it by introducing 'select_insert::can_rollback_data' to inform send_error() that the given statement can be rolled back (which in case of CREATE TABLE can always be done)
Don't close tables created with CREATE ... SELECT but keep them in the table cache.
Moved out MY_HOOKS from inside function (better readability)
sql/sql_load.cc:
Update to use new handler and column marking interface
Update using setup_tables()
sql/sql_olap.cc:
Update calls to setup_tables
Use enums instead of constants to setup_fields()
sql/sql_parse.cc:
Handle OPTION_KEEP_LOG:
- Set it on CREATE TEMPORARY TABLE / DROP TABLE
- Reset it when OPTION_STATUS_NO_TRANS_UPDATE is reset
- Don't set it for CREATE ... SELECT (this is handled in select_create class)
Remove reseting of OPTION_STATUS_NO_TRANS_UPDATE in begin_trans() as this should already be reset.
If in autocommit mode, reset OPTION_KEEP_LOG and OPTION_STATUS_NO_TRANS_UPDATE to not give warnings in future commands
sql/sql_partition.cc:
Update walk() usage
Trivial indentation fixes
sql/sql_plugin.cc:
Mark all columns as used for plugins
sql/sql_prepare.cc:
Added assert to find out hidden bugs in character_set_client (got an error in debug binary when this not set correctly)
Updates for new handler interface
Update calls to setup_fields()
sql/sql_repl.cc:
Indentation fixes
sql/sql_select.cc:
Update call to setup_tables() and setup_fields()
Remove some old disabled code
Update to new hadler interface
Indentation cleanups
Added column bitmaps for temporary tables.
Remove updating of the removed slots in the Field class
Added TABLE argument to cp_buffer_from_ref() (To be able to install temporary column maps)
For internal temporary tables, use handler::write_row(), handler::delete_row() and handler::update_row() instead of handler::ha_xxxx() for faster execution.
sql/sql_select.h:
Indentaition fixes.
Install temporary column usage maps when needed
Added TABLE element to cp_buffer_from_ref()
sql/sql_show.cc:
Update to new handler interface
Mark all columns used for internal tables.
Style fixes.
Added support for 'future' ROW_TYPE_PAGES.
Don't allocate TMP_TABLE_PARAM with calloc. The 'init()' function will initialize the structure properly.
sql/sql_table.cc:
Update to new handler interface
Simple my_snprintf -> strmake()
Changed some constants to defines
Don't test for NULL in primary key (as we a couple of line above force the PRIMARY KEY to be NOT NULL)
Change field->add_index to use field->flags & FIELD_IN_ADD_INDEX
Mark all columns as used for ALTER TABLE
Style fixes
Update call to filesort()
sql/sql_trigger.h:
Added friend functions to be able to test if triggers exists for table we are going to insert/update or delete in.
sql/sql_udf.cc:
Mark all columns as used for udf system table.
sql/sql_union.cc:
Update call to walk()
Update to new handler interface
sql/sql_update.cc:
Remove query_id argument from compare_record()
Use column bitmaps instead of query_id.
We can't use compare_records() to skip updates for handlers that returns a partial column set and the read_set doesn't cover all columns in the write set, because compare_record() can't in this case know if a not read column changed value.
Update call to setup_fields()
Using separate column read and write sets allows for easier checking of timestamp field was set by statement.
Removed call to free_io_cache() as this is now done in ha_reset()
Call table->mark_columns_needed_for_update() and table->prepare_for_position()
Style fixes
sql/sql_view.cc:
Style fixes
sql/table.cc:
Remove implicitely include 'errno.h'
Remove code for building normalized path, as this is now identical to 'path'
Remove field->fieldnr
Added update of field->part_of_key_not_clustered()
Create column bitmaps in TABLE and TABLE_SHARE
Don't setup a temporary MEM_ROOT object as a thread specific variable for the handler. Instead we send the to-be-used MEMROOT to get_new_handler()
Update to new handler interface
Update call to walk()
Added new functions:
- st_table::clear_column_bitmaps()
- st_table::prepare_for_position()
- st_table::mark_columns_used_by_index()
- st_table::restore_column_maps_after_mark_index()
- st_table::mark_columns_used_by_index_no_reset()
- st_table::mark_auto_increment_column()
- st_table::mark_columns_needed_for_delete()
- st_table::mark_columns_needed_for_update()
- st_table::mark_columns_needed_for_insert()
sql/table.h:
Moved column usage bitmaps from handler to TABLE
Added to TABLE_SHARE all_set and column_bitmap_size
Added to TABLE merge_keys, bitmap_init_values, def_read_set, def_write_set, tmp_set, read_set and write_set.
Declared all new table column bitmap functions
Added TABLE functions column_bitmaps_set(), column_bitmaps_set_no_signal(), use_all_columns() and default_column_bitmaps()
Added functions: tmp_use_all_columns() and tmp_restore_column_map() to temporarly switch column bitmaps
Added functions: dbug_tmp_use_all_columns() and dbug_tmp_restore_column_map() to temporarly switch column bitmaps to avoid asserts in Field::store() and Field::val().
sql/tztime.cc:
Mark all columns as used for timezone tables
storage/archive/ha_archive.cc:
Update to new handler interface
storage/archive/ha_archive.h:
Update to new handler interface
storage/blackhole/ha_blackhole.cc:
Update to new handler interface
storage/blackhole/ha_blackhole.h:
Update to new handler interface
removed not needed flag HA_DUPP_POS
storage/csv/ha_tina.cc:
Update to new handler interface
storage/csv/ha_tina.h:
Update to new handler interface
storage/example/ha_example.cc:
Update to new handler interface
storage/example/ha_example.h:
Update to new handler interface
storage/heap/hp_extra.c:
Added heap_reset() (Required by new handler interface)
storage/heap/hp_test2.c:
Use heap_reset()
storage/myisam/ft_boolean_search.c:
Fixed compiler warning
storage/myisam/mi_extra.c:
Added mi_reset() (Required by new handler interface)
storage/myisam/mi_search.c:
Fixed DBUG_PRINT messages to use 0x%lx instead of %lx
storage/myisam/mi_test2.c:
Use mi_reset()
storage/myisam/myisampack.c:
Use mi_reset()
storage/myisammrg/myrg_extra.c:
Added myrg_reset() (Required by new handler interface)
unittest/mysys/base64.t.c:
Include my_global.h
Don't include implictely include file 'stdlib.h'
2006-06-04 17:52:22 +02:00
|
|
|
drop view if exists v1,v2,v3;
|
2005-11-24 05:17:38 +01:00
|
|
|
--enable_warnings
|
|
|
|
|
|
|
|
|
|
|
2005-04-04 21:43:58 +02:00
|
|
|
# simple test of grants
|
|
|
|
|
grant create view on test.* to test@localhost;
|
|
|
|
|
show grants for test@localhost;
|
|
|
|
|
revoke create view on test.* from test@localhost;
|
|
|
|
|
show grants for test@localhost;
|
Add new option "check-testcases" to mysql-test-run.pl
Cleanup the sideeffects from most of the testcases with sideeffects.
mysql-test/mysql-test-run.pl:
Add option "check-testcases" to mysql-test-run.pl
Will execute "include/check-testcase.test" once before each tescase and record the output into "var/tmp/check-testcase.result"
After the teastcase it will run again and this time compare the output with previously recorded file.
mysql-test/r/analyze.result:
Drop table t1 at end of test
mysql-test/r/create_select_tmp.result:
Drop table t1 at end of test
mysql-test/r/ctype_cp932.result:
Drop table t1 at end of test
mysql-test/r/ctype_recoding.result:
Drop table t1 at end of test
mysql-test/r/grant2.result:
Drop user mysqltest_2 and mysqltest_A@'%'
mysql-test/r/join_outer.result:
Drop view v1 to cleanup
mysql-test/r/ps_1general.result:
Drop table t1 at end of test
mysql-test/r/query_cache.result:
Drop function "f1"
mysql-test/r/read_only.result:
Reset the "read_only" flag
mysql-test/r/rpl000001.result:
Remove user "blafasel2"
mysql-test/r/rpl000017.result:
Remove user "replicate"
mysql-test/r/rpl_failed_optimize.result:
Drop table t1 to cleanup
mysql-test/r/rpl_flush_tables.result:
Drop tables t3, t4, t5
mysql-test/r/rpl_ignore_revoke.result:
Delete user "user_foo"
mysql-test/r/rpl_insert_id.result:
Drop table t1 to cleanup
mysql-test/r/rpl_loaddata.result:
Drop tyable t1 to cleanup
mysql-test/r/rpl_loaddata_rule_m.result:
Drop tyable t1 to cleanup
mysql-test/r/rpl_loaddata_rule_s.result:
Drop tyable t1 to cleanup
mysql-test/r/rpl_misc_functions.result:
Drop tyable t1 to cleanup
mysql-test/r/rpl_multi_update3.result:
Drop tyable t1 and t2 to cleanup
mysql-test/r/rpl_replicate_do.result:
Drop tyable t1 to cleanup
mysql-test/r/rpl_skip_error.result:
Drop tyable t1 to cleanup
mysql-test/r/rpl_slave_status.result:
Drop tyable t1 to cleanup
mysql-test/r/sp-prelocking.result:
Drop view v1 and tables t1, t2, t3 and t4 to cleanup
mysql-test/r/sp-security.result:
Delete users to cleanup
Delete remaining traces in tables_priv and procs_priv
mysql-test/r/subselect_innodb.result:
Drop procedure p1 to cleanup
mysql-test/r/trigger-compat.result:
Drop trigger wl2818_trg1 and wl2818_trg2.
Drop table t1, t2
Drop database mysqltest_db1
And the users "mysqltest_dfn@localhost" and "mysqltest_inv@localhost"
mysql-test/r/type_bit.result:
Drop tables t1 and t2 to cleanup
mysql-test/r/variables.result:
Set GLOBAL max_join_size to 10 as it originally was in variables-master.opt
mysql-test/r/view_grant.result:
Dop user "test@localhost" to cleanup
mysql-test/t/analyze.test:
Drop table t1 to cleanup
mysql-test/t/create_select_tmp.test:
Drop table t1 to cleanup
mysql-test/t/ctype_cp932.test:
Drop table t1 to cleanup
mysql-test/t/ctype_recoding.test:
Drop table t1 to cleanup
mysql-test/t/fulltext_var.test:
Restore the original ft_boolean_syntax
mysql-test/t/grant2.test:
Drop users "mysqltest_2" and "mysqltest_A@'%'" to cleanup
mysql-test/t/innodb_cache.test:
Reset query_cache_size to original value
mysql-test/t/join_outer.test:
Drop view v1 to cleanup
mysql-test/t/ps_1general.test:
Drop table t1 to cleanup
mysql-test/t/query_cache.test:
Drop function "f1" to cleanup
mysql-test/t/read_only.test:
Reset the readonly flag
mysql-test/t/rpl000001.test:
Delete user "blafasel2" to cleanup
mysql-test/t/rpl000017.test:
Delete user "replicate" to cleanup
mysql-test/t/rpl_failed_optimize.test:
Drop table t1 to cleanup
mysql-test/t/rpl_flush_tables.test:
Droip table t3, t4 and t5 to cleanup
mysql-test/t/rpl_ignore_revoke.test:
Delet user "user_foo" to cleanup
mysql-test/t/rpl_insert_id.test:
drop table t1 to cleanup
mysql-test/t/rpl_loaddata.test:
Drop table t1 to cleanup
mysql-test/t/rpl_loaddata_rule_m.test:
Drop table t1 to cleanup
mysql-test/t/rpl_loaddata_rule_s.test:
Drop table t1 to cleanup
mysql-test/t/rpl_misc_functions.test:
Drop table t1 to cleanup
mysql-test/t/rpl_multi_update3.test:
Drop table t1 and t2 to cleanup
mysql-test/t/rpl_replicate_do.test:
Drop table t1 to cleanup
mysql-test/t/rpl_skip_error.test:
Drop table t1 to cleanup
mysql-test/t/rpl_slave_status.test:
Drop table t1 to cleanup
mysql-test/t/sp-prelocking.test:
Drop table t1, t2 t3 and t4 to cleanup
Drop view v1
mysql-test/t/sp-security.test:
Delete test users from mysql.user, mysql.db, mysql.procs_priv and mysql.tables_priv
Drop table t1 to cleanup
mysql-test/t/subselect_innodb.test:
Drop procedure p1 to cleanup
mysql-test/t/trigger-compat.test:
Drop trigger wl2818_trg1 and wl2818_trg2 to cleanup
Drop table t1, t2
Drop users
drop database mysqltest_db1
mysql-test/t/type_bit.test:
drop table t1 and t2 to cleanup
mysql-test/t/variables-master.opt:
Increase max_join_size to 100.
mysql-test/t/variables.test:
Set max_join_size to 10, which was the original value in variables-master.opt
mysql-test/t/view_grant.test:
Drop the user "test@localhost"
mysql-test/include/check-testcase.test:
New BitKeeper file ``mysql-test/include/check-testcase.test''
2006-01-26 17:54:34 +01:00
|
|
|
# The grant above creates a new user test@localhost, delete it
|
|
|
|
|
drop user test@localhost;
|
2005-04-04 21:43:58 +02:00
|
|
|
|
|
|
|
|
# grant create view test
|
|
|
|
|
#
|
|
|
|
|
connect (root,localhost,root,,test);
|
|
|
|
|
connection root;
|
|
|
|
|
--disable_warnings
|
|
|
|
|
create database mysqltest;
|
|
|
|
|
--enable_warnings
|
|
|
|
|
|
|
|
|
|
create table mysqltest.t1 (a int, b int);
|
|
|
|
|
create table mysqltest.t2 (a int, b int);
|
|
|
|
|
|
|
|
|
|
grant select on mysqltest.t1 to mysqltest_1@localhost;
|
|
|
|
|
grant create view,select on test.* to mysqltest_1@localhost;
|
|
|
|
|
|
|
|
|
|
connect (user1,localhost,mysqltest_1,,test);
|
|
|
|
|
connection user1;
|
|
|
|
|
|
2009-03-03 21:34:18 +01:00
|
|
|
--error ER_SPECIFIC_ACCESS_DENIED_ERROR
|
2005-09-14 09:53:09 +02:00
|
|
|
create definer=root@localhost view v1 as select * from mysqltest.t1;
|
2005-04-04 21:43:58 +02:00
|
|
|
create view v1 as select * from mysqltest.t1;
|
|
|
|
|
# try to modify view without DROP privilege on it
|
2009-03-03 21:34:18 +01:00
|
|
|
--error ER_TABLEACCESS_DENIED_ERROR
|
2005-04-04 21:43:58 +02:00
|
|
|
alter view v1 as select * from mysqltest.t1;
|
2009-03-03 21:34:18 +01:00
|
|
|
--error ER_TABLEACCESS_DENIED_ERROR
|
2005-04-04 21:43:58 +02:00
|
|
|
create or replace view v1 as select * from mysqltest.t1;
|
|
|
|
|
# no CRETE VIEW privilege
|
2009-03-03 21:34:18 +01:00
|
|
|
--error ER_TABLEACCESS_DENIED_ERROR
|
2005-04-04 21:43:58 +02:00
|
|
|
create view mysqltest.v2 as select * from mysqltest.t1;
|
|
|
|
|
# no SELECT privilege
|
2009-03-03 21:34:18 +01:00
|
|
|
--error ER_TABLEACCESS_DENIED_ERROR
|
2005-04-04 21:43:58 +02:00
|
|
|
create view v2 as select * from mysqltest.t2;
|
|
|
|
|
|
|
|
|
|
connection root;
|
2005-09-14 09:53:09 +02:00
|
|
|
# check view definer information
|
|
|
|
|
show create view v1;
|
|
|
|
|
|
2005-04-04 21:43:58 +02:00
|
|
|
grant create view,drop,select on test.* to mysqltest_1@localhost;
|
|
|
|
|
|
|
|
|
|
connection user1;
|
2009-03-03 21:34:18 +01:00
|
|
|
# following 'use' command is workaround of Bug#9582 and should be removed
|
2005-04-04 21:43:58 +02:00
|
|
|
# when that bug will be fixed
|
|
|
|
|
use test;
|
|
|
|
|
alter view v1 as select * from mysqltest.t1;
|
|
|
|
|
create or replace view v1 as select * from mysqltest.t1;
|
|
|
|
|
|
|
|
|
|
connection root;
|
|
|
|
|
revoke all privileges on mysqltest.t1 from mysqltest_1@localhost;
|
|
|
|
|
revoke all privileges on test.* from mysqltest_1@localhost;
|
|
|
|
|
|
|
|
|
|
drop database mysqltest;
|
|
|
|
|
drop view test.v1;
|
|
|
|
|
|
|
|
|
|
#
|
|
|
|
|
# grants per columns
|
|
|
|
|
#
|
|
|
|
|
# MERGE algorithm
|
|
|
|
|
--disable_warnings
|
|
|
|
|
create database mysqltest;
|
|
|
|
|
--enable_warnings
|
|
|
|
|
|
|
|
|
|
create table mysqltest.t1 (a int, b int);
|
|
|
|
|
create view mysqltest.v1 (c,d) as select a+1,b+1 from mysqltest.t1;
|
|
|
|
|
grant select (c) on mysqltest.v1 to mysqltest_1@localhost;
|
|
|
|
|
|
|
|
|
|
connection user1;
|
|
|
|
|
select c from mysqltest.v1;
|
|
|
|
|
# there are no privileges on column 'd'
|
2009-03-03 21:34:18 +01:00
|
|
|
--error ER_COLUMNACCESS_DENIED_ERROR
|
2005-04-04 21:43:58 +02:00
|
|
|
select d from mysqltest.v1;
|
|
|
|
|
|
|
|
|
|
connection root;
|
|
|
|
|
revoke all privileges on mysqltest.v1 from mysqltest_1@localhost;
|
|
|
|
|
delete from mysql.user where user='mysqltest_1';
|
|
|
|
|
drop database mysqltest;
|
|
|
|
|
|
|
|
|
|
# TEMPORARY TABLE algorithm
|
|
|
|
|
--disable_warnings
|
|
|
|
|
create database mysqltest;
|
|
|
|
|
--enable_warnings
|
|
|
|
|
|
|
|
|
|
create table mysqltest.t1 (a int, b int);
|
|
|
|
|
create algorithm=temptable view mysqltest.v1 (c,d) as select a+1,b+1 from mysqltest.t1;
|
|
|
|
|
grant select (c) on mysqltest.v1 to mysqltest_1@localhost;
|
|
|
|
|
|
|
|
|
|
connection user1;
|
|
|
|
|
select c from mysqltest.v1;
|
|
|
|
|
# there are no privileges on column 'd'
|
2009-03-03 21:34:18 +01:00
|
|
|
--error ER_COLUMNACCESS_DENIED_ERROR
|
2005-04-04 21:43:58 +02:00
|
|
|
select d from mysqltest.v1;
|
|
|
|
|
|
|
|
|
|
connection root;
|
|
|
|
|
revoke all privileges on mysqltest.v1 from mysqltest_1@localhost;
|
|
|
|
|
delete from mysql.user where user='mysqltest_1';
|
|
|
|
|
drop database mysqltest;
|
|
|
|
|
|
|
|
|
|
#
|
|
|
|
|
# EXPLAIN rights
|
|
|
|
|
#
|
|
|
|
|
connection root;
|
|
|
|
|
--disable_warnings
|
|
|
|
|
create database mysqltest;
|
|
|
|
|
--enable_warnings
|
2009-03-03 21:34:18 +01:00
|
|
|
# prepare views and tables
|
2005-04-04 21:43:58 +02:00
|
|
|
create table mysqltest.t1 (a int, b int);
|
|
|
|
|
create table mysqltest.t2 (a int, b int);
|
|
|
|
|
create view mysqltest.v1 (c,d) as select a+1,b+1 from mysqltest.t1;
|
|
|
|
|
create algorithm=temptable view mysqltest.v2 (c,d) as select a+1,b+1 from mysqltest.t1;
|
|
|
|
|
create view mysqltest.v3 (c,d) as select a+1,b+1 from mysqltest.t2;
|
|
|
|
|
create algorithm=temptable view mysqltest.v4 (c,d) as select a+1,b+1 from mysqltest.t2;
|
2011-09-29 11:47:11 +02:00
|
|
|
# v5: SHOW VIEW, but no SELECT
|
|
|
|
|
create view mysqltest.v5 (c,d) as select a+1,b+1 from mysqltest.t1;
|
2005-04-04 21:43:58 +02:00
|
|
|
grant select on mysqltest.v1 to mysqltest_1@localhost;
|
|
|
|
|
grant select on mysqltest.v2 to mysqltest_1@localhost;
|
|
|
|
|
grant select on mysqltest.v3 to mysqltest_1@localhost;
|
|
|
|
|
grant select on mysqltest.v4 to mysqltest_1@localhost;
|
2011-09-29 11:47:11 +02:00
|
|
|
grant show view on mysqltest.v5 to mysqltest_1@localhost;
|
2005-04-04 21:43:58 +02:00
|
|
|
|
|
|
|
|
connection user1;
|
2011-09-29 11:47:11 +02:00
|
|
|
# all SELECTs works, except v5 which lacks SELECT privs
|
2005-04-04 21:43:58 +02:00
|
|
|
select c from mysqltest.v1;
|
|
|
|
|
select c from mysqltest.v2;
|
|
|
|
|
select c from mysqltest.v3;
|
|
|
|
|
select c from mysqltest.v4;
|
2011-09-29 11:47:11 +02:00
|
|
|
--error ER_TABLEACCESS_DENIED_ERROR
|
|
|
|
|
select c from mysqltest.v5;
|
2005-04-04 21:43:58 +02:00
|
|
|
# test of show coluns
|
|
|
|
|
show columns from mysqltest.v1;
|
|
|
|
|
show columns from mysqltest.v2;
|
2011-09-29 11:47:11 +02:00
|
|
|
# explain/show fail
|
2009-03-03 21:34:18 +01:00
|
|
|
--error ER_VIEW_NO_EXPLAIN
|
2005-04-04 21:43:58 +02:00
|
|
|
explain select c from mysqltest.v1;
|
2009-03-03 21:34:18 +01:00
|
|
|
--error ER_TABLEACCESS_DENIED_ERROR
|
2005-04-04 21:43:58 +02:00
|
|
|
show create view mysqltest.v1;
|
2009-03-03 21:34:18 +01:00
|
|
|
--error ER_VIEW_NO_EXPLAIN
|
2005-04-04 21:43:58 +02:00
|
|
|
explain select c from mysqltest.v2;
|
2009-03-03 21:34:18 +01:00
|
|
|
--error ER_TABLEACCESS_DENIED_ERROR
|
2005-04-04 21:43:58 +02:00
|
|
|
show create view mysqltest.v2;
|
2009-03-03 21:34:18 +01:00
|
|
|
--error ER_VIEW_NO_EXPLAIN
|
2005-04-04 21:43:58 +02:00
|
|
|
explain select c from mysqltest.v3;
|
2009-03-03 21:34:18 +01:00
|
|
|
--error ER_TABLEACCESS_DENIED_ERROR
|
2005-04-04 21:43:58 +02:00
|
|
|
show create view mysqltest.v3;
|
2009-03-03 21:34:18 +01:00
|
|
|
--error ER_VIEW_NO_EXPLAIN
|
2005-04-04 21:43:58 +02:00
|
|
|
explain select c from mysqltest.v4;
|
2009-03-03 21:34:18 +01:00
|
|
|
--error ER_TABLEACCESS_DENIED_ERROR
|
2005-04-04 21:43:58 +02:00
|
|
|
show create view mysqltest.v4;
|
2011-09-29 11:47:11 +02:00
|
|
|
--error ER_TABLEACCESS_DENIED_ERROR
|
|
|
|
|
explain select c from mysqltest.v5;
|
2011-10-06 11:55:57 +02:00
|
|
|
# new in 5.5: SHOW CREATE VIEW needs SELECT now (MySQL Bug#27145)
|
|
|
|
|
--error ER_TABLEACCESS_DENIED_ERROR
|
|
|
|
|
show create view mysqltest.v5;
|
|
|
|
|
connection root;
|
|
|
|
|
grant select on mysqltest.v5 to mysqltest_1@localhost;
|
|
|
|
|
connection user1;
|
2011-09-29 11:47:11 +02:00
|
|
|
show create view mysqltest.v5;
|
2005-04-04 21:43:58 +02:00
|
|
|
|
2011-09-29 11:47:11 +02:00
|
|
|
# missing SELECT on underlying t1, no SHOW VIEW on v1 either.
|
|
|
|
|
--error ER_VIEW_NO_EXPLAIN
|
|
|
|
|
explain select c from mysqltest.v1;
|
|
|
|
|
# missing SHOW VIEW
|
|
|
|
|
--error ER_TABLEACCESS_DENIED_ERROR
|
|
|
|
|
show create view mysqltest.v1;
|
2005-04-04 21:43:58 +02:00
|
|
|
# allow to see one of underlying table
|
|
|
|
|
connection root;
|
2011-09-29 11:47:11 +02:00
|
|
|
grant show view on mysqltest.v1 to mysqltest_1@localhost;
|
2005-04-04 21:43:58 +02:00
|
|
|
grant select on mysqltest.t1 to mysqltest_1@localhost;
|
2011-10-06 11:55:57 +02:00
|
|
|
revoke select on mysqltest.v5 from mysqltest_1@localhost;
|
2005-04-04 21:43:58 +02:00
|
|
|
connection user1;
|
2011-09-29 11:47:11 +02:00
|
|
|
# EXPLAIN works
|
2005-04-04 21:43:58 +02:00
|
|
|
explain select c from mysqltest.v1;
|
|
|
|
|
show create view mysqltest.v1;
|
2011-09-29 11:47:11 +02:00
|
|
|
# missing SHOW VIEW
|
|
|
|
|
--error ER_VIEW_NO_EXPLAIN
|
2005-04-04 21:43:58 +02:00
|
|
|
explain select c from mysqltest.v2;
|
2009-03-03 21:34:18 +01:00
|
|
|
--error ER_TABLEACCESS_DENIED_ERROR
|
2005-04-04 21:43:58 +02:00
|
|
|
show create view mysqltest.v2;
|
|
|
|
|
# but other EXPLAINs do not
|
2009-03-03 21:34:18 +01:00
|
|
|
--error ER_VIEW_NO_EXPLAIN
|
2005-04-04 21:43:58 +02:00
|
|
|
explain select c from mysqltest.v3;
|
2009-03-03 21:34:18 +01:00
|
|
|
--error ER_TABLEACCESS_DENIED_ERROR
|
2005-04-04 21:43:58 +02:00
|
|
|
show create view mysqltest.v3;
|
2009-03-03 21:34:18 +01:00
|
|
|
--error ER_VIEW_NO_EXPLAIN
|
2005-04-04 21:43:58 +02:00
|
|
|
explain select c from mysqltest.v4;
|
2009-03-03 21:34:18 +01:00
|
|
|
--error ER_TABLEACCESS_DENIED_ERROR
|
2005-04-04 21:43:58 +02:00
|
|
|
show create view mysqltest.v4;
|
2011-09-29 11:47:11 +02:00
|
|
|
# we have SHOW VIEW on v5, and SELECT on t1 -- not enough
|
|
|
|
|
--error ER_TABLEACCESS_DENIED_ERROR
|
|
|
|
|
explain select c from mysqltest.v5;
|
2005-04-04 21:43:58 +02:00
|
|
|
|
|
|
|
|
# allow to see any view in mysqltest database
|
|
|
|
|
connection root;
|
|
|
|
|
grant show view on mysqltest.* to mysqltest_1@localhost;
|
|
|
|
|
connection user1;
|
|
|
|
|
explain select c from mysqltest.v1;
|
|
|
|
|
show create view mysqltest.v1;
|
|
|
|
|
explain select c from mysqltest.v2;
|
|
|
|
|
show create view mysqltest.v2;
|
2011-09-29 11:47:11 +02:00
|
|
|
# have SHOW VIEW | SELECT on v3, but no SELECT on t2
|
|
|
|
|
--error ER_VIEW_NO_EXPLAIN
|
2005-04-04 21:43:58 +02:00
|
|
|
explain select c from mysqltest.v3;
|
|
|
|
|
show create view mysqltest.v3;
|
2011-09-29 11:47:11 +02:00
|
|
|
# have SHOW VIEW | SELECT on v4, but no SELECT on t2
|
|
|
|
|
--error ER_VIEW_NO_EXPLAIN
|
2005-04-04 21:43:58 +02:00
|
|
|
explain select c from mysqltest.v4;
|
|
|
|
|
show create view mysqltest.v4;
|
|
|
|
|
|
|
|
|
|
connection root;
|
|
|
|
|
revoke all privileges on mysqltest.* from mysqltest_1@localhost;
|
|
|
|
|
delete from mysql.user where user='mysqltest_1';
|
|
|
|
|
drop database mysqltest;
|
|
|
|
|
|
|
|
|
|
#
|
|
|
|
|
# UPDATE privileges on VIEW columns and whole VIEW
|
|
|
|
|
#
|
|
|
|
|
connection root;
|
|
|
|
|
--disable_warnings
|
|
|
|
|
create database mysqltest;
|
|
|
|
|
--enable_warnings
|
|
|
|
|
|
|
|
|
|
create table mysqltest.t1 (a int, b int, primary key(a));
|
|
|
|
|
insert into mysqltest.t1 values (10,2), (20,3), (30,4), (40,5), (50,10);
|
|
|
|
|
create table mysqltest.t2 (x int);
|
|
|
|
|
insert into mysqltest.t2 values (3), (4), (5), (6);
|
|
|
|
|
create view mysqltest.v1 (a,c) as select a, b+1 from mysqltest.t1;
|
|
|
|
|
create view mysqltest.v2 (a,c) as select a, b from mysqltest.t1;
|
|
|
|
|
create view mysqltest.v3 (a,c) as select a, b+1 from mysqltest.t1;
|
|
|
|
|
|
|
|
|
|
grant update (a) on mysqltest.v2 to mysqltest_1@localhost;
|
|
|
|
|
grant update on mysqltest.v1 to mysqltest_1@localhost;
|
|
|
|
|
grant select on mysqltest.* to mysqltest_1@localhost;
|
|
|
|
|
|
|
|
|
|
connection user1;
|
|
|
|
|
use mysqltest;
|
|
|
|
|
# update with rights on VIEW column
|
|
|
|
|
update t2,v1 set v1.a=v1.a+v1.c where t2.x=v1.c;
|
|
|
|
|
select * from t1;
|
|
|
|
|
update v1 set a=a+c;
|
|
|
|
|
select * from t1;
|
|
|
|
|
# update with rights on whole VIEW
|
|
|
|
|
update t2,v2 set v2.a=v2.a+v2.c where t2.x=v2.c;
|
|
|
|
|
select * from t1;
|
|
|
|
|
update v2 set a=a+c;
|
|
|
|
|
select * from t1;
|
|
|
|
|
# no rights on column
|
2009-03-03 21:34:18 +01:00
|
|
|
--error ER_COLUMNACCESS_DENIED_ERROR
|
2005-04-04 21:43:58 +02:00
|
|
|
update t2,v2 set v2.c=v2.a+v2.c where t2.x=v2.c;
|
2009-03-03 21:34:18 +01:00
|
|
|
--error ER_COLUMNACCESS_DENIED_ERROR
|
2005-04-04 21:43:58 +02:00
|
|
|
update v2 set c=a+c;
|
|
|
|
|
# no rights for view
|
2009-03-03 21:34:18 +01:00
|
|
|
--error ER_TABLEACCESS_DENIED_ERROR
|
2005-04-04 21:43:58 +02:00
|
|
|
update t2,v3 set v3.a=v3.a+v3.c where t2.x=v3.c;
|
2009-03-03 21:34:18 +01:00
|
|
|
--error ER_TABLEACCESS_DENIED_ERROR
|
2005-04-04 21:43:58 +02:00
|
|
|
update v3 set a=a+c;
|
|
|
|
|
|
|
|
|
|
use test;
|
|
|
|
|
connection root;
|
|
|
|
|
REVOKE ALL PRIVILEGES, GRANT OPTION FROM mysqltest_1@localhost;
|
|
|
|
|
drop database mysqltest;
|
|
|
|
|
|
|
|
|
|
#
|
|
|
|
|
# DELETE privileges on VIEW
|
|
|
|
|
#
|
|
|
|
|
connection root;
|
|
|
|
|
--disable_warnings
|
|
|
|
|
create database mysqltest;
|
|
|
|
|
--enable_warnings
|
|
|
|
|
|
|
|
|
|
create table mysqltest.t1 (a int, b int, primary key(a));
|
|
|
|
|
insert into mysqltest.t1 values (1,2), (2,3), (3,4), (4,5), (5,10);
|
|
|
|
|
create table mysqltest.t2 (x int);
|
|
|
|
|
insert into mysqltest.t2 values (3), (4), (5), (6);
|
|
|
|
|
create view mysqltest.v1 (a,c) as select a, b+1 from mysqltest.t1;
|
|
|
|
|
create view mysqltest.v2 (a,c) as select a, b+1 from mysqltest.t1;
|
|
|
|
|
|
|
|
|
|
grant delete on mysqltest.v1 to mysqltest_1@localhost;
|
|
|
|
|
grant select on mysqltest.* to mysqltest_1@localhost;
|
|
|
|
|
|
|
|
|
|
connection user1;
|
|
|
|
|
use mysqltest;
|
|
|
|
|
# update with rights on VIEW column
|
|
|
|
|
delete from v1 where c < 4;
|
|
|
|
|
select * from t1;
|
|
|
|
|
delete v1 from t2,v1 where t2.x=v1.c;
|
|
|
|
|
select * from t1;
|
|
|
|
|
# no rights for view
|
2009-03-03 21:34:18 +01:00
|
|
|
--error ER_TABLEACCESS_DENIED_ERROR
|
2005-04-04 21:43:58 +02:00
|
|
|
delete v2 from t2,v2 where t2.x=v2.c;
|
2009-03-03 21:34:18 +01:00
|
|
|
--error ER_TABLEACCESS_DENIED_ERROR
|
2005-04-04 21:43:58 +02:00
|
|
|
delete from v2 where c < 4;
|
|
|
|
|
|
|
|
|
|
use test;
|
|
|
|
|
connection root;
|
|
|
|
|
REVOKE ALL PRIVILEGES, GRANT OPTION FROM mysqltest_1@localhost;
|
|
|
|
|
drop database mysqltest;
|
|
|
|
|
|
|
|
|
|
#
|
|
|
|
|
# insert privileges on VIEW
|
|
|
|
|
#
|
|
|
|
|
connection root;
|
|
|
|
|
--disable_warnings
|
|
|
|
|
create database mysqltest;
|
|
|
|
|
--enable_warnings
|
|
|
|
|
|
|
|
|
|
create table mysqltest.t1 (a int, b int, primary key(a));
|
|
|
|
|
insert into mysqltest.t1 values (1,2), (2,3);
|
|
|
|
|
create table mysqltest.t2 (x int, y int);
|
|
|
|
|
insert into mysqltest.t2 values (3,4);
|
|
|
|
|
create view mysqltest.v1 (a,c) as select a, b from mysqltest.t1;
|
|
|
|
|
create view mysqltest.v2 (a,c) as select a, b from mysqltest.t1;
|
|
|
|
|
|
|
|
|
|
grant insert on mysqltest.v1 to mysqltest_1@localhost;
|
|
|
|
|
grant select on mysqltest.* to mysqltest_1@localhost;
|
|
|
|
|
|
|
|
|
|
connection user1;
|
|
|
|
|
use mysqltest;
|
|
|
|
|
# update with rights on VIEW column
|
|
|
|
|
insert into v1 values (5,6);
|
|
|
|
|
select * from t1;
|
|
|
|
|
insert into v1 select x,y from t2;
|
|
|
|
|
select * from t1;
|
|
|
|
|
# no rights for view
|
2009-03-03 21:34:18 +01:00
|
|
|
--error ER_TABLEACCESS_DENIED_ERROR
|
2005-04-04 21:43:58 +02:00
|
|
|
insert into v2 values (5,6);
|
2009-03-03 21:34:18 +01:00
|
|
|
--error ER_TABLEACCESS_DENIED_ERROR
|
2005-04-04 21:43:58 +02:00
|
|
|
insert into v2 select x,y from t2;
|
|
|
|
|
|
|
|
|
|
use test;
|
|
|
|
|
connection root;
|
|
|
|
|
REVOKE ALL PRIVILEGES, GRANT OPTION FROM mysqltest_1@localhost;
|
|
|
|
|
drop database mysqltest;
|
|
|
|
|
|
|
|
|
|
#
|
|
|
|
|
# test of CREATE VIEW privileges if we have limited privileges
|
|
|
|
|
#
|
|
|
|
|
connection root;
|
|
|
|
|
--disable_warnings
|
|
|
|
|
create database mysqltest;
|
|
|
|
|
--enable_warnings
|
|
|
|
|
|
|
|
|
|
create table mysqltest.t1 (a int, b int);
|
|
|
|
|
create table mysqltest.t2 (a int, b int);
|
|
|
|
|
|
|
|
|
|
grant update on mysqltest.t1 to mysqltest_1@localhost;
|
|
|
|
|
grant update(b) on mysqltest.t2 to mysqltest_1@localhost;
|
|
|
|
|
grant create view,update on test.* to mysqltest_1@localhost;
|
|
|
|
|
|
|
|
|
|
connection user1;
|
|
|
|
|
|
|
|
|
|
create view v1 as select * from mysqltest.t1;
|
|
|
|
|
create view v2 as select b from mysqltest.t2;
|
|
|
|
|
# There are not rights on mysqltest.v1
|
2009-03-03 21:34:18 +01:00
|
|
|
--error ER_TABLEACCESS_DENIED_ERROR
|
2005-04-04 21:43:58 +02:00
|
|
|
create view mysqltest.v1 as select * from mysqltest.t1;
|
|
|
|
|
# There are not any rights on mysqltest.t2.a
|
2009-03-03 21:34:18 +01:00
|
|
|
--error ER_COLUMNACCESS_DENIED_ERROR
|
2005-04-04 21:43:58 +02:00
|
|
|
create view v3 as select a from mysqltest.t2;
|
|
|
|
|
|
|
|
|
|
# give CREATE VIEW privileges (without any privileges for result column)
|
|
|
|
|
connection root;
|
|
|
|
|
create table mysqltest.v3 (b int);
|
|
|
|
|
grant create view on mysqltest.v3 to mysqltest_1@localhost;
|
|
|
|
|
drop table mysqltest.v3;
|
|
|
|
|
connection user1;
|
|
|
|
|
create view mysqltest.v3 as select b from mysqltest.t2;
|
|
|
|
|
|
|
|
|
|
# give UPDATE privileges
|
|
|
|
|
connection root;
|
|
|
|
|
grant create view, update on mysqltest.v3 to mysqltest_1@localhost;
|
|
|
|
|
drop view mysqltest.v3;
|
|
|
|
|
connection user1;
|
|
|
|
|
create view mysqltest.v3 as select b from mysqltest.t2;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
# Expression need select privileges
|
2009-03-03 21:34:18 +01:00
|
|
|
--error ER_COLUMNACCESS_DENIED_ERROR
|
2005-04-04 21:43:58 +02:00
|
|
|
create view v4 as select b+1 from mysqltest.t2;
|
|
|
|
|
|
|
|
|
|
connection root;
|
|
|
|
|
grant create view,update,select on test.* to mysqltest_1@localhost;
|
|
|
|
|
connection user1;
|
2009-03-03 21:34:18 +01:00
|
|
|
--error ER_COLUMNACCESS_DENIED_ERROR
|
2005-04-04 21:43:58 +02:00
|
|
|
create view v4 as select b+1 from mysqltest.t2;
|
|
|
|
|
|
|
|
|
|
connection root;
|
|
|
|
|
grant update,select(b) on mysqltest.t2 to mysqltest_1@localhost;
|
|
|
|
|
connection user1;
|
|
|
|
|
create view v4 as select b+1 from mysqltest.t2;
|
|
|
|
|
|
|
|
|
|
connection root;
|
|
|
|
|
REVOKE ALL PRIVILEGES, GRANT OPTION FROM mysqltest_1@localhost;
|
|
|
|
|
drop database mysqltest;
|
|
|
|
|
drop view v1,v2,v4;
|
|
|
|
|
|
|
|
|
|
#
|
|
|
|
|
# user with global DB privileges
|
|
|
|
|
#
|
|
|
|
|
connection root;
|
|
|
|
|
--disable_warnings
|
|
|
|
|
create database mysqltest;
|
|
|
|
|
--enable_warnings
|
|
|
|
|
create table mysqltest.t1 (a int);
|
|
|
|
|
grant all privileges on mysqltest.* to mysqltest_1@localhost;
|
|
|
|
|
|
|
|
|
|
connection user1;
|
|
|
|
|
use mysqltest;
|
|
|
|
|
create view v1 as select * from t1;
|
2005-10-27 23:18:23 +02:00
|
|
|
use test;
|
2005-04-04 21:43:58 +02:00
|
|
|
|
|
|
|
|
connection root;
|
|
|
|
|
revoke all privileges on mysqltest.* from mysqltest_1@localhost;
|
|
|
|
|
drop database mysqltest;
|
|
|
|
|
|
2005-10-27 23:18:23 +02:00
|
|
|
#
|
|
|
|
|
# view definer grants revoking
|
|
|
|
|
#
|
|
|
|
|
connection root;
|
|
|
|
|
--disable_warnings
|
|
|
|
|
create database mysqltest;
|
|
|
|
|
--enable_warnings
|
|
|
|
|
|
|
|
|
|
create table mysqltest.t1 (a int, b int);
|
|
|
|
|
|
|
|
|
|
grant select on mysqltest.t1 to mysqltest_1@localhost;
|
|
|
|
|
grant create view,select on test.* to mysqltest_1@localhost;
|
|
|
|
|
|
|
|
|
|
connection user1;
|
|
|
|
|
|
|
|
|
|
create view v1 as select * from mysqltest.t1;
|
|
|
|
|
|
|
|
|
|
connection root;
|
|
|
|
|
# check view definer information
|
|
|
|
|
show create view v1;
|
|
|
|
|
revoke select on mysqltest.t1 from mysqltest_1@localhost;
|
2009-03-03 21:34:18 +01:00
|
|
|
--error ER_VIEW_INVALID
|
2005-10-27 23:18:23 +02:00
|
|
|
select * from v1;
|
|
|
|
|
grant select on mysqltest.t1 to mysqltest_1@localhost;
|
|
|
|
|
select * from v1;
|
|
|
|
|
REVOKE ALL PRIVILEGES, GRANT OPTION FROM mysqltest_1@localhost;
|
|
|
|
|
drop view v1;
|
|
|
|
|
drop database mysqltest;
|
|
|
|
|
|
|
|
|
|
#
|
2009-03-03 21:34:18 +01:00
|
|
|
# rights on execution of view underlying functiond (Bug#9505)
|
2005-10-27 23:18:23 +02:00
|
|
|
#
|
|
|
|
|
connection root;
|
|
|
|
|
--disable_warnings
|
|
|
|
|
create database mysqltest;
|
|
|
|
|
--enable_warnings
|
|
|
|
|
|
|
|
|
|
use mysqltest;
|
|
|
|
|
create table t1 (a int);
|
|
|
|
|
insert into t1 values (1);
|
|
|
|
|
create table t2 (s1 int);
|
|
|
|
|
--disable_warnings
|
|
|
|
|
drop function if exists f2;
|
|
|
|
|
--enable_warnings
|
|
|
|
|
delimiter //;
|
|
|
|
|
create function f2 () returns int begin declare v int; select s1 from t2
|
|
|
|
|
into v; return v; end//
|
|
|
|
|
delimiter ;//
|
|
|
|
|
create algorithm=TEMPTABLE view v1 as select f2() from t1;
|
|
|
|
|
create algorithm=MERGE view v2 as select f2() from t1;
|
|
|
|
|
create algorithm=TEMPTABLE SQL SECURITY INVOKER view v3 as select f2() from t1;
|
|
|
|
|
create algorithm=MERGE SQL SECURITY INVOKER view v4 as select f2() from t1;
|
|
|
|
|
create SQL SECURITY INVOKER view v5 as select * from v4;
|
|
|
|
|
grant select on v1 to mysqltest_1@localhost;
|
|
|
|
|
grant select on v2 to mysqltest_1@localhost;
|
|
|
|
|
grant select on v3 to mysqltest_1@localhost;
|
|
|
|
|
grant select on v4 to mysqltest_1@localhost;
|
|
|
|
|
grant select on v5 to mysqltest_1@localhost;
|
|
|
|
|
|
|
|
|
|
connection user1;
|
|
|
|
|
use mysqltest;
|
|
|
|
|
select * from v1;
|
|
|
|
|
select * from v2;
|
2009-03-03 21:34:18 +01:00
|
|
|
--error ER_VIEW_INVALID
|
2005-10-27 23:18:23 +02:00
|
|
|
select * from v3;
|
2009-03-03 21:34:18 +01:00
|
|
|
--error ER_VIEW_INVALID
|
2005-10-27 23:18:23 +02:00
|
|
|
select * from v4;
|
2009-03-03 21:34:18 +01:00
|
|
|
--error ER_VIEW_INVALID
|
2005-10-27 23:18:23 +02:00
|
|
|
select * from v5;
|
|
|
|
|
use test;
|
|
|
|
|
|
|
|
|
|
connection root;
|
|
|
|
|
drop view v1, v2, v3, v4, v5;
|
|
|
|
|
drop function f2;
|
|
|
|
|
drop table t1, t2;
|
|
|
|
|
use test;
|
|
|
|
|
REVOKE ALL PRIVILEGES, GRANT OPTION FROM mysqltest_1@localhost;
|
|
|
|
|
drop database mysqltest;
|
|
|
|
|
|
|
|
|
|
#
|
|
|
|
|
# revertion of previous test, definer of view lost his/her rights to execute
|
|
|
|
|
# function
|
|
|
|
|
#
|
|
|
|
|
|
|
|
|
|
connection root;
|
|
|
|
|
--disable_warnings
|
|
|
|
|
create database mysqltest;
|
|
|
|
|
--enable_warnings
|
|
|
|
|
|
|
|
|
|
use mysqltest;
|
|
|
|
|
create table t1 (a int);
|
|
|
|
|
insert into t1 values (1);
|
|
|
|
|
create table t2 (s1 int);
|
|
|
|
|
--disable_warnings
|
|
|
|
|
drop function if exists f2;
|
|
|
|
|
--enable_warnings
|
|
|
|
|
delimiter //;
|
|
|
|
|
create function f2 () returns int begin declare v int; select s1 from t2
|
|
|
|
|
into v; return v; end//
|
|
|
|
|
delimiter ;//
|
|
|
|
|
grant select on t1 to mysqltest_1@localhost;
|
|
|
|
|
grant execute on function f2 to mysqltest_1@localhost;
|
|
|
|
|
grant create view on mysqltest.* to mysqltest_1@localhost;
|
|
|
|
|
|
|
|
|
|
connection user1;
|
|
|
|
|
use mysqltest;
|
|
|
|
|
create algorithm=TEMPTABLE view v1 as select f2() from t1;
|
|
|
|
|
create algorithm=MERGE view v2 as select f2() from t1;
|
|
|
|
|
create algorithm=TEMPTABLE SQL SECURITY INVOKER view v3 as select f2() from t1;
|
|
|
|
|
create algorithm=MERGE SQL SECURITY INVOKER view v4 as select f2() from t1;
|
|
|
|
|
use test;
|
|
|
|
|
|
|
|
|
|
connection root;
|
|
|
|
|
create view v5 as select * from v1;
|
|
|
|
|
revoke execute on function f2 from mysqltest_1@localhost;
|
2009-03-03 21:34:18 +01:00
|
|
|
--error ER_VIEW_INVALID
|
2005-10-27 23:18:23 +02:00
|
|
|
select * from v1;
|
2009-03-03 21:34:18 +01:00
|
|
|
--error ER_VIEW_INVALID
|
2005-10-27 23:18:23 +02:00
|
|
|
select * from v2;
|
|
|
|
|
select * from v3;
|
|
|
|
|
select * from v4;
|
2009-03-03 21:34:18 +01:00
|
|
|
--error ER_VIEW_INVALID
|
2005-10-27 23:18:23 +02:00
|
|
|
select * from v5;
|
|
|
|
|
|
|
|
|
|
drop view v1, v2, v3, v4, v5;
|
|
|
|
|
drop function f2;
|
|
|
|
|
drop table t1, t2;
|
|
|
|
|
use test;
|
|
|
|
|
REVOKE ALL PRIVILEGES, GRANT OPTION FROM mysqltest_1@localhost;
|
|
|
|
|
drop database mysqltest;
|
|
|
|
|
|
|
|
|
|
#
|
|
|
|
|
# definer/invoker rights for columns
|
|
|
|
|
#
|
|
|
|
|
connection root;
|
|
|
|
|
--disable_warnings
|
|
|
|
|
create database mysqltest;
|
|
|
|
|
--enable_warnings
|
|
|
|
|
|
|
|
|
|
use mysqltest;
|
|
|
|
|
create table t1 (a int);
|
|
|
|
|
create table v1 (a int);
|
|
|
|
|
insert into t1 values (1);
|
|
|
|
|
grant select on t1 to mysqltest_1@localhost;
|
|
|
|
|
grant select on v1 to mysqltest_1@localhost;
|
|
|
|
|
grant create view on mysqltest.* to mysqltest_1@localhost;
|
|
|
|
|
drop table v1;
|
|
|
|
|
|
|
|
|
|
connection user1;
|
|
|
|
|
use mysqltest;
|
|
|
|
|
create algorithm=TEMPTABLE view v1 as select *, a as b from t1;
|
|
|
|
|
create algorithm=MERGE view v2 as select *, a as b from t1;
|
|
|
|
|
create algorithm=TEMPTABLE SQL SECURITY INVOKER view v3 as select *, a as b from t1;
|
|
|
|
|
create algorithm=MERGE SQL SECURITY INVOKER view v4 as select *, a as b from t1;
|
|
|
|
|
create view v5 as select * from v1;
|
|
|
|
|
use test;
|
|
|
|
|
|
|
|
|
|
connection root;
|
|
|
|
|
revoke select on t1 from mysqltest_1@localhost;
|
2009-03-03 21:34:18 +01:00
|
|
|
--error ER_VIEW_INVALID
|
2005-10-27 23:18:23 +02:00
|
|
|
select * from v1;
|
2009-03-03 21:34:18 +01:00
|
|
|
--error ER_VIEW_INVALID
|
2005-10-27 23:18:23 +02:00
|
|
|
select * from v2;
|
|
|
|
|
select * from v3;
|
|
|
|
|
select * from v4;
|
2009-03-03 21:34:18 +01:00
|
|
|
--error ER_VIEW_INVALID
|
2005-10-27 23:18:23 +02:00
|
|
|
select * from v5;
|
|
|
|
|
|
|
|
|
|
#drop view v1, v2, v3, v4, v5;
|
|
|
|
|
drop table t1;
|
|
|
|
|
use test;
|
|
|
|
|
REVOKE ALL PRIVILEGES, GRANT OPTION FROM mysqltest_1@localhost;
|
|
|
|
|
drop database mysqltest;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
connection root;
|
|
|
|
|
--disable_warnings
|
|
|
|
|
create database mysqltest;
|
|
|
|
|
--enable_warnings
|
|
|
|
|
|
|
|
|
|
use mysqltest;
|
|
|
|
|
create table t1 (a int);
|
|
|
|
|
insert into t1 values (1);
|
|
|
|
|
create algorithm=TEMPTABLE view v1 as select *, a as b from t1;
|
|
|
|
|
create algorithm=MERGE view v2 as select *, a as b from t1;
|
|
|
|
|
create algorithm=TEMPTABLE SQL SECURITY INVOKER view v3 as select *, a as b from t1;
|
|
|
|
|
create algorithm=MERGE SQL SECURITY INVOKER view v4 as select *, a as b from t1;
|
|
|
|
|
create SQL SECURITY INVOKER view v5 as select * from v4;
|
|
|
|
|
grant select on v1 to mysqltest_1@localhost;
|
|
|
|
|
grant select on v2 to mysqltest_1@localhost;
|
|
|
|
|
grant select on v3 to mysqltest_1@localhost;
|
|
|
|
|
grant select on v4 to mysqltest_1@localhost;
|
|
|
|
|
grant select on v5 to mysqltest_1@localhost;
|
|
|
|
|
|
|
|
|
|
connection user1;
|
|
|
|
|
use mysqltest;
|
|
|
|
|
select * from v1;
|
|
|
|
|
select * from v2;
|
2009-03-03 21:34:18 +01:00
|
|
|
--error ER_VIEW_INVALID
|
2005-10-27 23:18:23 +02:00
|
|
|
select * from v3;
|
2009-03-03 21:34:18 +01:00
|
|
|
--error ER_VIEW_INVALID
|
2005-10-27 23:18:23 +02:00
|
|
|
select * from v4;
|
2009-03-03 21:34:18 +01:00
|
|
|
--error ER_VIEW_INVALID
|
2005-10-27 23:18:23 +02:00
|
|
|
select * from v5;
|
|
|
|
|
use test;
|
|
|
|
|
|
|
|
|
|
connection root;
|
|
|
|
|
drop view v1, v2, v3, v4, v5;
|
|
|
|
|
drop table t1;
|
|
|
|
|
use test;
|
|
|
|
|
REVOKE ALL PRIVILEGES, GRANT OPTION FROM mysqltest_1@localhost;
|
|
|
|
|
drop database mysqltest;
|
2005-10-28 12:11:32 +02:00
|
|
|
|
|
|
|
|
#
|
2009-03-03 21:34:18 +01:00
|
|
|
# Bug#14256 definer in view definition is not fully qualified
|
2005-10-28 12:11:32 +02:00
|
|
|
#
|
|
|
|
|
--disable_warnings
|
|
|
|
|
drop view if exists v1;
|
2008-02-21 10:17:32 +01:00
|
|
|
drop table if exists t1;
|
2005-10-28 12:11:32 +02:00
|
|
|
--enable_warnings
|
|
|
|
|
|
|
|
|
|
# Backup anonymous users and remove them. (They get in the way of
|
|
|
|
|
# the one we test with here otherwise.)
|
|
|
|
|
create table t1 as select * from mysql.user where user='';
|
|
|
|
|
delete from mysql.user where user='';
|
|
|
|
|
flush privileges;
|
|
|
|
|
|
|
|
|
|
# Create the test user
|
|
|
|
|
grant all on test.* to 'test14256'@'%';
|
|
|
|
|
|
|
|
|
|
connect (test14256,localhost,test14256,,test);
|
|
|
|
|
connection test14256;
|
|
|
|
|
use test;
|
|
|
|
|
|
|
|
|
|
create view v1 as select 42;
|
|
|
|
|
show create view v1;
|
|
|
|
|
|
|
|
|
|
select definer into @v1def1 from information_schema.views
|
|
|
|
|
where table_schema = 'test' and table_name='v1';
|
|
|
|
|
drop view v1;
|
|
|
|
|
|
|
|
|
|
create definer=`test14256`@`%` view v1 as select 42;
|
|
|
|
|
show create view v1;
|
|
|
|
|
|
|
|
|
|
select definer into @v1def2 from information_schema.views
|
|
|
|
|
where table_schema = 'test' and table_name='v1';
|
|
|
|
|
drop view v1;
|
|
|
|
|
|
|
|
|
|
select @v1def1, @v1def2, @v1def1=@v1def2;
|
|
|
|
|
|
|
|
|
|
connection root;
|
2009-03-03 21:34:18 +01:00
|
|
|
disconnect test14256;
|
2005-10-28 12:11:32 +02:00
|
|
|
drop user test14256;
|
|
|
|
|
|
|
|
|
|
# Restore the anonymous users.
|
|
|
|
|
insert into mysql.user select * from t1;
|
|
|
|
|
flush privileges;
|
|
|
|
|
|
|
|
|
|
drop table t1;
|
2005-11-21 20:11:02 +01:00
|
|
|
|
|
|
|
|
#
|
2009-03-03 21:34:18 +01:00
|
|
|
# Bug#14726 freeing stack variable in case of an error of opening a view when
|
2009-03-05 14:35:03 +01:00
|
|
|
# we have locked tables with LOCK TABLES statement.
|
2005-11-21 20:11:02 +01:00
|
|
|
#
|
|
|
|
|
connection root;
|
|
|
|
|
--disable_warnings
|
|
|
|
|
create database mysqltest;
|
|
|
|
|
--enable_warnings
|
|
|
|
|
|
|
|
|
|
use mysqltest;
|
|
|
|
|
CREATE TABLE t1 (i INT);
|
|
|
|
|
CREATE VIEW v1 AS SELECT * FROM t1;
|
|
|
|
|
SHOW CREATE VIEW v1;
|
|
|
|
|
GRANT SELECT, LOCK TABLES ON mysqltest.* TO mysqltest_1@localhost;
|
|
|
|
|
|
|
|
|
|
connection user1;
|
|
|
|
|
|
|
|
|
|
use mysqltest;
|
|
|
|
|
LOCK TABLES v1 READ;
|
2009-03-03 21:34:18 +01:00
|
|
|
--error ER_TABLEACCESS_DENIED_ERROR
|
2005-11-21 20:11:02 +01:00
|
|
|
SHOW CREATE TABLE v1;
|
|
|
|
|
UNLOCK TABLES;
|
|
|
|
|
use test;
|
|
|
|
|
|
|
|
|
|
connection root;
|
|
|
|
|
use test;
|
|
|
|
|
drop user mysqltest_1@localhost;
|
|
|
|
|
drop database mysqltest;
|
|
|
|
|
|
|
|
|
|
#
|
2009-03-03 21:34:18 +01:00
|
|
|
# switch to default connection
|
2005-11-21 20:11:02 +01:00
|
|
|
#
|
|
|
|
|
disconnect user1;
|
|
|
|
|
disconnect root;
|
|
|
|
|
connection default;
|
2006-01-19 10:25:12 +01:00
|
|
|
|
|
|
|
|
#
|
|
|
|
|
# DEFINER information check
|
|
|
|
|
#
|
|
|
|
|
create definer=some_user@`` sql security invoker view v1 as select 1;
|
2006-03-09 19:00:45 +01:00
|
|
|
create definer=some_user@localhost sql security invoker view v2 as select 1;
|
2006-01-19 10:25:12 +01:00
|
|
|
show create view v1;
|
2006-03-09 19:00:45 +01:00
|
|
|
show create view v2;
|
2006-01-19 10:25:12 +01:00
|
|
|
drop view v1;
|
2006-03-09 19:00:45 +01:00
|
|
|
drop view v2;
|
2006-05-26 10:49:39 +02:00
|
|
|
|
2006-05-26 10:47:53 +02:00
|
|
|
#
|
2009-03-03 21:34:18 +01:00
|
|
|
# Bug#18681 View privileges are broken
|
2006-05-26 10:47:53 +02:00
|
|
|
#
|
|
|
|
|
CREATE DATABASE mysqltest1;
|
|
|
|
|
CREATE USER readonly@localhost;
|
|
|
|
|
CREATE TABLE mysqltest1.t1 (x INT);
|
|
|
|
|
INSERT INTO mysqltest1.t1 VALUES (1), (2);
|
|
|
|
|
CREATE SQL SECURITY INVOKER VIEW mysqltest1.v_t1 AS SELECT * FROM mysqltest1.t1;
|
|
|
|
|
CREATE SQL SECURITY DEFINER VIEW mysqltest1.v_ts AS SELECT * FROM mysqltest1.t1;
|
|
|
|
|
CREATE SQL SECURITY DEFINER VIEW mysqltest1.v_ti AS SELECT * FROM mysqltest1.t1;
|
|
|
|
|
CREATE SQL SECURITY DEFINER VIEW mysqltest1.v_tu AS SELECT * FROM mysqltest1.t1;
|
|
|
|
|
CREATE SQL SECURITY DEFINER VIEW mysqltest1.v_tus AS SELECT * FROM mysqltest1.t1;
|
|
|
|
|
CREATE SQL SECURITY DEFINER VIEW mysqltest1.v_td AS SELECT * FROM mysqltest1.t1;
|
|
|
|
|
CREATE SQL SECURITY DEFINER VIEW mysqltest1.v_tds AS SELECT * FROM mysqltest1.t1;
|
2006-11-15 10:23:27 +01:00
|
|
|
GRANT SELECT, INSERT, UPDATE, DELETE ON mysqltest1.v_t1 TO readonly@localhost;
|
|
|
|
|
GRANT SELECT ON mysqltest1.v_ts TO readonly@localhost;
|
|
|
|
|
GRANT INSERT ON mysqltest1.v_ti TO readonly@localhost;
|
|
|
|
|
GRANT UPDATE ON mysqltest1.v_tu TO readonly@localhost;
|
|
|
|
|
GRANT UPDATE,SELECT ON mysqltest1.v_tus TO readonly@localhost;
|
|
|
|
|
GRANT DELETE ON mysqltest1.v_td TO readonly@localhost;
|
|
|
|
|
GRANT DELETE,SELECT ON mysqltest1.v_tds TO readonly@localhost;
|
2006-05-26 10:47:53 +02:00
|
|
|
|
2009-03-03 21:34:18 +01:00
|
|
|
connect (n1,localhost,readonly,,);
|
|
|
|
|
connection n1;
|
2006-05-26 10:47:53 +02:00
|
|
|
|
2009-03-03 21:34:18 +01:00
|
|
|
--error ER_VIEW_INVALID
|
2006-05-26 10:47:53 +02:00
|
|
|
SELECT * FROM mysqltest1.v_t1;
|
2009-03-03 21:34:18 +01:00
|
|
|
--error ER_VIEW_INVALID
|
2006-05-26 10:47:53 +02:00
|
|
|
INSERT INTO mysqltest1.v_t1 VALUES(4);
|
2009-03-03 21:34:18 +01:00
|
|
|
--error ER_VIEW_INVALID
|
2006-05-26 10:47:53 +02:00
|
|
|
DELETE FROM mysqltest1.v_t1 WHERE x = 1;
|
2009-03-03 21:34:18 +01:00
|
|
|
--error ER_VIEW_INVALID
|
2006-05-26 10:47:53 +02:00
|
|
|
UPDATE mysqltest1.v_t1 SET x = 3 WHERE x = 2;
|
2009-03-03 21:34:18 +01:00
|
|
|
--error ER_VIEW_INVALID
|
2006-05-26 10:47:53 +02:00
|
|
|
UPDATE mysqltest1.v_t1 SET x = 3;
|
2009-03-03 21:34:18 +01:00
|
|
|
--error ER_VIEW_INVALID
|
2006-05-26 10:47:53 +02:00
|
|
|
DELETE FROM mysqltest1.v_t1;
|
2009-03-03 21:34:18 +01:00
|
|
|
--error ER_VIEW_INVALID
|
2006-05-26 10:47:53 +02:00
|
|
|
SELECT 1 FROM mysqltest1.v_t1;
|
2009-03-03 21:34:18 +01:00
|
|
|
--error ER_TABLEACCESS_DENIED_ERROR
|
2006-05-26 10:47:53 +02:00
|
|
|
SELECT * FROM mysqltest1.t1;
|
|
|
|
|
|
|
|
|
|
SELECT * FROM mysqltest1.v_ts;
|
2009-03-03 21:34:18 +01:00
|
|
|
--error ER_TABLEACCESS_DENIED_ERROR
|
2006-05-26 10:47:53 +02:00
|
|
|
SELECT * FROM mysqltest1.v_ts, mysqltest1.t1 WHERE mysqltest1.t1.x = mysqltest1.v_ts.x;
|
2009-03-03 21:34:18 +01:00
|
|
|
--error ER_TABLEACCESS_DENIED_ERROR
|
2006-05-26 10:47:53 +02:00
|
|
|
SELECT * FROM mysqltest1.v_ti;
|
|
|
|
|
|
2009-03-03 21:34:18 +01:00
|
|
|
--error ER_TABLEACCESS_DENIED_ERROR
|
2006-05-26 10:47:53 +02:00
|
|
|
INSERT INTO mysqltest1.v_ts VALUES (100);
|
|
|
|
|
INSERT INTO mysqltest1.v_ti VALUES (100);
|
|
|
|
|
|
2009-03-03 21:34:18 +01:00
|
|
|
--error ER_TABLEACCESS_DENIED_ERROR
|
2006-05-26 10:47:53 +02:00
|
|
|
UPDATE mysqltest1.v_ts SET x= 200 WHERE x = 100;
|
2009-03-03 21:34:18 +01:00
|
|
|
--error ER_TABLEACCESS_DENIED_ERROR
|
2006-05-26 10:47:53 +02:00
|
|
|
UPDATE mysqltest1.v_ts SET x= 200;
|
|
|
|
|
UPDATE mysqltest1.v_tu SET x= 200 WHERE x = 100;
|
|
|
|
|
UPDATE mysqltest1.v_tus SET x= 200 WHERE x = 100;
|
|
|
|
|
UPDATE mysqltest1.v_tu SET x= 200;
|
|
|
|
|
|
2009-03-03 21:34:18 +01:00
|
|
|
--error ER_TABLEACCESS_DENIED_ERROR
|
2006-05-26 10:47:53 +02:00
|
|
|
DELETE FROM mysqltest1.v_ts WHERE x= 200;
|
2009-03-03 21:34:18 +01:00
|
|
|
--error ER_TABLEACCESS_DENIED_ERROR
|
2006-05-26 10:47:53 +02:00
|
|
|
DELETE FROM mysqltest1.v_ts;
|
2009-03-03 21:34:18 +01:00
|
|
|
--error ER_COLUMNACCESS_DENIED_ERROR
|
2006-05-26 10:47:53 +02:00
|
|
|
DELETE FROM mysqltest1.v_td WHERE x= 200;
|
|
|
|
|
DELETE FROM mysqltest1.v_tds WHERE x= 200;
|
|
|
|
|
DELETE FROM mysqltest1.v_td;
|
|
|
|
|
|
2009-03-03 21:34:18 +01:00
|
|
|
connection default;
|
|
|
|
|
disconnect n1;
|
2006-05-26 10:47:53 +02:00
|
|
|
DROP VIEW mysqltest1.v_tds;
|
|
|
|
|
DROP VIEW mysqltest1.v_td;
|
|
|
|
|
DROP VIEW mysqltest1.v_tus;
|
|
|
|
|
DROP VIEW mysqltest1.v_tu;
|
|
|
|
|
DROP VIEW mysqltest1.v_ti;
|
|
|
|
|
DROP VIEW mysqltest1.v_ts;
|
|
|
|
|
DROP VIEW mysqltest1.v_t1;
|
|
|
|
|
DROP TABLE mysqltest1.t1;
|
2006-11-15 10:23:27 +01:00
|
|
|
DROP USER readonly@localhost;
|
2006-05-26 10:47:53 +02:00
|
|
|
DROP DATABASE mysqltest1;
|
2006-05-26 10:57:56 +02:00
|
|
|
|
2006-05-26 10:49:39 +02:00
|
|
|
#
|
2009-03-03 21:34:18 +01:00
|
|
|
# Bug#14875 Bad view DEFINER makes SHOW CREATE VIEW fail
|
2006-05-26 10:49:39 +02:00
|
|
|
#
|
|
|
|
|
CREATE TABLE t1 (a INT PRIMARY KEY);
|
|
|
|
|
INSERT INTO t1 VALUES (1), (2), (3);
|
|
|
|
|
CREATE DEFINER = 'no-such-user'@localhost VIEW v AS SELECT a from t1;
|
2009-03-03 21:34:18 +01:00
|
|
|
#--warning ER_VIEW_OTHER_USER
|
2006-05-26 10:49:39 +02:00
|
|
|
SHOW CREATE VIEW v;
|
2009-03-03 21:34:18 +01:00
|
|
|
--error ER_NO_SUCH_USER
|
2006-05-26 10:49:39 +02:00
|
|
|
SELECT * FROM v;
|
|
|
|
|
DROP VIEW v;
|
|
|
|
|
DROP TABLE t1;
|
|
|
|
|
USE test;
|
2006-06-12 17:15:08 +02:00
|
|
|
|
|
|
|
|
#
|
2009-03-03 21:34:18 +01:00
|
|
|
# Bug#20363 Create view on just created view is now denied
|
2006-06-12 17:15:08 +02:00
|
|
|
#
|
|
|
|
|
eval CREATE USER mysqltest_db1@localhost identified by 'PWD';
|
|
|
|
|
eval GRANT ALL ON mysqltest_db1.* TO mysqltest_db1@localhost WITH GRANT OPTION;
|
|
|
|
|
|
|
|
|
|
# The session with the non root user is needed.
|
|
|
|
|
--replace_result $MASTER_MYPORT MYSQL_PORT $MASTER_MYSOCK MYSQL_SOCK
|
|
|
|
|
connect (session1,localhost,mysqltest_db1,PWD,test);
|
|
|
|
|
|
|
|
|
|
CREATE SCHEMA mysqltest_db1 ;
|
|
|
|
|
USE mysqltest_db1 ;
|
|
|
|
|
|
|
|
|
|
CREATE TABLE t1 (f1 INTEGER);
|
|
|
|
|
|
|
|
|
|
CREATE VIEW view1 AS
|
|
|
|
|
SELECT * FROM t1;
|
|
|
|
|
SHOW CREATE VIEW view1;
|
|
|
|
|
|
|
|
|
|
CREATE VIEW view2 AS
|
|
|
|
|
SELECT * FROM view1;
|
|
|
|
|
--echo # Here comes a suspicious warning
|
|
|
|
|
SHOW CREATE VIEW view2;
|
|
|
|
|
--echo # But the view view2 is usable
|
|
|
|
|
SELECT * FROM view2;
|
|
|
|
|
|
|
|
|
|
CREATE VIEW view3 AS
|
|
|
|
|
SELECT * FROM view2;
|
|
|
|
|
|
|
|
|
|
SELECT * from view3;
|
|
|
|
|
|
|
|
|
|
connection default;
|
2009-03-03 21:34:18 +01:00
|
|
|
disconnect session1;
|
2006-06-12 17:15:08 +02:00
|
|
|
DROP VIEW mysqltest_db1.view3;
|
|
|
|
|
DROP VIEW mysqltest_db1.view2;
|
|
|
|
|
DROP VIEW mysqltest_db1.view1;
|
|
|
|
|
DROP TABLE mysqltest_db1.t1;
|
|
|
|
|
DROP SCHEMA mysqltest_db1;
|
|
|
|
|
DROP USER mysqltest_db1@localhost;
|
2006-06-21 11:12:46 +02:00
|
|
|
#
|
2009-03-03 21:34:18 +01:00
|
|
|
# Bug#20482 failure on Create join view with sources views/tables
|
2009-03-05 14:35:03 +01:00
|
|
|
# in different schemas
|
2006-06-21 11:12:46 +02:00
|
|
|
#
|
|
|
|
|
--disable_warnings
|
|
|
|
|
CREATE DATABASE test1;
|
|
|
|
|
CREATE DATABASE test2;
|
|
|
|
|
--enable_warnings
|
|
|
|
|
|
|
|
|
|
CREATE TABLE test1.t0 (a VARCHAR(20));
|
|
|
|
|
CREATE TABLE test2.t1 (a VARCHAR(20));
|
|
|
|
|
CREATE VIEW test2.t3 AS SELECT * FROM test1.t0;
|
2009-03-03 21:34:18 +01:00
|
|
|
CREATE OR REPLACE VIEW test.v1 AS
|
2006-06-21 11:12:46 +02:00
|
|
|
SELECT ta.a AS col1, tb.a AS col2 FROM test2.t3 ta, test2.t1 tb;
|
|
|
|
|
|
|
|
|
|
DROP VIEW test.v1;
|
|
|
|
|
DROP VIEW test2.t3;
|
|
|
|
|
DROP TABLE test2.t1, test1.t0;
|
|
|
|
|
DROP DATABASE test2;
|
|
|
|
|
DROP DATABASE test1;
|
2006-07-04 21:55:52 +02:00
|
|
|
|
2006-07-02 12:35:45 +02:00
|
|
|
|
|
|
|
|
#
|
2009-03-03 21:34:18 +01:00
|
|
|
# Bug#20570 CURRENT_USER() in a VIEW with SQL SECURITY DEFINER returns
|
2009-03-05 14:35:03 +01:00
|
|
|
# invoker name
|
2006-07-02 12:35:45 +02:00
|
|
|
#
|
|
|
|
|
--disable_warnings
|
|
|
|
|
DROP VIEW IF EXISTS v1;
|
|
|
|
|
DROP VIEW IF EXISTS v2;
|
|
|
|
|
DROP VIEW IF EXISTS v3;
|
|
|
|
|
DROP FUNCTION IF EXISTS f1;
|
|
|
|
|
DROP FUNCTION IF EXISTS f2;
|
|
|
|
|
DROP PROCEDURE IF EXISTS p1;
|
|
|
|
|
--enable_warnings
|
|
|
|
|
|
|
|
|
|
CREATE SQL SECURITY DEFINER VIEW v1 AS SELECT CURRENT_USER() AS cu;
|
|
|
|
|
|
|
|
|
|
CREATE FUNCTION f1() RETURNS VARCHAR(77) SQL SECURITY INVOKER
|
|
|
|
|
RETURN CURRENT_USER();
|
|
|
|
|
CREATE SQL SECURITY DEFINER VIEW v2 AS SELECT f1() AS cu;
|
|
|
|
|
|
|
|
|
|
CREATE PROCEDURE p1(OUT cu VARCHAR(77)) SQL SECURITY INVOKER
|
|
|
|
|
SET cu= CURRENT_USER();
|
|
|
|
|
delimiter |;
|
|
|
|
|
CREATE FUNCTION f2() RETURNS VARCHAR(77) SQL SECURITY INVOKER
|
|
|
|
|
BEGIN
|
|
|
|
|
DECLARE cu VARCHAR(77);
|
|
|
|
|
CALL p1(cu);
|
|
|
|
|
RETURN cu;
|
|
|
|
|
END|
|
|
|
|
|
delimiter ;|
|
|
|
|
|
CREATE SQL SECURITY DEFINER VIEW v3 AS SELECT f2() AS cu;
|
|
|
|
|
|
|
|
|
|
CREATE USER mysqltest_u1@localhost;
|
|
|
|
|
GRANT ALL ON test.* TO mysqltest_u1@localhost;
|
|
|
|
|
|
|
|
|
|
connect (conn1, localhost, mysqltest_u1,,);
|
|
|
|
|
|
|
|
|
|
--echo
|
|
|
|
|
--echo The following tests should all return 1.
|
|
|
|
|
--echo
|
|
|
|
|
SELECT CURRENT_USER() = 'mysqltest_u1@localhost';
|
|
|
|
|
SELECT f1() = 'mysqltest_u1@localhost';
|
|
|
|
|
CALL p1(@cu);
|
|
|
|
|
SELECT @cu = 'mysqltest_u1@localhost';
|
|
|
|
|
SELECT f2() = 'mysqltest_u1@localhost';
|
|
|
|
|
SELECT cu = 'root@localhost' FROM v1;
|
|
|
|
|
SELECT cu = 'root@localhost' FROM v2;
|
|
|
|
|
SELECT cu = 'root@localhost' FROM v3;
|
|
|
|
|
|
|
|
|
|
disconnect conn1;
|
|
|
|
|
connection default;
|
|
|
|
|
|
|
|
|
|
DROP VIEW v3;
|
|
|
|
|
DROP FUNCTION f2;
|
|
|
|
|
DROP PROCEDURE p1;
|
|
|
|
|
DROP FUNCTION f1;
|
|
|
|
|
DROP VIEW v2;
|
|
|
|
|
DROP VIEW v1;
|
|
|
|
|
DROP USER mysqltest_u1@localhost;
|
|
|
|
|
|
2007-01-18 10:48:17 +01:00
|
|
|
|
2006-11-27 14:15:32 +01:00
|
|
|
#
|
2009-03-03 21:34:18 +01:00
|
|
|
# Bug#17254 Error for DEFINER security on VIEW provides too much info
|
2006-11-27 14:15:32 +01:00
|
|
|
#
|
|
|
|
|
connect (root,localhost,root,,);
|
|
|
|
|
connection root;
|
|
|
|
|
CREATE DATABASE db17254;
|
|
|
|
|
USE db17254;
|
|
|
|
|
CREATE TABLE t1 (f1 INT);
|
|
|
|
|
INSERT INTO t1 VALUES (10),(20);
|
|
|
|
|
CREATE USER def_17254@localhost;
|
|
|
|
|
GRANT SELECT ON db17254.* TO def_17254@localhost;
|
|
|
|
|
CREATE USER inv_17254@localhost;
|
|
|
|
|
GRANT SELECT ON db17254.t1 TO inv_17254@localhost;
|
|
|
|
|
GRANT CREATE VIEW ON db17254.* TO def_17254@localhost;
|
|
|
|
|
|
|
|
|
|
connect (def,localhost,def_17254,,db17254);
|
|
|
|
|
connection def;
|
|
|
|
|
CREATE VIEW v1 AS SELECT * FROM t1;
|
|
|
|
|
|
|
|
|
|
connection root;
|
|
|
|
|
DROP USER def_17254@localhost;
|
|
|
|
|
|
|
|
|
|
connect (inv,localhost,inv_17254,,db17254);
|
|
|
|
|
connection inv;
|
|
|
|
|
--echo for a user
|
2009-03-03 21:34:18 +01:00
|
|
|
--error ER_TABLEACCESS_DENIED_ERROR
|
2006-11-27 14:15:32 +01:00
|
|
|
SELECT * FROM v1;
|
|
|
|
|
|
|
|
|
|
connection root;
|
|
|
|
|
--echo for a superuser
|
2009-03-03 21:34:18 +01:00
|
|
|
--error ER_NO_SUCH_USER
|
2006-11-27 14:15:32 +01:00
|
|
|
SELECT * FROM v1;
|
|
|
|
|
DROP USER inv_17254@localhost;
|
|
|
|
|
DROP DATABASE db17254;
|
|
|
|
|
disconnect def;
|
|
|
|
|
disconnect inv;
|
|
|
|
|
|
2007-01-18 10:48:17 +01:00
|
|
|
|
|
|
|
|
#
|
2009-03-03 21:34:18 +01:00
|
|
|
# Bug#24404 strange bug with view+permission+prepared statement
|
2007-01-18 10:48:17 +01:00
|
|
|
#
|
|
|
|
|
--disable_warnings
|
|
|
|
|
DROP DATABASE IF EXISTS mysqltest_db1;
|
|
|
|
|
DROP DATABASE IF EXISTS mysqltest_db2;
|
|
|
|
|
--enable_warnings
|
|
|
|
|
--error 0,ER_CANNOT_USER
|
|
|
|
|
DROP USER mysqltest_u1;
|
|
|
|
|
--error 0,ER_CANNOT_USER
|
|
|
|
|
DROP USER mysqltest_u2;
|
|
|
|
|
|
|
|
|
|
CREATE USER mysqltest_u1@localhost;
|
|
|
|
|
CREATE USER mysqltest_u2@localhost;
|
|
|
|
|
|
|
|
|
|
CREATE DATABASE mysqltest_db1;
|
|
|
|
|
CREATE DATABASE mysqltest_db2;
|
|
|
|
|
|
|
|
|
|
GRANT ALL ON mysqltest_db1.* TO mysqltest_u1@localhost WITH GRANT OPTION;
|
|
|
|
|
GRANT ALL ON mysqltest_db2.* TO mysqltest_u2@localhost;
|
|
|
|
|
|
|
|
|
|
connect (conn1, localhost, mysqltest_u1, , mysqltest_db1);
|
|
|
|
|
|
|
|
|
|
CREATE TABLE t1 (i INT);
|
|
|
|
|
INSERT INTO t1 VALUES (1);
|
|
|
|
|
|
|
|
|
|
# Use view with subquery for better coverage.
|
|
|
|
|
CREATE VIEW v1 AS SELECT i FROM t1 WHERE 1 IN (SELECT * FROM t1);
|
|
|
|
|
|
|
|
|
|
CREATE TABLE t2 (s CHAR(7));
|
|
|
|
|
INSERT INTO t2 VALUES ('public');
|
|
|
|
|
|
|
|
|
|
GRANT SELECT ON v1 TO mysqltest_u2@localhost;
|
|
|
|
|
GRANT SELECT ON t2 TO mysqltest_u2@localhost;
|
|
|
|
|
|
|
|
|
|
connect (conn2, localhost, mysqltest_u2, , mysqltest_db2);
|
|
|
|
|
|
|
|
|
|
SELECT * FROM mysqltest_db1.v1, mysqltest_db1.t2;
|
|
|
|
|
PREPARE stmt1 FROM "SELECT * FROM mysqltest_db1.t2";
|
|
|
|
|
EXECUTE stmt1;
|
|
|
|
|
PREPARE stmt2 FROM "SELECT * FROM mysqltest_db1.v1, mysqltest_db1.t2";
|
|
|
|
|
EXECUTE stmt2;
|
|
|
|
|
|
|
|
|
|
connection conn1;
|
|
|
|
|
# Make table 't2' private.
|
|
|
|
|
REVOKE SELECT ON t2 FROM mysqltest_u2@localhost;
|
|
|
|
|
UPDATE t2 SET s = 'private' WHERE s = 'public';
|
|
|
|
|
|
|
|
|
|
connection conn2;
|
|
|
|
|
--error ER_TABLEACCESS_DENIED_ERROR
|
|
|
|
|
SELECT * FROM mysqltest_db1.v1, mysqltest_db1.t2;
|
|
|
|
|
--error ER_TABLEACCESS_DENIED_ERROR
|
|
|
|
|
EXECUTE stmt1;
|
|
|
|
|
# Original bug was here: the statement didn't fail.
|
|
|
|
|
--error ER_TABLEACCESS_DENIED_ERROR
|
|
|
|
|
EXECUTE stmt2;
|
|
|
|
|
|
|
|
|
|
# Cleanup.
|
|
|
|
|
disconnect conn2;
|
|
|
|
|
disconnect conn1;
|
|
|
|
|
connection default;
|
|
|
|
|
REVOKE ALL ON mysqltest_db1.* FROM mysqltest_u1@localhost;
|
|
|
|
|
REVOKE ALL ON mysqltest_db2.* FROM mysqltest_u2@localhost;
|
|
|
|
|
DROP DATABASE mysqltest_db1;
|
|
|
|
|
DROP DATABASE mysqltest_db2;
|
|
|
|
|
DROP USER mysqltest_u1@localhost;
|
|
|
|
|
DROP USER mysqltest_u2@localhost;
|
|
|
|
|
|
2007-03-22 20:05:19 +01:00
|
|
|
#
|
2009-03-03 21:34:18 +01:00
|
|
|
# Bug#26813 The SUPER privilege is wrongly required to alter a view created
|
|
|
|
|
# by another user.
|
2007-03-22 20:05:19 +01:00
|
|
|
#
|
|
|
|
|
connection root;
|
|
|
|
|
CREATE DATABASE db26813;
|
|
|
|
|
USE db26813;
|
|
|
|
|
CREATE TABLE t1(f1 INT, f2 INT);
|
|
|
|
|
CREATE VIEW v1 AS SELECT f1 FROM t1;
|
|
|
|
|
CREATE VIEW v2 AS SELECT f1 FROM t1;
|
|
|
|
|
CREATE VIEW v3 AS SELECT f1 FROM t1;
|
|
|
|
|
CREATE USER u26813@localhost;
|
|
|
|
|
GRANT DROP ON db26813.v1 TO u26813@localhost;
|
|
|
|
|
GRANT CREATE VIEW ON db26813.v2 TO u26813@localhost;
|
|
|
|
|
GRANT DROP, CREATE VIEW ON db26813.v3 TO u26813@localhost;
|
|
|
|
|
GRANT SELECT ON db26813.t1 TO u26813@localhost;
|
|
|
|
|
|
|
|
|
|
connect (u1,localhost,u26813,,db26813);
|
|
|
|
|
connection u1;
|
Initial import of WL#3726 "DDL locking for all metadata objects".
Backport of:
------------------------------------------------------------
revno: 2630.4.1
committer: Dmitry Lenev <dlenev@mysql.com>
branch nick: mysql-6.0-3726-w
timestamp: Fri 2008-05-23 17:54:03 +0400
message:
WL#3726 "DDL locking for all metadata objects".
After review fixes in progress.
------------------------------------------------------------
This is the first patch in series. It transforms the metadata
locking subsystem to use a dedicated module (mdl.h,cc). No
significant changes in the locking protocol.
The import passes the test suite with the exception of
deprecated/removed 6.0 features, and MERGE tables. The latter
are subject to a fix by WL#4144.
Unfortunately, the original changeset comments got lost in a merge,
thus this import has its own (largely insufficient) comments.
This patch fixes Bug#25144 "replication / binlog with view breaks".
Warning: this patch introduces an incompatible change:
Under LOCK TABLES, it's no longer possible to FLUSH a table that
was not locked for WRITE.
Under LOCK TABLES, it's no longer possible to DROP a table or
VIEW that was not locked for WRITE.
******
Backport of:
------------------------------------------------------------
revno: 2630.4.2
committer: Dmitry Lenev <dlenev@mysql.com>
branch nick: mysql-6.0-3726-w
timestamp: Sat 2008-05-24 14:03:45 +0400
message:
WL#3726 "DDL locking for all metadata objects".
After review fixes in progress.
******
Backport of:
------------------------------------------------------------
revno: 2630.4.3
committer: Dmitry Lenev <dlenev@mysql.com>
branch nick: mysql-6.0-3726-w
timestamp: Sat 2008-05-24 14:08:51 +0400
message:
WL#3726 "DDL locking for all metadata objects"
Fixed failing Windows builds by adding mdl.cc to the lists
of files needed to build server/libmysqld on Windows.
******
Backport of:
------------------------------------------------------------
revno: 2630.4.4
committer: Dmitry Lenev <dlenev@mysql.com>
branch nick: mysql-6.0-3726-w
timestamp: Sat 2008-05-24 21:57:58 +0400
message:
WL#3726 "DDL locking for all metadata objects".
Fix for assert failures in kill.test which occured when one
tried to kill ALTER TABLE statement on merge table while it
was waiting in wait_while_table_is_used() for other connections
to close this table.
These assert failures stemmed from the fact that cleanup code
in this case assumed that temporary table representing new
version of table was open with adding to THD::temporary_tables
list while code which were opening this temporary table wasn't
always fulfilling this.
This patch changes code that opens new version of table to
always do this linking in. It also streamlines cleanup process
for cases when error occurs while we have new version of table
open.
******
WL#3726 "DDL locking for all metadata objects"
Add libmysqld/mdl.cc to .bzrignore.
******
Backport of:
------------------------------------------------------------
revno: 2630.4.6
committer: Dmitry Lenev <dlenev@mysql.com>
branch nick: mysql-6.0-3726-w
timestamp: Sun 2008-05-25 00:33:22 +0400
message:
WL#3726 "DDL locking for all metadata objects".
Addition to the fix of assert failures in kill.test caused by
changes for this worklog.
Make sure we close the new table only once.
.bzrignore:
Add libmysqld/mdl.cc
libmysqld/CMakeLists.txt:
Added mdl.cc to the list of files needed for building of libmysqld.
libmysqld/Makefile.am:
Added files implementing new meta-data locking subsystem to the server.
mysql-test/include/handler.inc:
Use separate connection for waiting while threads performing DDL
operations conflicting with open HANDLER tables reach blocked
state. This is required because now we check and close tables open
by HANDLER statements in this connection conflicting with DDL in
another each time open_tables() is called and thus select from I_S
which is used for waiting will unblock DDL operations if issued
from connection with open HANDLERs.
mysql-test/r/create.result:
Adjusted test case after change in implementation of CREATE TABLE
... SELECT. We no longer have special check in open_table() which
catches the case when we select from the table created. Instead we
rely on unique_table() call which happens after opening and
locking all tables.
mysql-test/r/flush.result:
FLUSH TABLES WITH READ LOCK can no longer happen under LOCK
TABLES. Updated test accordingly.
mysql-test/r/flush_table.result:
Under LOCK TABLES we no longer allow to do FLUSH TABLES for tables
locked for read. Updated test accordingly.
mysql-test/r/handler_innodb.result:
Use separate connection for waiting while threads performing DDL
operations conflicting with open HANDLER tables reach blocked
state. This is required because now we check and close tables open
by HANDLER statements in this connection conflicting with DDL in
another each time open_tables() is called and thus select from I_S
which is used for waiting will unblock DDL operations if issued
from connection with open HANDLERs.
mysql-test/r/handler_myisam.result:
Use separate connection for waiting while threads performing DDL
operations conflicting with open HANDLER tables reach blocked
state. This is required because now we check and close tables open
by HANDLER statements in this connection conflicting with DDL in
another each time open_tables() is called and thus select from I_S
which is used for waiting will unblock DDL operations if issued
from connection with open HANDLERs.
mysql-test/r/information_schema.result:
Additional test for WL#3726 "DDL locking for all metadata
objects". Check that we use high-priority metadata lock requests
when filling I_S tables.
Rearrange tests to match 6.0 better (fewer merge conflicts).
mysql-test/r/kill.result:
Added tests checking that DDL and DML statements waiting for
metadata locks can be interrupted by KILL command.
mysql-test/r/lock.result:
One no longer is allowed to do DROP VIEW under LOCK TABLES even if
this view is locked by LOCK TABLES. The problem is that in such
situation write locks on view are not mutually exclusive so
upgrading metadata lock which is required for dropping of view
will lead to deadlock.
mysql-test/r/partition_column_prune.result:
Update results (same results in 6.0), WL#3726
mysql-test/r/partition_pruning.result:
Update results (same results in 6.0), WL#3726
mysql-test/r/ps_ddl.result:
We no longer invalidate prepared CREATE TABLE ... SELECT statement
if target table changes. This is OK since it is not strictly
necessary.
The first change is wrong, is caused by FLUSH TABLE
now flushing all unused tables. This is a regression that
Dmitri fixed in 6.0 in a follow up patch.
mysql-test/r/sp.result:
Under LOCK TABLES we no longer allow accessing views which were
not explicitly locked. To access view we need to obtain metadata
lock on it and doing this under LOCK TABLES may lead to deadlocks.
mysql-test/r/view.result:
One no longer is allowed to do DROP VIEW under LOCK TABLES even if
this view is locked by LOCK TABLES. The problem is that in such
situation even "write locks" on view are not mutually exclusive so
upgrading metadata lock which is required for dropping of view
will lead to deadlock
mysql-test/r/view_grant.result:
ALTER VIEW implementation was changed to open a view only after
checking that user which does alter has appropriate privileges on
it. This means that in case when user's privileges are
insufficient for this we won't check that new view definer is the
same as original one or user performing alter has SUPER privilege.
Adjusted test case accordingly.
mysql-test/r/view_multi.result:
Added test case for bug#25144 "replication / binlog with view
breaks".
mysql-test/suite/rpl/t/disabled.def:
Disable test for deprecated features (they don't work with new MDL).
mysql-test/t/create.test:
Adjusted test case after change in implementation of CREATE TABLE
... SELECT. We no longer have special check in open_table() which
catches the case when we select from the table created. Instead we
rely on unique_table() call which happens after opening and
locking all tables.
mysql-test/t/disabled.def:
Disable merge.test, subject of WL#4144
mysql-test/t/flush.test:
FLUSH TABLES WITH READ LOCK can no longer happen under LOCK
TABLES. Updated test accordingly.
mysql-test/t/flush_table.test:
Under LOCK TABLES we no longer allow to do FLUSH TABLES for tables
locked for read. Updated test accordingly.
mysql-test/t/information_schema.test:
Additional test for WL#3726 "DDL locking for all metadata
objects". Check that we use high-priority metadata lock requests
when filling I_S tables.
Rearrange the results for easier merges with 6.0.
mysql-test/t/kill.test:
Added tests checking that DDL and DML statements waiting for
metadata locks can be interrupted by KILL command.
mysql-test/t/lock.test:
One no longer is allowed to do DROP VIEW under LOCK TABLES even if
this view is locked by LOCK TABLES. The problem is that in such
situation write locks on view are not mutually exclusive so
upgrading metadata lock which is required for dropping of view
will lead to deadlock.
mysql-test/t/lock_multi.test:
Adjusted test case to the changes of status in various places
caused by change in implementation FLUSH TABLES WITH READ LOCK,
which is now takes global metadata lock before flushing tables and
therefore waits on at these places.
mysql-test/t/ps_ddl.test:
We no longer invalidate prepared CREATE TABLE ... SELECT statement
if target table changes. This is OK since it is not strictly
necessary.
The first change is wrong, is caused by FLUSH TABLE
now flushing all unused tables. This is a regression that
Dmitri fixed in 6.0 in a follow up patch.
mysql-test/t/sp.test:
Under LOCK TABLES we no longer allow accessing views which were
not explicitly locked. To access view we need to obtain metadata
lock on it and doing this under LOCK TABLES may lead to deadlocks.
mysql-test/t/trigger_notembedded.test:
Adjusted test case to the changes of status in various places
caused by change in implementation FLUSH TABLES WITH READ LOCK,
which is now takes global metadata lock before flushing tables and
therefore waits on at these places.
mysql-test/t/view.test:
One no longer is allowed to do DROP VIEW under LOCK TABLES even if
this view is locked by LOCK TABLES. The problem is that in such
situation even "write locks" on view are not mutually exclusive so
upgrading metadata lock which is required for dropping of view
will lead to deadlock.
mysql-test/t/view_grant.test:
ALTER VIEW implementation was changed to open a view only after
checking that user which does alter has appropriate privileges on
it. This means that in case when user's privileges are
insufficient for this we won't check that new view definer is the
same as original one or user performing alter has SUPER privilege.
Adjusted test case accordingly.
mysql-test/t/view_multi.test:
Added test case for bug#25144 "replication / binlog with view
breaks".
sql/CMakeLists.txt:
Added mdl.cc to the list of files needed for building of server.
sql/Makefile.am:
Added files implementing new meta-data locking subsystem to the
server.
sql/event_db_repository.cc:
Allocate metadata lock requests objects (MDL_LOCK) on execution
memory root in cases when TABLE_LIST objects is also allocated
there or on stack.
sql/ha_ndbcluster.cc:
Adjusted code to work nicely with new metadata locking subsystem.
close_cached_tables() no longer has wait_for_placeholder argument.
Instead of relying on this parameter and related behavior FLUSH
TABLES WITH READ LOCK now takes global shared metadata lock.
sql/ha_ndbcluster_binlog.cc:
Adjusted code to work with new metadata locking subsystem.
close_cached_tables() no longer has wait_for_placeholder argument.
Instead of relying on this parameter and related behavior FLUSH
TABLES WITH READ LOCK now takes global shared metadata lock.
sql/handler.cc:
update_frm_version():
Directly update TABLE_SHARE::mysql_version member instead of
going through all TABLE instances for this table (old code was a
legacy from pre-table-definition-cache days).
sql/lock.cc:
Use new metadata locking subsystem. Threw away most of functions
related to name locking as now one is supposed to use metadata
locking API instead. In lock_global_read_lock() and
unlock_global_read_lock() in order to avoid problems with global
read lock sneaking in at the moment when we perform FLUSH TABLES
or ALTER TABLE under LOCK TABLES and when tables being reopened
are protected only by metadata locks we also have to take global
shared meta data lock.
sql/log_event.cc:
Adjusted code to work with new metadata locking subsystem. For
tables open by slave thread for applying RBR events allocate
memory for lock request object in the same chunk of memory as
TABLE_LIST objects for them. In order to ensure that we keep these
objects around until tables are open always close tables before
calling Relay_log_info::clear_tables_to_lock(). Use new auxiliary
Relay_log_info::slave_close_thread_tables() method to enforce
this.
sql/log_event_old.cc:
Adjusted code to work with new metadata locking subsystem. Since
for tables open by slave thread for applying RBR events memory for
lock request object is allocated in the same chunk of memory as
TABLE_LIST objects for them we have to ensure that we keep these
objects around until tables are open. To ensure this we always
close tables before calling
Relay_log_info::clear_tables_to_lock(). To enfore this we use
new auxiliary Relay_log_info::slave_close_thread_tables()
method.
sql/mdl.cc:
Implemented new metadata locking subsystem and API described in
WL3726 "DDL locking for all metadata objects".
sql/mdl.h:
Implemented new metadata locking subsystem and API described in
WL3726 "DDL locking for all metadata objects".
sql/mysql_priv.h:
- close_thread_tables()/close_tables_for_reopen() now has one more
argument which indicates that metadata locks should be released
but not removed from the context in order to be used later in
mdl_wait_for_locks() and tdc_wait_for_old_version().
- close_cached_table() routine is no longer public.
- Thread waiting in wait_while_table_is_used() can be now killed
so this function returns boolean to make caller aware of such
situation.
- We no longer have table cache as separate entity instead used
and unused TABLE instances are linked to TABLE_SHARE objects in
table definition cache.
- Now third argument of open_table() is also used for requesting
table repair or auto-discovery of table's new definition. So its
type was changed from bool to enum.
- Added tdc_open_view() function for opening view by getting its
definition from disk (and table cache in future).
- reopen_name_locked_table() no longer needs "link_in" argument as
now we have exclusive metadata locks instead of dummy TABLE
instances when this function is called.
- find_locked_table() now takes head of list of TABLE instances
instead of always scanning through THD::open_tables list. Also
added find_write_locked_table() auxiliary.
- reopen_tables(), close_cached_tables() no longer have
mark_share_as_old and wait_for_placeholder arguments. Instead of
relying on this parameters and related behavior FLUSH TABLES
WITH READ LOCK now takes global shared metadata lock.
- We no longer need drop_locked_tables() and
abort_locked_tables().
- mysql_ha_rm_tables() now always assume that LOCK_open is not
acquired by caller.
- Added notify_thread_having_shared_lock() callback invoked by
metadata locking subsystem when acquiring an exclusive lock, for
each thread that has a conflicting shared metadata lock.
- Introduced expel_table_from_cache() as replacement for
remove_table_from_cache() (the main difference is that this new
function assumes that caller follows metadata locking protocol
and never waits).
- Threw away most of functions related to name locking. One should
use new metadata locking subsystem and API instead.
sql/mysqld.cc:
Got rid of call initializing/deinitializing table cache since now
it is embedded into table definition cache. Added calls for
initializing/ deinitializing metadata locking subsystem.
sql/rpl_rli.cc:
Introduced auxiliary Relay_log_info::slave_close_thread_tables()
method which is used for enforcing that we always close tables
open for RBR before deallocating TABLE_LIST elements and MDL_LOCK
objects for them.
sql/rpl_rli.h:
Introduced auxiliary Relay_log_info::slave_close_thread_tables()
method which is used for enforcing that we always close tables
open for RBR before deallocating TABLE_LIST elements and MDL_LOCK
objects for them.
sql/set_var.cc:
close_cached_tables() no longer has wait_for_placeholder argument.
Instead of relying on this parameter and related behavior FLUSH
TABLES WITH READ LOCK now takes global shared metadata lock.
sql/sp_head.cc:
For tables added to the statement's table list by prelocking
algorithm we allocate these objects either on the same memory as
corresponding table list elements or on THD::locked_tables_root
(if we are building table list for LOCK TABLES).
sql/sql_acl.cc:
Allocate metadata lock requests objects (MDL_LOCK) on execution
memory root in cases when we use stack TABLE_LIST objects to open
tables. Got rid of redundant code by using unlock_locked_tables()
function.
sql/sql_base.cc:
Changed code to use new MDL subsystem. Got rid of separate table
cache. Now used and unused TABLE instances are linked to the
TABLE_SHAREs in table definition cache.
check_unused():
Adjusted code to the fact that we no longer have separate table
cache. Removed dead code.
table_def_free():
Free TABLE instances referenced from TABLE_SHARE objects before
destroying table definition cache.
get_table_share():
Added assert which ensures that noone will be able to access
table (and its share) without acquiring some kind of metadata
lock first.
close_handle_and_leave_table_as_lock():
Adjusted code to the fact that TABLE instances now are linked to
list in TABLE_SHARE.
list_open_tables():
Changed this function to use table definition cache instead of
table cache.
free_cache_entry():
Unlink freed TABLE elements from the list of all TABLE instances
for the table in TABLE_SHARE.
kill_delayed_thread_for_table():
Added auxiliary for killing delayed insert threads for
particular table.
close_cached_tables():
Got rid of wait_for_refresh argument as we now rely on global
shared metadata lock to prevent FLUSH WITH READ LOCK sneaking in
when we are reopening tables. Heavily reworked this function to
use new MDL code and not to rely on separate table cache entity.
close_open_tables():
We no longer have separate table cache.
close_thread_tables():
Release metadata locks after closing all tables. Added skip_mdl
argument which allows us not to remove metadata lock requests
from the context in case when we are going to use this requests
later in mdl_wait_for_locks() and tdc_wait_for_old_versions().
close_thread_table()/close_table_for_reopen():
Since we no longer have separate table cache and all TABLE
instances are linked to TABLE_SHARE objects in table definition
cache we have to link/unlink TABLE object to/from appropriate
lists in the share.
name_lock_locked_table():
Moved redundant code to find_write_locked_table() function and
adjusted code to the fact that wait_while_table_is_used() can
now return with an error if our thread is killed.
reopen_table_entry():
We no longer need "link_in" argument as with MDL we no longer
call this function with dummy TABLE object pre-allocated and
added to the THD::open_tables. Also now we add newly-open TABLE
instance to the list of share's used TABLE instances.
table_cache_insert_placeholder():
Got rid of name-locking legacy.
lock_table_name_if_not_cached():
Moved to sql_table.cc the only place where it is used. It was
also reimplemented using new MDL API.
open_table():
- Reworked this function to use new MDL subsystem.
- Changed code to deal with table definition cache directly
instead of going through separate table cache.
- Now third argument is also used for requesting table repair
or auto-discovery of table's new definition. So its type was
changed from bool to enum.
find_locked_table()/find_write_locked_table():
Accept head of list of TABLE objects as first argument and use
this list instead of always searching in THD::open_tables list.
Also added auxiliary for finding write-locked locked tables.
reopen_table():
Adjusted function to work with new MDL subsystem and to properly
manuipulate with lists of used/unused TABLE instaces in
TABLE_SHARE.
reopen_tables():
Removed mark_share_as_old parameter. Instead of relying on it
and related behavior FLUSH TABLES WITH READ LOCK now takes
global shared metadata lock. Changed code after removing
separate table cache.
drop_locked_tables()/abort_locked_tables():
Got rid of functions which are no longer needed.
unlock_locked_tables():
Moved this function from sql_parse.cc and changed it to release
memory which was used for allocating metadata lock requests for
tables open and locked by LOCK TABLES.
tdc_open_view():
Intoduced function for opening a view by getting its definition
from disk (and table cache in future).
reopen_table_entry():
Introduced function for opening table definitions while holding
exclusive metatadata lock on it.
open_unireg_entry():
Got rid of this function. Most of its functionality is relocated
to open_table() and open_table_fini() functions, and some of it
to reopen_table_entry() and tdc_open_view(). Also code
resposible for auto-repair and auto-discovery of tables was
moved to separate function.
open_table_entry_fini():
Introduced function which contains common actions which finalize
process of TABLE object creation.
auto_repair_table():
Moved code responsible for auto-repair of table being opened
here.
handle_failed_open_table_attempt()
Moved code responsible for handling failing attempt to open
table to one place (retry due to lock conflict/old version,
auto-discovery and repair).
open_tables():
- Flush open HANDLER tables if they have old version of if there
is conflicting metadata lock against them (before this moment
we had this code in open_table()).
- When we open view which should be processed via derived table
on the second execution of prepared statement or stored
routine we still should call open_table() for it in order to
obtain metadata lock on it and prepare its security context.
- In cases when we discover that some special handling of
failure to open table is needed call
handle_failed_open_table_attempt() which handles all such
scenarios.
open_ltable():
Handling of various special scenarios of failure to open a table
was moved to separate handle_failed_open_table_attempt()
function.
remove_db_from_cache():
Removed this function as it is no longer used.
notify_thread_having_shared_lock():
Added callback which is invoked by MDL subsystem when acquiring
an exclusive lock, for each thread that has a conflicting shared
metadata lock.
expel_table_from_cache():
Introduced function for removing unused TABLE instances. Unlike
remove_table_from_cache() it relies on caller following MDL
protocol and having appropriate locks when calling it and thus
does not do any waiting if table is still in use.
tdc_wait_for_old_version():
Added function which allows open_tables() to wait in cases when
we discover that we should back-off due to presence of old
version of table.
abort_and_upgrade_lock():
Use new MDL calls.
mysql_wait_completed_table():
Got rid of unused function.
open_system_tables_for_read/for_update()/performance_schema_table():
Allocate MDL_LOCK objects on execution memory root in cases when
TABLE_LIST objects for corresponding tables is allocated on
stack.
close_performance_schema_table():
Release metadata locks after closing tables.
******
Use I_P_List for free/used tables list in the table share.
sql/sql_binlog.cc:
Use Relay_log_info::slave_close_thread_tables() method to enforce
that we always close tables open for RBR before deallocating
TABLE_LIST elements and MDL_LOCK objects for them.
sql/sql_class.cc:
Added meta-data locking contexts as part of Open_tables_state
context. Also introduced THD::locked_tables_root memory root
which is to be used for allocating MDL_LOCK objects for tables in
LOCK TABLES statement (end of lifetime for such objects is UNLOCK
TABLES so we can't use statement or execution root for them).
sql/sql_class.h:
Added meta-data locking contexts as part of Open_tables_state
context. Also introduced THD::locked_tables_root memory root
which is to be used for allocating MDL_LOCK objects for tables in
LOCK TABLES statement (end of lifetime for such objects is UNLOCK
TABLES so we can't use statement or execution root for them).
Note: handler_mdl_context and locked_tables_root and
mdl_el_root will be removed by subsequent patches.
sql/sql_db.cc:
mysql_rm_db() does not really need to call remove_db_from_cache()
as it drops each table in the database using
mysql_rm_table_part2(), which performs all necessary operations on
table (definition) cache.
sql/sql_delete.cc:
Use the new metadata locking API for TRUNCATE.
sql/sql_handler.cc:
Changed HANDLER implementation to use new metadata locking
subsystem. Note that MDL_LOCK objects for HANDLER tables are
allocated in the same chunk of heap memory as TABLE_LIST object
for those tables.
sql/sql_insert.cc:
mysql_insert():
find_locked_table() now takes head of list of TABLE object as
its argument instead of always scanning through THD::open_tables
list.
handle_delayed_insert():
Allocate metadata lock request object for table open by delayed
insert thread on execution memroot. create_table_from_items():
We no longer allocate dummy TABLE objects for tables being
created if they don't exist. As consequence
reopen_name_locked_table() no longer has link_in argument.
open_table() now has one more argument which is not relevant for
temporary tables.
sql/sql_parse.cc:
- Moved unlock_locked_tables() routine to sql_base.cc and made
available it in other files. Got rid of some redundant code by
using this function.
- Replaced boolean TABLE_LIST::create member with enum
open_table_type member.
- Use special memory root for allocating MDL_LOCK objects for
tables open and locked by LOCK TABLES (these object should live
till UNLOCK TABLES so we can't allocate them on statement nor
execution memory root). Also properly set metadata lock
upgradability attribure for those tables.
- Under LOCK TABLES it is no longer allowed to flush tables which
are not write-locked as this breaks metadata locking protocol
and thus potentially might lead to deadlock.
- Added auxiliary adjust_mdl_locks_upgradability() function.
sql/sql_partition.cc:
Adjusted code to the fact that reopen_tables() no longer has
"mark_share_as_old" argument. Got rid of comments which are no
longer true.
sql/sql_plist.h:
Added I_P_List template class for parametrized intrusive doubly
linked lists and I_P_List_iterator for corresponding iterator.
Unlike for I_List<> list elements of such list can participate in
several lists. Unlike List<> such lists are doubly-linked and
intrusive.
sql/sql_plugin.cc:
Allocate metadata lock requests objects (MDL_LOCK) on execution
memory root in cases when we use stack TABLE_LIST objects to open
tables.
sql/sql_prepare.cc:
Replaced boolean TABLE_LIST::create member with enum
open_table_type member. This allows easily handle situation in
which instead of opening the table we want only to take exclusive
metadata lock on it.
sql/sql_rename.cc:
Use new metadata locking subsystem in implementation of RENAME
TABLE.
sql/sql_servers.cc:
Allocate metadata lock requests objects (MDL_LOCK) on execution
memory root in cases when we use stack TABLE_LIST objects to open
tables. Got rid of redundant code by using unlock_locked_tables()
function.
sql/sql_show.cc:
Acquire shared metadata lock when we are getting information for
I_S table directly from TABLE_SHARE without doing full-blown table
open. We use high priority lock request in this situation in
order to avoid deadlocks.
Also allocate metadata lock requests objects (MDL_LOCK) on
execution memory root in cases when TABLE_LIST objects are also
allocated there
sql/sql_table.cc:
mysql_rm_table():
Removed comment which is no longer relevant.
mysql_rm_table_part2():
Now caller of mysql_ha_rm_tables() should not own LOCK_open.
Adjusted code to use new metadata locking subsystem instead of
name-locks.
lock_table_name_if_not_cached():
Moved this function from sql_base.cc to this file and
reimplemented it using metadata locking API.
mysql_create_table():
Adjusted code to use new MDL API.
wait_while_table_is_used():
Changed function to use new MDL subsystem. Made thread waiting
in it killable (this also led to introduction of return value so
caller can distinguish successful executions from situations
when waiting was aborted).
close_cached_tables():
Thread waiting in this function is killable now. As result it
has return value for distinguishing between succes and failure.
Got rid of redundant boradcast_refresh() call.
prepare_for_repair():
Use MDL subsystem instead of name-locks.
mysql_admin_table():
mysql_ha_rm_tables() now always assumes that caller doesn't own
LOCK_open.
mysql_repair_table():
We should mark all elements of table list as requiring
upgradable metadata locks.
mysql_create_table_like():
Use new MDL subsystem instead of name-locks.
create_temporary_tables():
We don't need to obtain metadata locks when creating temporary
table.
mysql_fast_or_online_alter_table():
Thread waiting in wait_while_table_is_used() is now killable.
mysql_alter_table():
Adjusted code to work with new MDL subsystem and to the fact
that threads waiting in what_while_table_is_used() and
close_cached_table() are now killable.
sql/sql_test.cc:
We no longer have separate table cache. TABLE instances are now
associated with/linked to TABLE_SHARE objects in table definition
cache.
sql/sql_trigger.cc:
Adjusted code to work with new metadata locking subsystem. Also
reopen_tables() no longer has mark_share_as_old argument (Instead
of relying on this parameter and related behavior FLUSH TABLES
WITH READ LOCK now takes global shared metadata lock).
sql/sql_udf.cc:
Allocate metadata lock requests objects (MDL_LOCK) on execution
memory root in cases when we use stack TABLE_LIST objects to open
tables.
sql/sql_update.cc:
Adjusted code to work with new meta-data locking subsystem.
sql/sql_view.cc:
Added proper meta-data locking to implementations of
CREATE/ALTER/DROP VIEW statements. Now we obtain exclusive
meta-data lock on a view before creating/ changing/dropping it.
This ensures that all concurrent statements that use this view
will finish before our statement will proceed and therefore we
will get correct order of statements in the binary log.
Also ensure that TABLE_LIST::mdl_upgradable attribute is properly
propagated for underlying tables of view.
sql/table.cc:
Added auxiliary alloc_mdl_locks() function for allocating metadata
lock request objects for all elements of table list.
sql/table.h:
TABLE_SHARE:
Got rid of unused members. Introduced members for storing lists
of used and unused TABLE objects for this share.
TABLE:
Added members for linking TABLE objects into per-share lists of
used and unused TABLE instances. Added member for holding
pointer to metadata lock for this table.
TABLE_LIST:
Replaced boolean TABLE_LIST::create member with enum
open_table_type member. This allows easily handle situation in
which instead of opening the table we want only to take
exclusive meta-data lock on it (we need this in order to handle
ALTER VIEW and CREATE VIEW statements).
Introduced new mdl_upgradable member for marking elements of
table list for which we need to take upgradable shared metadata
lock instead of plain shared metadata lock. Added pointer for
holding pointer to MDL_LOCK for the table.
Added auxiliary alloc_mdl_locks() function for allocating metadata
lock requests objects for all elements of table list. Added
auxiliary set_all_mdl_upgradable() function for marking all
elements in table list as requiring upgradable metadata locks.
storage/myisammrg/ha_myisammrg.cc:
Allocate MDL_LOCK objects for underlying tables of MERGE table.
To be reworked once Ingo pushes his patch for WL4144.
2009-11-30 16:55:03 +01:00
|
|
|
--error ER_TABLEACCESS_DENIED_ERROR
|
2007-03-22 20:05:19 +01:00
|
|
|
ALTER VIEW v1 AS SELECT f2 FROM t1;
|
Initial import of WL#3726 "DDL locking for all metadata objects".
Backport of:
------------------------------------------------------------
revno: 2630.4.1
committer: Dmitry Lenev <dlenev@mysql.com>
branch nick: mysql-6.0-3726-w
timestamp: Fri 2008-05-23 17:54:03 +0400
message:
WL#3726 "DDL locking for all metadata objects".
After review fixes in progress.
------------------------------------------------------------
This is the first patch in series. It transforms the metadata
locking subsystem to use a dedicated module (mdl.h,cc). No
significant changes in the locking protocol.
The import passes the test suite with the exception of
deprecated/removed 6.0 features, and MERGE tables. The latter
are subject to a fix by WL#4144.
Unfortunately, the original changeset comments got lost in a merge,
thus this import has its own (largely insufficient) comments.
This patch fixes Bug#25144 "replication / binlog with view breaks".
Warning: this patch introduces an incompatible change:
Under LOCK TABLES, it's no longer possible to FLUSH a table that
was not locked for WRITE.
Under LOCK TABLES, it's no longer possible to DROP a table or
VIEW that was not locked for WRITE.
******
Backport of:
------------------------------------------------------------
revno: 2630.4.2
committer: Dmitry Lenev <dlenev@mysql.com>
branch nick: mysql-6.0-3726-w
timestamp: Sat 2008-05-24 14:03:45 +0400
message:
WL#3726 "DDL locking for all metadata objects".
After review fixes in progress.
******
Backport of:
------------------------------------------------------------
revno: 2630.4.3
committer: Dmitry Lenev <dlenev@mysql.com>
branch nick: mysql-6.0-3726-w
timestamp: Sat 2008-05-24 14:08:51 +0400
message:
WL#3726 "DDL locking for all metadata objects"
Fixed failing Windows builds by adding mdl.cc to the lists
of files needed to build server/libmysqld on Windows.
******
Backport of:
------------------------------------------------------------
revno: 2630.4.4
committer: Dmitry Lenev <dlenev@mysql.com>
branch nick: mysql-6.0-3726-w
timestamp: Sat 2008-05-24 21:57:58 +0400
message:
WL#3726 "DDL locking for all metadata objects".
Fix for assert failures in kill.test which occured when one
tried to kill ALTER TABLE statement on merge table while it
was waiting in wait_while_table_is_used() for other connections
to close this table.
These assert failures stemmed from the fact that cleanup code
in this case assumed that temporary table representing new
version of table was open with adding to THD::temporary_tables
list while code which were opening this temporary table wasn't
always fulfilling this.
This patch changes code that opens new version of table to
always do this linking in. It also streamlines cleanup process
for cases when error occurs while we have new version of table
open.
******
WL#3726 "DDL locking for all metadata objects"
Add libmysqld/mdl.cc to .bzrignore.
******
Backport of:
------------------------------------------------------------
revno: 2630.4.6
committer: Dmitry Lenev <dlenev@mysql.com>
branch nick: mysql-6.0-3726-w
timestamp: Sun 2008-05-25 00:33:22 +0400
message:
WL#3726 "DDL locking for all metadata objects".
Addition to the fix of assert failures in kill.test caused by
changes for this worklog.
Make sure we close the new table only once.
.bzrignore:
Add libmysqld/mdl.cc
libmysqld/CMakeLists.txt:
Added mdl.cc to the list of files needed for building of libmysqld.
libmysqld/Makefile.am:
Added files implementing new meta-data locking subsystem to the server.
mysql-test/include/handler.inc:
Use separate connection for waiting while threads performing DDL
operations conflicting with open HANDLER tables reach blocked
state. This is required because now we check and close tables open
by HANDLER statements in this connection conflicting with DDL in
another each time open_tables() is called and thus select from I_S
which is used for waiting will unblock DDL operations if issued
from connection with open HANDLERs.
mysql-test/r/create.result:
Adjusted test case after change in implementation of CREATE TABLE
... SELECT. We no longer have special check in open_table() which
catches the case when we select from the table created. Instead we
rely on unique_table() call which happens after opening and
locking all tables.
mysql-test/r/flush.result:
FLUSH TABLES WITH READ LOCK can no longer happen under LOCK
TABLES. Updated test accordingly.
mysql-test/r/flush_table.result:
Under LOCK TABLES we no longer allow to do FLUSH TABLES for tables
locked for read. Updated test accordingly.
mysql-test/r/handler_innodb.result:
Use separate connection for waiting while threads performing DDL
operations conflicting with open HANDLER tables reach blocked
state. This is required because now we check and close tables open
by HANDLER statements in this connection conflicting with DDL in
another each time open_tables() is called and thus select from I_S
which is used for waiting will unblock DDL operations if issued
from connection with open HANDLERs.
mysql-test/r/handler_myisam.result:
Use separate connection for waiting while threads performing DDL
operations conflicting with open HANDLER tables reach blocked
state. This is required because now we check and close tables open
by HANDLER statements in this connection conflicting with DDL in
another each time open_tables() is called and thus select from I_S
which is used for waiting will unblock DDL operations if issued
from connection with open HANDLERs.
mysql-test/r/information_schema.result:
Additional test for WL#3726 "DDL locking for all metadata
objects". Check that we use high-priority metadata lock requests
when filling I_S tables.
Rearrange tests to match 6.0 better (fewer merge conflicts).
mysql-test/r/kill.result:
Added tests checking that DDL and DML statements waiting for
metadata locks can be interrupted by KILL command.
mysql-test/r/lock.result:
One no longer is allowed to do DROP VIEW under LOCK TABLES even if
this view is locked by LOCK TABLES. The problem is that in such
situation write locks on view are not mutually exclusive so
upgrading metadata lock which is required for dropping of view
will lead to deadlock.
mysql-test/r/partition_column_prune.result:
Update results (same results in 6.0), WL#3726
mysql-test/r/partition_pruning.result:
Update results (same results in 6.0), WL#3726
mysql-test/r/ps_ddl.result:
We no longer invalidate prepared CREATE TABLE ... SELECT statement
if target table changes. This is OK since it is not strictly
necessary.
The first change is wrong, is caused by FLUSH TABLE
now flushing all unused tables. This is a regression that
Dmitri fixed in 6.0 in a follow up patch.
mysql-test/r/sp.result:
Under LOCK TABLES we no longer allow accessing views which were
not explicitly locked. To access view we need to obtain metadata
lock on it and doing this under LOCK TABLES may lead to deadlocks.
mysql-test/r/view.result:
One no longer is allowed to do DROP VIEW under LOCK TABLES even if
this view is locked by LOCK TABLES. The problem is that in such
situation even "write locks" on view are not mutually exclusive so
upgrading metadata lock which is required for dropping of view
will lead to deadlock
mysql-test/r/view_grant.result:
ALTER VIEW implementation was changed to open a view only after
checking that user which does alter has appropriate privileges on
it. This means that in case when user's privileges are
insufficient for this we won't check that new view definer is the
same as original one or user performing alter has SUPER privilege.
Adjusted test case accordingly.
mysql-test/r/view_multi.result:
Added test case for bug#25144 "replication / binlog with view
breaks".
mysql-test/suite/rpl/t/disabled.def:
Disable test for deprecated features (they don't work with new MDL).
mysql-test/t/create.test:
Adjusted test case after change in implementation of CREATE TABLE
... SELECT. We no longer have special check in open_table() which
catches the case when we select from the table created. Instead we
rely on unique_table() call which happens after opening and
locking all tables.
mysql-test/t/disabled.def:
Disable merge.test, subject of WL#4144
mysql-test/t/flush.test:
FLUSH TABLES WITH READ LOCK can no longer happen under LOCK
TABLES. Updated test accordingly.
mysql-test/t/flush_table.test:
Under LOCK TABLES we no longer allow to do FLUSH TABLES for tables
locked for read. Updated test accordingly.
mysql-test/t/information_schema.test:
Additional test for WL#3726 "DDL locking for all metadata
objects". Check that we use high-priority metadata lock requests
when filling I_S tables.
Rearrange the results for easier merges with 6.0.
mysql-test/t/kill.test:
Added tests checking that DDL and DML statements waiting for
metadata locks can be interrupted by KILL command.
mysql-test/t/lock.test:
One no longer is allowed to do DROP VIEW under LOCK TABLES even if
this view is locked by LOCK TABLES. The problem is that in such
situation write locks on view are not mutually exclusive so
upgrading metadata lock which is required for dropping of view
will lead to deadlock.
mysql-test/t/lock_multi.test:
Adjusted test case to the changes of status in various places
caused by change in implementation FLUSH TABLES WITH READ LOCK,
which is now takes global metadata lock before flushing tables and
therefore waits on at these places.
mysql-test/t/ps_ddl.test:
We no longer invalidate prepared CREATE TABLE ... SELECT statement
if target table changes. This is OK since it is not strictly
necessary.
The first change is wrong, is caused by FLUSH TABLE
now flushing all unused tables. This is a regression that
Dmitri fixed in 6.0 in a follow up patch.
mysql-test/t/sp.test:
Under LOCK TABLES we no longer allow accessing views which were
not explicitly locked. To access view we need to obtain metadata
lock on it and doing this under LOCK TABLES may lead to deadlocks.
mysql-test/t/trigger_notembedded.test:
Adjusted test case to the changes of status in various places
caused by change in implementation FLUSH TABLES WITH READ LOCK,
which is now takes global metadata lock before flushing tables and
therefore waits on at these places.
mysql-test/t/view.test:
One no longer is allowed to do DROP VIEW under LOCK TABLES even if
this view is locked by LOCK TABLES. The problem is that in such
situation even "write locks" on view are not mutually exclusive so
upgrading metadata lock which is required for dropping of view
will lead to deadlock.
mysql-test/t/view_grant.test:
ALTER VIEW implementation was changed to open a view only after
checking that user which does alter has appropriate privileges on
it. This means that in case when user's privileges are
insufficient for this we won't check that new view definer is the
same as original one or user performing alter has SUPER privilege.
Adjusted test case accordingly.
mysql-test/t/view_multi.test:
Added test case for bug#25144 "replication / binlog with view
breaks".
sql/CMakeLists.txt:
Added mdl.cc to the list of files needed for building of server.
sql/Makefile.am:
Added files implementing new meta-data locking subsystem to the
server.
sql/event_db_repository.cc:
Allocate metadata lock requests objects (MDL_LOCK) on execution
memory root in cases when TABLE_LIST objects is also allocated
there or on stack.
sql/ha_ndbcluster.cc:
Adjusted code to work nicely with new metadata locking subsystem.
close_cached_tables() no longer has wait_for_placeholder argument.
Instead of relying on this parameter and related behavior FLUSH
TABLES WITH READ LOCK now takes global shared metadata lock.
sql/ha_ndbcluster_binlog.cc:
Adjusted code to work with new metadata locking subsystem.
close_cached_tables() no longer has wait_for_placeholder argument.
Instead of relying on this parameter and related behavior FLUSH
TABLES WITH READ LOCK now takes global shared metadata lock.
sql/handler.cc:
update_frm_version():
Directly update TABLE_SHARE::mysql_version member instead of
going through all TABLE instances for this table (old code was a
legacy from pre-table-definition-cache days).
sql/lock.cc:
Use new metadata locking subsystem. Threw away most of functions
related to name locking as now one is supposed to use metadata
locking API instead. In lock_global_read_lock() and
unlock_global_read_lock() in order to avoid problems with global
read lock sneaking in at the moment when we perform FLUSH TABLES
or ALTER TABLE under LOCK TABLES and when tables being reopened
are protected only by metadata locks we also have to take global
shared meta data lock.
sql/log_event.cc:
Adjusted code to work with new metadata locking subsystem. For
tables open by slave thread for applying RBR events allocate
memory for lock request object in the same chunk of memory as
TABLE_LIST objects for them. In order to ensure that we keep these
objects around until tables are open always close tables before
calling Relay_log_info::clear_tables_to_lock(). Use new auxiliary
Relay_log_info::slave_close_thread_tables() method to enforce
this.
sql/log_event_old.cc:
Adjusted code to work with new metadata locking subsystem. Since
for tables open by slave thread for applying RBR events memory for
lock request object is allocated in the same chunk of memory as
TABLE_LIST objects for them we have to ensure that we keep these
objects around until tables are open. To ensure this we always
close tables before calling
Relay_log_info::clear_tables_to_lock(). To enfore this we use
new auxiliary Relay_log_info::slave_close_thread_tables()
method.
sql/mdl.cc:
Implemented new metadata locking subsystem and API described in
WL3726 "DDL locking for all metadata objects".
sql/mdl.h:
Implemented new metadata locking subsystem and API described in
WL3726 "DDL locking for all metadata objects".
sql/mysql_priv.h:
- close_thread_tables()/close_tables_for_reopen() now has one more
argument which indicates that metadata locks should be released
but not removed from the context in order to be used later in
mdl_wait_for_locks() and tdc_wait_for_old_version().
- close_cached_table() routine is no longer public.
- Thread waiting in wait_while_table_is_used() can be now killed
so this function returns boolean to make caller aware of such
situation.
- We no longer have table cache as separate entity instead used
and unused TABLE instances are linked to TABLE_SHARE objects in
table definition cache.
- Now third argument of open_table() is also used for requesting
table repair or auto-discovery of table's new definition. So its
type was changed from bool to enum.
- Added tdc_open_view() function for opening view by getting its
definition from disk (and table cache in future).
- reopen_name_locked_table() no longer needs "link_in" argument as
now we have exclusive metadata locks instead of dummy TABLE
instances when this function is called.
- find_locked_table() now takes head of list of TABLE instances
instead of always scanning through THD::open_tables list. Also
added find_write_locked_table() auxiliary.
- reopen_tables(), close_cached_tables() no longer have
mark_share_as_old and wait_for_placeholder arguments. Instead of
relying on this parameters and related behavior FLUSH TABLES
WITH READ LOCK now takes global shared metadata lock.
- We no longer need drop_locked_tables() and
abort_locked_tables().
- mysql_ha_rm_tables() now always assume that LOCK_open is not
acquired by caller.
- Added notify_thread_having_shared_lock() callback invoked by
metadata locking subsystem when acquiring an exclusive lock, for
each thread that has a conflicting shared metadata lock.
- Introduced expel_table_from_cache() as replacement for
remove_table_from_cache() (the main difference is that this new
function assumes that caller follows metadata locking protocol
and never waits).
- Threw away most of functions related to name locking. One should
use new metadata locking subsystem and API instead.
sql/mysqld.cc:
Got rid of call initializing/deinitializing table cache since now
it is embedded into table definition cache. Added calls for
initializing/ deinitializing metadata locking subsystem.
sql/rpl_rli.cc:
Introduced auxiliary Relay_log_info::slave_close_thread_tables()
method which is used for enforcing that we always close tables
open for RBR before deallocating TABLE_LIST elements and MDL_LOCK
objects for them.
sql/rpl_rli.h:
Introduced auxiliary Relay_log_info::slave_close_thread_tables()
method which is used for enforcing that we always close tables
open for RBR before deallocating TABLE_LIST elements and MDL_LOCK
objects for them.
sql/set_var.cc:
close_cached_tables() no longer has wait_for_placeholder argument.
Instead of relying on this parameter and related behavior FLUSH
TABLES WITH READ LOCK now takes global shared metadata lock.
sql/sp_head.cc:
For tables added to the statement's table list by prelocking
algorithm we allocate these objects either on the same memory as
corresponding table list elements or on THD::locked_tables_root
(if we are building table list for LOCK TABLES).
sql/sql_acl.cc:
Allocate metadata lock requests objects (MDL_LOCK) on execution
memory root in cases when we use stack TABLE_LIST objects to open
tables. Got rid of redundant code by using unlock_locked_tables()
function.
sql/sql_base.cc:
Changed code to use new MDL subsystem. Got rid of separate table
cache. Now used and unused TABLE instances are linked to the
TABLE_SHAREs in table definition cache.
check_unused():
Adjusted code to the fact that we no longer have separate table
cache. Removed dead code.
table_def_free():
Free TABLE instances referenced from TABLE_SHARE objects before
destroying table definition cache.
get_table_share():
Added assert which ensures that noone will be able to access
table (and its share) without acquiring some kind of metadata
lock first.
close_handle_and_leave_table_as_lock():
Adjusted code to the fact that TABLE instances now are linked to
list in TABLE_SHARE.
list_open_tables():
Changed this function to use table definition cache instead of
table cache.
free_cache_entry():
Unlink freed TABLE elements from the list of all TABLE instances
for the table in TABLE_SHARE.
kill_delayed_thread_for_table():
Added auxiliary for killing delayed insert threads for
particular table.
close_cached_tables():
Got rid of wait_for_refresh argument as we now rely on global
shared metadata lock to prevent FLUSH WITH READ LOCK sneaking in
when we are reopening tables. Heavily reworked this function to
use new MDL code and not to rely on separate table cache entity.
close_open_tables():
We no longer have separate table cache.
close_thread_tables():
Release metadata locks after closing all tables. Added skip_mdl
argument which allows us not to remove metadata lock requests
from the context in case when we are going to use this requests
later in mdl_wait_for_locks() and tdc_wait_for_old_versions().
close_thread_table()/close_table_for_reopen():
Since we no longer have separate table cache and all TABLE
instances are linked to TABLE_SHARE objects in table definition
cache we have to link/unlink TABLE object to/from appropriate
lists in the share.
name_lock_locked_table():
Moved redundant code to find_write_locked_table() function and
adjusted code to the fact that wait_while_table_is_used() can
now return with an error if our thread is killed.
reopen_table_entry():
We no longer need "link_in" argument as with MDL we no longer
call this function with dummy TABLE object pre-allocated and
added to the THD::open_tables. Also now we add newly-open TABLE
instance to the list of share's used TABLE instances.
table_cache_insert_placeholder():
Got rid of name-locking legacy.
lock_table_name_if_not_cached():
Moved to sql_table.cc the only place where it is used. It was
also reimplemented using new MDL API.
open_table():
- Reworked this function to use new MDL subsystem.
- Changed code to deal with table definition cache directly
instead of going through separate table cache.
- Now third argument is also used for requesting table repair
or auto-discovery of table's new definition. So its type was
changed from bool to enum.
find_locked_table()/find_write_locked_table():
Accept head of list of TABLE objects as first argument and use
this list instead of always searching in THD::open_tables list.
Also added auxiliary for finding write-locked locked tables.
reopen_table():
Adjusted function to work with new MDL subsystem and to properly
manuipulate with lists of used/unused TABLE instaces in
TABLE_SHARE.
reopen_tables():
Removed mark_share_as_old parameter. Instead of relying on it
and related behavior FLUSH TABLES WITH READ LOCK now takes
global shared metadata lock. Changed code after removing
separate table cache.
drop_locked_tables()/abort_locked_tables():
Got rid of functions which are no longer needed.
unlock_locked_tables():
Moved this function from sql_parse.cc and changed it to release
memory which was used for allocating metadata lock requests for
tables open and locked by LOCK TABLES.
tdc_open_view():
Intoduced function for opening a view by getting its definition
from disk (and table cache in future).
reopen_table_entry():
Introduced function for opening table definitions while holding
exclusive metatadata lock on it.
open_unireg_entry():
Got rid of this function. Most of its functionality is relocated
to open_table() and open_table_fini() functions, and some of it
to reopen_table_entry() and tdc_open_view(). Also code
resposible for auto-repair and auto-discovery of tables was
moved to separate function.
open_table_entry_fini():
Introduced function which contains common actions which finalize
process of TABLE object creation.
auto_repair_table():
Moved code responsible for auto-repair of table being opened
here.
handle_failed_open_table_attempt()
Moved code responsible for handling failing attempt to open
table to one place (retry due to lock conflict/old version,
auto-discovery and repair).
open_tables():
- Flush open HANDLER tables if they have old version of if there
is conflicting metadata lock against them (before this moment
we had this code in open_table()).
- When we open view which should be processed via derived table
on the second execution of prepared statement or stored
routine we still should call open_table() for it in order to
obtain metadata lock on it and prepare its security context.
- In cases when we discover that some special handling of
failure to open table is needed call
handle_failed_open_table_attempt() which handles all such
scenarios.
open_ltable():
Handling of various special scenarios of failure to open a table
was moved to separate handle_failed_open_table_attempt()
function.
remove_db_from_cache():
Removed this function as it is no longer used.
notify_thread_having_shared_lock():
Added callback which is invoked by MDL subsystem when acquiring
an exclusive lock, for each thread that has a conflicting shared
metadata lock.
expel_table_from_cache():
Introduced function for removing unused TABLE instances. Unlike
remove_table_from_cache() it relies on caller following MDL
protocol and having appropriate locks when calling it and thus
does not do any waiting if table is still in use.
tdc_wait_for_old_version():
Added function which allows open_tables() to wait in cases when
we discover that we should back-off due to presence of old
version of table.
abort_and_upgrade_lock():
Use new MDL calls.
mysql_wait_completed_table():
Got rid of unused function.
open_system_tables_for_read/for_update()/performance_schema_table():
Allocate MDL_LOCK objects on execution memory root in cases when
TABLE_LIST objects for corresponding tables is allocated on
stack.
close_performance_schema_table():
Release metadata locks after closing tables.
******
Use I_P_List for free/used tables list in the table share.
sql/sql_binlog.cc:
Use Relay_log_info::slave_close_thread_tables() method to enforce
that we always close tables open for RBR before deallocating
TABLE_LIST elements and MDL_LOCK objects for them.
sql/sql_class.cc:
Added meta-data locking contexts as part of Open_tables_state
context. Also introduced THD::locked_tables_root memory root
which is to be used for allocating MDL_LOCK objects for tables in
LOCK TABLES statement (end of lifetime for such objects is UNLOCK
TABLES so we can't use statement or execution root for them).
sql/sql_class.h:
Added meta-data locking contexts as part of Open_tables_state
context. Also introduced THD::locked_tables_root memory root
which is to be used for allocating MDL_LOCK objects for tables in
LOCK TABLES statement (end of lifetime for such objects is UNLOCK
TABLES so we can't use statement or execution root for them).
Note: handler_mdl_context and locked_tables_root and
mdl_el_root will be removed by subsequent patches.
sql/sql_db.cc:
mysql_rm_db() does not really need to call remove_db_from_cache()
as it drops each table in the database using
mysql_rm_table_part2(), which performs all necessary operations on
table (definition) cache.
sql/sql_delete.cc:
Use the new metadata locking API for TRUNCATE.
sql/sql_handler.cc:
Changed HANDLER implementation to use new metadata locking
subsystem. Note that MDL_LOCK objects for HANDLER tables are
allocated in the same chunk of heap memory as TABLE_LIST object
for those tables.
sql/sql_insert.cc:
mysql_insert():
find_locked_table() now takes head of list of TABLE object as
its argument instead of always scanning through THD::open_tables
list.
handle_delayed_insert():
Allocate metadata lock request object for table open by delayed
insert thread on execution memroot. create_table_from_items():
We no longer allocate dummy TABLE objects for tables being
created if they don't exist. As consequence
reopen_name_locked_table() no longer has link_in argument.
open_table() now has one more argument which is not relevant for
temporary tables.
sql/sql_parse.cc:
- Moved unlock_locked_tables() routine to sql_base.cc and made
available it in other files. Got rid of some redundant code by
using this function.
- Replaced boolean TABLE_LIST::create member with enum
open_table_type member.
- Use special memory root for allocating MDL_LOCK objects for
tables open and locked by LOCK TABLES (these object should live
till UNLOCK TABLES so we can't allocate them on statement nor
execution memory root). Also properly set metadata lock
upgradability attribure for those tables.
- Under LOCK TABLES it is no longer allowed to flush tables which
are not write-locked as this breaks metadata locking protocol
and thus potentially might lead to deadlock.
- Added auxiliary adjust_mdl_locks_upgradability() function.
sql/sql_partition.cc:
Adjusted code to the fact that reopen_tables() no longer has
"mark_share_as_old" argument. Got rid of comments which are no
longer true.
sql/sql_plist.h:
Added I_P_List template class for parametrized intrusive doubly
linked lists and I_P_List_iterator for corresponding iterator.
Unlike for I_List<> list elements of such list can participate in
several lists. Unlike List<> such lists are doubly-linked and
intrusive.
sql/sql_plugin.cc:
Allocate metadata lock requests objects (MDL_LOCK) on execution
memory root in cases when we use stack TABLE_LIST objects to open
tables.
sql/sql_prepare.cc:
Replaced boolean TABLE_LIST::create member with enum
open_table_type member. This allows easily handle situation in
which instead of opening the table we want only to take exclusive
metadata lock on it.
sql/sql_rename.cc:
Use new metadata locking subsystem in implementation of RENAME
TABLE.
sql/sql_servers.cc:
Allocate metadata lock requests objects (MDL_LOCK) on execution
memory root in cases when we use stack TABLE_LIST objects to open
tables. Got rid of redundant code by using unlock_locked_tables()
function.
sql/sql_show.cc:
Acquire shared metadata lock when we are getting information for
I_S table directly from TABLE_SHARE without doing full-blown table
open. We use high priority lock request in this situation in
order to avoid deadlocks.
Also allocate metadata lock requests objects (MDL_LOCK) on
execution memory root in cases when TABLE_LIST objects are also
allocated there
sql/sql_table.cc:
mysql_rm_table():
Removed comment which is no longer relevant.
mysql_rm_table_part2():
Now caller of mysql_ha_rm_tables() should not own LOCK_open.
Adjusted code to use new metadata locking subsystem instead of
name-locks.
lock_table_name_if_not_cached():
Moved this function from sql_base.cc to this file and
reimplemented it using metadata locking API.
mysql_create_table():
Adjusted code to use new MDL API.
wait_while_table_is_used():
Changed function to use new MDL subsystem. Made thread waiting
in it killable (this also led to introduction of return value so
caller can distinguish successful executions from situations
when waiting was aborted).
close_cached_tables():
Thread waiting in this function is killable now. As result it
has return value for distinguishing between succes and failure.
Got rid of redundant boradcast_refresh() call.
prepare_for_repair():
Use MDL subsystem instead of name-locks.
mysql_admin_table():
mysql_ha_rm_tables() now always assumes that caller doesn't own
LOCK_open.
mysql_repair_table():
We should mark all elements of table list as requiring
upgradable metadata locks.
mysql_create_table_like():
Use new MDL subsystem instead of name-locks.
create_temporary_tables():
We don't need to obtain metadata locks when creating temporary
table.
mysql_fast_or_online_alter_table():
Thread waiting in wait_while_table_is_used() is now killable.
mysql_alter_table():
Adjusted code to work with new MDL subsystem and to the fact
that threads waiting in what_while_table_is_used() and
close_cached_table() are now killable.
sql/sql_test.cc:
We no longer have separate table cache. TABLE instances are now
associated with/linked to TABLE_SHARE objects in table definition
cache.
sql/sql_trigger.cc:
Adjusted code to work with new metadata locking subsystem. Also
reopen_tables() no longer has mark_share_as_old argument (Instead
of relying on this parameter and related behavior FLUSH TABLES
WITH READ LOCK now takes global shared metadata lock).
sql/sql_udf.cc:
Allocate metadata lock requests objects (MDL_LOCK) on execution
memory root in cases when we use stack TABLE_LIST objects to open
tables.
sql/sql_update.cc:
Adjusted code to work with new meta-data locking subsystem.
sql/sql_view.cc:
Added proper meta-data locking to implementations of
CREATE/ALTER/DROP VIEW statements. Now we obtain exclusive
meta-data lock on a view before creating/ changing/dropping it.
This ensures that all concurrent statements that use this view
will finish before our statement will proceed and therefore we
will get correct order of statements in the binary log.
Also ensure that TABLE_LIST::mdl_upgradable attribute is properly
propagated for underlying tables of view.
sql/table.cc:
Added auxiliary alloc_mdl_locks() function for allocating metadata
lock request objects for all elements of table list.
sql/table.h:
TABLE_SHARE:
Got rid of unused members. Introduced members for storing lists
of used and unused TABLE objects for this share.
TABLE:
Added members for linking TABLE objects into per-share lists of
used and unused TABLE instances. Added member for holding
pointer to metadata lock for this table.
TABLE_LIST:
Replaced boolean TABLE_LIST::create member with enum
open_table_type member. This allows easily handle situation in
which instead of opening the table we want only to take
exclusive meta-data lock on it (we need this in order to handle
ALTER VIEW and CREATE VIEW statements).
Introduced new mdl_upgradable member for marking elements of
table list for which we need to take upgradable shared metadata
lock instead of plain shared metadata lock. Added pointer for
holding pointer to MDL_LOCK for the table.
Added auxiliary alloc_mdl_locks() function for allocating metadata
lock requests objects for all elements of table list. Added
auxiliary set_all_mdl_upgradable() function for marking all
elements in table list as requiring upgradable metadata locks.
storage/myisammrg/ha_myisammrg.cc:
Allocate MDL_LOCK objects for underlying tables of MERGE table.
To be reworked once Ingo pushes his patch for WL4144.
2009-11-30 16:55:03 +01:00
|
|
|
--error ER_TABLEACCESS_DENIED_ERROR
|
2007-03-22 20:05:19 +01:00
|
|
|
ALTER VIEW v2 AS SELECT f2 FROM t1;
|
2007-09-20 16:05:09 +02:00
|
|
|
--error ER_SPECIFIC_ACCESS_DENIED_ERROR
|
2007-03-22 20:05:19 +01:00
|
|
|
ALTER VIEW v3 AS SELECT f2 FROM t1;
|
|
|
|
|
|
|
|
|
|
connection root;
|
|
|
|
|
SHOW CREATE VIEW v3;
|
|
|
|
|
|
|
|
|
|
DROP USER u26813@localhost;
|
|
|
|
|
DROP DATABASE db26813;
|
|
|
|
|
disconnect u1;
|
2007-01-18 10:48:17 +01:00
|
|
|
|
2007-09-20 16:05:09 +02:00
|
|
|
--echo #
|
2009-03-03 21:34:18 +01:00
|
|
|
--echo # Bug#29908 A user can gain additional access through the ALTER VIEW.
|
2007-09-20 16:05:09 +02:00
|
|
|
--echo #
|
|
|
|
|
connection root;
|
|
|
|
|
CREATE DATABASE mysqltest_29908;
|
|
|
|
|
USE mysqltest_29908;
|
|
|
|
|
CREATE TABLE t1(f1 INT, f2 INT);
|
|
|
|
|
CREATE USER u29908_1@localhost;
|
|
|
|
|
CREATE DEFINER = u29908_1@localhost VIEW v1 AS SELECT f1 FROM t1;
|
|
|
|
|
CREATE DEFINER = u29908_1@localhost SQL SECURITY INVOKER VIEW v2 AS
|
|
|
|
|
SELECT f1 FROM t1;
|
2009-10-19 14:58:13 +02:00
|
|
|
GRANT SELECT, DROP, CREATE VIEW, SHOW VIEW ON mysqltest_29908.v1 TO u29908_1@localhost;
|
|
|
|
|
GRANT SELECT, DROP, CREATE VIEW, SHOW VIEW ON mysqltest_29908.v2 TO u29908_1@localhost;
|
2007-09-20 16:05:09 +02:00
|
|
|
GRANT SELECT ON mysqltest_29908.t1 TO u29908_1@localhost;
|
|
|
|
|
CREATE USER u29908_2@localhost;
|
2009-10-19 14:58:13 +02:00
|
|
|
GRANT SELECT, DROP, CREATE VIEW ON mysqltest_29908.v1 TO u29908_2@localhost;
|
|
|
|
|
GRANT SELECT, DROP, CREATE VIEW, SHOW VIEW ON mysqltest_29908.v2 TO u29908_2@localhost;
|
2007-09-20 16:05:09 +02:00
|
|
|
GRANT SELECT ON mysqltest_29908.t1 TO u29908_2@localhost;
|
|
|
|
|
|
|
|
|
|
connect (u2,localhost,u29908_2,,mysqltest_29908);
|
|
|
|
|
--error ER_SPECIFIC_ACCESS_DENIED_ERROR
|
|
|
|
|
ALTER VIEW v1 AS SELECT f2 FROM t1;
|
2007-09-29 03:07:29 +02:00
|
|
|
--error ER_SPECIFIC_ACCESS_DENIED_ERROR
|
2007-09-20 16:05:09 +02:00
|
|
|
ALTER VIEW v2 AS SELECT f2 FROM t1;
|
|
|
|
|
SHOW CREATE VIEW v2;
|
|
|
|
|
|
|
|
|
|
connect (u1,localhost,u29908_1,,mysqltest_29908);
|
|
|
|
|
ALTER VIEW v1 AS SELECT f2 FROM t1;
|
|
|
|
|
SHOW CREATE VIEW v1;
|
2007-09-29 03:07:29 +02:00
|
|
|
ALTER VIEW v2 AS SELECT f2 FROM t1;
|
2007-09-20 16:05:09 +02:00
|
|
|
SHOW CREATE VIEW v2;
|
|
|
|
|
|
|
|
|
|
connection root;
|
|
|
|
|
ALTER VIEW v1 AS SELECT f1 FROM t1;
|
|
|
|
|
SHOW CREATE VIEW v1;
|
2007-09-29 03:07:29 +02:00
|
|
|
ALTER VIEW v2 AS SELECT f1 FROM t1;
|
2007-09-20 16:05:09 +02:00
|
|
|
SHOW CREATE VIEW v2;
|
|
|
|
|
|
|
|
|
|
DROP USER u29908_1@localhost;
|
|
|
|
|
DROP USER u29908_2@localhost;
|
|
|
|
|
DROP DATABASE mysqltest_29908;
|
|
|
|
|
disconnect u1;
|
|
|
|
|
disconnect u2;
|
|
|
|
|
--echo #######################################################################
|
|
|
|
|
|
2007-03-21 22:34:15 +01:00
|
|
|
#
|
2009-03-03 21:34:18 +01:00
|
|
|
# Bug#24040 Create View don't succed with "all privileges" on a database.
|
2007-03-21 22:34:15 +01:00
|
|
|
#
|
|
|
|
|
|
|
|
|
|
# Prepare.
|
|
|
|
|
|
|
|
|
|
--disable_warnings
|
|
|
|
|
DROP DATABASE IF EXISTS mysqltest1;
|
|
|
|
|
DROP DATABASE IF EXISTS mysqltest2;
|
|
|
|
|
--enable_warnings
|
|
|
|
|
|
|
|
|
|
CREATE DATABASE mysqltest1;
|
|
|
|
|
CREATE DATABASE mysqltest2;
|
|
|
|
|
|
|
|
|
|
# Test.
|
|
|
|
|
|
|
|
|
|
CREATE TABLE mysqltest1.t1(c1 INT);
|
|
|
|
|
CREATE TABLE mysqltest1.t2(c2 INT);
|
|
|
|
|
CREATE TABLE mysqltest1.t3(c3 INT);
|
|
|
|
|
CREATE TABLE mysqltest1.t4(c4 INT);
|
|
|
|
|
|
|
|
|
|
INSERT INTO mysqltest1.t1 VALUES (11), (12), (13), (14);
|
|
|
|
|
INSERT INTO mysqltest1.t2 VALUES (21), (22), (23), (24);
|
|
|
|
|
INSERT INTO mysqltest1.t3 VALUES (31), (32), (33), (34);
|
|
|
|
|
INSERT INTO mysqltest1.t4 VALUES (41), (42), (43), (44);
|
|
|
|
|
|
|
|
|
|
GRANT SELECT ON mysqltest1.t1 TO mysqltest_u1@localhost;
|
|
|
|
|
GRANT INSERT ON mysqltest1.t2 TO mysqltest_u1@localhost;
|
|
|
|
|
GRANT SELECT, UPDATE ON mysqltest1.t3 TO mysqltest_u1@localhost;
|
|
|
|
|
GRANT SELECT, DELETE ON mysqltest1.t4 TO mysqltest_u1@localhost;
|
|
|
|
|
|
|
|
|
|
GRANT ALL PRIVILEGES ON mysqltest2.* TO mysqltest_u1@localhost;
|
|
|
|
|
|
|
|
|
|
--connect (bug24040_con,localhost,mysqltest_u1,,mysqltest2)
|
|
|
|
|
--echo
|
|
|
|
|
--echo ---> connection: bug24040_con
|
|
|
|
|
|
|
|
|
|
SELECT * FROM mysqltest1.t1;
|
|
|
|
|
INSERT INTO mysqltest1.t2 VALUES(25);
|
|
|
|
|
UPDATE mysqltest1.t3 SET c3 = 331 WHERE c3 = 31;
|
|
|
|
|
DELETE FROM mysqltest1.t4 WHERE c4 = 44;
|
|
|
|
|
|
|
|
|
|
CREATE VIEW v1 AS SELECT * FROM mysqltest1.t1;
|
|
|
|
|
CREATE VIEW v2 AS SELECT * FROM mysqltest1.t2;
|
|
|
|
|
CREATE VIEW v3 AS SELECT * FROM mysqltest1.t3;
|
|
|
|
|
CREATE VIEW v4 AS SELECT * FROM mysqltest1.t4;
|
|
|
|
|
|
|
|
|
|
SELECT * FROM v1;
|
|
|
|
|
INSERT INTO v2 VALUES(26);
|
|
|
|
|
UPDATE v3 SET c3 = 332 WHERE c3 = 32;
|
|
|
|
|
DELETE FROM v4 WHERE c4 = 43;
|
|
|
|
|
|
|
|
|
|
--error ER_COLUMNACCESS_DENIED_ERROR
|
|
|
|
|
CREATE VIEW v12 AS SELECT c1, c2 FROM mysqltest1.t1, mysqltest1.t2;
|
|
|
|
|
CREATE VIEW v13 AS SELECT c1, c3 FROM mysqltest1.t1, mysqltest1.t3;
|
|
|
|
|
CREATE VIEW v14 AS SELECT c1, c4 FROM mysqltest1.t1, mysqltest1.t4;
|
|
|
|
|
|
|
|
|
|
--error ER_COLUMNACCESS_DENIED_ERROR
|
|
|
|
|
CREATE VIEW v21 AS SELECT c2, c1 FROM mysqltest1.t2, mysqltest1.t1;
|
|
|
|
|
--error ER_COLUMNACCESS_DENIED_ERROR
|
|
|
|
|
CREATE VIEW v23 AS SELECT c2, c3 FROM mysqltest1.t2, mysqltest1.t3;
|
|
|
|
|
--error ER_COLUMNACCESS_DENIED_ERROR
|
|
|
|
|
CREATE VIEW v24 AS SELECT c2, c4 FROM mysqltest1.t2, mysqltest1.t4;
|
|
|
|
|
|
|
|
|
|
CREATE VIEW v31 AS SELECT c3, c1 FROM mysqltest1.t3, mysqltest1.t1;
|
|
|
|
|
--error ER_COLUMNACCESS_DENIED_ERROR
|
|
|
|
|
CREATE VIEW v32 AS SELECT c3, c2 FROM mysqltest1.t3, mysqltest1.t2;
|
|
|
|
|
CREATE VIEW v34 AS SELECT c3, c4 FROM mysqltest1.t3, mysqltest1.t4;
|
|
|
|
|
|
|
|
|
|
CREATE VIEW v41 AS SELECT c4, c1 FROM mysqltest1.t4, mysqltest1.t1;
|
|
|
|
|
--error ER_COLUMNACCESS_DENIED_ERROR
|
|
|
|
|
CREATE VIEW v42 AS SELECT c4, c2 FROM mysqltest1.t4, mysqltest1.t2;
|
|
|
|
|
CREATE VIEW v43 AS SELECT c4, c3 FROM mysqltest1.t4, mysqltest1.t3;
|
|
|
|
|
|
|
|
|
|
--connection default
|
|
|
|
|
--echo
|
|
|
|
|
--echo ---> connection: default
|
|
|
|
|
|
|
|
|
|
SELECT * FROM mysqltest1.t1;
|
|
|
|
|
SELECT * FROM mysqltest1.t2;
|
|
|
|
|
SELECT * FROM mysqltest1.t3;
|
|
|
|
|
SELECT * FROM mysqltest1.t4;
|
|
|
|
|
|
|
|
|
|
# Cleanup.
|
|
|
|
|
|
2009-03-03 21:34:18 +01:00
|
|
|
disconnect bug24040_con;
|
2007-03-21 22:34:15 +01:00
|
|
|
|
|
|
|
|
DROP DATABASE mysqltest1;
|
|
|
|
|
DROP DATABASE mysqltest2;
|
|
|
|
|
DROP USER mysqltest_u1@localhost;
|
|
|
|
|
|
2009-02-26 18:00:44 +01:00
|
|
|
|
|
|
|
|
#
|
2009-03-05 14:35:03 +01:00
|
|
|
# Bug#41354 Access control is bypassed when all columns of a view are
|
|
|
|
|
# selected by * wildcard
|
2009-02-26 18:00:44 +01:00
|
|
|
|
|
|
|
|
CREATE DATABASE db1;
|
|
|
|
|
USE db1;
|
|
|
|
|
CREATE TABLE t1(f1 INT, f2 INT);
|
|
|
|
|
CREATE VIEW v1 AS SELECT f1, f2 FROM t1;
|
|
|
|
|
|
|
|
|
|
GRANT SELECT (f1) ON t1 TO foo;
|
|
|
|
|
GRANT SELECT (f1) ON v1 TO foo;
|
|
|
|
|
|
|
|
|
|
connect (addconfoo, localhost, foo,,);
|
|
|
|
|
connection addconfoo;
|
|
|
|
|
USE db1;
|
|
|
|
|
|
|
|
|
|
SELECT f1 FROM t1;
|
|
|
|
|
--error ER_COLUMNACCESS_DENIED_ERROR
|
|
|
|
|
SELECT f2 FROM t1;
|
|
|
|
|
--error ER_TABLEACCESS_DENIED_ERROR
|
|
|
|
|
SELECT * FROM t1;
|
|
|
|
|
|
|
|
|
|
SELECT f1 FROM v1;
|
|
|
|
|
--error ER_COLUMNACCESS_DENIED_ERROR
|
|
|
|
|
SELECT f2 FROM v1;
|
|
|
|
|
--error ER_TABLEACCESS_DENIED_ERROR
|
|
|
|
|
SELECT * FROM v1;
|
|
|
|
|
|
|
|
|
|
connection default;
|
2009-03-03 21:34:18 +01:00
|
|
|
disconnect root;
|
2009-02-26 18:00:44 +01:00
|
|
|
disconnect addconfoo;
|
2009-03-05 14:35:03 +01:00
|
|
|
USE test;
|
2009-02-26 18:00:44 +01:00
|
|
|
REVOKE SELECT (f1) ON db1.t1 FROM foo;
|
|
|
|
|
REVOKE SELECT (f1) ON db1.v1 FROM foo;
|
|
|
|
|
DROP USER foo;
|
|
|
|
|
DROP VIEW db1.v1;
|
|
|
|
|
DROP TABLE db1.t1;
|
|
|
|
|
DROP DATABASE db1;
|
|
|
|
|
|
2009-03-05 14:35:03 +01:00
|
|
|
connection default;
|
2011-09-29 11:47:11 +02:00
|
|
|
|
|
|
|
|
|
|
|
|
|
--echo Bug #11765687/#58677:
|
|
|
|
|
--echo No privilege on table/view, but can know #rows / underlying table's name
|
|
|
|
|
|
|
|
|
|
# As a root-like user
|
|
|
|
|
connect (root,localhost,root,,test);
|
|
|
|
|
connection root;
|
|
|
|
|
|
|
|
|
|
create database mysqltest1;
|
|
|
|
|
create table mysqltest1.t1 (i int);
|
|
|
|
|
create table mysqltest1.t2 (j int);
|
|
|
|
|
create table mysqltest1.t3 (k int, secret int);
|
|
|
|
|
|
|
|
|
|
create user alice@localhost;
|
|
|
|
|
create user bob@localhost;
|
|
|
|
|
create user cecil@localhost;
|
|
|
|
|
create user dan@localhost;
|
|
|
|
|
create user eugene@localhost;
|
|
|
|
|
create user fiona@localhost;
|
|
|
|
|
create user greg@localhost;
|
|
|
|
|
create user han@localhost;
|
|
|
|
|
create user inga@localhost;
|
|
|
|
|
create user jamie@localhost;
|
|
|
|
|
create user karl@localhost;
|
|
|
|
|
create user lena@localhost;
|
|
|
|
|
create user mhairi@localhost;
|
|
|
|
|
create user noam@localhost;
|
|
|
|
|
create user olga@localhost;
|
|
|
|
|
create user pjotr@localhost;
|
|
|
|
|
create user quintessa@localhost;
|
|
|
|
|
|
|
|
|
|
grant all privileges on mysqltest1.* to alice@localhost with grant option;
|
|
|
|
|
|
|
|
|
|
#
|
|
|
|
|
--echo ... as alice
|
|
|
|
|
connect (test11765687,localhost,alice,,mysqltest1);
|
|
|
|
|
connection test11765687;
|
|
|
|
|
|
|
|
|
|
create view v1 as select * from t1;
|
|
|
|
|
create view v2 as select * from v1, t2;
|
|
|
|
|
create view v3 as select k from t3;
|
|
|
|
|
|
|
|
|
|
grant select on mysqltest1.v1 to bob@localhost;
|
|
|
|
|
|
|
|
|
|
grant show view on mysqltest1.v1 to cecil@localhost;
|
|
|
|
|
|
|
|
|
|
grant select, show view on mysqltest1.v1 to dan@localhost;
|
|
|
|
|
grant select on mysqltest1.t1 to dan@localhost;
|
|
|
|
|
|
|
|
|
|
grant select on mysqltest1.* to eugene@localhost;
|
|
|
|
|
|
|
|
|
|
grant select, show view on mysqltest1.v2 to fiona@localhost;
|
|
|
|
|
|
|
|
|
|
grant select, show view on mysqltest1.v2 to greg@localhost;
|
|
|
|
|
grant show view on mysqltest1.v1 to greg@localhost;
|
|
|
|
|
|
|
|
|
|
grant select(k) on mysqltest1.t3 to han@localhost;
|
|
|
|
|
grant select, show view on mysqltest1.v3 to han@localhost;
|
|
|
|
|
|
|
|
|
|
grant select on mysqltest1.t1 to inga@localhost;
|
|
|
|
|
grant select on mysqltest1.t2 to inga@localhost;
|
|
|
|
|
grant select on mysqltest1.v1 to inga@localhost;
|
|
|
|
|
grant select, show view on mysqltest1.v2 to inga@localhost;
|
|
|
|
|
|
|
|
|
|
grant select on mysqltest1.t1 to jamie@localhost;
|
|
|
|
|
grant select on mysqltest1.t2 to jamie@localhost;
|
|
|
|
|
grant show view on mysqltest1.v1 to jamie@localhost;
|
|
|
|
|
grant select, show view on mysqltest1.v2 to jamie@localhost;
|
|
|
|
|
|
|
|
|
|
grant select on mysqltest1.t1 to karl@localhost;
|
|
|
|
|
grant select on mysqltest1.t2 to karl@localhost;
|
|
|
|
|
grant select, show view on mysqltest1.v1 to karl@localhost;
|
|
|
|
|
grant select on mysqltest1.v2 to karl@localhost;
|
|
|
|
|
|
|
|
|
|
grant select on mysqltest1.t1 to lena@localhost;
|
|
|
|
|
grant select on mysqltest1.t2 to lena@localhost;
|
|
|
|
|
grant select, show view on mysqltest1.v1 to lena@localhost;
|
|
|
|
|
grant show view on mysqltest1.v2 to lena@localhost;
|
|
|
|
|
|
|
|
|
|
grant select on mysqltest1.t1 to mhairi@localhost;
|
|
|
|
|
grant select on mysqltest1.t2 to mhairi@localhost;
|
|
|
|
|
grant select, show view on mysqltest1.v1 to mhairi@localhost;
|
|
|
|
|
grant select, show view on mysqltest1.v2 to mhairi@localhost;
|
|
|
|
|
|
|
|
|
|
grant select on mysqltest1.t1 to noam@localhost;
|
|
|
|
|
grant select, show view on mysqltest1.v1 to noam@localhost;
|
|
|
|
|
grant select, show view on mysqltest1.v2 to noam@localhost;
|
|
|
|
|
|
|
|
|
|
grant select on mysqltest1.t2 to olga@localhost;
|
|
|
|
|
grant select, show view on mysqltest1.v1 to olga@localhost;
|
|
|
|
|
grant select, show view on mysqltest1.v2 to olga@localhost;
|
|
|
|
|
|
|
|
|
|
grant select on mysqltest1.t1 to pjotr@localhost;
|
|
|
|
|
grant select on mysqltest1.t2 to pjotr@localhost;
|
|
|
|
|
grant select, show view on mysqltest1.v2 to pjotr@localhost;
|
|
|
|
|
|
|
|
|
|
grant select, show view on mysqltest1.v1 to quintessa@localhost;
|
|
|
|
|
|
|
|
|
|
disconnect test11765687;
|
|
|
|
|
|
|
|
|
|
#
|
|
|
|
|
--echo ... as bob
|
|
|
|
|
connect (test11765687,localhost,bob,,mysqltest1);
|
|
|
|
|
connection test11765687;
|
|
|
|
|
|
|
|
|
|
select * from v1; # Should succeed.
|
|
|
|
|
--error ER_VIEW_NO_EXPLAIN
|
|
|
|
|
explain select * from v1; # fail, no SHOW_VIEW
|
|
|
|
|
|
|
|
|
|
disconnect test11765687;
|
|
|
|
|
|
|
|
|
|
#
|
|
|
|
|
--echo ... as cecil
|
|
|
|
|
connect (test11765687,localhost,cecil,,mysqltest1);
|
|
|
|
|
connection test11765687;
|
|
|
|
|
|
|
|
|
|
--error ER_TABLEACCESS_DENIED_ERROR
|
|
|
|
|
select * from v1; # fail, no SELECT
|
|
|
|
|
--error ER_TABLEACCESS_DENIED_ERROR
|
|
|
|
|
explain select * from v1; # fail, no SELECT
|
|
|
|
|
|
|
|
|
|
disconnect test11765687;
|
|
|
|
|
|
|
|
|
|
#
|
|
|
|
|
--echo ... as dan
|
|
|
|
|
connect (test11765687,localhost,dan,,mysqltest1);
|
|
|
|
|
connection test11765687;
|
|
|
|
|
|
|
|
|
|
select * from v1; # Should succeed.
|
|
|
|
|
explain select * from v1; # Should succeed.
|
|
|
|
|
|
|
|
|
|
disconnect test11765687;
|
|
|
|
|
|
|
|
|
|
#
|
|
|
|
|
--echo ... as eugene
|
|
|
|
|
connect (test11765687,localhost,eugene,,mysqltest1);
|
|
|
|
|
connection test11765687;
|
|
|
|
|
|
|
|
|
|
select * from v1; # Should succeed.
|
|
|
|
|
--error ER_VIEW_NO_EXPLAIN
|
|
|
|
|
explain select * from v1; # fail, no SHOW_VIEW
|
|
|
|
|
|
|
|
|
|
disconnect test11765687;
|
|
|
|
|
|
|
|
|
|
#
|
|
|
|
|
--echo ... as fiona
|
|
|
|
|
connect (test11765687,localhost,fiona,,mysqltest1);
|
|
|
|
|
connection test11765687;
|
|
|
|
|
|
|
|
|
|
select * from v2; # Should succeed.
|
|
|
|
|
show create view v2; # Should succeed, but...
|
|
|
|
|
--error ER_TABLEACCESS_DENIED_ERROR
|
|
|
|
|
explain select * from t1; # fail, shouldn't see t1!
|
|
|
|
|
--error ER_TABLEACCESS_DENIED_ERROR
|
|
|
|
|
# err msg must give view name, no table names!!
|
|
|
|
|
explain select * from v1; # fail, have no privs on v1!
|
|
|
|
|
--error ER_TABLEACCESS_DENIED_ERROR
|
|
|
|
|
explain select * from t2; # fail, have no privs on t2!
|
|
|
|
|
--error ER_VIEW_NO_EXPLAIN
|
|
|
|
|
explain select * from v2; # fail, shouldn't see t2!
|
|
|
|
|
|
|
|
|
|
disconnect test11765687;
|
|
|
|
|
|
|
|
|
|
#
|
|
|
|
|
--echo ... as greg
|
|
|
|
|
connect (test11765687,localhost,greg,,mysqltest1);
|
|
|
|
|
connection test11765687;
|
|
|
|
|
|
|
|
|
|
select * from v2; # Should succeed.
|
|
|
|
|
--error ER_TABLEACCESS_DENIED_ERROR
|
|
|
|
|
explain select * from v1; # fail; no SELECT on v1!
|
|
|
|
|
--error ER_VIEW_NO_EXPLAIN
|
|
|
|
|
explain select * from v2; # fail; no SELECT on v1!
|
|
|
|
|
|
|
|
|
|
disconnect test11765687;
|
|
|
|
|
|
|
|
|
|
#
|
|
|
|
|
--echo ... as han
|
|
|
|
|
connect (test11765687,localhost,han,,mysqltest1);
|
|
|
|
|
connection test11765687;
|
|
|
|
|
|
|
|
|
|
--error ER_TABLEACCESS_DENIED_ERROR
|
|
|
|
|
select * from t3; # don't have privs on all columns,
|
|
|
|
|
--error ER_TABLEACCESS_DENIED_ERROR
|
|
|
|
|
explain select * from t3; # so EXPLAIN on "forbidden" columns should fail.
|
|
|
|
|
select k from t3; # but we do have SELECT on column k though,
|
|
|
|
|
explain select k from t3; # so EXPLAIN just on k should work,
|
|
|
|
|
select * from v3; # and so should SELECT on view only using allowed columns
|
|
|
|
|
explain select * from v3; # as should the associated EXPLAIN
|
|
|
|
|
|
|
|
|
|
disconnect test11765687;
|
|
|
|
|
|
|
|
|
|
#
|
|
|
|
|
--echo ... as inga
|
|
|
|
|
connect (test11765687,localhost,inga,,mysqltest1);
|
|
|
|
|
connection test11765687;
|
|
|
|
|
|
|
|
|
|
select * from v2;
|
|
|
|
|
# has sel/show on v2, sel on t1/t2, only sel v1
|
|
|
|
|
# fail: lacks show on v1
|
|
|
|
|
--error ER_VIEW_NO_EXPLAIN
|
|
|
|
|
explain select * from v2;
|
|
|
|
|
disconnect test11765687;
|
|
|
|
|
|
|
|
|
|
#
|
|
|
|
|
--echo ... as jamie
|
|
|
|
|
connect (test11765687,localhost,jamie,,mysqltest1);
|
|
|
|
|
connection test11765687;
|
|
|
|
|
|
|
|
|
|
select * from v2;
|
|
|
|
|
# has sel/show on v2, sel on t1/t2, only show v1
|
|
|
|
|
# fail: lacks sel on v1
|
|
|
|
|
--error ER_VIEW_NO_EXPLAIN
|
|
|
|
|
explain select * from v2;
|
|
|
|
|
disconnect test11765687;
|
|
|
|
|
|
|
|
|
|
#
|
|
|
|
|
--echo ... as karl
|
|
|
|
|
connect (test11765687,localhost,karl,,mysqltest1);
|
|
|
|
|
connection test11765687;
|
|
|
|
|
|
|
|
|
|
select * from v2;
|
|
|
|
|
# has sel only on v2, sel on t1/t2, sel/show v1
|
|
|
|
|
# fail: lacks show on v2
|
|
|
|
|
--error ER_VIEW_NO_EXPLAIN
|
|
|
|
|
explain select * from v2;
|
|
|
|
|
disconnect test11765687;
|
|
|
|
|
|
|
|
|
|
#
|
|
|
|
|
--echo ... as lena
|
|
|
|
|
|
|
|
|
|
connect (test11765687,localhost,lena,,mysqltest1);
|
|
|
|
|
connection test11765687;
|
|
|
|
|
--error ER_TABLEACCESS_DENIED_ERROR
|
|
|
|
|
select * from v2;
|
|
|
|
|
# has show only on v2, sel on t1/t2, sel/show v1
|
|
|
|
|
# fail: lacks sel on v2
|
|
|
|
|
--error ER_TABLEACCESS_DENIED_ERROR
|
|
|
|
|
explain select * from v2;
|
|
|
|
|
disconnect test11765687;
|
|
|
|
|
|
|
|
|
|
#
|
|
|
|
|
--echo ... as mhairi
|
|
|
|
|
connect (test11765687,localhost,mhairi,,mysqltest1);
|
|
|
|
|
connection test11765687;
|
|
|
|
|
|
|
|
|
|
select * from v2;
|
|
|
|
|
# has sel/show on v2, sel on t1/t2, sel/show v1
|
|
|
|
|
explain select * from v2;
|
|
|
|
|
disconnect test11765687;
|
|
|
|
|
|
|
|
|
|
#
|
|
|
|
|
--echo ... as noam
|
|
|
|
|
connect (test11765687,localhost,noam,,mysqltest1);
|
|
|
|
|
connection test11765687;
|
|
|
|
|
|
|
|
|
|
select * from v2;
|
|
|
|
|
# has sel/show on v2, sel only on t1, sel/show v1 (no sel on t2!)
|
|
|
|
|
--error ER_VIEW_NO_EXPLAIN
|
|
|
|
|
explain select * from v2;
|
|
|
|
|
disconnect test11765687;
|
|
|
|
|
|
|
|
|
|
#
|
|
|
|
|
--echo ... as olga
|
|
|
|
|
connect (test11765687,localhost,olga,,mysqltest1);
|
|
|
|
|
connection test11765687;
|
|
|
|
|
|
|
|
|
|
select * from v2;
|
|
|
|
|
# has sel/show on v2, sel only on t2, sel/show v1 (no sel on t1!)
|
|
|
|
|
--error ER_VIEW_NO_EXPLAIN
|
|
|
|
|
explain select * from v2;
|
|
|
|
|
disconnect test11765687;
|
|
|
|
|
|
|
|
|
|
#
|
|
|
|
|
--echo ... as pjotr
|
|
|
|
|
connect (test11765687,localhost,pjotr,,mysqltest1);
|
|
|
|
|
connection test11765687;
|
|
|
|
|
|
|
|
|
|
select * from v2;
|
|
|
|
|
# has sel/show on v2, sel only on t2, nothing on v1
|
|
|
|
|
# fail: lacks show on v1
|
|
|
|
|
--error ER_VIEW_NO_EXPLAIN
|
|
|
|
|
explain select * from v2;
|
|
|
|
|
disconnect test11765687;
|
|
|
|
|
|
|
|
|
|
#
|
|
|
|
|
--echo ... as quintessa
|
|
|
|
|
connect (test11765687,localhost,quintessa,,mysqltest1);
|
|
|
|
|
connection test11765687;
|
|
|
|
|
|
|
|
|
|
select * from v1; # Should succeed.
|
|
|
|
|
--error ER_VIEW_NO_EXPLAIN
|
|
|
|
|
explain select * from v1; # fail: lacks select on t1
|
|
|
|
|
|
|
|
|
|
disconnect test11765687;
|
|
|
|
|
|
|
|
|
|
# cleanup
|
|
|
|
|
|
|
|
|
|
#
|
|
|
|
|
--echo ... as root again at last: clean-up time!
|
|
|
|
|
connection root;
|
|
|
|
|
|
|
|
|
|
drop user alice@localhost;
|
|
|
|
|
drop user bob@localhost;
|
|
|
|
|
drop user cecil@localhost;
|
|
|
|
|
drop user dan@localhost;
|
|
|
|
|
drop user eugene@localhost;
|
|
|
|
|
drop user fiona@localhost;
|
|
|
|
|
drop user greg@localhost;
|
|
|
|
|
drop user han@localhost;
|
|
|
|
|
drop user inga@localhost;
|
|
|
|
|
drop user jamie@localhost;
|
|
|
|
|
drop user karl@localhost;
|
|
|
|
|
drop user lena@localhost;
|
|
|
|
|
drop user mhairi@localhost;
|
|
|
|
|
drop user noam@localhost;
|
|
|
|
|
drop user olga@localhost;
|
|
|
|
|
drop user pjotr@localhost;
|
|
|
|
|
drop user quintessa@localhost;
|
|
|
|
|
|
|
|
|
|
drop database mysqltest1;
|
|
|
|
|
|
|
|
|
|
disconnect root;
|
|
|
|
|
|
|
|
|
|
connection default;
|
|
|
|
|
|
2013-08-28 07:49:53 +02:00
|
|
|
#
|
|
|
|
|
# MDEV-4951 drop user leaves privileges
|
|
|
|
|
#
|
|
|
|
|
#verify that no privileges were left after the above
|
|
|
|
|
select * from information_schema.table_privileges;
|
|
|
|
|
|
2007-01-18 10:48:17 +01:00
|
|
|
--echo End of 5.0 tests.
|
2007-03-23 07:16:30 +01:00
|
|
|
|
|
|
|
|
|
|
|
|
|
#
|
|
|
|
|
# Test that ALTER VIEW accepts DEFINER and ALGORITHM, see bug#16425.
|
|
|
|
|
#
|
|
|
|
|
connection default;
|
|
|
|
|
--disable_warnings
|
|
|
|
|
DROP VIEW IF EXISTS v1;
|
|
|
|
|
DROP TABLE IF EXISTS t1;
|
|
|
|
|
--enable_warnings
|
|
|
|
|
|
|
|
|
|
CREATE TABLE t1 (i INT);
|
|
|
|
|
CREATE VIEW v1 AS SELECT * FROM t1;
|
|
|
|
|
|
|
|
|
|
ALTER VIEW v1 AS SELECT * FROM t1;
|
|
|
|
|
SHOW CREATE VIEW v1;
|
|
|
|
|
ALTER DEFINER=no_such@user_1 VIEW v1 AS SELECT * FROM t1;
|
|
|
|
|
SHOW CREATE VIEW v1;
|
|
|
|
|
ALTER ALGORITHM=MERGE VIEW v1 AS SELECT * FROM t1;
|
|
|
|
|
SHOW CREATE VIEW v1;
|
|
|
|
|
ALTER ALGORITHM=TEMPTABLE DEFINER=no_such@user_2 VIEW v1 AS SELECT * FROM t1;
|
|
|
|
|
SHOW CREATE VIEW v1;
|
|
|
|
|
|
|
|
|
|
DROP VIEW v1;
|
|
|
|
|
DROP TABLE t1;
|
|
|
|
|
|
2009-02-25 11:19:29 +01:00
|
|
|
#
|
|
|
|
|
# Bug#37191: Failed assertion in CREATE VIEW
|
|
|
|
|
#
|
|
|
|
|
CREATE USER mysqluser1@localhost;
|
|
|
|
|
CREATE DATABASE mysqltest1;
|
|
|
|
|
|
|
|
|
|
USE mysqltest1;
|
|
|
|
|
|
|
|
|
|
CREATE TABLE t1 ( a INT );
|
|
|
|
|
CREATE TABLE t2 ( b INT );
|
|
|
|
|
|
|
|
|
|
INSERT INTO t1 VALUES (1), (2);
|
|
|
|
|
INSERT INTO t2 VALUES (1), (2);
|
|
|
|
|
|
|
|
|
|
GRANT CREATE VIEW ON mysqltest1.* TO mysqluser1@localhost;
|
|
|
|
|
|
|
|
|
|
GRANT SELECT ON t1 TO mysqluser1@localhost;
|
|
|
|
|
GRANT INSERT ON t2 TO mysqluser1@localhost;
|
|
|
|
|
|
|
|
|
|
--connect (connection1, localhost, mysqluser1, , mysqltest1)
|
|
|
|
|
|
|
|
|
|
--echo This would lead to failed assertion.
|
|
|
|
|
CREATE VIEW v1 AS SELECT a, b FROM t1, t2;
|
|
|
|
|
|
|
|
|
|
--error ER_TABLEACCESS_DENIED_ERROR
|
|
|
|
|
SELECT * FROM v1;
|
|
|
|
|
--error ER_TABLEACCESS_DENIED_ERROR
|
|
|
|
|
SELECT b FROM v1;
|
|
|
|
|
|
|
|
|
|
--disconnect connection1
|
|
|
|
|
--connection default
|
|
|
|
|
|
|
|
|
|
DROP TABLE t1, t2;
|
|
|
|
|
DROP VIEW v1;
|
|
|
|
|
DROP DATABASE mysqltest1;
|
|
|
|
|
DROP USER mysqluser1@localhost;
|
|
|
|
|
USE test;
|
|
|
|
|
|
2007-03-23 07:16:30 +01:00
|
|
|
--echo End of 5.1 tests.
|
2008-09-03 16:45:40 +02:00
|
|
|
|
|
|
|
|
#
|
|
|
|
|
# Bug#36086: SELECT * from views don't check column grants
|
|
|
|
|
#
|
|
|
|
|
CREATE USER mysqluser1@localhost;
|
|
|
|
|
CREATE DATABASE mysqltest1;
|
|
|
|
|
|
|
|
|
|
USE mysqltest1;
|
|
|
|
|
|
|
|
|
|
CREATE TABLE t1 ( a INT, b INT );
|
|
|
|
|
CREATE TABLE t2 ( a INT, b INT );
|
|
|
|
|
|
|
|
|
|
CREATE VIEW v1 AS SELECT a, b FROM t1;
|
|
|
|
|
|
|
|
|
|
GRANT SELECT( a ) ON v1 TO mysqluser1@localhost;
|
|
|
|
|
GRANT UPDATE( b ) ON t2 TO mysqluser1@localhost;
|
|
|
|
|
|
|
|
|
|
--connect (connection1, localhost, mysqluser1, , test)
|
|
|
|
|
|
|
|
|
|
--error ER_TABLEACCESS_DENIED_ERROR
|
|
|
|
|
SELECT * FROM mysqltest1.v1;
|
|
|
|
|
|
|
|
|
|
--error ER_TABLEACCESS_DENIED_ERROR
|
|
|
|
|
CREATE VIEW v1 AS SELECT * FROM mysqltest1.t2;
|
|
|
|
|
|
|
|
|
|
--disconnect connection1
|
|
|
|
|
|
|
|
|
|
--connection default
|
|
|
|
|
|
|
|
|
|
DROP TABLE t1, t2;
|
|
|
|
|
DROP VIEW v1;
|
|
|
|
|
DROP DATABASE mysqltest1;
|
|
|
|
|
DROP USER mysqluser1@localhost;
|
|
|
|
|
|
|
|
|
|
#
|
2009-03-06 15:56:17 +01:00
|
|
|
# Bug#35600 Security breach via view, I_S table and prepared
|
|
|
|
|
# statement/stored procedure
|
2008-09-03 16:45:40 +02:00
|
|
|
#
|
|
|
|
|
CREATE USER mysqluser1@localhost;
|
|
|
|
|
CREATE DATABASE mysqltest1;
|
|
|
|
|
|
|
|
|
|
USE mysqltest1;
|
|
|
|
|
|
|
|
|
|
CREATE VIEW v1 AS SELECT * FROM information_schema.tables LIMIT 1;
|
|
|
|
|
CREATE ALGORITHM = TEMPTABLE VIEW v2 AS SELECT 1 AS A;
|
|
|
|
|
|
2008-09-09 12:49:08 +02:00
|
|
|
CREATE VIEW test.v3 AS SELECT 1 AS a;
|
|
|
|
|
|
2008-09-03 16:45:40 +02:00
|
|
|
--connection default
|
|
|
|
|
GRANT SELECT ON mysqltest1.* to mysqluser1@localhost;
|
2008-09-09 12:49:08 +02:00
|
|
|
GRANT ALL ON test.* TO mysqluser1@localhost;
|
2008-09-03 16:45:40 +02:00
|
|
|
|
|
|
|
|
--connect (connection1, localhost, mysqluser1, , test)
|
|
|
|
|
PREPARE stmt_v1 FROM "SELECT * FROM mysqltest1.v1";
|
|
|
|
|
PREPARE stmt_v2 FROM "SELECT * FROM mysqltest1.v2";
|
|
|
|
|
|
|
|
|
|
--connection default
|
|
|
|
|
REVOKE SELECT ON mysqltest1.* FROM mysqluser1@localhost;
|
|
|
|
|
|
|
|
|
|
--connection connection1
|
|
|
|
|
|
|
|
|
|
--error ER_TABLEACCESS_DENIED_ERROR
|
|
|
|
|
EXECUTE stmt_v1;
|
|
|
|
|
--error ER_TABLEACCESS_DENIED_ERROR
|
|
|
|
|
EXECUTE stmt_v2;
|
|
|
|
|
--disconnect connection1
|
2008-09-09 12:49:08 +02:00
|
|
|
|
|
|
|
|
--connect (connection2, localhost, mysqluser1,,)
|
|
|
|
|
PREPARE stmt FROM "SELECT a FROM v3";
|
|
|
|
|
EXECUTE stmt;
|
|
|
|
|
--disconnect connection2
|
|
|
|
|
|
2008-09-03 16:45:40 +02:00
|
|
|
--connection default
|
|
|
|
|
DROP VIEW v1, v2;
|
|
|
|
|
DROP DATABASE mysqltest1;
|
2008-09-09 12:49:08 +02:00
|
|
|
DROP VIEW test.v3;
|
2008-09-03 16:45:40 +02:00
|
|
|
DROP USER mysqluser1@localhost;
|
2009-03-06 15:56:17 +01:00
|
|
|
USE test;
|
|
|
|
|
|
2009-09-28 13:25:47 +02:00
|
|
|
--echo #
|
|
|
|
|
--echo # Bug#35996: SELECT + SHOW VIEW should be enough to display view
|
|
|
|
|
--echo # definition
|
|
|
|
|
--echo #
|
|
|
|
|
-- source include/not_embedded.inc
|
|
|
|
|
CREATE USER mysqluser1@localhost;
|
|
|
|
|
CREATE DATABASE mysqltest1;
|
|
|
|
|
CREATE DATABASE mysqltest2;
|
|
|
|
|
GRANT USAGE, SELECT, CREATE VIEW, SHOW VIEW
|
|
|
|
|
ON mysqltest2.* TO mysqluser1@localhost;
|
|
|
|
|
|
|
|
|
|
USE mysqltest1;
|
|
|
|
|
|
|
|
|
|
CREATE TABLE t1( a INT );
|
|
|
|
|
CREATE TABLE t2( a INT, b INT );
|
|
|
|
|
CREATE FUNCTION f1() RETURNS INT RETURN 1;
|
|
|
|
|
CREATE VIEW v1 AS SELECT 1 AS a;
|
|
|
|
|
CREATE VIEW v2 AS SELECT 1 AS a, 2 AS b;
|
|
|
|
|
|
|
|
|
|
GRANT SELECT ON TABLE t1 TO mysqluser1@localhost;
|
|
|
|
|
GRANT SELECT (a, b) ON TABLE t2 TO mysqluser1@localhost;
|
|
|
|
|
GRANT EXECUTE ON FUNCTION f1 TO mysqluser1@localhost;
|
|
|
|
|
GRANT SELECT ON TABLE v1 TO mysqluser1@localhost;
|
|
|
|
|
GRANT SELECT (a, b) ON TABLE v2 TO mysqluser1@localhost;
|
|
|
|
|
|
|
|
|
|
CREATE VIEW v_t1 AS SELECT * FROM t1;
|
|
|
|
|
CREATE VIEW v_t2 AS SELECT * FROM t2;
|
|
|
|
|
CREATE VIEW v_f1 AS SELECT f1() AS a;
|
|
|
|
|
CREATE VIEW v_v1 AS SELECT * FROM v1;
|
|
|
|
|
CREATE VIEW v_v2 AS SELECT * FROM v2;
|
|
|
|
|
|
|
|
|
|
GRANT SELECT, SHOW VIEW ON v_t1 TO mysqluser1@localhost;
|
|
|
|
|
GRANT SELECT, SHOW VIEW ON v_t2 TO mysqluser1@localhost;
|
|
|
|
|
GRANT SELECT, SHOW VIEW ON v_f1 TO mysqluser1@localhost;
|
|
|
|
|
GRANT SELECT, SHOW VIEW ON v_v1 TO mysqluser1@localhost;
|
|
|
|
|
GRANT SELECT, SHOW VIEW ON v_v2 TO mysqluser1@localhost;
|
|
|
|
|
|
|
|
|
|
--connect (connection1, localhost, mysqluser1,, mysqltest2)
|
|
|
|
|
CREATE VIEW v_mysqluser1_t1 AS SELECT * FROM mysqltest1.t1;
|
|
|
|
|
CREATE VIEW v_mysqluser1_t2 AS SELECT * FROM mysqltest1.t2;
|
|
|
|
|
CREATE VIEW v_mysqluser1_f1 AS SELECT mysqltest1.f1() AS a;
|
|
|
|
|
CREATE VIEW v_mysqluser1_v1 AS SELECT * FROM mysqltest1.v1;
|
|
|
|
|
CREATE VIEW v_mysqluser1_v2 AS SELECT * FROM mysqltest1.v2;
|
|
|
|
|
|
|
|
|
|
SHOW CREATE VIEW mysqltest1.v_t1;
|
|
|
|
|
SHOW CREATE VIEW mysqltest1.v_t2;
|
|
|
|
|
SHOW CREATE VIEW mysqltest1.v_f1;
|
|
|
|
|
SHOW CREATE VIEW mysqltest1.v_v1;
|
|
|
|
|
SHOW CREATE VIEW mysqltest1.v_v2;
|
|
|
|
|
|
|
|
|
|
SHOW CREATE VIEW v_mysqluser1_t1;
|
|
|
|
|
SHOW CREATE VIEW v_mysqluser1_t2;
|
|
|
|
|
SHOW CREATE VIEW v_mysqluser1_f1;
|
|
|
|
|
SHOW CREATE VIEW v_mysqluser1_v1;
|
|
|
|
|
SHOW CREATE VIEW v_mysqluser1_v2;
|
|
|
|
|
|
|
|
|
|
--connection default
|
|
|
|
|
REVOKE SELECT ON TABLE t1 FROM mysqluser1@localhost;
|
|
|
|
|
REVOKE SELECT (a) ON TABLE t2 FROM mysqluser1@localhost;
|
|
|
|
|
REVOKE EXECUTE ON FUNCTION f1 FROM mysqluser1@localhost;
|
|
|
|
|
REVOKE SELECT ON TABLE v1 FROM mysqluser1@localhost;
|
|
|
|
|
|
|
|
|
|
--connection connection1
|
|
|
|
|
SHOW CREATE VIEW mysqltest1.v_t1;
|
|
|
|
|
SHOW CREATE VIEW mysqltest1.v_t2;
|
|
|
|
|
SHOW CREATE VIEW mysqltest1.v_f1;
|
|
|
|
|
SHOW CREATE VIEW mysqltest1.v_v1;
|
|
|
|
|
SHOW CREATE VIEW mysqltest1.v_v2;
|
|
|
|
|
|
|
|
|
|
SHOW CREATE VIEW v_mysqluser1_t1;
|
|
|
|
|
SHOW CREATE VIEW v_mysqluser1_t2;
|
|
|
|
|
SHOW CREATE VIEW v_mysqluser1_f1;
|
|
|
|
|
SHOW CREATE VIEW v_mysqluser1_v1;
|
|
|
|
|
SHOW CREATE VIEW v_mysqluser1_v2;
|
|
|
|
|
|
|
|
|
|
--connection default
|
|
|
|
|
--echo # Testing the case when the views reference missing objects.
|
|
|
|
|
--echo # Obviously, there are no privileges to check for, so we
|
|
|
|
|
--echo # need only each object type once.
|
|
|
|
|
DROP TABLE t1;
|
|
|
|
|
DROP FUNCTION f1;
|
|
|
|
|
DROP VIEW v1;
|
|
|
|
|
|
|
|
|
|
--connection connection1
|
|
|
|
|
SHOW CREATE VIEW mysqltest1.v_t1;
|
|
|
|
|
SHOW CREATE VIEW mysqltest1.v_f1;
|
|
|
|
|
SHOW CREATE VIEW mysqltest1.v_v1;
|
|
|
|
|
|
|
|
|
|
SHOW CREATE VIEW v_mysqluser1_t1;
|
|
|
|
|
SHOW CREATE VIEW v_mysqluser1_f1;
|
|
|
|
|
SHOW CREATE VIEW v_mysqluser1_v1;
|
|
|
|
|
|
|
|
|
|
--connection default
|
|
|
|
|
REVOKE SHOW VIEW ON v_t1 FROM mysqluser1@localhost;
|
|
|
|
|
REVOKE SHOW VIEW ON v_f1 FROM mysqluser1@localhost;
|
|
|
|
|
REVOKE SHOW VIEW ON v_v1 FROM mysqluser1@localhost;
|
|
|
|
|
|
|
|
|
|
--connection connection1
|
|
|
|
|
--error ER_TABLEACCESS_DENIED_ERROR
|
|
|
|
|
SHOW CREATE VIEW mysqltest1.v_t1;
|
|
|
|
|
--error ER_TABLEACCESS_DENIED_ERROR
|
|
|
|
|
SHOW CREATE VIEW mysqltest1.v_f1;
|
|
|
|
|
--error ER_TABLEACCESS_DENIED_ERROR
|
|
|
|
|
SHOW CREATE VIEW mysqltest1.v_v1;
|
|
|
|
|
SHOW CREATE VIEW v_mysqluser1_t1;
|
|
|
|
|
SHOW CREATE VIEW v_mysqluser1_f1;
|
|
|
|
|
SHOW CREATE VIEW v_mysqluser1_v1;
|
|
|
|
|
|
|
|
|
|
--disconnect connection1
|
|
|
|
|
--connection default
|
|
|
|
|
DROP USER mysqluser1@localhost;
|
|
|
|
|
DROP DATABASE mysqltest1;
|
|
|
|
|
DROP DATABASE mysqltest2;
|
|
|
|
|
USE test;
|
|
|
|
|
|
|
|
|
|
CREATE TABLE t1( a INT );
|
|
|
|
|
CREATE DEFINER = no_such_user@no_such_host VIEW v1 AS SELECT * FROM t1;
|
|
|
|
|
SHOW CREATE VIEW v1;
|
|
|
|
|
DROP TABLE t1;
|
|
|
|
|
DROP VIEW v1;
|
|
|
|
|
|
2009-03-06 15:56:17 +01:00
|
|
|
|
2009-10-16 13:12:21 +02:00
|
|
|
--echo #
|
|
|
|
|
--echo # Bug #46019: ERROR 1356 When selecting from within another
|
|
|
|
|
--echo # view that has Group By
|
|
|
|
|
--echo #
|
|
|
|
|
CREATE DATABASE mysqltest1;
|
|
|
|
|
USE mysqltest1;
|
|
|
|
|
|
|
|
|
|
CREATE TABLE t1 (a INT);
|
|
|
|
|
|
|
|
|
|
CREATE SQL SECURITY INVOKER VIEW v1 AS SELECT a FROM t1 GROUP BY a;
|
|
|
|
|
CREATE SQL SECURITY INVOKER VIEW v2 AS SELECT a FROM v1;
|
|
|
|
|
|
|
|
|
|
CREATE USER mysqluser1;
|
|
|
|
|
|
|
|
|
|
GRANT SELECT ON TABLE t1 TO mysqluser1;
|
|
|
|
|
GRANT SELECT, SHOW VIEW ON TABLE v1 TO mysqluser1;
|
|
|
|
|
GRANT SELECT, SHOW VIEW ON TABLE v2 TO mysqluser1;
|
|
|
|
|
|
|
|
|
|
--connect (mysqluser1, localhost, mysqluser1,,mysqltest1)
|
|
|
|
|
SELECT a FROM v1;
|
|
|
|
|
SELECT a FROM v2;
|
|
|
|
|
|
|
|
|
|
--connection default
|
|
|
|
|
--disconnect mysqluser1
|
|
|
|
|
DROP USER mysqluser1;
|
|
|
|
|
DROP DATABASE mysqltest1;
|
2010-02-12 03:54:14 +01:00
|
|
|
USE test;
|
|
|
|
|
|
|
|
|
|
--echo #
|
|
|
|
|
--echo # Bug#47734: Assertion failed: ! is_set() when locking a view with non-existing definer
|
|
|
|
|
--echo #
|
|
|
|
|
|
|
|
|
|
--disable_warnings
|
|
|
|
|
DROP VIEW IF EXISTS v1;
|
|
|
|
|
--enable_warnings
|
|
|
|
|
|
|
|
|
|
CREATE DEFINER=`unknown`@`unknown` SQL SECURITY DEFINER VIEW v1 AS SELECT 1;
|
|
|
|
|
--error ER_NO_SUCH_USER
|
|
|
|
|
LOCK TABLES v1 READ;
|
|
|
|
|
DROP VIEW v1;
|
2011-01-12 14:08:30 +01:00
|
|
|
|
|
|
|
|
|
|
|
|
|
--echo #
|
|
|
|
|
--echo # Bug #58499 "DEFINER-security view selecting from INVOKER-security view
|
|
|
|
|
--echo # access check wrong".
|
|
|
|
|
--echo #
|
|
|
|
|
--echo # Check that we correctly handle privileges for various combinations
|
|
|
|
|
--echo # of INVOKER and DEFINER-security views using each other.
|
|
|
|
|
--disable_warnings
|
|
|
|
|
DROP DATABASE IF EXISTS mysqltest1;
|
|
|
|
|
--enable_warnings
|
|
|
|
|
CREATE DATABASE mysqltest1;
|
|
|
|
|
USE mysqltest1;
|
|
|
|
|
CREATE TABLE t1 (i INT);
|
|
|
|
|
CREATE TABLE t2 (j INT);
|
|
|
|
|
INSERT INTO t1 VALUES (1);
|
|
|
|
|
INSERT INTO t2 VALUES (2);
|
|
|
|
|
--echo #
|
|
|
|
|
--echo # 1) DEFINER-security view uses INVOKER-security view (covers
|
|
|
|
|
--echo # scenario originally described in the bug report).
|
|
|
|
|
CREATE SQL SECURITY INVOKER VIEW v1_uses_t1 AS SELECT * FROM t1;
|
|
|
|
|
CREATE SQL SECURITY INVOKER VIEW v1_uses_t2 AS SELECT * FROM t2;
|
|
|
|
|
CREATE USER 'mysqluser1'@'%';
|
|
|
|
|
GRANT CREATE VIEW ON mysqltest1.* TO 'mysqluser1'@'%';
|
|
|
|
|
GRANT SELECT ON t1 TO 'mysqluser1'@'%';
|
|
|
|
|
--echo # To be able create 'v2_uses_t2' we also need select on t2.
|
|
|
|
|
GRANT SELECT ON t2 TO 'mysqluser1'@'%';
|
|
|
|
|
GRANT SELECT ON v1_uses_t1 TO 'mysqluser1'@'%';
|
|
|
|
|
GRANT SELECT ON v1_uses_t2 TO 'mysqluser1'@'%';
|
|
|
|
|
--echo #
|
|
|
|
|
--echo # Connection 'mysqluser1'.
|
|
|
|
|
--connect (mysqluser1, localhost, mysqluser1,,mysqltest1)
|
|
|
|
|
CREATE SQL SECURITY DEFINER VIEW v2_uses_t1 AS SELECT * FROM v1_uses_t1;
|
|
|
|
|
CREATE SQL SECURITY DEFINER VIEW v2_uses_t2 AS SELECT * FROM v1_uses_t2;
|
|
|
|
|
--echo #
|
|
|
|
|
--echo # Connection 'default'.
|
|
|
|
|
--connection default
|
|
|
|
|
CREATE USER 'mysqluser2'@'%';
|
|
|
|
|
GRANT SELECT ON v2_uses_t1 TO 'mysqluser2'@'%';
|
|
|
|
|
GRANT SELECT ON v2_uses_t2 TO 'mysqluser2'@'%';
|
|
|
|
|
GRANT SELECT ON t2 TO 'mysqluser2'@'%';
|
|
|
|
|
GRANT CREATE VIEW ON mysqltest1.* TO 'mysqluser2'@'%';
|
|
|
|
|
--echo # Make 'mysqluser1' unable to access t2.
|
|
|
|
|
REVOKE SELECT ON t2 FROM 'mysqluser1'@'%';
|
|
|
|
|
--echo #
|
|
|
|
|
--echo # Connection 'mysqluser2'.
|
|
|
|
|
--connect (mysqluser2, localhost, mysqluser2,,mysqltest1)
|
|
|
|
|
--echo # The below statement should succeed thanks to suid nature of v2_uses_t1.
|
|
|
|
|
SELECT * FROM v2_uses_t1;
|
|
|
|
|
--echo # The below statement should fail due to suid nature of v2_uses_t2.
|
|
|
|
|
--error ER_VIEW_INVALID
|
|
|
|
|
SELECT * FROM v2_uses_t2;
|
|
|
|
|
--echo #
|
|
|
|
|
--echo # 2) INVOKER-security view uses INVOKER-security view.
|
|
|
|
|
--echo #
|
|
|
|
|
--echo # Connection 'default'.
|
|
|
|
|
--connection default
|
|
|
|
|
DROP VIEW v2_uses_t1, v2_uses_t2;
|
|
|
|
|
CREATE SQL SECURITY INVOKER VIEW v2_uses_t1 AS SELECT * FROM v1_uses_t1;
|
|
|
|
|
CREATE SQL SECURITY INVOKER VIEW v2_uses_t2 AS SELECT * FROM v1_uses_t2;
|
|
|
|
|
GRANT SELECT ON v2_uses_t1 TO 'mysqluser1'@'%';
|
|
|
|
|
GRANT SELECT ON v2_uses_t2 TO 'mysqluser1'@'%';
|
|
|
|
|
GRANT SELECT ON v1_uses_t1 TO 'mysqluser2'@'%';
|
|
|
|
|
GRANT SELECT ON v1_uses_t2 TO 'mysqluser2'@'%';
|
|
|
|
|
--echo #
|
|
|
|
|
--echo # Connection 'mysqluser1'.
|
|
|
|
|
--connection mysqluser1
|
|
|
|
|
--echo # For both versions of 'v2' 'mysqluser1' privileges should be used.
|
|
|
|
|
SELECT * FROM v2_uses_t1;
|
|
|
|
|
--error ER_VIEW_INVALID
|
|
|
|
|
SELECT * FROM v2_uses_t2;
|
|
|
|
|
--echo #
|
|
|
|
|
--echo # Connection 'mysqluser2'.
|
|
|
|
|
--connection mysqluser2
|
|
|
|
|
--echo # And now for both versions of 'v2' 'mysqluser2' privileges should
|
|
|
|
|
--echo # be used.
|
|
|
|
|
--error ER_VIEW_INVALID
|
|
|
|
|
SELECT * FROM v2_uses_t1;
|
|
|
|
|
SELECT * FROM v2_uses_t2;
|
|
|
|
|
--echo #
|
|
|
|
|
--echo # 3) INVOKER-security view uses DEFINER-security view.
|
|
|
|
|
--echo #
|
|
|
|
|
--echo # Connection 'default'.
|
|
|
|
|
--connection default
|
|
|
|
|
DROP VIEW v1_uses_t1, v1_uses_t2;
|
|
|
|
|
--echo # To be able create 'v1_uses_t2' we also need select on t2.
|
|
|
|
|
GRANT SELECT ON t2 TO 'mysqluser1'@'%';
|
|
|
|
|
--echo #
|
|
|
|
|
--echo # Connection 'mysqluser1'.
|
|
|
|
|
--connection mysqluser1
|
|
|
|
|
CREATE SQL SECURITY DEFINER VIEW v1_uses_t1 AS SELECT * FROM t1;
|
|
|
|
|
CREATE SQL SECURITY DEFINER VIEW v1_uses_t2 AS SELECT * FROM t2;
|
|
|
|
|
--echo #
|
|
|
|
|
--echo # Connection 'default'.
|
|
|
|
|
--connection default
|
|
|
|
|
--echo # Make 'mysqluser1' unable to access t2.
|
|
|
|
|
REVOKE SELECT ON t2 FROM 'mysqluser1'@'%';
|
|
|
|
|
--echo #
|
|
|
|
|
--echo # Connection 'mysqluser2'.
|
|
|
|
|
--connection mysqluser2
|
|
|
|
|
--echo # Due to suid nature of v1_uses_t1 and v1_uses_t2 the first
|
|
|
|
|
--echo # select should succeed and the second select should fail.
|
|
|
|
|
SELECT * FROM v2_uses_t1;
|
|
|
|
|
--error ER_VIEW_INVALID
|
|
|
|
|
SELECT * FROM v2_uses_t2;
|
|
|
|
|
--echo #
|
|
|
|
|
--echo # 4) DEFINER-security view uses DEFINER-security view.
|
|
|
|
|
--echo #
|
|
|
|
|
--echo # Connection 'default'.
|
|
|
|
|
--connection default
|
|
|
|
|
DROP VIEW v2_uses_t1, v2_uses_t2;
|
|
|
|
|
--echo # To be able create 'v2_uses_t2' we also need select on t2.
|
|
|
|
|
GRANT SELECT ON t2 TO 'mysqluser1'@'%';
|
|
|
|
|
--echo #
|
|
|
|
|
--echo # Connection 'mysqluser2'.
|
|
|
|
|
--connection mysqluser2
|
|
|
|
|
CREATE SQL SECURITY DEFINER VIEW v2_uses_t1 AS SELECT * FROM v1_uses_t1;
|
|
|
|
|
CREATE SQL SECURITY DEFINER VIEW v2_uses_t2 AS SELECT * FROM v1_uses_t2;
|
|
|
|
|
--echo #
|
|
|
|
|
--echo # Connection 'default'.
|
|
|
|
|
--connection default
|
|
|
|
|
--echo # Make 'mysqluser1' unable to access t2.
|
|
|
|
|
REVOKE SELECT ON t2 FROM 'mysqluser1'@'%';
|
|
|
|
|
--echo #
|
|
|
|
|
--echo # Connection 'mysqluser2'.
|
|
|
|
|
--connection mysqluser2
|
|
|
|
|
--echo # Again privileges of creator of innermost views should apply.
|
|
|
|
|
SELECT * FROM v2_uses_t1;
|
|
|
|
|
--error ER_VIEW_INVALID
|
|
|
|
|
SELECT * FROM v2_uses_t2;
|
|
|
|
|
|
|
|
|
|
--disconnect mysqluser1
|
|
|
|
|
--disconnect mysqluser2
|
|
|
|
|
--connection default
|
|
|
|
|
USE test;
|
|
|
|
|
DROP DATABASE mysqltest1;
|
|
|
|
|
DROP USER 'mysqluser1'@'%';
|
|
|
|
|
DROP USER 'mysqluser2'@'%';
|
|
|
|
|
|
2014-03-24 07:18:01 +01:00
|
|
|
--echo #
|
|
|
|
|
--echo # Test for bug #11766767 - "59957: VIEW USING MERGE PERMISSIONS
|
|
|
|
|
--echo # IN MULTI-TABLE UPDATE".
|
|
|
|
|
--echo #
|
|
|
|
|
--disable_warnings
|
|
|
|
|
drop database if exists mysqltest1;
|
|
|
|
|
drop database if exists mysqltest2;
|
|
|
|
|
--enable_warnings
|
|
|
|
|
--echo #
|
|
|
|
|
--echo # Prepare playground.
|
|
|
|
|
create database mysqltest1;
|
|
|
|
|
create database mysqltest2;
|
|
|
|
|
create user user_11766767;
|
|
|
|
|
grant select on mysqltest1.* to user_11766767;
|
|
|
|
|
grant all on mysqltest2.* to user_11766767;
|
|
|
|
|
use mysqltest1;
|
|
|
|
|
create table t1 (id int primary key, val varchar(20));
|
|
|
|
|
insert into t1 values (1, 'test1');
|
|
|
|
|
create table t11 (id int primary key);
|
|
|
|
|
insert into t11 values (1);
|
|
|
|
|
create algorithm=temptable view v1_temp as select * from t1;
|
|
|
|
|
create algorithm=merge view v1_merge as select * from t1;
|
|
|
|
|
create algorithm=temptable view v11_temp as
|
|
|
|
|
select t1.id as id, t1.val as val from t1, t11 where t1.id= t11.id;
|
|
|
|
|
create algorithm=merge view v11_merge as
|
|
|
|
|
select t1.id as id, t1.val as val from t1, t11 where t1.id= t11.id;
|
|
|
|
|
use mysqltest2;
|
|
|
|
|
create table t2 (id int primary key, val varchar(20));
|
|
|
|
|
insert into t2 values (1, 'test2');
|
|
|
|
|
create table t21 (id int primary key);
|
|
|
|
|
insert into t21 values (1);
|
|
|
|
|
create algorithm=temptable view v2_temp as select * from t2;
|
|
|
|
|
create algorithm=merge view v2_merge as select * from t2;
|
|
|
|
|
create algorithm=temptable view v21_temp as
|
|
|
|
|
select t2.id as id, t2.val as val from t2, t21 where t2.id= t21.id;
|
|
|
|
|
create algorithm=merge view v21_merge as
|
|
|
|
|
select t2.id as id, t2.val as val from t2, t21 where t2.id= t21.id;
|
|
|
|
|
create algorithm=temptable sql security invoker view v3_temp as
|
|
|
|
|
select t1.id as id, t1.val as val from mysqltest1.t1 as t1, mysqltest1.t11 as t11
|
|
|
|
|
where t1.id = t11.id;
|
|
|
|
|
create algorithm=merge sql security invoker view v3_merge as
|
|
|
|
|
select t1.id as id, t1.val as val from mysqltest1.t1 as t1, mysqltest1.t11 as t11
|
|
|
|
|
where t1.id = t11.id;
|
|
|
|
|
create sql security invoker view v31 as
|
|
|
|
|
select t2.id as id, t2.val as val from mysqltest2.t2 as t2, mysqltest1.t11 as t11
|
|
|
|
|
where t2.id = t11.id;
|
|
|
|
|
create sql security invoker view v4 as
|
|
|
|
|
select t2.id as id, t2.val as val from mysqltest2.t2 as t2, mysqltest1.v1_merge as v1
|
|
|
|
|
where t2.id = v1.id;
|
|
|
|
|
create sql security invoker view v41 as
|
|
|
|
|
select v1.id as id, v1.val as val from mysqltest2.t2 as t2, mysqltest1.v1_merge as v1
|
|
|
|
|
where t2.id = v1.id;
|
|
|
|
|
create sql security invoker view v42 as
|
|
|
|
|
select v2.id as id, v2.val as val from mysqltest2.t2 as t2, mysqltest2.v2_merge as v2
|
|
|
|
|
where t2.id = v2.id;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
--echo #
|
|
|
|
|
--echo # Connect as user_11766767
|
|
|
|
|
connect (conn_11766767, localhost, user_11766767,,);
|
|
|
|
|
|
|
|
|
|
--echo #
|
|
|
|
|
--echo # A) Check how we handle privilege checking in multi-update for
|
|
|
|
|
--echo # directly used views.
|
|
|
|
|
--echo #
|
|
|
|
|
--echo # A.1) Originally reported problem, view is used in read-only mode.
|
|
|
|
|
--echo # This should work with only SELECT privilege for both mergeable
|
|
|
|
|
--echo # and temptable algorithms.
|
|
|
|
|
update mysqltest2.t2 as t2, mysqltest1.v1_merge as v1 set t2.val= 'test3'
|
|
|
|
|
where t2.id= v1.id;
|
|
|
|
|
update mysqltest2.t2 as t2, mysqltest1.v1_temp as v1 set t2.val= 'test4'
|
|
|
|
|
where t2.id= v1.id;
|
|
|
|
|
--echo #
|
|
|
|
|
--echo # A.2) If view is updated an UPDATE privilege on it is required.
|
|
|
|
|
--echo # Temptable views can't be updated.
|
|
|
|
|
--error ER_TABLEACCESS_DENIED_ERROR
|
|
|
|
|
update mysqltest2.t2 as t2, mysqltest1.v1_merge as v1 set v1.val= 'test5'
|
|
|
|
|
where t2.id= v1.id;
|
|
|
|
|
update mysqltest1.t1 as t1, mysqltest2.v2_merge as v2 set v2.val= 'test6'
|
|
|
|
|
where t1.id= v2.id;
|
|
|
|
|
--echo #
|
|
|
|
|
--echo # Note that the below error is OK even though user lacks UPDATE
|
|
|
|
|
--echo # privilege on v1_temp since he/she still has SELECT privilege on
|
|
|
|
|
--echo # this view.
|
|
|
|
|
--error ER_NON_UPDATABLE_TABLE
|
|
|
|
|
update mysqltest2.t2 as t2, mysqltest1.v1_temp as v1 set v1.val= 'test7'
|
|
|
|
|
where t2.id= v1.id;
|
|
|
|
|
--error ER_NON_UPDATABLE_TABLE
|
|
|
|
|
update mysqltest1.t1 as t1, mysqltest2.v2_temp as v2 set v2.val= 'test8'
|
|
|
|
|
where t1.id= v2.id;
|
|
|
|
|
--echo #
|
|
|
|
|
--echo # A.3) This also works for correctly for multi-table views.
|
|
|
|
|
--echo # When usage is read-only SELECT is enough.
|
|
|
|
|
update mysqltest2.t2 as t2, mysqltest1.v11_merge as v11 set t2.val= 'test9'
|
|
|
|
|
where t2.id= v11.id;
|
|
|
|
|
update mysqltest2.t2 as t2, mysqltest1.v11_temp as v11 set t2.val= 'test10'
|
|
|
|
|
where t2.id= v11.id;
|
|
|
|
|
--echo # When one of view's tables is updated, UPDATE is required
|
|
|
|
|
--echo # on a view.
|
|
|
|
|
--error ER_TABLEACCESS_DENIED_ERROR
|
|
|
|
|
update mysqltest2.t2 as t2, mysqltest1.v11_merge as v11 set v11.val= 'test11'
|
|
|
|
|
where t2.id= v11.id;
|
|
|
|
|
update mysqltest1.t1 as t1, mysqltest2.v21_merge as v21 set v21.val= 'test12'
|
|
|
|
|
where t1.id= v21.id;
|
|
|
|
|
--echo # As before, temptable views are not updateable.
|
|
|
|
|
--error ER_NON_UPDATABLE_TABLE
|
|
|
|
|
update mysqltest2.t2 as t2, mysqltest1.v11_temp as v11 set v11.val= 'test13'
|
|
|
|
|
where t2.id= v11.id;
|
|
|
|
|
--error ER_NON_UPDATABLE_TABLE
|
|
|
|
|
update mysqltest1.t1 as t1, mysqltest2.v21_temp as v21 set v21.val= 'test14'
|
|
|
|
|
where t1.id= v21.id;
|
|
|
|
|
|
|
|
|
|
--echo #
|
|
|
|
|
--echo # B) Now check that correct privileges are required on underlying
|
|
|
|
|
--echo # tables. To simplify this part of test we will use SECURITY
|
|
|
|
|
--echo # INVOKER views in it.
|
|
|
|
|
--echo #
|
|
|
|
|
--echo # B.1) In case when view is used for read only it is enough to have
|
|
|
|
|
--echo # SELECT on its underlying tables.
|
|
|
|
|
update mysqltest2.t2 as t2, mysqltest2.v3_merge as v3 set t2.val= 'test15'
|
|
|
|
|
where t2.id= v3.id;
|
|
|
|
|
update mysqltest2.t2 as t2, mysqltest2.v3_temp as v3 set t2.val= 'test16'
|
|
|
|
|
where t2.id= v3.id;
|
|
|
|
|
--echo #
|
|
|
|
|
--echo # B.2) If view is updated, UPDATE privilege on the table being updated
|
|
|
|
|
--echo # is required (since we already checked that temptable views are
|
|
|
|
|
--echo # not updateable we don't test them here).
|
|
|
|
|
--error ER_VIEW_INVALID
|
|
|
|
|
update mysqltest2.t2 as t2, mysqltest2.v3_merge as v3 set v3.val= 'test17'
|
|
|
|
|
where t2.id= v3.id;
|
|
|
|
|
update mysqltest1.t11 as t11, mysqltest2.v31 as v31 set v31.val= 'test18'
|
|
|
|
|
where t11.id= v31.id;
|
|
|
|
|
|
|
|
|
|
--echo #
|
|
|
|
|
--echo # C) Finally, check how we handle privilege checking in case when
|
|
|
|
|
--echo # view is used through another view. Again we will use SECURITY
|
|
|
|
|
--echo # INVOKER views for simplicity.
|
|
|
|
|
--echo #
|
|
|
|
|
--echo # C.1) As usual, when a view used by another view is going to be used
|
|
|
|
|
--echo # in read-only fashion, only SELECT privilege is necessary.
|
|
|
|
|
update mysqltest1.t11 as t11, mysqltest2.v4 as v4 set v4.val= 'test19'
|
|
|
|
|
where t11.id= v4.id;
|
|
|
|
|
--echo #
|
|
|
|
|
--echo # C.2) If one of underlying tables of the view is updated then
|
|
|
|
|
--echo # UPDATE on a view is necessary.
|
|
|
|
|
--error ER_VIEW_INVALID
|
|
|
|
|
update mysqltest1.t11 as t11, mysqltest2.v41 as v4 set v4.val= 'test20'
|
|
|
|
|
where t11.id= v4.id;
|
|
|
|
|
update mysqltest1.t11 as t11, mysqltest2.v42 as v4 set v4.val= 'test20'
|
|
|
|
|
where t11.id= v4.id;
|
|
|
|
|
|
|
|
|
|
--echo #
|
|
|
|
|
--echo # Clean-up.
|
|
|
|
|
--echo #
|
|
|
|
|
--echo # Switching to connection 'default'.
|
|
|
|
|
disconnect conn_11766767;
|
|
|
|
|
connection default;
|
|
|
|
|
drop user user_11766767;
|
|
|
|
|
drop database mysqltest1;
|
|
|
|
|
drop database mysqltest2;
|
2011-01-12 14:08:30 +01:00
|
|
|
|
|
|
|
|
# Wait till we reached the initial number of concurrent sessions
|
|
|
|
|
--source include/wait_until_count_sessions.inc
|