2006-05-22 20:46:13 +02:00
|
|
|
/* Copyright (C) 2004-2006 MySQL AB
|
2005-12-05 11:45:04 +01:00
|
|
|
|
|
|
|
|
This program is free software; you can redistribute it and/or modify
|
|
|
|
|
it under the terms of the GNU General Public License as published by
|
|
|
|
|
the Free Software Foundation; either version 2 of the License, or
|
|
|
|
|
(at your option) any later version.
|
|
|
|
|
|
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
|
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
|
GNU General Public License for more details.
|
|
|
|
|
|
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
|
|
|
along with this program; if not, write to the Free Software
|
|
|
|
|
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
|
|
|
|
|
|
2006-06-08 23:07:11 +02:00
|
|
|
#include "mysql_priv.h"
|
|
|
|
|
#include "events_priv.h"
|
|
|
|
|
#include "events.h"
|
|
|
|
|
#include "event_timed.h"
|
2006-05-22 20:46:13 +02:00
|
|
|
#include "event_scheduler.h"
|
2005-12-02 13:22:15 +01:00
|
|
|
#include "sp.h"
|
2006-05-22 20:46:13 +02:00
|
|
|
#include "sp_head.h"
|
2005-12-02 13:22:15 +01:00
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
TODO list :
|
2005-12-05 11:45:04 +01:00
|
|
|
- CREATE EVENT should not go into binary log! Does it now? The SQL statements
|
|
|
|
|
issued by the EVENT are replicated.
|
2005-12-07 19:26:44 +01:00
|
|
|
I have an idea how to solve the problem at failover. So the status field
|
|
|
|
|
will be ENUM('DISABLED', 'ENABLED', 'SLAVESIDE_DISABLED').
|
|
|
|
|
In this case when CREATE EVENT is replicated it should go into the binary
|
|
|
|
|
as SLAVESIDE_DISABLED if it is ENABLED, when it's created as DISABLEd it
|
|
|
|
|
should be replicated as disabled. If an event is ALTERed as DISABLED the
|
|
|
|
|
query should go untouched into the binary log, when ALTERed as enable then
|
|
|
|
|
it should go as SLAVESIDE_DISABLED. This is regarding the SQL interface.
|
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.
2006-06-04 17:52:22 +02:00
|
|
|
TT routines however modify mysql.event internally and this does not go the
|
|
|
|
|
log so in this case queries has to be injected into the log...somehow... or
|
2005-12-07 19:26:44 +01:00
|
|
|
maybe a solution is RBR for this case, because the event may go only from
|
|
|
|
|
ENABLED to DISABLED status change and this is safe for replicating. As well
|
|
|
|
|
an event may be deleted which is also safe for RBR.
|
2005-12-05 11:45:04 +01:00
|
|
|
|
|
|
|
|
- Add logging to file
|
|
|
|
|
|
|
|
|
|
Warning:
|
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.
2006-06-04 17:52:22 +02:00
|
|
|
- For now parallel execution is not possible because the same sp_head cannot
|
|
|
|
|
be executed few times!!! There is still no lock attached to particular
|
|
|
|
|
event.
|
2005-12-07 22:29:00 +01:00
|
|
|
*/
|
2005-12-05 11:45:04 +01:00
|
|
|
|
|
|
|
|
|
|
|
|
|
MEM_ROOT evex_mem_root;
|
2006-02-14 16:20:48 +01:00
|
|
|
time_t mysql_event_last_create_time= 0L;
|
|
|
|
|
|
|
|
|
|
|
2006-05-22 20:46:13 +02:00
|
|
|
const char *event_scheduler_state_names[]=
|
|
|
|
|
{ "OFF", "0", "ON", "1", "SUSPEND", "2", NullS };
|
|
|
|
|
|
|
|
|
|
TYPELIB Events::opt_typelib=
|
|
|
|
|
{
|
|
|
|
|
array_elements(event_scheduler_state_names)-1,
|
|
|
|
|
"",
|
|
|
|
|
event_scheduler_state_names,
|
|
|
|
|
NULL
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
ulong Events::opt_event_scheduler= 2;
|
|
|
|
|
|
|
|
|
|
static
|
|
|
|
|
TABLE_FIELD_W_TYPE event_table_fields[Events::FIELD_COUNT] = {
|
2006-02-14 16:20:48 +01:00
|
|
|
{
|
2006-02-28 14:43:49 +01:00
|
|
|
{(char *) STRING_WITH_LEN("db")},
|
2006-02-14 16:20:48 +01:00
|
|
|
{(char *) STRING_WITH_LEN("char(64)")},
|
|
|
|
|
{(char *) STRING_WITH_LEN("utf8")}
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
{(char *) STRING_WITH_LEN("name")},
|
|
|
|
|
{(char *) STRING_WITH_LEN("char(64)")},
|
|
|
|
|
{(char *) STRING_WITH_LEN("utf8")}
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
{(char *) STRING_WITH_LEN("body")},
|
|
|
|
|
{(char *) STRING_WITH_LEN("longblob")},
|
|
|
|
|
{NULL, 0}
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
{(char *) STRING_WITH_LEN("definer")},
|
|
|
|
|
{(char *) STRING_WITH_LEN("char(77)")},
|
|
|
|
|
{(char *) STRING_WITH_LEN("utf8")}
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
{(char *) STRING_WITH_LEN("execute_at")},
|
|
|
|
|
{(char *) STRING_WITH_LEN("datetime")},
|
|
|
|
|
{NULL, 0}
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
{(char *) STRING_WITH_LEN("interval_value")},
|
|
|
|
|
{(char *) STRING_WITH_LEN("int(11)")},
|
|
|
|
|
{NULL, 0}
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
{(char *) STRING_WITH_LEN("interval_field")},
|
|
|
|
|
{(char *) STRING_WITH_LEN("enum('YEAR','QUARTER','MONTH','DAY',"
|
|
|
|
|
"'HOUR','MINUTE','WEEK','SECOND','MICROSECOND','YEAR_MONTH','DAY_HOUR',"
|
|
|
|
|
"'DAY_MINUTE','DAY_SECOND','HOUR_MINUTE','HOUR_SECOND','MINUTE_SECOND',"
|
|
|
|
|
"'DAY_MICROSECOND','HOUR_MICROSECOND','MINUTE_MICROSECOND',"
|
|
|
|
|
"'SECOND_MICROSECOND')")},
|
|
|
|
|
{NULL, 0}
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
{(char *) STRING_WITH_LEN("created")},
|
|
|
|
|
{(char *) STRING_WITH_LEN("timestamp")},
|
|
|
|
|
{NULL, 0}
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
{(char *) STRING_WITH_LEN("modified")},
|
|
|
|
|
{(char *) STRING_WITH_LEN("timestamp")},
|
|
|
|
|
{NULL, 0}
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
{(char *) STRING_WITH_LEN("last_executed")},
|
|
|
|
|
{(char *) STRING_WITH_LEN("datetime")},
|
2006-02-28 14:43:49 +01:00
|
|
|
{NULL, 0}
|
2006-02-14 16:20:48 +01:00
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
{(char *) STRING_WITH_LEN("starts")},
|
|
|
|
|
{(char *) STRING_WITH_LEN("datetime")},
|
|
|
|
|
{NULL, 0}
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
{(char *) STRING_WITH_LEN("ends")},
|
|
|
|
|
{(char *) STRING_WITH_LEN("datetime")},
|
|
|
|
|
{NULL, 0}
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
{(char *) STRING_WITH_LEN("status")},
|
|
|
|
|
{(char *) STRING_WITH_LEN("enum('ENABLED','DISABLED')")},
|
|
|
|
|
{NULL, 0}
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
{(char *) STRING_WITH_LEN("on_completion")},
|
|
|
|
|
{(char *) STRING_WITH_LEN("enum('DROP','PRESERVE')")},
|
|
|
|
|
{NULL, 0}
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
{(char *) STRING_WITH_LEN("sql_mode")},
|
|
|
|
|
{(char *) STRING_WITH_LEN("set('REAL_AS_FLOAT','PIPES_AS_CONCAT','ANSI_QUOTES',"
|
|
|
|
|
"'IGNORE_SPACE','NOT_USED','ONLY_FULL_GROUP_BY','NO_UNSIGNED_SUBTRACTION',"
|
|
|
|
|
"'NO_DIR_IN_CREATE','POSTGRESQL','ORACLE','MSSQL','DB2','MAXDB',"
|
|
|
|
|
"'NO_KEY_OPTIONS','NO_TABLE_OPTIONS','NO_FIELD_OPTIONS','MYSQL323','MYSQL40',"
|
|
|
|
|
"'ANSI','NO_AUTO_VALUE_ON_ZERO','NO_BACKSLASH_ESCAPES','STRICT_TRANS_TABLES',"
|
|
|
|
|
"'STRICT_ALL_TABLES','NO_ZERO_IN_DATE','NO_ZERO_DATE','INVALID_DATES',"
|
|
|
|
|
"'ERROR_FOR_DIVISION_BY_ZERO','TRADITIONAL','NO_AUTO_CREATE_USER',"
|
|
|
|
|
"'HIGH_NOT_PRECEDENCE')")},
|
|
|
|
|
{NULL, 0}
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
{(char *) STRING_WITH_LEN("comment")},
|
|
|
|
|
{(char *) STRING_WITH_LEN("char(64)")},
|
|
|
|
|
{(char *) STRING_WITH_LEN("utf8")}
|
|
|
|
|
}
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
Compares 2 LEX strings regarding case.
|
2006-02-28 14:43:49 +01:00
|
|
|
|
2006-05-22 20:46:13 +02:00
|
|
|
SYNOPSIS
|
2006-06-08 23:07:11 +02:00
|
|
|
sortcmp_lex_string()
|
2006-02-28 14:43:49 +01:00
|
|
|
|
2006-02-14 16:20:48 +01:00
|
|
|
s - first LEX_STRING
|
|
|
|
|
t - second LEX_STRING
|
|
|
|
|
cs - charset
|
|
|
|
|
|
2006-05-22 20:46:13 +02:00
|
|
|
RETURN VALUE
|
2006-02-14 16:20:48 +01:00
|
|
|
-1 - s < t
|
|
|
|
|
0 - s == t
|
|
|
|
|
1 - s > t
|
2006-02-28 14:43:49 +01:00
|
|
|
|
2006-02-14 16:20:48 +01:00
|
|
|
Notes
|
|
|
|
|
TIME.second_part is not considered during comparison
|
|
|
|
|
*/
|
2006-01-30 13:15:23 +01:00
|
|
|
|
2005-12-08 20:37:54 +01:00
|
|
|
int sortcmp_lex_string(LEX_STRING s, LEX_STRING t, CHARSET_INFO *cs)
|
|
|
|
|
{
|
2005-12-28 11:07:57 +01:00
|
|
|
return cs->coll->strnncollsp(cs, (unsigned char *) s.str,s.length,
|
|
|
|
|
(unsigned char *) t.str,t.length, 0);
|
2005-12-08 20:37:54 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2006-02-14 16:20:48 +01:00
|
|
|
/*
|
|
|
|
|
Reconstructs interval expression from interval type and expression
|
|
|
|
|
value that is in form of a value of the smalles entity:
|
|
|
|
|
For
|
|
|
|
|
YEAR_MONTH - expression is in months
|
|
|
|
|
DAY_MINUTE - expression is in minutes
|
2006-02-28 14:43:49 +01:00
|
|
|
|
2006-05-22 20:46:13 +02:00
|
|
|
SYNOPSIS
|
|
|
|
|
Events::reconstruct_interval_expression()
|
2006-02-14 16:20:48 +01:00
|
|
|
buf - preallocated String buffer to add the value to
|
|
|
|
|
interval - the interval type (for instance YEAR_MONTH)
|
|
|
|
|
expression - the value in the lowest entity
|
2006-02-28 14:43:49 +01:00
|
|
|
|
2006-02-14 16:20:48 +01:00
|
|
|
RETURNS
|
|
|
|
|
0 - OK
|
|
|
|
|
1 - Error
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
int
|
2006-05-22 20:46:13 +02:00
|
|
|
Events::reconstruct_interval_expression(String *buf,
|
|
|
|
|
interval_type interval,
|
|
|
|
|
longlong expression)
|
2006-02-14 16:20:48 +01:00
|
|
|
{
|
|
|
|
|
ulonglong expr= expression;
|
|
|
|
|
char tmp_buff[128], *end;
|
|
|
|
|
bool close_quote= TRUE;
|
|
|
|
|
int multipl= 0;
|
|
|
|
|
char separator=':';
|
|
|
|
|
|
|
|
|
|
switch (interval) {
|
|
|
|
|
case INTERVAL_YEAR_MONTH:
|
|
|
|
|
multipl= 12;
|
|
|
|
|
separator= '-';
|
|
|
|
|
goto common_1_lev_code;
|
|
|
|
|
case INTERVAL_DAY_HOUR:
|
|
|
|
|
multipl= 24;
|
|
|
|
|
separator= ' ';
|
|
|
|
|
goto common_1_lev_code;
|
|
|
|
|
case INTERVAL_HOUR_MINUTE:
|
|
|
|
|
case INTERVAL_MINUTE_SECOND:
|
2006-02-28 14:43:49 +01:00
|
|
|
multipl= 60;
|
2006-02-14 16:20:48 +01:00
|
|
|
common_1_lev_code:
|
|
|
|
|
buf->append('\'');
|
|
|
|
|
end= longlong10_to_str(expression/multipl, tmp_buff, 10);
|
|
|
|
|
buf->append(tmp_buff, (uint) (end- tmp_buff));
|
|
|
|
|
expr= expr - (expr/multipl)*multipl;
|
|
|
|
|
break;
|
|
|
|
|
case INTERVAL_DAY_MINUTE:
|
|
|
|
|
{
|
2006-02-28 20:32:37 +01:00
|
|
|
ulonglong tmp_expr= expr;
|
2006-02-14 16:20:48 +01:00
|
|
|
|
|
|
|
|
tmp_expr/=(24*60);
|
|
|
|
|
buf->append('\'');
|
|
|
|
|
end= longlong10_to_str(tmp_expr, tmp_buff, 10);
|
|
|
|
|
buf->append(tmp_buff, (uint) (end- tmp_buff));// days
|
|
|
|
|
buf->append(' ');
|
|
|
|
|
|
|
|
|
|
tmp_expr= expr - tmp_expr*(24*60);//minutes left
|
|
|
|
|
end= longlong10_to_str(tmp_expr/60, tmp_buff, 10);
|
|
|
|
|
buf->append(tmp_buff, (uint) (end- tmp_buff));// hours
|
|
|
|
|
|
|
|
|
|
expr= tmp_expr - (tmp_expr/60)*60;
|
|
|
|
|
/* the code after the switch will finish */
|
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
case INTERVAL_HOUR_SECOND:
|
|
|
|
|
{
|
2006-02-28 20:32:37 +01:00
|
|
|
ulonglong tmp_expr= expr;
|
2006-02-14 16:20:48 +01:00
|
|
|
|
|
|
|
|
buf->append('\'');
|
|
|
|
|
end= longlong10_to_str(tmp_expr/3600, tmp_buff, 10);
|
|
|
|
|
buf->append(tmp_buff, (uint) (end- tmp_buff));// hours
|
|
|
|
|
buf->append(':');
|
|
|
|
|
|
|
|
|
|
tmp_expr= tmp_expr - (tmp_expr/3600)*3600;
|
|
|
|
|
end= longlong10_to_str(tmp_expr/60, tmp_buff, 10);
|
|
|
|
|
buf->append(tmp_buff, (uint) (end- tmp_buff));// minutes
|
|
|
|
|
|
|
|
|
|
expr= tmp_expr - (tmp_expr/60)*60;
|
|
|
|
|
/* the code after the switch will finish */
|
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
case INTERVAL_DAY_SECOND:
|
|
|
|
|
{
|
2006-02-28 20:32:37 +01:00
|
|
|
ulonglong tmp_expr= expr;
|
2006-02-14 16:20:48 +01:00
|
|
|
|
|
|
|
|
tmp_expr/=(24*3600);
|
|
|
|
|
buf->append('\'');
|
|
|
|
|
end= longlong10_to_str(tmp_expr, tmp_buff, 10);
|
|
|
|
|
buf->append(tmp_buff, (uint) (end- tmp_buff));// days
|
|
|
|
|
buf->append(' ');
|
|
|
|
|
|
|
|
|
|
tmp_expr= expr - tmp_expr*(24*3600);//seconds left
|
|
|
|
|
end= longlong10_to_str(tmp_expr/3600, tmp_buff, 10);
|
|
|
|
|
buf->append(tmp_buff, (uint) (end- tmp_buff));// hours
|
|
|
|
|
buf->append(':');
|
|
|
|
|
|
|
|
|
|
tmp_expr= tmp_expr - (tmp_expr/3600)*3600;
|
|
|
|
|
end= longlong10_to_str(tmp_expr/60, tmp_buff, 10);
|
|
|
|
|
buf->append(tmp_buff, (uint) (end- tmp_buff));// minutes
|
|
|
|
|
|
|
|
|
|
expr= tmp_expr - (tmp_expr/60)*60;
|
|
|
|
|
/* the code after the switch will finish */
|
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
case INTERVAL_DAY_MICROSECOND:
|
|
|
|
|
case INTERVAL_HOUR_MICROSECOND:
|
|
|
|
|
case INTERVAL_MINUTE_MICROSECOND:
|
|
|
|
|
case INTERVAL_SECOND_MICROSECOND:
|
2006-02-20 16:06:05 +01:00
|
|
|
case INTERVAL_MICROSECOND:
|
2006-02-14 20:10:51 +01:00
|
|
|
my_error(ER_NOT_SUPPORTED_YET, MYF(0), "MICROSECOND");
|
2006-02-14 16:20:48 +01:00
|
|
|
return 1;
|
|
|
|
|
break;
|
|
|
|
|
case INTERVAL_QUARTER:
|
|
|
|
|
expr/= 3;
|
|
|
|
|
close_quote= FALSE;
|
|
|
|
|
break;
|
|
|
|
|
case INTERVAL_WEEK:
|
|
|
|
|
expr/= 7;
|
|
|
|
|
default:
|
|
|
|
|
close_quote= FALSE;
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
if (close_quote)
|
|
|
|
|
buf->append(separator);
|
|
|
|
|
end= longlong10_to_str(expr, tmp_buff, 10);
|
|
|
|
|
buf->append(tmp_buff, (uint) (end- tmp_buff));
|
|
|
|
|
if (close_quote)
|
|
|
|
|
buf->append('\'');
|
2006-02-16 13:11:16 +01:00
|
|
|
|
2006-02-14 16:20:48 +01:00
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2005-12-06 16:15:29 +01:00
|
|
|
/*
|
|
|
|
|
Open mysql.event table for read
|
|
|
|
|
|
|
|
|
|
SYNOPSIS
|
2006-05-22 20:46:13 +02:00
|
|
|
Events::open_event_table()
|
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.
2006-06-04 17:52:22 +02:00
|
|
|
thd Thread context
|
|
|
|
|
lock_type How to lock the table
|
|
|
|
|
table We will store the open table here
|
2006-02-14 16:20:48 +01:00
|
|
|
|
2006-05-22 20:46:13 +02:00
|
|
|
RETURN VALUE
|
2006-02-28 14:43:49 +01:00
|
|
|
1 Cannot lock table
|
2005-12-16 12:42:39 +01:00
|
|
|
2 The table is corrupted - different number of fields
|
2006-02-28 14:43:49 +01:00
|
|
|
0 OK
|
2005-12-06 16:15:29 +01:00
|
|
|
*/
|
|
|
|
|
|
2005-12-16 12:42:39 +01:00
|
|
|
int
|
2006-05-22 20:46:13 +02:00
|
|
|
Events::open_event_table(THD *thd, enum thr_lock_type lock_type,
|
|
|
|
|
TABLE **table)
|
2005-12-06 16:15:29 +01:00
|
|
|
{
|
|
|
|
|
TABLE_LIST tables;
|
2006-06-04 20:05:22 +02:00
|
|
|
DBUG_ENTER("open_events_table");
|
2005-12-06 16:15:29 +01:00
|
|
|
|
|
|
|
|
bzero((char*) &tables, sizeof(tables));
|
|
|
|
|
tables.db= (char*) "mysql";
|
|
|
|
|
tables.table_name= tables.alias= (char*) "event";
|
|
|
|
|
tables.lock_type= lock_type;
|
|
|
|
|
|
|
|
|
|
if (simple_open_n_lock_tables(thd, &tables))
|
2005-12-16 12:42:39 +01:00
|
|
|
DBUG_RETURN(1);
|
|
|
|
|
|
2006-05-22 20:46:13 +02:00
|
|
|
if (table_check_intact(tables.table, Events::FIELD_COUNT,
|
|
|
|
|
event_table_fields,
|
2006-02-14 16:20:48 +01:00
|
|
|
&mysql_event_last_create_time,
|
2006-02-20 16:06:05 +01:00
|
|
|
ER_CANNOT_LOAD_FROM_TABLE))
|
2005-12-16 12:42:39 +01:00
|
|
|
{
|
|
|
|
|
close_thread_tables(thd);
|
|
|
|
|
DBUG_RETURN(2);
|
|
|
|
|
}
|
|
|
|
|
*table= tables.table;
|
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.
2006-06-04 17:52:22 +02:00
|
|
|
tables.table->use_all_columns();
|
2005-12-16 12:42:39 +01:00
|
|
|
DBUG_RETURN(0);
|
2005-12-06 16:15:29 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
Find row in open mysql.event table representing event
|
|
|
|
|
|
|
|
|
|
SYNOPSIS
|
2005-12-08 15:34:11 +01:00
|
|
|
evex_db_find_event_aux()
|
2006-02-16 00:43:11 +01:00
|
|
|
thd Thread context
|
2006-05-29 10:39:45 +02:00
|
|
|
et event_timed object containing dbname & name
|
2006-02-16 00:43:11 +01:00
|
|
|
table TABLE object for open mysql.event table.
|
|
|
|
|
|
|
|
|
|
RETURN VALUE
|
|
|
|
|
0 - Routine found
|
|
|
|
|
EVEX_KEY_NOT_FOUND - No routine with given name
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
inline int
|
2006-02-28 18:33:38 +01:00
|
|
|
evex_db_find_event_aux(THD *thd, Event_timed *et, TABLE *table)
|
2006-02-16 00:43:11 +01:00
|
|
|
{
|
2006-05-29 10:39:45 +02:00
|
|
|
return evex_db_find_event_by_name(thd, et->dbname, et->name, table);
|
2006-02-16 00:43:11 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
Find row in open mysql.event table representing event
|
|
|
|
|
|
|
|
|
|
SYNOPSIS
|
|
|
|
|
evex_db_find_event_by_name()
|
2005-12-06 16:15:29 +01:00
|
|
|
thd Thread context
|
|
|
|
|
dbname Name of event's database
|
|
|
|
|
rname Name of the event inside the db
|
|
|
|
|
table TABLE object for open mysql.event table.
|
|
|
|
|
|
|
|
|
|
RETURN VALUE
|
2005-12-08 15:34:11 +01:00
|
|
|
0 - Routine found
|
|
|
|
|
EVEX_KEY_NOT_FOUND - No routine with given name
|
2005-12-06 16:15:29 +01:00
|
|
|
*/
|
|
|
|
|
|
2005-12-06 16:46:29 +01:00
|
|
|
int
|
2006-02-16 00:43:11 +01:00
|
|
|
evex_db_find_event_by_name(THD *thd, const LEX_STRING dbname,
|
|
|
|
|
const LEX_STRING ev_name,
|
|
|
|
|
TABLE *table)
|
2005-12-06 16:15:29 +01:00
|
|
|
{
|
2005-12-08 15:34:11 +01:00
|
|
|
byte key[MAX_KEY_LENGTH];
|
2006-02-16 00:43:11 +01:00
|
|
|
DBUG_ENTER("evex_db_find_event_by_name");
|
2005-12-07 22:29:00 +01:00
|
|
|
DBUG_PRINT("enter", ("name: %.*s", ev_name.length, ev_name.str));
|
2005-12-06 16:15:29 +01:00
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
Create key to find row. We have to use field->store() to be able to
|
|
|
|
|
handle VARCHAR and CHAR fields.
|
|
|
|
|
Assumption here is that the two first fields in the table are
|
|
|
|
|
'db' and 'name' and the first key is the primary key over the
|
|
|
|
|
same fields.
|
|
|
|
|
*/
|
2006-05-22 20:46:13 +02:00
|
|
|
if (dbname.length > table->field[Events::FIELD_DB]->field_length ||
|
2006-05-29 10:39:45 +02:00
|
|
|
ev_name.length > table->field[Events::FIELD_NAME]->field_length)
|
2006-01-30 13:15:23 +01:00
|
|
|
|
2005-12-07 22:29:00 +01:00
|
|
|
DBUG_RETURN(EVEX_KEY_NOT_FOUND);
|
2005-12-07 19:26:44 +01:00
|
|
|
|
2006-05-22 20:46:13 +02:00
|
|
|
table->field[Events::FIELD_DB]->store(dbname.str, dbname.length,
|
2006-05-29 10:39:45 +02:00
|
|
|
&my_charset_bin);
|
2006-05-22 20:46:13 +02:00
|
|
|
table->field[Events::FIELD_NAME]->store(ev_name.str, ev_name.length,
|
2006-05-29 10:39:45 +02:00
|
|
|
&my_charset_bin);
|
2006-01-30 13:15:23 +01:00
|
|
|
|
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.
2006-06-04 17:52:22 +02:00
|
|
|
key_copy(key, table->record[0], table->key_info,
|
|
|
|
|
table->key_info->key_length);
|
2005-12-06 16:15:29 +01:00
|
|
|
|
2005-12-07 19:26:44 +01:00
|
|
|
if (table->file->index_read_idx(table->record[0], 0, key,
|
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.
2006-06-04 17:52:22 +02:00
|
|
|
table->key_info->key_length,
|
|
|
|
|
HA_READ_KEY_EXACT))
|
2006-05-22 20:46:13 +02:00
|
|
|
{
|
2006-06-04 20:05:22 +02:00
|
|
|
DBUG_PRINT("info", ("Row not found"));
|
2005-12-07 22:29:00 +01:00
|
|
|
DBUG_RETURN(EVEX_KEY_NOT_FOUND);
|
2006-05-22 20:46:13 +02:00
|
|
|
}
|
2005-12-06 16:15:29 +01:00
|
|
|
|
2006-05-22 20:46:13 +02:00
|
|
|
DBUG_PRINT("info", ("Row found!"));
|
2005-12-06 16:15:29 +01:00
|
|
|
DBUG_RETURN(0);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2005-12-02 13:22:15 +01:00
|
|
|
/*
|
2006-05-22 20:46:13 +02:00
|
|
|
Puts some data common to CREATE and ALTER EVENT into a row.
|
2005-12-02 13:22:15 +01:00
|
|
|
|
2006-05-22 20:46:13 +02:00
|
|
|
SYNOPSIS
|
|
|
|
|
evex_fill_row()
|
|
|
|
|
thd THD
|
|
|
|
|
table the row to fill out
|
|
|
|
|
et Event's data
|
2006-02-28 14:43:49 +01:00
|
|
|
|
2006-05-22 20:46:13 +02:00
|
|
|
RETURN VALUE
|
|
|
|
|
0 - OK
|
|
|
|
|
EVEX_GENERAL_ERROR - bad data
|
|
|
|
|
EVEX_GET_FIELD_FAILED - field count does not match. table corrupted?
|
2005-12-28 17:29:32 +01:00
|
|
|
|
2006-05-22 20:46:13 +02:00
|
|
|
DESCRIPTION
|
|
|
|
|
Used both when an event is created and when it is altered.
|
2005-12-02 13:22:15 +01:00
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
static int
|
2006-02-28 18:33:38 +01:00
|
|
|
evex_fill_row(THD *thd, TABLE *table, Event_timed *et, my_bool is_update)
|
2005-12-02 13:22:15 +01:00
|
|
|
{
|
2006-05-29 10:39:45 +02:00
|
|
|
CHARSET_INFO *scs= system_charset_info;
|
2006-05-22 20:46:13 +02:00
|
|
|
enum Events::enum_table_field field_num;
|
2005-12-28 17:29:32 +01:00
|
|
|
|
2005-12-02 13:22:15 +01:00
|
|
|
DBUG_ENTER("evex_fill_row");
|
|
|
|
|
|
2006-02-28 14:43:49 +01:00
|
|
|
DBUG_PRINT("info", ("dbname=[%s]", et->dbname.str));
|
|
|
|
|
DBUG_PRINT("info", ("name =[%s]", et->name.str));
|
|
|
|
|
DBUG_PRINT("info", ("body =[%s]", et->body.str));
|
2005-12-02 13:22:15 +01:00
|
|
|
|
2006-05-29 10:39:45 +02:00
|
|
|
if (table->field[field_num= Events::FIELD_DEFINER]->
|
|
|
|
|
store(et->definer.str, et->definer.length, scs))
|
|
|
|
|
goto err_truncate;
|
|
|
|
|
|
2006-05-22 20:46:13 +02:00
|
|
|
if (table->field[field_num= Events::FIELD_DB]->
|
2006-05-29 10:39:45 +02:00
|
|
|
store(et->dbname.str, et->dbname.length, scs))
|
|
|
|
|
goto err_truncate;
|
2005-12-28 17:29:32 +01:00
|
|
|
|
2006-05-22 20:46:13 +02:00
|
|
|
if (table->field[field_num= Events::FIELD_NAME]->
|
2006-05-29 10:39:45 +02:00
|
|
|
store(et->name.str, et->name.length, scs))
|
|
|
|
|
goto err_truncate;
|
2005-12-02 13:22:15 +01:00
|
|
|
|
2006-05-22 20:46:13 +02:00
|
|
|
/* both ON_COMPLETION and STATUS are NOT NULL thus not calling set_notnull()*/
|
|
|
|
|
table->field[Events::FIELD_ON_COMPLETION]->
|
|
|
|
|
store((longlong)et->on_completion, true);
|
2005-12-02 13:22:15 +01:00
|
|
|
|
2006-05-29 10:39:45 +02:00
|
|
|
table->field[Events::FIELD_STATUS]->store((longlong)et->status, true);
|
2005-12-02 13:22:15 +01:00
|
|
|
|
2006-02-20 23:52:22 +01:00
|
|
|
/*
|
|
|
|
|
Change the SQL_MODE only if body was present in an ALTER EVENT and of course
|
|
|
|
|
always during CREATE EVENT.
|
|
|
|
|
*/
|
2005-12-08 00:17:05 +01:00
|
|
|
if (et->body.str)
|
2006-02-20 23:52:22 +01:00
|
|
|
{
|
2006-05-22 20:46:13 +02:00
|
|
|
table->field[Events::FIELD_SQL_MODE]->
|
|
|
|
|
store((longlong)thd->variables.sql_mode, true);
|
2006-02-20 23:52:22 +01:00
|
|
|
|
2006-05-22 20:46:13 +02:00
|
|
|
if (table->field[field_num= Events::FIELD_BODY]->
|
2006-05-29 10:39:45 +02:00
|
|
|
store(et->body.str, et->body.length, scs))
|
|
|
|
|
goto err_truncate;
|
2006-02-20 23:52:22 +01:00
|
|
|
}
|
2005-12-02 13:22:15 +01:00
|
|
|
|
2005-12-08 00:17:05 +01:00
|
|
|
if (et->expression)
|
2005-12-02 13:22:15 +01:00
|
|
|
{
|
2006-05-22 20:46:13 +02:00
|
|
|
table->field[Events::FIELD_INTERVAL_EXPR]->set_notnull();
|
|
|
|
|
table->field[Events::FIELD_INTERVAL_EXPR]->
|
|
|
|
|
store((longlong)et->expression, true);
|
2005-12-02 13:22:15 +01:00
|
|
|
|
2006-05-22 20:46:13 +02:00
|
|
|
table->field[Events::FIELD_TRANSIENT_INTERVAL]->set_notnull();
|
2005-12-05 11:45:04 +01:00
|
|
|
/*
|
2006-01-10 11:31:45 +01:00
|
|
|
In the enum (C) intervals start from 0 but in mysql enum valid values start
|
|
|
|
|
from 1. Thus +1 offset is needed!
|
2005-12-05 11:45:04 +01:00
|
|
|
*/
|
2006-05-22 20:46:13 +02:00
|
|
|
table->field[Events::FIELD_TRANSIENT_INTERVAL]->
|
|
|
|
|
store((longlong)et->interval+1, true);
|
2006-01-30 13:15:23 +01:00
|
|
|
|
2006-05-22 20:46:13 +02:00
|
|
|
table->field[Events::FIELD_EXECUTE_AT]->set_null();
|
2006-02-28 11:43:10 +01:00
|
|
|
|
|
|
|
|
if (!et->starts_null)
|
|
|
|
|
{
|
2006-05-22 20:46:13 +02:00
|
|
|
table->field[Events::FIELD_STARTS]->set_notnull();
|
|
|
|
|
table->field[Events::FIELD_STARTS]->
|
2006-02-28 11:43:10 +01:00
|
|
|
store_time(&et->starts, MYSQL_TIMESTAMP_DATETIME);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (!et->ends_null)
|
|
|
|
|
{
|
2006-05-22 20:46:13 +02:00
|
|
|
table->field[Events::FIELD_ENDS]->set_notnull();
|
|
|
|
|
table->field[Events::FIELD_ENDS]->
|
2006-02-28 11:43:10 +01:00
|
|
|
store_time(&et->ends, MYSQL_TIMESTAMP_DATETIME);
|
|
|
|
|
}
|
2005-12-02 13:22:15 +01:00
|
|
|
}
|
2005-12-08 00:17:05 +01:00
|
|
|
else if (et->execute_at.year)
|
2005-12-02 13:22:15 +01:00
|
|
|
{
|
2006-05-22 20:46:13 +02:00
|
|
|
table->field[Events::FIELD_INTERVAL_EXPR]->set_null();
|
|
|
|
|
table->field[Events::FIELD_TRANSIENT_INTERVAL]->set_null();
|
|
|
|
|
table->field[Events::FIELD_STARTS]->set_null();
|
|
|
|
|
table->field[Events::FIELD_ENDS]->set_null();
|
2006-02-28 11:43:10 +01:00
|
|
|
|
2006-05-22 20:46:13 +02:00
|
|
|
table->field[Events::FIELD_EXECUTE_AT]->set_notnull();
|
|
|
|
|
table->field[Events::FIELD_EXECUTE_AT]->
|
|
|
|
|
store_time(&et->execute_at, MYSQL_TIMESTAMP_DATETIME);
|
2005-12-02 13:22:15 +01:00
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
2005-12-06 16:15:29 +01:00
|
|
|
DBUG_ASSERT(is_update);
|
2006-02-28 14:43:49 +01:00
|
|
|
/*
|
|
|
|
|
it is normal to be here when the action is update
|
|
|
|
|
this is an error if the action is create. something is borked
|
|
|
|
|
*/
|
2005-12-02 13:22:15 +01:00
|
|
|
}
|
|
|
|
|
|
2006-05-22 20:46:13 +02:00
|
|
|
((Field_timestamp *)table->field[Events::FIELD_MODIFIED])->set_time();
|
2005-12-02 13:22:15 +01:00
|
|
|
|
2006-02-28 11:43:10 +01:00
|
|
|
if (et->comment.str)
|
|
|
|
|
{
|
2006-05-22 20:46:13 +02:00
|
|
|
if (table->field[field_num= Events::FIELD_COMMENT]->
|
2006-05-29 10:39:45 +02:00
|
|
|
store(et->comment.str, et->comment.length, scs))
|
|
|
|
|
goto err_truncate;
|
2006-02-28 11:43:10 +01:00
|
|
|
}
|
2005-12-02 13:22:15 +01:00
|
|
|
|
2005-12-28 17:29:32 +01:00
|
|
|
DBUG_RETURN(0);
|
2006-05-29 10:39:45 +02:00
|
|
|
err_truncate:
|
2006-02-28 11:43:10 +01:00
|
|
|
my_error(ER_EVENT_DATA_TOO_LONG, MYF(0), table->field[field_num]->field_name);
|
2005-12-28 17:29:32 +01:00
|
|
|
DBUG_RETURN(EVEX_GENERAL_ERROR);
|
2005-12-02 13:22:15 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
2006-05-22 20:46:13 +02:00
|
|
|
Creates an event in mysql.event
|
|
|
|
|
|
|
|
|
|
SYNOPSIS
|
|
|
|
|
db_create_event()
|
|
|
|
|
thd THD
|
|
|
|
|
et Event_timed object containing information for the event
|
|
|
|
|
create_if_not If an warning should be generated in case event exists
|
|
|
|
|
rows_affected How many rows were affected
|
|
|
|
|
|
|
|
|
|
RETURN VALUE
|
|
|
|
|
0 - OK
|
|
|
|
|
EVEX_GENERAL_ERROR - Failure
|
|
|
|
|
|
|
|
|
|
DESCRIPTION
|
|
|
|
|
Creates an event. Relies on evex_fill_row which is shared with
|
|
|
|
|
db_update_event. The name of the event is inside "et".
|
2005-12-02 13:22:15 +01:00
|
|
|
*/
|
|
|
|
|
|
2006-05-22 20:46:13 +02:00
|
|
|
int
|
2006-02-28 18:33:38 +01:00
|
|
|
db_create_event(THD *thd, Event_timed *et, my_bool create_if_not,
|
2005-12-28 11:07:57 +01:00
|
|
|
uint *rows_affected)
|
2005-12-02 13:22:15 +01:00
|
|
|
{
|
2005-12-28 11:07:57 +01:00
|
|
|
int ret= 0;
|
2006-05-22 20:46:13 +02:00
|
|
|
CHARSET_INFO *scs= system_charset_info;
|
2005-12-02 13:22:15 +01:00
|
|
|
TABLE *table;
|
|
|
|
|
char olddb[128];
|
2005-12-06 16:15:29 +01:00
|
|
|
bool dbchanged= false;
|
2005-12-02 13:22:15 +01:00
|
|
|
DBUG_ENTER("db_create_event");
|
2005-12-08 00:17:05 +01:00
|
|
|
DBUG_PRINT("enter", ("name: %.*s", et->name.length, et->name.str));
|
2005-12-02 13:22:15 +01:00
|
|
|
|
2005-12-28 11:07:57 +01:00
|
|
|
*rows_affected= 0;
|
2005-12-06 16:15:29 +01:00
|
|
|
DBUG_PRINT("info", ("open mysql.event for update"));
|
2006-05-22 20:46:13 +02:00
|
|
|
if (Events::open_event_table(thd, TL_WRITE, &table))
|
2005-12-02 13:22:15 +01:00
|
|
|
{
|
2005-12-06 16:15:29 +01:00
|
|
|
my_error(ER_EVENT_OPEN_TABLE_FAILED, MYF(0));
|
2005-12-07 19:26:44 +01:00
|
|
|
goto err;
|
2005-12-02 13:22:15 +01:00
|
|
|
}
|
2006-02-28 14:43:49 +01:00
|
|
|
|
2005-12-06 16:15:29 +01:00
|
|
|
DBUG_PRINT("info", ("check existance of an event with the same name"));
|
2006-02-16 00:43:11 +01:00
|
|
|
if (!evex_db_find_event_aux(thd, et, table))
|
2005-12-02 13:22:15 +01:00
|
|
|
{
|
2006-01-18 20:41:22 +01:00
|
|
|
if (create_if_not)
|
|
|
|
|
{
|
|
|
|
|
push_warning_printf(thd, MYSQL_ERROR::WARN_LEVEL_NOTE,
|
2006-02-28 14:43:49 +01:00
|
|
|
ER_EVENT_ALREADY_EXISTS, ER(ER_EVENT_ALREADY_EXISTS),
|
|
|
|
|
et->name.str);
|
|
|
|
|
goto ok;
|
2006-01-18 20:41:22 +01:00
|
|
|
}
|
|
|
|
|
my_error(ER_EVENT_ALREADY_EXISTS, MYF(0), et->name.str);
|
|
|
|
|
goto err;
|
2005-12-02 13:22:15 +01:00
|
|
|
}
|
|
|
|
|
|
2005-12-06 16:15:29 +01:00
|
|
|
DBUG_PRINT("info", ("non-existant, go forward"));
|
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.
2006-06-04 17:52:22 +02:00
|
|
|
if ((ret= sp_use_new_db(thd, et->dbname.str,olddb, sizeof(olddb),0,
|
|
|
|
|
&dbchanged)))
|
2005-12-06 16:15:29 +01:00
|
|
|
{
|
|
|
|
|
my_error(ER_BAD_DB_ERROR, MYF(0));
|
2005-12-07 19:26:44 +01:00
|
|
|
goto err;
|
2005-12-06 16:15:29 +01:00
|
|
|
}
|
2006-02-28 14:43:49 +01:00
|
|
|
|
|
|
|
|
restore_record(table, s->default_values); // Get default values for fields
|
2005-12-02 13:22:15 +01:00
|
|
|
|
2005-12-28 17:29:32 +01:00
|
|
|
if (system_charset_info->cset->numchars(system_charset_info, et->dbname.str,
|
|
|
|
|
et->dbname.str + et->dbname.length)
|
|
|
|
|
> EVEX_DB_FIELD_LEN)
|
|
|
|
|
{
|
|
|
|
|
my_error(ER_TOO_LONG_IDENT, MYF(0), et->dbname.str);
|
|
|
|
|
goto err;
|
|
|
|
|
}
|
|
|
|
|
if (system_charset_info->cset->numchars(system_charset_info, et->name.str,
|
|
|
|
|
et->name.str + et->name.length)
|
|
|
|
|
> EVEX_DB_FIELD_LEN)
|
2005-12-02 13:22:15 +01:00
|
|
|
{
|
2005-12-08 00:17:05 +01:00
|
|
|
my_error(ER_TOO_LONG_IDENT, MYF(0), et->name.str);
|
2005-12-07 22:29:00 +01:00
|
|
|
goto err;
|
2005-12-02 13:22:15 +01:00
|
|
|
}
|
2005-12-28 17:29:32 +01:00
|
|
|
|
2006-05-22 20:46:13 +02:00
|
|
|
if (et->body.length > table->field[Events::FIELD_BODY]->field_length)
|
2005-12-02 13:22:15 +01:00
|
|
|
{
|
2005-12-08 00:17:05 +01:00
|
|
|
my_error(ER_TOO_LONG_BODY, MYF(0), et->name.str);
|
2005-12-07 22:29:00 +01:00
|
|
|
goto err;
|
2005-12-02 13:22:15 +01:00
|
|
|
}
|
2005-12-07 22:29:00 +01:00
|
|
|
|
2005-12-08 00:17:05 +01:00
|
|
|
if (!(et->expression) && !(et->execute_at.year))
|
2005-12-02 13:22:15 +01:00
|
|
|
{
|
2005-12-08 00:17:05 +01:00
|
|
|
DBUG_PRINT("error", ("neither expression nor execute_at are set!"));
|
2006-02-28 14:43:49 +01:00
|
|
|
my_error(ER_EVENT_NEITHER_M_EXPR_NOR_M_AT, MYF(0));
|
2005-12-07 19:26:44 +01:00
|
|
|
goto err;
|
2005-12-02 13:22:15 +01:00
|
|
|
}
|
2005-12-06 16:15:29 +01:00
|
|
|
|
2006-05-22 20:46:13 +02:00
|
|
|
((Field_timestamp *)table->field[Events::FIELD_CREATED])->set_time();
|
2005-12-08 15:34:11 +01:00
|
|
|
|
2006-02-28 14:43:49 +01:00
|
|
|
/*
|
|
|
|
|
evex_fill_row() calls my_error() in case of error so no need to
|
|
|
|
|
handle it here
|
|
|
|
|
*/
|
2005-12-06 16:15:29 +01:00
|
|
|
if ((ret= evex_fill_row(thd, table, et, false)))
|
2005-12-07 19:26:44 +01:00
|
|
|
goto err;
|
2005-12-02 13:22:15 +01:00
|
|
|
|
2006-01-11 12:49:56 +01:00
|
|
|
if (table->file->ha_write_row(table->record[0]))
|
2005-12-07 19:26:44 +01:00
|
|
|
{
|
2005-12-08 15:34:11 +01:00
|
|
|
my_error(ER_EVENT_STORE_FAILED, MYF(0), et->name.str, ret);
|
2005-12-07 19:26:44 +01:00
|
|
|
goto err;
|
|
|
|
|
}
|
2006-02-28 11:43:10 +01:00
|
|
|
|
2006-02-28 14:43:49 +01:00
|
|
|
#ifdef USE_THIS_CODE_AS_TEMPLATE_WHEN_EVENT_REPLICATION_IS_AGREED
|
2005-12-07 22:29:00 +01:00
|
|
|
if (mysql_bin_log.is_open())
|
2005-12-02 13:22:15 +01:00
|
|
|
{
|
|
|
|
|
thd->clear_error();
|
2006-02-28 14:43:49 +01:00
|
|
|
/* Such a statement can always go directly to binlog, no trans cache */
|
2006-05-22 20:46:13 +02:00
|
|
|
thd->binlog_query(THD::MYSQL_QUERY_TYPE, thd->query, thd->query_length,
|
|
|
|
|
FALSE, FALSE);
|
2005-12-02 13:22:15 +01:00
|
|
|
}
|
2006-02-28 11:43:10 +01:00
|
|
|
#endif
|
2006-02-28 14:43:49 +01:00
|
|
|
|
2005-12-28 11:07:57 +01:00
|
|
|
*rows_affected= 1;
|
|
|
|
|
ok:
|
2005-12-07 19:26:44 +01:00
|
|
|
if (dbchanged)
|
|
|
|
|
(void) mysql_change_db(thd, olddb, 1);
|
2005-12-13 13:21:11 +01:00
|
|
|
if (table)
|
|
|
|
|
close_thread_tables(thd);
|
2005-12-07 19:26:44 +01:00
|
|
|
DBUG_RETURN(EVEX_OK);
|
2005-12-06 16:15:29 +01:00
|
|
|
|
2005-12-07 19:26:44 +01:00
|
|
|
err:
|
2005-12-02 13:22:15 +01:00
|
|
|
if (dbchanged)
|
2005-12-06 16:15:29 +01:00
|
|
|
(void) mysql_change_db(thd, olddb, 1);
|
2005-12-13 13:21:11 +01:00
|
|
|
if (table)
|
|
|
|
|
close_thread_tables(thd);
|
2005-12-07 19:26:44 +01:00
|
|
|
DBUG_RETURN(EVEX_GENERAL_ERROR);
|
2005-12-02 13:22:15 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
2006-05-22 20:46:13 +02:00
|
|
|
Used to execute ALTER EVENT. Pendant to Events::update_event().
|
2005-12-02 13:22:15 +01:00
|
|
|
|
2006-05-22 20:46:13 +02:00
|
|
|
SYNOPSIS
|
|
|
|
|
db_update_event()
|
|
|
|
|
thd THD
|
|
|
|
|
sp_name the name of the event to alter
|
|
|
|
|
et event's data
|
|
|
|
|
|
|
|
|
|
RETURN VALUE
|
|
|
|
|
0 OK
|
|
|
|
|
EVEX_GENERAL_ERROR Error occured (my_error() called)
|
2006-02-28 14:43:49 +01:00
|
|
|
|
2006-05-22 20:46:13 +02:00
|
|
|
NOTES
|
|
|
|
|
sp_name is passed since this is the name of the event to
|
|
|
|
|
alter in case of RENAME TO.
|
2005-12-02 13:22:15 +01:00
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
static int
|
2006-02-28 18:33:38 +01:00
|
|
|
db_update_event(THD *thd, Event_timed *et, sp_name *new_name)
|
2005-12-02 13:22:15 +01:00
|
|
|
{
|
2006-05-29 10:39:45 +02:00
|
|
|
CHARSET_INFO *scs= system_charset_info;
|
2005-12-02 13:22:15 +01:00
|
|
|
TABLE *table;
|
2005-12-07 22:29:00 +01:00
|
|
|
int ret= EVEX_OPEN_TABLE_FAILED;
|
2005-12-02 13:22:15 +01:00
|
|
|
DBUG_ENTER("db_update_event");
|
2006-01-30 13:15:23 +01:00
|
|
|
DBUG_PRINT("enter", ("dbname: %.*s", et->dbname.length, et->dbname.str));
|
2005-12-08 00:17:05 +01:00
|
|
|
DBUG_PRINT("enter", ("name: %.*s", et->name.length, et->name.str));
|
2006-05-22 20:46:13 +02:00
|
|
|
DBUG_PRINT("enter", ("user: %.*s", et->definer.length, et->definer.str));
|
2005-12-08 00:17:05 +01:00
|
|
|
if (new_name)
|
|
|
|
|
DBUG_PRINT("enter", ("rename to: %.*s", new_name->m_name.length,
|
|
|
|
|
new_name->m_name.str));
|
2005-12-02 13:22:15 +01:00
|
|
|
|
2006-05-22 20:46:13 +02:00
|
|
|
if (Events::open_event_table(thd, TL_WRITE, &table))
|
2005-12-06 16:15:29 +01:00
|
|
|
{
|
|
|
|
|
my_error(ER_EVENT_OPEN_TABLE_FAILED, MYF(0));
|
2005-12-07 19:26:44 +01:00
|
|
|
goto err;
|
2005-12-06 16:15:29 +01:00
|
|
|
}
|
2005-12-08 15:34:11 +01:00
|
|
|
|
2006-02-28 14:43:49 +01:00
|
|
|
/* first look whether we overwrite */
|
2005-12-08 20:37:54 +01:00
|
|
|
if (new_name)
|
2005-12-08 15:34:11 +01:00
|
|
|
{
|
2006-05-29 10:39:45 +02:00
|
|
|
if (!sortcmp_lex_string(et->name, new_name->m_name, scs) &&
|
|
|
|
|
!sortcmp_lex_string(et->dbname, new_name->m_db, scs))
|
2005-12-08 20:37:54 +01:00
|
|
|
{
|
|
|
|
|
my_error(ER_EVENT_SAME_NAME, MYF(0), et->name.str);
|
|
|
|
|
goto err;
|
|
|
|
|
}
|
|
|
|
|
|
2006-05-29 10:39:45 +02:00
|
|
|
if (!evex_db_find_event_by_name(thd,new_name->m_db,new_name->m_name,table))
|
2005-12-08 20:37:54 +01:00
|
|
|
{
|
|
|
|
|
my_error(ER_EVENT_ALREADY_EXISTS, MYF(0), new_name->m_name.str);
|
|
|
|
|
goto err;
|
|
|
|
|
}
|
2005-12-08 15:34:11 +01:00
|
|
|
}
|
|
|
|
|
/*
|
2006-05-29 10:39:45 +02:00
|
|
|
...and then if there is such an event. Don't exchange the blocks
|
2005-12-08 15:34:11 +01:00
|
|
|
because you will get error 120 from table handler because new_name will
|
|
|
|
|
overwrite the key and SE will tell us that it cannot find the already found
|
|
|
|
|
row (copied into record[1] later
|
|
|
|
|
*/
|
2006-02-16 00:43:11 +01:00
|
|
|
if (EVEX_KEY_NOT_FOUND == evex_db_find_event_aux(thd, et, table))
|
2005-12-02 13:22:15 +01:00
|
|
|
{
|
2005-12-08 00:17:05 +01:00
|
|
|
my_error(ER_EVENT_DOES_NOT_EXIST, MYF(0), et->name.str);
|
2006-02-28 14:43:49 +01:00
|
|
|
goto err;
|
2005-12-06 16:15:29 +01:00
|
|
|
}
|
2005-12-08 15:34:11 +01:00
|
|
|
|
2005-12-06 16:15:29 +01:00
|
|
|
store_record(table,record[1]);
|
2006-02-28 14:43:49 +01:00
|
|
|
|
|
|
|
|
/* Don't update create on row update. */
|
2005-12-07 19:26:44 +01:00
|
|
|
table->timestamp_field_type= TIMESTAMP_NO_AUTO_SET;
|
|
|
|
|
|
2006-05-29 10:39:45 +02:00
|
|
|
/*
|
|
|
|
|
evex_fill_row() calls my_error() in case of error so no need to
|
|
|
|
|
handle it here
|
|
|
|
|
*/
|
2005-12-06 16:15:29 +01:00
|
|
|
if ((ret= evex_fill_row(thd, table, et, true)))
|
2005-12-07 19:26:44 +01:00
|
|
|
goto err;
|
2006-02-28 14:43:49 +01:00
|
|
|
|
2005-12-08 00:17:05 +01:00
|
|
|
if (new_name)
|
2005-12-06 16:15:29 +01:00
|
|
|
{
|
2006-05-22 20:46:13 +02:00
|
|
|
table->field[Events::FIELD_DB]->
|
2006-05-29 10:39:45 +02:00
|
|
|
store(new_name->m_db.str, new_name->m_db.length, scs);
|
2006-05-22 20:46:13 +02:00
|
|
|
table->field[Events::FIELD_NAME]->
|
2006-05-29 10:39:45 +02:00
|
|
|
store(new_name->m_name.str, new_name->m_name.length, scs);
|
2005-12-06 16:15:29 +01:00
|
|
|
}
|
2005-12-02 13:22:15 +01:00
|
|
|
|
2006-01-11 12:49:56 +01:00
|
|
|
if ((ret= table->file->ha_update_row(table->record[1], table->record[0])))
|
2005-12-06 16:15:29 +01:00
|
|
|
{
|
2005-12-08 15:34:11 +01:00
|
|
|
my_error(ER_EVENT_STORE_FAILED, MYF(0), et->name.str, ret);
|
2005-12-07 19:26:44 +01:00
|
|
|
goto err;
|
2005-12-02 13:22:15 +01:00
|
|
|
}
|
2005-12-07 19:26:44 +01:00
|
|
|
|
2006-02-28 14:43:49 +01:00
|
|
|
/* close mysql.event or we crash later when loading the event from disk */
|
2005-12-02 13:22:15 +01:00
|
|
|
close_thread_tables(thd);
|
2005-12-07 19:26:44 +01:00
|
|
|
DBUG_RETURN(0);
|
|
|
|
|
|
|
|
|
|
err:
|
|
|
|
|
if (table)
|
|
|
|
|
close_thread_tables(thd);
|
|
|
|
|
DBUG_RETURN(EVEX_GENERAL_ERROR);
|
2005-12-02 13:22:15 +01:00
|
|
|
}
|
|
|
|
|
|
2005-12-06 16:15:29 +01:00
|
|
|
|
2005-12-02 13:22:15 +01:00
|
|
|
/*
|
2006-05-22 20:46:13 +02:00
|
|
|
Looks for a named event in mysql.event and in case of success returns
|
|
|
|
|
an object will data loaded from the table.
|
|
|
|
|
|
|
|
|
|
SYNOPSIS
|
|
|
|
|
db_find_event()
|
|
|
|
|
thd THD
|
|
|
|
|
name the name of the event to find
|
|
|
|
|
ett event's data if event is found
|
|
|
|
|
tbl TABLE object to use when not NULL
|
|
|
|
|
|
|
|
|
|
NOTES
|
|
|
|
|
1) Use sp_name for look up, return in **ett if found
|
|
|
|
|
2) tbl is not closed at exit
|
|
|
|
|
|
|
|
|
|
RETURN VALUE
|
|
|
|
|
0 ok In this case *ett is set to the event
|
|
|
|
|
# error *ett == 0
|
2005-12-02 13:22:15 +01:00
|
|
|
*/
|
2005-12-07 22:29:00 +01:00
|
|
|
|
2006-05-22 20:46:13 +02:00
|
|
|
int
|
2006-05-29 10:39:45 +02:00
|
|
|
db_find_event(THD *thd, sp_name *name, Event_timed **ett, TABLE *tbl,
|
|
|
|
|
MEM_ROOT *root)
|
2005-12-02 13:22:15 +01:00
|
|
|
{
|
|
|
|
|
TABLE *table;
|
|
|
|
|
int ret;
|
2006-05-29 10:39:45 +02:00
|
|
|
Event_timed *et= NULL;
|
2005-12-02 13:22:15 +01:00
|
|
|
DBUG_ENTER("db_find_event");
|
2005-12-07 19:26:44 +01:00
|
|
|
DBUG_PRINT("enter", ("name: %*s", name->m_name.length, name->m_name.str));
|
2005-12-02 13:22:15 +01:00
|
|
|
|
2006-02-14 16:20:48 +01:00
|
|
|
if (!root)
|
|
|
|
|
root= &evex_mem_root;
|
|
|
|
|
|
2005-12-07 19:26:44 +01:00
|
|
|
if (tbl)
|
|
|
|
|
table= tbl;
|
2006-05-22 20:46:13 +02:00
|
|
|
else if (Events::open_event_table(thd, TL_READ, &table))
|
2005-12-06 16:15:29 +01:00
|
|
|
{
|
|
|
|
|
my_error(ER_EVENT_OPEN_TABLE_FAILED, MYF(0));
|
2005-12-07 19:26:44 +01:00
|
|
|
ret= EVEX_GENERAL_ERROR;
|
2005-12-06 16:15:29 +01:00
|
|
|
goto done;
|
|
|
|
|
}
|
2005-12-02 13:22:15 +01:00
|
|
|
|
2006-05-29 10:39:45 +02:00
|
|
|
if ((ret= evex_db_find_event_by_name(thd, name->m_db, name->m_name, table)))
|
2005-12-07 19:26:44 +01:00
|
|
|
{
|
2005-12-08 00:17:05 +01:00
|
|
|
my_error(ER_EVENT_DOES_NOT_EXIST, MYF(0), name->m_name.str);
|
2005-12-07 19:26:44 +01:00
|
|
|
goto done;
|
|
|
|
|
}
|
2006-02-28 18:33:38 +01:00
|
|
|
et= new Event_timed;
|
2005-12-02 13:22:15 +01:00
|
|
|
|
|
|
|
|
/*
|
2005-12-07 19:26:44 +01:00
|
|
|
1)The table should not be closed beforehand. ::load_from_row() only loads
|
|
|
|
|
and does not compile
|
|
|
|
|
|
|
|
|
|
2)::load_from_row() is silent on error therefore we emit error msg here
|
2005-12-02 13:22:15 +01:00
|
|
|
*/
|
2006-02-14 16:20:48 +01:00
|
|
|
if ((ret= et->load_from_row(root, table)))
|
2005-12-07 19:26:44 +01:00
|
|
|
{
|
2006-02-20 16:06:05 +01:00
|
|
|
my_error(ER_CANNOT_LOAD_FROM_TABLE, MYF(0));
|
2005-12-02 13:22:15 +01:00
|
|
|
goto done;
|
2005-12-07 19:26:44 +01:00
|
|
|
}
|
2005-12-02 13:22:15 +01:00
|
|
|
|
|
|
|
|
done:
|
2006-05-29 10:39:45 +02:00
|
|
|
if (ret)
|
2005-12-02 13:22:15 +01:00
|
|
|
{
|
|
|
|
|
delete et;
|
|
|
|
|
et= 0;
|
|
|
|
|
}
|
2006-02-28 14:43:49 +01:00
|
|
|
/* don't close the table if we haven't opened it ourselves */
|
2005-12-13 23:10:29 +01:00
|
|
|
if (!tbl && table)
|
2005-12-07 19:26:44 +01:00
|
|
|
close_thread_tables(thd);
|
2005-12-02 13:22:15 +01:00
|
|
|
*ett= et;
|
|
|
|
|
DBUG_RETURN(ret);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2005-12-07 22:29:00 +01:00
|
|
|
/*
|
2006-05-22 20:46:13 +02:00
|
|
|
The function exported to the world for creating of events.
|
2005-12-02 13:22:15 +01:00
|
|
|
|
2006-05-22 20:46:13 +02:00
|
|
|
SYNOPSIS
|
|
|
|
|
Events::create_event()
|
|
|
|
|
thd THD
|
|
|
|
|
et event's data
|
|
|
|
|
create_options Options specified when in the query. We are
|
|
|
|
|
interested whether there is IF NOT EXISTS
|
|
|
|
|
rows_affected How many rows were affected
|
2005-12-02 13:22:15 +01:00
|
|
|
|
2006-05-22 20:46:13 +02:00
|
|
|
RETURN VALUE
|
|
|
|
|
0 OK
|
|
|
|
|
!0 Error
|
2005-12-02 13:22:15 +01:00
|
|
|
|
2006-05-22 20:46:13 +02:00
|
|
|
NOTES
|
|
|
|
|
- in case there is an event with the same name (db) and
|
|
|
|
|
IF NOT EXISTS is specified, an warning is put into the W stack.
|
2005-12-02 13:22:15 +01:00
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
int
|
2006-05-22 20:46:13 +02:00
|
|
|
Events::create_event(THD *thd, Event_timed *et, uint create_options,
|
2006-05-29 10:39:45 +02:00
|
|
|
uint *rows_affected)
|
2005-12-02 13:22:15 +01:00
|
|
|
{
|
2006-05-22 20:46:13 +02:00
|
|
|
int ret;
|
2005-12-02 13:22:15 +01:00
|
|
|
|
2006-05-22 20:46:13 +02:00
|
|
|
DBUG_ENTER("Events::create_event");
|
2005-12-08 00:17:05 +01:00
|
|
|
DBUG_PRINT("enter", ("name: %*s options:%d", et->name.length,
|
|
|
|
|
et->name.str, create_options));
|
2005-12-02 13:22:15 +01:00
|
|
|
|
2006-05-22 20:46:13 +02:00
|
|
|
if (!(ret = db_create_event(thd, et,
|
2005-12-28 11:07:57 +01:00
|
|
|
create_options & HA_LEX_CREATE_IF_NOT_EXISTS,
|
|
|
|
|
rows_affected)))
|
2005-12-02 13:22:15 +01:00
|
|
|
{
|
2006-05-22 20:46:13 +02:00
|
|
|
Event_scheduler *scheduler= Event_scheduler::get_instance();
|
2006-06-08 23:07:11 +02:00
|
|
|
if (scheduler->initialized() &&
|
|
|
|
|
(ret= scheduler->create_event(thd, et, true)))
|
2006-05-22 20:46:13 +02:00
|
|
|
my_error(ER_EVENT_MODIFY_QUEUE_ERROR, MYF(0), ret);
|
2005-12-02 13:22:15 +01:00
|
|
|
}
|
2006-02-28 14:43:49 +01:00
|
|
|
/* No need to close the table, it will be closed in sql_parse::do_command */
|
2005-12-06 16:15:29 +01:00
|
|
|
|
2005-12-02 13:22:15 +01:00
|
|
|
DBUG_RETURN(ret);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
2006-05-22 20:46:13 +02:00
|
|
|
The function exported to the world for alteration of events.
|
|
|
|
|
|
|
|
|
|
SYNOPSIS
|
|
|
|
|
Events::update_event()
|
|
|
|
|
thd THD
|
|
|
|
|
et event's data
|
|
|
|
|
new_name set in case of RENAME TO.
|
|
|
|
|
|
|
|
|
|
RETURN VALUE
|
|
|
|
|
0 OK
|
|
|
|
|
!0 Error
|
|
|
|
|
|
|
|
|
|
NOTES
|
|
|
|
|
et contains data about dbname and event name.
|
|
|
|
|
new_name is the new name of the event, if not null (this means
|
|
|
|
|
that RENAME TO was specified in the query)
|
2005-12-02 13:22:15 +01:00
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
int
|
2006-05-22 20:46:13 +02:00
|
|
|
Events::update_event(THD *thd, Event_timed *et, sp_name *new_name,
|
|
|
|
|
uint *rows_affected)
|
2005-12-02 13:22:15 +01:00
|
|
|
{
|
2006-02-28 20:32:37 +01:00
|
|
|
int ret;
|
2005-12-02 13:22:15 +01:00
|
|
|
|
2006-05-22 20:46:13 +02:00
|
|
|
DBUG_ENTER("Events::update_event");
|
2005-12-08 00:17:05 +01:00
|
|
|
DBUG_PRINT("enter", ("name: %*s", et->name.length, et->name.str));
|
2005-12-07 19:26:44 +01:00
|
|
|
/*
|
|
|
|
|
db_update_event() opens & closes the table to prevent
|
2005-12-08 15:34:11 +01:00
|
|
|
crash later in the code when loading and compiling the new definition.
|
|
|
|
|
Also on error conditions my_error() is called so no need to handle here
|
2005-12-07 19:26:44 +01:00
|
|
|
*/
|
2006-05-22 20:46:13 +02:00
|
|
|
if (!(ret= db_update_event(thd, et, new_name)))
|
2005-12-08 15:34:11 +01:00
|
|
|
{
|
2006-05-22 20:46:13 +02:00
|
|
|
Event_scheduler *scheduler= Event_scheduler::get_instance();
|
|
|
|
|
if (scheduler->initialized() &&
|
2006-06-08 23:07:11 +02:00
|
|
|
(ret= scheduler->update_event(thd, et,
|
2006-05-22 20:46:13 +02:00
|
|
|
new_name? &new_name->m_db: NULL,
|
|
|
|
|
new_name? &new_name->m_name: NULL)))
|
|
|
|
|
my_error(ER_EVENT_MODIFY_QUEUE_ERROR, MYF(0), ret);
|
2005-12-08 15:34:11 +01:00
|
|
|
}
|
2005-12-02 13:22:15 +01:00
|
|
|
DBUG_RETURN(ret);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
2006-05-22 20:46:13 +02:00
|
|
|
Drops an event
|
|
|
|
|
|
|
|
|
|
SYNOPSIS
|
|
|
|
|
db_drop_event()
|
|
|
|
|
thd THD
|
|
|
|
|
et event's name
|
|
|
|
|
drop_if_exists if set and the event not existing => warning onto the stack
|
|
|
|
|
rows_affected affected number of rows is returned heres
|
|
|
|
|
|
|
|
|
|
RETURN VALUE
|
|
|
|
|
0 OK
|
|
|
|
|
!0 Error (my_error() called)
|
2005-12-02 13:22:15 +01:00
|
|
|
*/
|
|
|
|
|
|
2006-02-28 18:33:38 +01:00
|
|
|
int db_drop_event(THD *thd, Event_timed *et, bool drop_if_exists,
|
2006-02-07 19:28:33 +01:00
|
|
|
uint *rows_affected)
|
2005-12-02 13:22:15 +01:00
|
|
|
{
|
|
|
|
|
TABLE *table;
|
2006-02-07 19:28:33 +01:00
|
|
|
Open_tables_state backup;
|
2006-02-15 23:43:11 +01:00
|
|
|
int ret;
|
2006-02-07 19:28:33 +01:00
|
|
|
|
|
|
|
|
DBUG_ENTER("db_drop_event");
|
|
|
|
|
ret= EVEX_OPEN_TABLE_FAILED;
|
2005-12-02 13:22:15 +01:00
|
|
|
|
2006-02-07 19:28:33 +01:00
|
|
|
thd->reset_n_backup_open_tables_state(&backup);
|
2006-05-22 20:46:13 +02:00
|
|
|
if (Events::open_event_table(thd, TL_WRITE, &table))
|
2005-12-07 22:29:00 +01:00
|
|
|
{
|
|
|
|
|
my_error(ER_EVENT_OPEN_TABLE_FAILED, MYF(0));
|
|
|
|
|
goto done;
|
|
|
|
|
}
|
2005-12-02 13:22:15 +01:00
|
|
|
|
2006-02-16 05:21:02 +01:00
|
|
|
if (!(ret= evex_db_find_event_aux(thd, et, table)))
|
2005-12-02 13:22:15 +01:00
|
|
|
{
|
2006-01-11 12:49:56 +01:00
|
|
|
if ((ret= table->file->ha_delete_row(table->record[0])))
|
2005-12-02 13:22:15 +01:00
|
|
|
{
|
2005-12-07 19:26:44 +01:00
|
|
|
my_error(ER_EVENT_CANNOT_DELETE, MYF(0));
|
2005-12-02 13:22:15 +01:00
|
|
|
goto done;
|
|
|
|
|
}
|
|
|
|
|
}
|
2005-12-08 15:34:11 +01:00
|
|
|
else if (ret == EVEX_KEY_NOT_FOUND)
|
|
|
|
|
{
|
|
|
|
|
if (drop_if_exists)
|
|
|
|
|
{
|
|
|
|
|
push_warning_printf(thd, MYSQL_ERROR::WARN_LEVEL_NOTE,
|
2006-02-28 14:43:49 +01:00
|
|
|
ER_SP_DOES_NOT_EXIST, ER(ER_SP_DOES_NOT_EXIST),
|
|
|
|
|
"Event", et->name.str);
|
2005-12-08 15:34:11 +01:00
|
|
|
ret= 0;
|
|
|
|
|
} else
|
|
|
|
|
my_error(ER_EVENT_DOES_NOT_EXIST, MYF(0), et->name.str);
|
2005-12-02 13:22:15 +01:00
|
|
|
goto done;
|
2005-12-08 15:34:11 +01:00
|
|
|
}
|
2005-12-02 13:22:15 +01:00
|
|
|
|
|
|
|
|
|
2005-12-20 13:21:02 +01:00
|
|
|
done:
|
2005-12-07 19:26:44 +01:00
|
|
|
/*
|
2006-02-28 18:33:38 +01:00
|
|
|
evex_drop_event() is used by Event_timed::drop therefore
|
2005-12-20 13:21:02 +01:00
|
|
|
we have to close our thread tables.
|
2005-12-07 19:26:44 +01:00
|
|
|
*/
|
2005-12-20 13:21:02 +01:00
|
|
|
close_thread_tables(thd);
|
2006-02-07 19:28:33 +01:00
|
|
|
thd->restore_backup_open_tables_state(&backup);
|
|
|
|
|
DBUG_RETURN(ret);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
2006-05-22 20:46:13 +02:00
|
|
|
Drops an event
|
|
|
|
|
|
|
|
|
|
SYNOPSIS
|
|
|
|
|
Events::drop_event()
|
|
|
|
|
thd THD
|
|
|
|
|
et event's name
|
|
|
|
|
drop_if_exists if set and the event not existing => warning onto the stack
|
|
|
|
|
rows_affected affected number of rows is returned heres
|
|
|
|
|
|
|
|
|
|
RETURN VALUE
|
|
|
|
|
0 OK
|
|
|
|
|
!0 Error (reported)
|
2006-02-07 19:28:33 +01:00
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
int
|
2006-05-22 20:46:13 +02:00
|
|
|
Events::drop_event(THD *thd, Event_timed *et, bool drop_if_exists,
|
|
|
|
|
uint *rows_affected)
|
2006-02-07 19:28:33 +01:00
|
|
|
{
|
2006-05-22 20:46:13 +02:00
|
|
|
int ret;
|
2006-02-28 14:43:49 +01:00
|
|
|
|
2006-05-22 20:46:13 +02:00
|
|
|
DBUG_ENTER("Events::drop_event");
|
|
|
|
|
if (!(ret= db_drop_event(thd, et, drop_if_exists, rows_affected)))
|
|
|
|
|
{
|
|
|
|
|
Event_scheduler *scheduler= Event_scheduler::get_instance();
|
|
|
|
|
if (scheduler->initialized() && (ret= scheduler->drop_event(thd, et)))
|
|
|
|
|
my_error(ER_EVENT_MODIFY_QUEUE_ERROR, MYF(0), ret);
|
|
|
|
|
}
|
2005-12-02 13:22:15 +01:00
|
|
|
|
|
|
|
|
DBUG_RETURN(ret);
|
|
|
|
|
}
|
|
|
|
|
|
2006-02-14 16:20:48 +01:00
|
|
|
|
|
|
|
|
/*
|
2006-05-22 20:46:13 +02:00
|
|
|
SHOW CREATE EVENT
|
2006-02-14 16:20:48 +01:00
|
|
|
|
2006-05-22 20:46:13 +02:00
|
|
|
SYNOPSIS
|
|
|
|
|
Events::show_create_event()
|
|
|
|
|
thd THD
|
|
|
|
|
spn the name of the event (db, name)
|
2006-02-28 14:43:49 +01:00
|
|
|
|
2006-05-22 20:46:13 +02:00
|
|
|
RETURN VALUE
|
|
|
|
|
0 OK
|
|
|
|
|
1 Error during writing to the wire
|
2006-02-14 16:20:48 +01:00
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
int
|
2006-05-29 10:39:45 +02:00
|
|
|
Events::show_create_event(THD *thd, sp_name *spn)
|
2006-02-14 16:20:48 +01:00
|
|
|
{
|
|
|
|
|
int ret;
|
2006-02-28 18:33:38 +01:00
|
|
|
Event_timed *et= NULL;
|
2006-02-14 16:20:48 +01:00
|
|
|
Open_tables_state backup;
|
|
|
|
|
|
|
|
|
|
DBUG_ENTER("evex_update_event");
|
|
|
|
|
DBUG_PRINT("enter", ("name: %*s", spn->m_name.length, spn->m_name.str));
|
|
|
|
|
|
|
|
|
|
thd->reset_n_backup_open_tables_state(&backup);
|
2006-05-29 10:39:45 +02:00
|
|
|
ret= db_find_event(thd, spn, &et, NULL, thd->mem_root);
|
2006-02-14 16:20:48 +01:00
|
|
|
thd->restore_backup_open_tables_state(&backup);
|
|
|
|
|
|
2006-05-22 20:46:13 +02:00
|
|
|
if (!ret)
|
2006-02-28 14:43:49 +01:00
|
|
|
{
|
2006-02-14 16:20:48 +01:00
|
|
|
Protocol *protocol= thd->protocol;
|
|
|
|
|
char show_str_buf[768];
|
|
|
|
|
String show_str(show_str_buf, sizeof(show_str_buf), system_charset_info);
|
|
|
|
|
List<Item> field_list;
|
2006-02-21 02:40:23 +01:00
|
|
|
byte *sql_mode_str;
|
2006-02-14 16:20:48 +01:00
|
|
|
ulong sql_mode_len=0;
|
2006-02-28 14:43:49 +01:00
|
|
|
|
2006-02-14 16:20:48 +01:00
|
|
|
show_str.length(0);
|
2006-05-22 20:46:13 +02:00
|
|
|
show_str.set_charset(system_charset_info);
|
2006-02-14 16:20:48 +01:00
|
|
|
|
|
|
|
|
if (et->get_create_event(thd, &show_str))
|
2006-05-22 20:46:13 +02:00
|
|
|
goto err;
|
2006-02-14 16:20:48 +01:00
|
|
|
|
|
|
|
|
field_list.push_back(new Item_empty_string("Event", NAME_LEN));
|
|
|
|
|
|
|
|
|
|
sql_mode_str=
|
|
|
|
|
sys_var_thd_sql_mode::symbolic_mode_representation(thd, et->sql_mode,
|
|
|
|
|
&sql_mode_len);
|
|
|
|
|
|
|
|
|
|
field_list.push_back(new Item_empty_string("sql_mode", sql_mode_len));
|
|
|
|
|
|
|
|
|
|
field_list.push_back(new Item_empty_string("Create Event",
|
|
|
|
|
show_str.length()));
|
|
|
|
|
if (protocol->send_fields(&field_list, Protocol::SEND_NUM_ROWS |
|
|
|
|
|
Protocol::SEND_EOF))
|
2006-05-22 20:46:13 +02:00
|
|
|
goto err;
|
|
|
|
|
|
2006-02-14 16:20:48 +01:00
|
|
|
protocol->prepare_for_resend();
|
|
|
|
|
protocol->store(et->name.str, et->name.length, system_charset_info);
|
|
|
|
|
|
|
|
|
|
protocol->store((char*) sql_mode_str, sql_mode_len, system_charset_info);
|
|
|
|
|
|
2006-05-22 20:46:13 +02:00
|
|
|
protocol->store(show_str.c_ptr(), show_str.length(), system_charset_info);
|
2006-02-14 16:20:48 +01:00
|
|
|
ret= protocol->write();
|
|
|
|
|
send_eof(thd);
|
|
|
|
|
}
|
2006-05-22 20:46:13 +02:00
|
|
|
delete et;
|
2006-02-14 16:20:48 +01:00
|
|
|
DBUG_RETURN(ret);
|
2006-05-22 20:46:13 +02:00
|
|
|
err:
|
|
|
|
|
delete et;
|
|
|
|
|
DBUG_RETURN(1);
|
2006-02-14 16:20:48 +01:00
|
|
|
}
|
2005-12-02 13:22:15 +01:00
|
|
|
|
2006-02-16 00:43:11 +01:00
|
|
|
|
|
|
|
|
/*
|
2006-05-22 20:46:13 +02:00
|
|
|
Drops all events from a schema
|
2006-02-28 14:43:49 +01:00
|
|
|
|
2006-05-22 20:46:13 +02:00
|
|
|
SYNOPSIS
|
|
|
|
|
Events::drop_schema_events()
|
|
|
|
|
thd Thread
|
|
|
|
|
db ASCIIZ schema name
|
|
|
|
|
|
|
|
|
|
RETURN VALUE
|
|
|
|
|
0 OK
|
|
|
|
|
!0 Error
|
2006-02-16 00:43:11 +01:00
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
int
|
2006-05-22 20:46:13 +02:00
|
|
|
Events::drop_schema_events(THD *thd, char *db)
|
2006-02-16 00:43:11 +01:00
|
|
|
{
|
|
|
|
|
int ret= 0;
|
|
|
|
|
LEX_STRING db_lex= {db, strlen(db)};
|
|
|
|
|
|
|
|
|
|
DBUG_ENTER("evex_drop_db_events");
|
2006-05-22 20:46:13 +02:00
|
|
|
DBUG_PRINT("enter", ("dropping events from %s", db));
|
2006-02-16 00:43:11 +01:00
|
|
|
|
2006-05-22 20:46:13 +02:00
|
|
|
Event_scheduler *scheduler= Event_scheduler::get_instance();
|
|
|
|
|
if (scheduler->initialized())
|
|
|
|
|
ret= scheduler->drop_schema_events(thd, &db_lex);
|
|
|
|
|
else
|
|
|
|
|
ret= db_drop_events_from_table(thd, &db_lex);
|
2006-02-16 00:43:11 +01:00
|
|
|
|
2006-05-22 20:46:13 +02:00
|
|
|
DBUG_RETURN(ret);
|
|
|
|
|
}
|
2006-02-16 00:43:11 +01:00
|
|
|
|
|
|
|
|
|
2006-05-22 20:46:13 +02:00
|
|
|
/*
|
|
|
|
|
Drops all events in the selected database, from mysql.event.
|
2006-02-16 00:43:11 +01:00
|
|
|
|
2006-05-22 20:46:13 +02:00
|
|
|
SYNOPSIS
|
|
|
|
|
evex_drop_db_events_from_table()
|
|
|
|
|
thd Thread
|
|
|
|
|
db Schema name
|
2006-02-16 00:43:11 +01:00
|
|
|
|
2006-05-22 20:46:13 +02:00
|
|
|
RETURN VALUE
|
|
|
|
|
0 OK
|
|
|
|
|
!0 Error from ha_delete_row
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
int
|
|
|
|
|
db_drop_events_from_table(THD *thd, LEX_STRING *db)
|
|
|
|
|
{
|
|
|
|
|
int ret;
|
|
|
|
|
TABLE *table;
|
|
|
|
|
READ_RECORD read_record_info;
|
|
|
|
|
DBUG_ENTER("db_drop_events_from_table");
|
|
|
|
|
DBUG_PRINT("info", ("dropping events from %s", db->str));
|
|
|
|
|
|
|
|
|
|
if ((ret= Events::open_event_table(thd, TL_WRITE, &table)))
|
|
|
|
|
{
|
2006-06-04 20:05:22 +02:00
|
|
|
if (my_errno != ENOENT)
|
|
|
|
|
sql_print_error("Table mysql.event is damaged. Got error %d on open",
|
|
|
|
|
my_errno);
|
2006-05-22 20:46:13 +02:00
|
|
|
DBUG_RETURN(ret);
|
|
|
|
|
}
|
2006-02-16 00:43:11 +01:00
|
|
|
/* only enabled events are in memory, so we go now and delete the rest */
|
2006-05-22 20:46:13 +02:00
|
|
|
init_read_record(&read_record_info, thd, table, NULL, 1, 0);
|
2006-02-16 00:43:11 +01:00
|
|
|
while (!(read_record_info.read_record(&read_record_info)) && !ret)
|
|
|
|
|
{
|
2006-05-22 20:46:13 +02:00
|
|
|
char *et_db= get_field(thd->mem_root,
|
|
|
|
|
table->field[Events::FIELD_DB]);
|
2006-02-16 00:43:11 +01:00
|
|
|
|
|
|
|
|
LEX_STRING et_db_lex= {et_db, strlen(et_db)};
|
2006-05-22 20:46:13 +02:00
|
|
|
DBUG_PRINT("info", ("Current event %s.%s", et_db,
|
|
|
|
|
get_field(thd->mem_root,
|
|
|
|
|
table->field[Events::FIELD_NAME])));
|
|
|
|
|
|
|
|
|
|
if (!sortcmp_lex_string(et_db_lex, *db, system_charset_info))
|
2006-02-16 00:43:11 +01:00
|
|
|
{
|
2006-05-22 20:46:13 +02:00
|
|
|
DBUG_PRINT("info", ("Dropping"));
|
|
|
|
|
if ((ret= table->file->ha_delete_row(table->record[0])))
|
|
|
|
|
my_error(ER_EVENT_DROP_FAILED, MYF(0),
|
|
|
|
|
get_field(thd->mem_root,
|
|
|
|
|
table->field[Events::FIELD_NAME]));
|
2006-02-16 00:43:11 +01:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
end_read_record(&read_record_info);
|
2006-02-28 14:43:49 +01:00
|
|
|
thd->version--; /* Force close to free memory */
|
2006-02-16 00:43:11 +01:00
|
|
|
|
|
|
|
|
close_thread_tables(thd);
|
|
|
|
|
|
|
|
|
|
DBUG_RETURN(ret);
|
|
|
|
|
}
|
2006-05-22 20:46:13 +02:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
Inits the scheduler's structures.
|
|
|
|
|
|
|
|
|
|
SYNOPSIS
|
|
|
|
|
Events::init()
|
|
|
|
|
|
|
|
|
|
NOTES
|
|
|
|
|
This function is not synchronized.
|
|
|
|
|
|
|
|
|
|
RETURN VALUE
|
|
|
|
|
0 OK
|
|
|
|
|
1 Error
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
int
|
|
|
|
|
Events::init()
|
|
|
|
|
{
|
|
|
|
|
int ret= 0;
|
|
|
|
|
DBUG_ENTER("Events::init");
|
|
|
|
|
|
|
|
|
|
/* it should be an assignment! */
|
|
|
|
|
if (opt_event_scheduler)
|
|
|
|
|
{
|
|
|
|
|
Event_scheduler *scheduler= Event_scheduler::get_instance();
|
|
|
|
|
DBUG_ASSERT(opt_event_scheduler == 1 || opt_event_scheduler == 2);
|
|
|
|
|
DBUG_RETURN(scheduler->init() ||
|
|
|
|
|
(opt_event_scheduler == 1? scheduler->start():
|
|
|
|
|
scheduler->start_suspended()));
|
|
|
|
|
}
|
|
|
|
|
DBUG_RETURN(0);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
Cleans up scheduler's resources. Called at server shutdown.
|
|
|
|
|
|
|
|
|
|
SYNOPSIS
|
|
|
|
|
Events::shutdown()
|
|
|
|
|
|
|
|
|
|
NOTES
|
|
|
|
|
This function is not synchronized.
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
Events::shutdown()
|
|
|
|
|
{
|
|
|
|
|
DBUG_ENTER("Events::shutdown");
|
|
|
|
|
Event_scheduler *scheduler= Event_scheduler::get_instance();
|
|
|
|
|
if (scheduler->initialized())
|
|
|
|
|
{
|
|
|
|
|
scheduler->stop();
|
|
|
|
|
scheduler->destroy();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
DBUG_VOID_RETURN;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
Proxy for Event_scheduler::dump_internal_status
|
|
|
|
|
|
|
|
|
|
SYNOPSIS
|
|
|
|
|
Events::dump_internal_status()
|
|
|
|
|
thd Thread
|
|
|
|
|
|
|
|
|
|
RETURN VALUE
|
|
|
|
|
0 OK
|
|
|
|
|
!0 Error
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
int
|
|
|
|
|
Events::dump_internal_status(THD *thd)
|
|
|
|
|
{
|
|
|
|
|
return Event_scheduler::dump_internal_status(thd);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
Inits Events mutexes
|
|
|
|
|
|
|
|
|
|
SYNOPSIS
|
|
|
|
|
Events::init_mutexes()
|
|
|
|
|
thd Thread
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
Events::init_mutexes()
|
|
|
|
|
{
|
|
|
|
|
Event_scheduler::init_mutexes();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
Destroys Events mutexes
|
|
|
|
|
|
|
|
|
|
SYNOPSIS
|
|
|
|
|
Events::destroy_mutexes()
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
Events::destroy_mutexes()
|
|
|
|
|
{
|
|
|
|
|
Event_scheduler::destroy_mutexes();
|
|
|
|
|
}
|