2005-07-09 19:51:59 +02:00
|
|
|
/* Copyright (C) 2004-2005 MySQL AB
|
|
|
|
|
|
|
|
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
|
2006-12-23 20:17:15 +01:00
|
|
|
the Free Software Foundation; version 2 of the License.
|
2005-07-09 19:51:59 +02:00
|
|
|
|
|
|
|
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-03-10 01:44:08 +01:00
|
|
|
#define MYSQL_LEX 1
|
2004-09-07 14:29:46 +02:00
|
|
|
#include "mysql_priv.h"
|
|
|
|
#include "sp_head.h"
|
|
|
|
#include "sql_trigger.h"
|
|
|
|
#include "parse_file.h"
|
|
|
|
|
2005-11-20 19:47:07 +01:00
|
|
|
static const LEX_STRING triggers_file_type=
|
2006-08-17 18:13:45 +02:00
|
|
|
{ C_STRING_WITH_LEN("TRIGGERS") };
|
2005-03-27 14:15:21 +02:00
|
|
|
|
|
|
|
const char * const triggers_file_ext= ".TRG";
|
2004-09-07 14:29:46 +02:00
|
|
|
|
|
|
|
/*
|
|
|
|
Table of .TRG file field descriptors.
|
|
|
|
We have here only one field now because in nearest future .TRG
|
|
|
|
files will be merged into .FRM files (so we don't need something
|
|
|
|
like md5 or created fields).
|
|
|
|
*/
|
|
|
|
static File_option triggers_file_parameters[]=
|
|
|
|
{
|
2005-11-10 20:25:03 +01:00
|
|
|
{
|
2006-08-17 18:13:45 +02:00
|
|
|
{ C_STRING_WITH_LEN("triggers") },
|
2006-10-20 13:47:52 +02:00
|
|
|
my_offsetof(class Table_triggers_list, definitions_list),
|
2005-11-10 20:25:03 +01:00
|
|
|
FILE_OPTIONS_STRLIST
|
|
|
|
},
|
|
|
|
{
|
2006-08-17 18:13:45 +02:00
|
|
|
{ C_STRING_WITH_LEN("sql_modes") },
|
2006-10-20 13:47:52 +02:00
|
|
|
my_offsetof(class Table_triggers_list, definition_modes_list),
|
2005-11-10 20:25:03 +01:00
|
|
|
FILE_OPTIONS_ULLLIST
|
|
|
|
},
|
|
|
|
{
|
2006-08-17 18:13:45 +02:00
|
|
|
{ C_STRING_WITH_LEN("definers") },
|
2006-10-20 13:47:52 +02:00
|
|
|
my_offsetof(class Table_triggers_list, definers_list),
|
2005-11-10 20:25:03 +01:00
|
|
|
FILE_OPTIONS_STRLIST
|
|
|
|
},
|
|
|
|
{ { 0, 0 }, 0, FILE_OPTIONS_STRING }
|
2004-09-07 14:29:46 +02:00
|
|
|
};
|
|
|
|
|
2006-01-05 23:47:49 +01:00
|
|
|
File_option sql_modes_parameters=
|
|
|
|
{
|
2006-08-17 18:13:45 +02:00
|
|
|
{ C_STRING_WITH_LEN("sql_modes") },
|
2006-10-20 13:47:52 +02:00
|
|
|
my_offsetof(class Table_triggers_list, definition_modes_list),
|
2006-01-05 23:47:49 +01:00
|
|
|
FILE_OPTIONS_ULLLIST
|
|
|
|
};
|
|
|
|
|
2005-11-10 20:25:03 +01:00
|
|
|
/*
|
|
|
|
This must be kept up to date whenever a new option is added to the list
|
|
|
|
above, as it specifies the number of required parameters of the trigger in
|
|
|
|
.trg file.
|
|
|
|
*/
|
|
|
|
|
|
|
|
static const int TRG_NUM_REQUIRED_PARAMETERS= 4;
|
2004-09-07 14:29:46 +02:00
|
|
|
|
2005-07-19 18:06:49 +02:00
|
|
|
/*
|
|
|
|
Structure representing contents of .TRN file which are used to support
|
|
|
|
database wide trigger namespace.
|
|
|
|
*/
|
|
|
|
|
|
|
|
struct st_trigname
|
|
|
|
{
|
|
|
|
LEX_STRING trigger_table;
|
|
|
|
};
|
|
|
|
|
2005-11-20 19:47:07 +01:00
|
|
|
static const LEX_STRING trigname_file_type=
|
2006-08-17 18:13:45 +02:00
|
|
|
{ C_STRING_WITH_LEN("TRIGGERNAME") };
|
2005-07-19 18:06:49 +02:00
|
|
|
|
|
|
|
const char * const trigname_file_ext= ".TRN";
|
|
|
|
|
|
|
|
static File_option trigname_file_parameters[]=
|
|
|
|
{
|
2005-11-10 20:25:03 +01:00
|
|
|
{
|
2006-08-17 18:13:45 +02:00
|
|
|
{ C_STRING_WITH_LEN("trigger_table")},
|
2005-11-10 20:25:03 +01:00
|
|
|
offsetof(struct st_trigname, trigger_table),
|
2006-03-27 23:01:51 +02:00
|
|
|
FILE_OPTIONS_ESTRING
|
2005-11-10 20:25:03 +01:00
|
|
|
},
|
|
|
|
{ { 0, 0 }, 0, FILE_OPTIONS_STRING }
|
2005-07-19 18:06:49 +02:00
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
const LEX_STRING trg_action_time_type_names[]=
|
|
|
|
{
|
2006-08-17 18:13:45 +02:00
|
|
|
{ C_STRING_WITH_LEN("BEFORE") },
|
|
|
|
{ C_STRING_WITH_LEN("AFTER") }
|
2005-07-19 18:06:49 +02:00
|
|
|
};
|
|
|
|
|
|
|
|
const LEX_STRING trg_event_type_names[]=
|
|
|
|
{
|
2006-08-17 18:13:45 +02:00
|
|
|
{ C_STRING_WITH_LEN("INSERT") },
|
|
|
|
{ C_STRING_WITH_LEN("UPDATE") },
|
|
|
|
{ C_STRING_WITH_LEN("DELETE") }
|
2005-07-19 18:06:49 +02:00
|
|
|
};
|
|
|
|
|
|
|
|
|
Bug#23703 (DROP TRIGGER needs an IF EXISTS)
This change set implements the DROP TRIGGER IF EXISTS functionality.
This fix is considered a bug and not a feature, because without it,
there is no known method to write a database creation script that can create
a trigger without failing, when executed on a database that may or may not
contain already a trigger of the same name.
Implementing this functionality closes an orthogonality gap between triggers
and stored procedures / stored functions (which do support the DROP IF
EXISTS syntax).
In sql_trigger.cc, in mysql_create_or_drop_trigger,
the code has been reordered to:
- perform the tests that do not depend on the file system (access()),
- get the locks (wait_if_global_read_lock, LOCK_open)
- call access()
- perform the operation
- write to the binlog
- unlock (LOCK_open, start_waiting_global_read_lock)
This is to ensure that all the code that depends on the presence of the
trigger file is executed in the same critical section,
and prevents race conditions similar to the case fixed by Bug 14262 :
- thread 1 executes DROP TRIGGER IF EXISTS, access() returns a failure
- thread 2 executes CREATE TRIGGER
- thread 2 logs CREATE TRIGGER
- thread 1 logs DROP TRIGGER IF EXISTS
The patch itself is based on code contributed by the MySQL community,
under the terms of the Contributor License Agreement (See Bug 18161).
mysql-test/r/rpl_trigger.result:
DROP TRIGGER IF EXISTS
mysql-test/r/trigger.result:
DROP TRIGGER IF EXISTS
mysql-test/t/rpl_trigger.test:
DROP TRIGGER IF EXISTS
mysql-test/t/trigger.test:
DROP TRIGGER IF EXISTS
sql/sql_trigger.cc:
DROP TRIGGER IF EXISTS
sql/sql_yacc.yy:
DROP TRIGGER IF EXISTS
2006-11-13 23:40:22 +01:00
|
|
|
static int
|
|
|
|
add_table_for_trigger(THD *thd, sp_name *trig, bool if_exists,
|
|
|
|
TABLE_LIST ** table);
|
2005-07-19 18:06:49 +02:00
|
|
|
|
2005-11-20 19:47:07 +01:00
|
|
|
class Handle_old_incorrect_sql_modes_hook: public Unknown_key_hook
|
|
|
|
{
|
|
|
|
private:
|
|
|
|
char *path;
|
|
|
|
public:
|
|
|
|
Handle_old_incorrect_sql_modes_hook(char *file_path)
|
|
|
|
:path(file_path)
|
|
|
|
{};
|
|
|
|
virtual bool process_unknown_string(char *&unknown_key, gptr base,
|
|
|
|
MEM_ROOT *mem_root, char *end);
|
|
|
|
};
|
2005-07-19 18:06:49 +02:00
|
|
|
|
2006-03-27 23:01:51 +02:00
|
|
|
class Handle_old_incorrect_trigger_table_hook: public Unknown_key_hook
|
|
|
|
{
|
|
|
|
public:
|
|
|
|
Handle_old_incorrect_trigger_table_hook(char *file_path,
|
|
|
|
LEX_STRING *trigger_table_arg)
|
|
|
|
:path(file_path), trigger_table_value(trigger_table_arg)
|
|
|
|
{};
|
|
|
|
virtual bool process_unknown_string(char *&unknown_key, gptr base,
|
|
|
|
MEM_ROOT *mem_root, char *end);
|
|
|
|
private:
|
|
|
|
char *path;
|
|
|
|
LEX_STRING *trigger_table_value;
|
|
|
|
};
|
|
|
|
|
2004-09-07 14:29:46 +02:00
|
|
|
/*
|
|
|
|
Create or drop trigger for table.
|
|
|
|
|
|
|
|
SYNOPSIS
|
|
|
|
mysql_create_or_drop_trigger()
|
|
|
|
thd - current thread context (including trigger definition in LEX)
|
|
|
|
tables - table list containing one table for which trigger is created.
|
2005-05-06 10:39:30 +02:00
|
|
|
create - whenever we create (TRUE) or drop (FALSE) trigger
|
2004-09-07 14:29:46 +02:00
|
|
|
|
|
|
|
NOTE
|
|
|
|
This function is mainly responsible for opening and locking of table and
|
|
|
|
invalidation of all its instances in table cache after trigger creation.
|
|
|
|
Real work on trigger creation/dropping is done inside Table_triggers_list
|
|
|
|
methods.
|
|
|
|
|
|
|
|
RETURN VALUE
|
2004-10-20 03:04:37 +02:00
|
|
|
FALSE Success
|
|
|
|
TRUE error
|
2004-09-07 14:29:46 +02:00
|
|
|
*/
|
2004-10-20 03:04:37 +02:00
|
|
|
bool mysql_create_or_drop_trigger(THD *thd, TABLE_LIST *tables, bool create)
|
2004-09-07 14:29:46 +02:00
|
|
|
{
|
Bug#23703 (DROP TRIGGER needs an IF EXISTS)
This change set implements the DROP TRIGGER IF EXISTS functionality.
This fix is considered a bug and not a feature, because without it,
there is no known method to write a database creation script that can create
a trigger without failing, when executed on a database that may or may not
contain already a trigger of the same name.
Implementing this functionality closes an orthogonality gap between triggers
and stored procedures / stored functions (which do support the DROP IF
EXISTS syntax).
In sql_trigger.cc, in mysql_create_or_drop_trigger,
the code has been reordered to:
- perform the tests that do not depend on the file system (access()),
- get the locks (wait_if_global_read_lock, LOCK_open)
- call access()
- perform the operation
- write to the binlog
- unlock (LOCK_open, start_waiting_global_read_lock)
This is to ensure that all the code that depends on the presence of the
trigger file is executed in the same critical section,
and prevents race conditions similar to the case fixed by Bug 14262 :
- thread 1 executes DROP TRIGGER IF EXISTS, access() returns a failure
- thread 2 executes CREATE TRIGGER
- thread 2 logs CREATE TRIGGER
- thread 1 logs DROP TRIGGER IF EXISTS
The patch itself is based on code contributed by the MySQL community,
under the terms of the Contributor License Agreement (See Bug 18161).
mysql-test/r/rpl_trigger.result:
DROP TRIGGER IF EXISTS
mysql-test/r/trigger.result:
DROP TRIGGER IF EXISTS
mysql-test/t/rpl_trigger.test:
DROP TRIGGER IF EXISTS
mysql-test/t/trigger.test:
DROP TRIGGER IF EXISTS
sql/sql_trigger.cc:
DROP TRIGGER IF EXISTS
sql/sql_yacc.yy:
DROP TRIGGER IF EXISTS
2006-11-13 23:40:22 +01:00
|
|
|
/*
|
|
|
|
FIXME: The code below takes too many different paths depending on the
|
|
|
|
'create' flag, so that the justification for a single function
|
|
|
|
'mysql_create_or_drop_trigger', compared to two separate functions
|
|
|
|
'mysql_create_trigger' and 'mysql_drop_trigger' is not apparent.
|
|
|
|
This is a good candidate for a minor refactoring.
|
|
|
|
*/
|
2004-09-07 14:29:46 +02:00
|
|
|
TABLE *table;
|
2005-10-17 20:37:24 +02:00
|
|
|
bool result= TRUE;
|
2006-08-24 16:48:26 +02:00
|
|
|
String stmt_query;
|
2005-11-10 20:25:03 +01:00
|
|
|
|
2004-09-07 14:29:46 +02:00
|
|
|
DBUG_ENTER("mysql_create_or_drop_trigger");
|
|
|
|
|
2006-08-24 16:48:26 +02:00
|
|
|
/* Charset of the buffer for statement must be system one. */
|
|
|
|
stmt_query.set_charset(system_charset_info);
|
|
|
|
|
2004-09-07 14:29:46 +02:00
|
|
|
/*
|
|
|
|
QQ: This function could be merged in mysql_alter_table() function
|
|
|
|
But do we want this ?
|
|
|
|
*/
|
|
|
|
|
2005-12-11 13:26:15 +01:00
|
|
|
/*
|
|
|
|
Note that once we will have check for TRIGGER privilege in place we won't
|
|
|
|
need second part of condition below, since check_access() function also
|
|
|
|
checks that db is specified.
|
|
|
|
*/
|
|
|
|
if (!thd->lex->spname->m_db.length || create && !tables->db_length)
|
|
|
|
{
|
|
|
|
my_error(ER_NO_DB_ERROR, MYF(0));
|
|
|
|
DBUG_RETURN(TRUE);
|
|
|
|
}
|
|
|
|
|
2006-06-28 02:16:02 +02:00
|
|
|
/*
|
|
|
|
We don't allow creating triggers on tables in the 'mysql' schema
|
|
|
|
*/
|
|
|
|
if (create && !my_strcasecmp(system_charset_info, "mysql", tables->db))
|
|
|
|
{
|
|
|
|
my_error(ER_NO_TRIGGERS_ON_SYSTEM_SCHEMA, MYF(0));
|
|
|
|
DBUG_RETURN(TRUE);
|
|
|
|
}
|
|
|
|
|
2004-09-07 14:29:46 +02:00
|
|
|
/*
|
2005-10-17 20:37:24 +02:00
|
|
|
There is no DETERMINISTIC clause for triggers, so can't check it.
|
|
|
|
But a trigger can in theory be used to do nasty things (if it supported
|
|
|
|
DROP for example) so we do the check for privileges. For now there is
|
|
|
|
already a stronger test right above; but when this stronger test will
|
2005-11-10 17:50:51 +01:00
|
|
|
be removed, the test below will hold. Because triggers have the same
|
Bug#23703 (DROP TRIGGER needs an IF EXISTS)
This change set implements the DROP TRIGGER IF EXISTS functionality.
This fix is considered a bug and not a feature, because without it,
there is no known method to write a database creation script that can create
a trigger without failing, when executed on a database that may or may not
contain already a trigger of the same name.
Implementing this functionality closes an orthogonality gap between triggers
and stored procedures / stored functions (which do support the DROP IF
EXISTS syntax).
In sql_trigger.cc, in mysql_create_or_drop_trigger,
the code has been reordered to:
- perform the tests that do not depend on the file system (access()),
- get the locks (wait_if_global_read_lock, LOCK_open)
- call access()
- perform the operation
- write to the binlog
- unlock (LOCK_open, start_waiting_global_read_lock)
This is to ensure that all the code that depends on the presence of the
trigger file is executed in the same critical section,
and prevents race conditions similar to the case fixed by Bug 14262 :
- thread 1 executes DROP TRIGGER IF EXISTS, access() returns a failure
- thread 2 executes CREATE TRIGGER
- thread 2 logs CREATE TRIGGER
- thread 1 logs DROP TRIGGER IF EXISTS
The patch itself is based on code contributed by the MySQL community,
under the terms of the Contributor License Agreement (See Bug 18161).
mysql-test/r/rpl_trigger.result:
DROP TRIGGER IF EXISTS
mysql-test/r/trigger.result:
DROP TRIGGER IF EXISTS
mysql-test/t/rpl_trigger.test:
DROP TRIGGER IF EXISTS
mysql-test/t/trigger.test:
DROP TRIGGER IF EXISTS
sql/sql_trigger.cc:
DROP TRIGGER IF EXISTS
sql/sql_yacc.yy:
DROP TRIGGER IF EXISTS
2006-11-13 23:40:22 +01:00
|
|
|
nature as functions regarding binlogging: their body is implicitly
|
2005-11-10 17:50:51 +01:00
|
|
|
binlogged, so they share the same danger, so trust_function_creators
|
|
|
|
applies to them too.
|
2004-09-07 14:29:46 +02:00
|
|
|
*/
|
2005-11-10 17:50:51 +01:00
|
|
|
if (!trust_function_creators && mysql_bin_log.is_open() &&
|
2005-10-17 20:37:24 +02:00
|
|
|
!(thd->security_ctx->master_access & SUPER_ACL))
|
2004-09-07 14:29:46 +02:00
|
|
|
{
|
2005-10-17 20:37:24 +02:00
|
|
|
my_error(ER_BINLOG_CREATE_ROUTINE_NEED_SUPER, MYF(0));
|
2004-10-20 03:04:37 +02:00
|
|
|
DBUG_RETURN(TRUE);
|
2004-09-07 14:29:46 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
We don't want perform our operations while global read lock is held
|
Bug#23703 (DROP TRIGGER needs an IF EXISTS)
This change set implements the DROP TRIGGER IF EXISTS functionality.
This fix is considered a bug and not a feature, because without it,
there is no known method to write a database creation script that can create
a trigger without failing, when executed on a database that may or may not
contain already a trigger of the same name.
Implementing this functionality closes an orthogonality gap between triggers
and stored procedures / stored functions (which do support the DROP IF
EXISTS syntax).
In sql_trigger.cc, in mysql_create_or_drop_trigger,
the code has been reordered to:
- perform the tests that do not depend on the file system (access()),
- get the locks (wait_if_global_read_lock, LOCK_open)
- call access()
- perform the operation
- write to the binlog
- unlock (LOCK_open, start_waiting_global_read_lock)
This is to ensure that all the code that depends on the presence of the
trigger file is executed in the same critical section,
and prevents race conditions similar to the case fixed by Bug 14262 :
- thread 1 executes DROP TRIGGER IF EXISTS, access() returns a failure
- thread 2 executes CREATE TRIGGER
- thread 2 logs CREATE TRIGGER
- thread 1 logs DROP TRIGGER IF EXISTS
The patch itself is based on code contributed by the MySQL community,
under the terms of the Contributor License Agreement (See Bug 18161).
mysql-test/r/rpl_trigger.result:
DROP TRIGGER IF EXISTS
mysql-test/r/trigger.result:
DROP TRIGGER IF EXISTS
mysql-test/t/rpl_trigger.test:
DROP TRIGGER IF EXISTS
mysql-test/t/trigger.test:
DROP TRIGGER IF EXISTS
sql/sql_trigger.cc:
DROP TRIGGER IF EXISTS
sql/sql_yacc.yy:
DROP TRIGGER IF EXISTS
2006-11-13 23:40:22 +01:00
|
|
|
so we have to wait until its end and then prevent it from occurring
|
2004-09-07 14:29:46 +02:00
|
|
|
again until we are done. (Acquiring LOCK_open is not enough because
|
Bug#23703 (DROP TRIGGER needs an IF EXISTS)
This change set implements the DROP TRIGGER IF EXISTS functionality.
This fix is considered a bug and not a feature, because without it,
there is no known method to write a database creation script that can create
a trigger without failing, when executed on a database that may or may not
contain already a trigger of the same name.
Implementing this functionality closes an orthogonality gap between triggers
and stored procedures / stored functions (which do support the DROP IF
EXISTS syntax).
In sql_trigger.cc, in mysql_create_or_drop_trigger,
the code has been reordered to:
- perform the tests that do not depend on the file system (access()),
- get the locks (wait_if_global_read_lock, LOCK_open)
- call access()
- perform the operation
- write to the binlog
- unlock (LOCK_open, start_waiting_global_read_lock)
This is to ensure that all the code that depends on the presence of the
trigger file is executed in the same critical section,
and prevents race conditions similar to the case fixed by Bug 14262 :
- thread 1 executes DROP TRIGGER IF EXISTS, access() returns a failure
- thread 2 executes CREATE TRIGGER
- thread 2 logs CREATE TRIGGER
- thread 1 logs DROP TRIGGER IF EXISTS
The patch itself is based on code contributed by the MySQL community,
under the terms of the Contributor License Agreement (See Bug 18161).
mysql-test/r/rpl_trigger.result:
DROP TRIGGER IF EXISTS
mysql-test/r/trigger.result:
DROP TRIGGER IF EXISTS
mysql-test/t/rpl_trigger.test:
DROP TRIGGER IF EXISTS
mysql-test/t/trigger.test:
DROP TRIGGER IF EXISTS
sql/sql_trigger.cc:
DROP TRIGGER IF EXISTS
sql/sql_yacc.yy:
DROP TRIGGER IF EXISTS
2006-11-13 23:40:22 +01:00
|
|
|
global read lock is held without holding LOCK_open).
|
2004-09-07 14:29:46 +02:00
|
|
|
*/
|
2005-10-17 20:37:24 +02:00
|
|
|
if (wait_if_global_read_lock(thd, 0, 1))
|
2004-10-20 03:04:37 +02:00
|
|
|
DBUG_RETURN(TRUE);
|
2004-09-07 14:29:46 +02:00
|
|
|
|
2005-10-17 20:37:24 +02:00
|
|
|
VOID(pthread_mutex_lock(&LOCK_open));
|
|
|
|
|
Bug#23703 (DROP TRIGGER needs an IF EXISTS)
This change set implements the DROP TRIGGER IF EXISTS functionality.
This fix is considered a bug and not a feature, because without it,
there is no known method to write a database creation script that can create
a trigger without failing, when executed on a database that may or may not
contain already a trigger of the same name.
Implementing this functionality closes an orthogonality gap between triggers
and stored procedures / stored functions (which do support the DROP IF
EXISTS syntax).
In sql_trigger.cc, in mysql_create_or_drop_trigger,
the code has been reordered to:
- perform the tests that do not depend on the file system (access()),
- get the locks (wait_if_global_read_lock, LOCK_open)
- call access()
- perform the operation
- write to the binlog
- unlock (LOCK_open, start_waiting_global_read_lock)
This is to ensure that all the code that depends on the presence of the
trigger file is executed in the same critical section,
and prevents race conditions similar to the case fixed by Bug 14262 :
- thread 1 executes DROP TRIGGER IF EXISTS, access() returns a failure
- thread 2 executes CREATE TRIGGER
- thread 2 logs CREATE TRIGGER
- thread 1 logs DROP TRIGGER IF EXISTS
The patch itself is based on code contributed by the MySQL community,
under the terms of the Contributor License Agreement (See Bug 18161).
mysql-test/r/rpl_trigger.result:
DROP TRIGGER IF EXISTS
mysql-test/r/trigger.result:
DROP TRIGGER IF EXISTS
mysql-test/t/rpl_trigger.test:
DROP TRIGGER IF EXISTS
mysql-test/t/trigger.test:
DROP TRIGGER IF EXISTS
sql/sql_trigger.cc:
DROP TRIGGER IF EXISTS
sql/sql_yacc.yy:
DROP TRIGGER IF EXISTS
2006-11-13 23:40:22 +01:00
|
|
|
if (!create)
|
|
|
|
{
|
|
|
|
bool if_exists= thd->lex->drop_if_exists;
|
|
|
|
|
|
|
|
if (add_table_for_trigger(thd, thd->lex->spname, if_exists, & tables))
|
|
|
|
goto end;
|
|
|
|
|
|
|
|
if (!tables)
|
|
|
|
{
|
|
|
|
DBUG_ASSERT(if_exists);
|
|
|
|
/*
|
|
|
|
Since the trigger does not exist, there is no associated table,
|
|
|
|
and therefore :
|
|
|
|
- no TRIGGER privileges to check,
|
|
|
|
- no trigger to drop,
|
|
|
|
- no table to lock/modify,
|
|
|
|
so the drop statement is successful.
|
|
|
|
*/
|
|
|
|
result= FALSE;
|
|
|
|
/* Still, we need to log the query ... */
|
|
|
|
stmt_query.append(thd->query, thd->query_length);
|
|
|
|
goto end;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2006-11-30 01:34:10 +01:00
|
|
|
/*
|
|
|
|
Check that the user has TRIGGER privilege on the subject table.
|
|
|
|
*/
|
|
|
|
{
|
|
|
|
bool err_status;
|
|
|
|
TABLE_LIST **save_query_tables_own_last= thd->lex->query_tables_own_last;
|
|
|
|
thd->lex->query_tables_own_last= 0;
|
|
|
|
|
|
|
|
err_status= check_table_access(thd, TRIGGER_ACL, tables, 0);
|
|
|
|
|
|
|
|
thd->lex->query_tables_own_last= save_query_tables_own_last;
|
|
|
|
|
|
|
|
if (err_status)
|
|
|
|
goto end;
|
|
|
|
}
|
|
|
|
|
Bug#23703 (DROP TRIGGER needs an IF EXISTS)
This change set implements the DROP TRIGGER IF EXISTS functionality.
This fix is considered a bug and not a feature, because without it,
there is no known method to write a database creation script that can create
a trigger without failing, when executed on a database that may or may not
contain already a trigger of the same name.
Implementing this functionality closes an orthogonality gap between triggers
and stored procedures / stored functions (which do support the DROP IF
EXISTS syntax).
In sql_trigger.cc, in mysql_create_or_drop_trigger,
the code has been reordered to:
- perform the tests that do not depend on the file system (access()),
- get the locks (wait_if_global_read_lock, LOCK_open)
- call access()
- perform the operation
- write to the binlog
- unlock (LOCK_open, start_waiting_global_read_lock)
This is to ensure that all the code that depends on the presence of the
trigger file is executed in the same critical section,
and prevents race conditions similar to the case fixed by Bug 14262 :
- thread 1 executes DROP TRIGGER IF EXISTS, access() returns a failure
- thread 2 executes CREATE TRIGGER
- thread 2 logs CREATE TRIGGER
- thread 1 logs DROP TRIGGER IF EXISTS
The patch itself is based on code contributed by the MySQL community,
under the terms of the Contributor License Agreement (See Bug 18161).
mysql-test/r/rpl_trigger.result:
DROP TRIGGER IF EXISTS
mysql-test/r/trigger.result:
DROP TRIGGER IF EXISTS
mysql-test/t/rpl_trigger.test:
DROP TRIGGER IF EXISTS
mysql-test/t/trigger.test:
DROP TRIGGER IF EXISTS
sql/sql_trigger.cc:
DROP TRIGGER IF EXISTS
sql/sql_yacc.yy:
DROP TRIGGER IF EXISTS
2006-11-13 23:40:22 +01:00
|
|
|
/* We should have only one table in table list. */
|
|
|
|
DBUG_ASSERT(tables->next_global == 0);
|
|
|
|
|
|
|
|
/* We do not allow creation of triggers on temporary tables. */
|
|
|
|
if (create && find_temporary_table(thd, tables->db, tables->table_name))
|
|
|
|
{
|
|
|
|
my_error(ER_TRG_ON_VIEW_OR_TEMP_TABLE, MYF(0), tables->alias);
|
|
|
|
goto end;
|
|
|
|
}
|
|
|
|
|
2005-10-17 20:37:24 +02:00
|
|
|
if (lock_table_names(thd, tables))
|
|
|
|
goto end;
|
|
|
|
|
|
|
|
/* We also don't allow creation of triggers on views. */
|
|
|
|
tables->required_type= FRMTYPE_TABLE;
|
|
|
|
|
|
|
|
if (reopen_name_locked_table(thd, tables))
|
2005-05-06 18:52:19 +02:00
|
|
|
{
|
2005-10-17 20:37:24 +02:00
|
|
|
unlock_table_name(thd, tables);
|
|
|
|
goto end;
|
|
|
|
}
|
|
|
|
table= tables->table;
|
|
|
|
|
|
|
|
if (!table->triggers)
|
|
|
|
{
|
|
|
|
if (!create)
|
|
|
|
{
|
|
|
|
my_error(ER_TRG_DOES_NOT_EXIST, MYF(0));
|
|
|
|
goto end;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!(table->triggers= new (&table->mem_root) Table_triggers_list(table)))
|
|
|
|
goto end;
|
2005-05-06 18:52:19 +02:00
|
|
|
}
|
|
|
|
|
2004-10-20 03:04:37 +02:00
|
|
|
result= (create ?
|
2006-08-24 16:48:26 +02:00
|
|
|
table->triggers->create_trigger(thd, tables, &stmt_query):
|
|
|
|
table->triggers->drop_trigger(thd, tables, &stmt_query));
|
2004-09-07 14:29:46 +02:00
|
|
|
|
2005-10-17 20:37:24 +02:00
|
|
|
end:
|
2004-09-07 14:29:46 +02:00
|
|
|
|
|
|
|
if (!result)
|
2005-11-10 20:25:03 +01:00
|
|
|
{
|
|
|
|
if (mysql_bin_log.is_open())
|
2005-05-06 18:52:19 +02:00
|
|
|
{
|
2005-11-10 20:25:03 +01:00
|
|
|
thd->clear_error();
|
|
|
|
|
|
|
|
/* Such a statement can always go directly to binlog, no trans cache. */
|
2006-10-21 04:21:05 +02:00
|
|
|
thd->binlog_query(THD::STMT_QUERY_TYPE,
|
2006-10-12 23:51:56 +02:00
|
|
|
stmt_query.ptr(), stmt_query.length(), FALSE, FALSE);
|
2005-05-06 18:52:19 +02:00
|
|
|
}
|
2006-10-03 19:38:25 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
VOID(pthread_mutex_unlock(&LOCK_open));
|
|
|
|
start_waiting_global_read_lock(thd);
|
2004-09-07 14:29:46 +02:00
|
|
|
|
2006-10-03 19:38:25 +02:00
|
|
|
if (!result)
|
2005-11-10 20:25:03 +01:00
|
|
|
send_ok(thd);
|
|
|
|
|
2004-09-07 14:29:46 +02:00
|
|
|
DBUG_RETURN(result);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
Create trigger for table.
|
|
|
|
|
|
|
|
SYNOPSIS
|
|
|
|
create_trigger()
|
2005-11-10 20:25:03 +01:00
|
|
|
thd - current thread context (including trigger definition in
|
|
|
|
LEX)
|
|
|
|
tables - table list containing one open table for which the
|
|
|
|
trigger is created.
|
2006-08-24 16:48:26 +02:00
|
|
|
stmt_query - [OUT] after successful return, this string contains
|
|
|
|
well-formed statement for creation this trigger.
|
2004-09-07 14:29:46 +02:00
|
|
|
|
2005-12-11 13:26:15 +01:00
|
|
|
NOTE
|
2006-03-01 12:13:07 +01:00
|
|
|
- Assumes that trigger name is fully qualified.
|
|
|
|
- NULL-string means the following LEX_STRING instance:
|
|
|
|
{ str = 0; length = 0 }.
|
|
|
|
- In other words, definer_user and definer_host should contain
|
|
|
|
simultaneously NULL-strings (non-SUID/old trigger) or valid strings
|
|
|
|
(SUID/new trigger).
|
2005-12-11 13:26:15 +01:00
|
|
|
|
2004-09-07 14:29:46 +02:00
|
|
|
RETURN VALUE
|
|
|
|
False - success
|
|
|
|
True - error
|
|
|
|
*/
|
2005-11-10 20:25:03 +01:00
|
|
|
bool Table_triggers_list::create_trigger(THD *thd, TABLE_LIST *tables,
|
2006-08-24 16:48:26 +02:00
|
|
|
String *stmt_query)
|
2004-09-07 14:29:46 +02:00
|
|
|
{
|
|
|
|
LEX *lex= thd->lex;
|
|
|
|
TABLE *table= tables->table;
|
2006-02-27 18:00:07 +01:00
|
|
|
char file_buff[FN_REFLEN], trigname_buff[FN_REFLEN];
|
2005-12-31 06:01:26 +01:00
|
|
|
LEX_STRING file, trigname_file;
|
2006-11-30 02:40:42 +01:00
|
|
|
LEX_STRING *trg_def;
|
2006-08-24 16:48:26 +02:00
|
|
|
LEX_STRING definer_user;
|
|
|
|
LEX_STRING definer_host;
|
2005-07-28 21:39:11 +02:00
|
|
|
ulonglong *trg_sql_mode;
|
2006-01-11 00:07:40 +01:00
|
|
|
char trg_definer_holder[USER_HOST_BUFF_SIZE];
|
2005-11-10 20:25:03 +01:00
|
|
|
LEX_STRING *trg_definer;
|
2004-11-24 10:24:02 +01:00
|
|
|
Item_trigger_field *trg_field;
|
2005-07-19 18:06:49 +02:00
|
|
|
struct st_trigname trigname;
|
2004-09-07 14:29:46 +02:00
|
|
|
|
2005-07-19 18:06:49 +02:00
|
|
|
|
|
|
|
/* Trigger must be in the same schema as target table. */
|
Table definition cache, part 2
The table opening process now works the following way:
- Create common TABLE_SHARE object
- Read the .frm file and unpack it into the TABLE_SHARE object
- Create a TABLE object based on the information in the TABLE_SHARE
object and open a handler to the table object
Other noteworthy changes:
- In TABLE_SHARE the most common strings are now LEX_STRING's
- Better error message when table is not found
- Variable table_cache is now renamed 'table_open_cache'
- New variable 'table_definition_cache' that is the number of table defintions that will be cached
- strxnmov() calls are now fixed to avoid overflows
- strxnmov() will now always add one end \0 to result
- engine objects are now created with a TABLE_SHARE object instead of a TABLE object.
- After creating a field object one must call field->init(table) before using it
- For a busy system this change will give you:
- Less memory usage for table object
- Faster opening of tables (if it's has been in use or is in table definition cache)
- Allow you to cache many table definitions objects
- Faster drop of table
mysql-test/mysql-test-run.sh:
Fixed some problems with --gdb option
Test both with socket and tcp/ip port that all old servers are killed
mysql-test/r/flush_table.result:
More tests with lock table with 2 threads + flush table
mysql-test/r/information_schema.result:
Removed old (now wrong) result
mysql-test/r/innodb.result:
Better error messages (thanks to TDC patch)
mysql-test/r/merge.result:
Extra flush table test
mysql-test/r/ndb_bitfield.result:
Better error messages (thanks to TDC patch)
mysql-test/r/ndb_partition_error.result:
Better error messages (thanks to TDC patch)
mysql-test/r/query_cache.result:
Remove tables left from old tests
mysql-test/r/temp_table.result:
Test truncate with temporary tables
mysql-test/r/variables.result:
Table_cache -> Table_open_cache
mysql-test/t/flush_table.test:
More tests with lock table with 2 threads + flush table
mysql-test/t/merge.test:
Extra flush table test
mysql-test/t/multi_update.test:
Added 'sleep' to make test predictable
mysql-test/t/query_cache.test:
Remove tables left from old tests
mysql-test/t/temp_table.test:
Test truncate with temporary tables
mysql-test/t/variables.test:
Table_cache -> Table_open_cache
mysql-test/valgrind.supp:
Remove warning that may happens becasue threads dies in different order
mysys/hash.c:
Fixed wrong DBUG_PRINT
mysys/mf_dirname.c:
More DBUG
mysys/mf_pack.c:
Better comment
mysys/mf_tempdir.c:
More DBUG
Ensure that we call cleanup_dirname() on all temporary directory paths.
If we don't do this, we will get a failure when comparing temporary table
names as in some cases the temporary table name is run through convert_dirname())
mysys/my_alloc.c:
Indentation fix
sql/examples/ha_example.cc:
We new use TABLE_SHARE instead of TABLE when creating engine handlers
sql/examples/ha_example.h:
We new use TABLE_SHARE instead of TABLE when creating engine handlers
sql/examples/ha_tina.cc:
We new use TABLE_SHARE instead of TABLE when creating engine handlers
sql/examples/ha_tina.h:
We new use TABLE_SHARE instead of TABLE when creating engine handlers
sql/field.cc:
Update for table definition cache:
- Field creation now takes TABLE_SHARE instead of TABLE as argument
(This is becasue field definitions are now cached in TABLE_SHARE)
When a field is created, one now must call field->init(TABLE) before using it
- Use s->db instead of s->table_cache_key
- Added Field::clone() to create a field in TABLE from a field in TABLE_SHARE
- make_field() takes TABLE_SHARE as argument instead of TABLE
- move_field() -> move_field_offset()
sql/field.h:
Update for table definition cache:
- Field creation now takes TABLE_SHARE instead of TABLE as argument
(This is becasue field definitions are now cached in TABLE_SHARE)
When a field is created, one now must call field->init(TABLE) before using it
- Added Field::clone() to create a field in TABLE from a field in TABLE_SHARE
- make_field() takes TABLE_SHARE as argument instead of TABLE
- move_field() -> move_field_offset()
sql/ha_archive.cc:
We new use TABLE_SHARE instead of TABLE when creating engine handlers
sql/ha_archive.h:
We new use TABLE_SHARE instead of TABLE when creating engine handlers
sql/ha_berkeley.cc:
We new use TABLE_SHARE instead of TABLE when creating engine handlers
Changed name of argument create() to not hide internal 'table' variable.
table->s -> table_share
sql/ha_berkeley.h:
We new use TABLE_SHARE instead of TABLE when creating engine handlers
sql/ha_blackhole.cc:
We new use TABLE_SHARE instead of TABLE when creating engine handlers
sql/ha_blackhole.h:
We new use TABLE_SHARE instead of TABLE when creating engine handlers
sql/ha_federated.cc:
We new use TABLE_SHARE instead of TABLE when creating engine handlers
Fixed comments
Remove index variable and replace with pointers (simple optimization)
move_field() -> move_field_offset()
Removed some strlen() calls
sql/ha_federated.h:
We new use TABLE_SHARE instead of TABLE when creating engine handlers
sql/ha_heap.cc:
We new use TABLE_SHARE instead of TABLE when creating engine handlers
Simplify delete_table() and create() as the given file names are now without extension
sql/ha_heap.h:
We new use TABLE_SHARE instead of TABLE when creating engine handlers
sql/ha_innodb.cc:
We new use TABLE_SHARE instead of TABLE when creating engine handlers
sql/ha_innodb.h:
We new use TABLE_SHARE instead of TABLE when creating engine handlers
sql/ha_myisam.cc:
We new use TABLE_SHARE instead of TABLE when creating engine handlers
Remove not needed fn_format()
Fixed for new table->s structure
sql/ha_myisam.h:
We new use TABLE_SHARE instead of TABLE when creating engine handlers
sql/ha_myisammrg.cc:
We new use TABLE_SHARE instead of TABLE when creating engine handlers
Don't set 'is_view' for MERGE tables
Use new interface to find_temporary_table()
sql/ha_myisammrg.h:
We new use TABLE_SHARE instead of TABLE when creating engine handlers
Added flag HA_NO_COPY_ON_ALTER
sql/ha_ndbcluster.cc:
We new use TABLE_SHARE instead of TABLE when creating engine handlers
Fixed wrong calls to strxnmov()
Give error HA_ERR_TABLE_DEF_CHANGED if table definition has changed
drop_table -> intern_drop_table()
table->s -> table_share
Move part_info to TABLE
Fixed comments & DBUG print's
New arguments to print_error()
sql/ha_ndbcluster.h:
We new use TABLE_SHARE instead of TABLE when creating engine handlers
sql/ha_partition.cc:
We new use TABLE_SHARE instead of TABLE when creating engine handlers
We can't set up or use part_info when creating handler as there is not yet any table object
New ha_intialise() to work with TDC (Done by Mikael)
sql/ha_partition.h:
We new use TABLE_SHARE instead of TABLE when creating engine handlers
Got set_part_info() from Mikael
sql/handler.cc:
We new use TABLE_SHARE instead of TABLE when creating engine handlers
ha_delete_table() now also takes database as an argument
handler::ha_open() now takes TABLE as argument
ha_open() now calls ha_allocate_read_write_set()
Simplify ha_allocate_read_write_set()
Remove ha_deallocate_read_write_set()
Use table_share (Cached by table definition cache)
sql/handler.h:
New table flag: HA_NO_COPY_ON_ALTER (used by merge tables)
Remove ha_deallocate_read_write_set()
get_new_handler() now takes TABLE_SHARE as argument
ha_delete_table() now gets database as argument
sql/item.cc:
table_name and db are now LEX_STRING objects
When creating fields, we have now have to call field->init(table)
move_field -> move_field_offset()
sql/item.h:
tmp_table_field_from_field_type() now takes an extra paramenter 'fixed_length' to allow one to force usage of CHAR
instead of BLOB
sql/item_cmpfunc.cc:
Fixed call to tmp_table_field_from_field_type()
sql/item_create.cc:
Assert if new not handled cast type
sql/item_func.cc:
When creating fields, we have now have to call field->init(table)
dummy_table used by 'sp' now needs a TABLE_SHARE object
sql/item_subselect.cc:
Trivial code cleanups
sql/item_sum.cc:
When creating fields, we have now have to call field->init(table)
sql/item_timefunc.cc:
Item_func_str_to_date::tmp_table_field() now replaced by call to
tmp_table_field_from_field_type() (see item_timefunc.h)
sql/item_timefunc.h:
Simply tmp_table_field()
sql/item_uniq.cc:
When creating fields, we have now have to call field->init(table)
sql/key.cc:
Added 'KEY' argument to 'find_ref_key' to simplify code
sql/lock.cc:
More debugging
Use create_table_def_key() to create key for table cache
Allocate TABLE_SHARE properly when creating name lock
Fix that locked_table_name doesn't test same table twice
sql/mysql_priv.h:
New functions for table definition cache
New interfaces to a lot of functions.
New faster interface to find_temporary_table() and close_temporary_table()
sql/mysqld.cc:
Added support for table definition cache of size 'table_def_size'
Fixed som calls to strnmov()
Changed name of 'table_cache' to 'table_open_cache'
sql/opt_range.cc:
Use new interfaces
Fixed warnings from valgrind
sql/parse_file.cc:
Safer calls to strxnmov()
Fixed typo
sql/set_var.cc:
Added variable 'table_definition_cache'
Variable table_cache renamed to 'table_open_cache'
sql/slave.cc:
Use new interface
sql/sp.cc:
Proper use of TABLE_SHARE
sql/sp_head.cc:
Remove compiler warnings
We have now to call field->init(table)
sql/sp_head.h:
Pointers to parsed strings are now const
sql/sql_acl.cc:
table_name is now a LEX_STRING
sql/sql_base.cc:
Main implementation of table definition cache
(The #ifdef's are there for the future when table definition cache will replace open table cache)
Now table definitions are cached indepndent of open tables, which will speed up things when a table is in use at once from several places
Views are not yet cached; For the moment we only cache if a table is a view or not.
Faster implementation of find_temorary_table()
Replace 'wait_for_refresh()' with the more general function 'wait_for_condition()'
Drop table is slightly faster as we can use the table definition cache to know the type of the table
sql/sql_cache.cc:
table_cache_key and table_name are now LEX_STRING
'sDBUG print fixes
sql/sql_class.cc:
table_cache_key is now a LEX_STRING
safer strxnmov()
sql/sql_class.h:
Added number of open table shares (table definitions)
sql/sql_db.cc:
safer strxnmov()
sql/sql_delete.cc:
Use new interface to find_temporary_table()
sql/sql_derived.cc:
table_name is now a LEX_STRING
sql/sql_handler.cc:
TABLE_SHARE->db and TABLE_SHARE->table_name are now LEX_STRING's
sql/sql_insert.cc:
TABLE_SHARE->db and TABLE_SHARE->table_name are now LEX_STRING's
sql/sql_lex.cc:
Make parsed string a const (to quickly find out if anything is trying to change the query string)
sql/sql_lex.h:
Make parsed string a const (to quickly find out if anything is trying to change the query string)
sql/sql_load.cc:
Safer strxnmov()
sql/sql_parse.cc:
Better error if wrong DB name
sql/sql_partition.cc:
part_info moved to TABLE from TABLE_SHARE
Indentation changes
sql/sql_select.cc:
Indentation fixes
Call field->init(TABLE) for new created fields
Update create_tmp_table() to use TABLE_SHARE properly
sql/sql_select.h:
Call field->init(TABLE) for new created fields
sql/sql_show.cc:
table_name is now a LEX_STRING
part_info moved to TABLE
sql/sql_table.cc:
Use table definition cache to speed up delete of tables
Fixed calls to functions with new interfaces
Don't use 'share_not_to_be_used'
Instead of doing openfrm() when doing repair, we now have to call
get_table_share() followed by open_table_from_share().
Replace some fn_format() with faster unpack_filename().
Safer strxnmov()
part_info is now in TABLE
Added Mikaels patch for partition and ALTER TABLE
Instead of using 'TABLE_SHARE->is_view' use 'table_flags() & HA_NO_COPY_ON_ALTER
sql/sql_test.cc:
table_name and table_cache_key are now LEX_STRING's
sql/sql_trigger.cc:
TABLE_SHARE->db and TABLE_SHARE->table_name are now LEX_STRING's
safer strxnmov()
Removed compiler warnings
sql/sql_update.cc:
Call field->init(TABLE) after field is created
sql/sql_view.cc:
safer strxnmov()
Create common TABLE_SHARE object for views to allow us to cache if table is a view
sql/structs.h:
Added SHOW_TABLE_DEFINITIONS
sql/table.cc:
Creation and destruct of TABLE_SHARE objects that are common for many TABLE objects
The table opening process now works the following way:
- Create common TABLE_SHARE object
- Read the .frm file and unpack it into the TABLE_SHARE object
- Create a TABLE object based on the information in the TABLE_SHARE
object and open a handler to the table object
open_table_def() is written in such a way that it should be trival to add parsing of the .frm files in new formats
sql/table.h:
TABLE objects for the same database table now share a common TABLE_SHARE object
In TABLE_SHARE the most common strings are now LEX_STRING's
sql/unireg.cc:
Changed arguments to rea_create_table() to have same order as other functions
Call field->init(table) for new created fields
sql/unireg.h:
Added OPEN_VIEW
strings/strxnmov.c:
Change strxnmov() to always add end \0
This makes usage of strxnmov() safer as most of MySQL code assumes that strxnmov() will create a null terminated string
2005-11-23 21:45:02 +01:00
|
|
|
if (my_strcasecmp(table_alias_charset, table->s->db.str,
|
2005-12-24 18:13:51 +01:00
|
|
|
lex->spname->m_db.str))
|
2004-09-07 14:29:46 +02:00
|
|
|
{
|
2005-07-19 18:06:49 +02:00
|
|
|
my_error(ER_TRG_IN_WRONG_SCHEMA, MYF(0));
|
2004-09-07 14:29:46 +02:00
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
2005-07-19 18:06:49 +02:00
|
|
|
/* We don't allow creation of several triggers of the same type yet */
|
|
|
|
if (bodies[lex->trg_chistics.event][lex->trg_chistics.action_time])
|
2004-09-07 14:29:46 +02:00
|
|
|
{
|
2006-06-28 21:50:50 +02:00
|
|
|
my_error(ER_NOT_SUPPORTED_YET, MYF(0),
|
|
|
|
"multiple triggers with the same action time"
|
|
|
|
" and event for one table");
|
2005-07-19 18:06:49 +02:00
|
|
|
return 1;
|
2004-09-07 14:29:46 +02:00
|
|
|
}
|
|
|
|
|
2006-03-01 12:13:07 +01:00
|
|
|
if (!lex->definer)
|
|
|
|
{
|
|
|
|
/*
|
|
|
|
DEFINER-clause is missing.
|
|
|
|
|
|
|
|
If we are in slave thread, this means that we received CREATE TRIGGER
|
|
|
|
from the master, that does not support definer in triggers. So, we
|
|
|
|
should mark this trigger as non-SUID. Note that this does not happen
|
|
|
|
when we parse triggers' definitions during opening .TRG file.
|
|
|
|
LEX::definer is ignored in that case.
|
|
|
|
|
|
|
|
Otherwise, we should use CURRENT_USER() as definer.
|
|
|
|
|
|
|
|
NOTE: when CREATE TRIGGER statement is allowed to be executed in PS/SP,
|
|
|
|
it will be required to create the definer below in persistent MEM_ROOT
|
|
|
|
of PS/SP.
|
|
|
|
*/
|
2005-11-10 20:25:03 +01:00
|
|
|
|
2006-03-01 12:13:07 +01:00
|
|
|
if (!thd->slave_thread)
|
|
|
|
{
|
|
|
|
if (!(lex->definer= create_default_definer(thd)))
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
}
|
2005-11-10 20:25:03 +01:00
|
|
|
|
|
|
|
/*
|
|
|
|
If the specified definer differs from the current user, we should check
|
|
|
|
that the current user has SUPER privilege (in order to create trigger
|
|
|
|
under another user one must have SUPER privilege).
|
|
|
|
*/
|
|
|
|
|
2006-03-01 12:13:07 +01:00
|
|
|
if (lex->definer &&
|
|
|
|
(strcmp(lex->definer->user.str, thd->security_ctx->priv_user) ||
|
|
|
|
my_strcasecmp(system_charset_info,
|
|
|
|
lex->definer->host.str,
|
|
|
|
thd->security_ctx->priv_host)))
|
2005-11-10 20:25:03 +01:00
|
|
|
{
|
|
|
|
if (check_global_access(thd, SUPER_ACL))
|
|
|
|
{
|
|
|
|
my_error(ER_SPECIFIC_ACCESS_DENIED_ERROR, MYF(0), "SUPER");
|
|
|
|
return TRUE;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2004-11-24 10:24:02 +01:00
|
|
|
/*
|
|
|
|
Let us check if all references to fields in old/new versions of row in
|
|
|
|
this trigger are ok.
|
|
|
|
|
|
|
|
NOTE: We do it here more from ease of use standpoint. We still have to
|
|
|
|
do some checks on each execution. E.g. we can catch privilege changes
|
|
|
|
only during execution. Also in near future, when we will allow access
|
|
|
|
to other tables from trigger we won't be able to catch changes in other
|
|
|
|
tables...
|
|
|
|
|
2005-05-24 20:19:33 +02:00
|
|
|
Since we don't plan to access to contents of the fields it does not
|
|
|
|
matter that we choose for both OLD and NEW values the same versions
|
|
|
|
of Field objects here.
|
2004-11-24 10:24:02 +01:00
|
|
|
*/
|
2005-05-24 20:19:33 +02:00
|
|
|
old_field= new_field= table->field;
|
2004-11-24 10:24:02 +01:00
|
|
|
|
|
|
|
for (trg_field= (Item_trigger_field *)(lex->trg_table_fields.first);
|
|
|
|
trg_field; trg_field= trg_field->next_trg_field)
|
|
|
|
{
|
2006-01-24 18:15:12 +01:00
|
|
|
/*
|
|
|
|
NOTE: now we do not check privileges at CREATE TRIGGER time. This will
|
|
|
|
be changed in the future.
|
|
|
|
*/
|
|
|
|
trg_field->setup_field(thd, table, NULL);
|
|
|
|
|
2005-02-08 23:50:45 +01:00
|
|
|
if (!trg_field->fixed &&
|
2005-07-01 06:05:42 +02:00
|
|
|
trg_field->fix_fields(thd, (Item **)0))
|
2004-11-24 10:24:02 +01:00
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
2004-09-07 14:29:46 +02:00
|
|
|
/*
|
|
|
|
Here we are creating file with triggers and save all triggers in it.
|
|
|
|
sql_create_definition_file() files handles renaming and backup of older
|
|
|
|
versions
|
|
|
|
*/
|
2005-12-31 06:01:26 +01:00
|
|
|
file.length= build_table_filename(file_buff, FN_REFLEN-1,
|
|
|
|
tables->db, tables->table_name,
|
Bug#18775 - Temporary table from alter table visible to other threads
Continued implementation of WL#1324 (table name to filename encoding)
The intermediate (not temporary) files of the new table
during ALTER TABLE was visible for SHOW TABLES. These
intermediate files are copies of the original table with
the changes done by ALTER TABLE. After all the data is
copied over from the original table, these files are renamed
to the original tables file names. So they are not temporary
files. They persist after ALTER TABLE, but just with another
name.
In 5.0 the intermediate files are invisible for SHOW TABLES
because all file names beginning with "#sql" were suppressed.
This failed since 5.1.6 because even temporary table names were
converted when making file names from them. The prefix became
converted to "@0023sql". Converting the prefix during SHOW TABLES
would suppress the listing of user tables that start with "#sql".
The solution of the problem is to continue the implementation of
the table name to file name conversion feature. One requirement
is to suppress the conversion for temporary table names.
This change is straightforward for real temporary tables as there
is a function that creates temporary file names.
But the generated path names are located in TMPDIR and have no
relation to the internal table name. This cannot be used for
ALTER TABLE. Its intermediate files need to be in the same
directory as the old table files. And it is necessary to be
able to deduce the same path from the same table name repeatedly.
Consequently the intermediate table files must be handled like normal
tables. Their internal names shall start with tmp_file_prefix
(#sql) and they shall not be converted like normal table names.
I added a flags parameter to all relevant functions that are
called from ALTER TABLE. It is used to suppress the conversion
for the intermediate table files.
The outcome is that the suppression of #sql in SHOW TABLES
works again. It does not suppress user tables as these are
converted to @0023sql on file level.
This patch does also fix ALTER TABLE ... RENAME, which could not
rename a table with non-ASCII characters in its name.
It does also fix the problem that a user could create a table like
`#sql-xxxx-yyyy`, where xxxx is mysqld's pid and yyyy is the thread
ID of some other thread, which prevented this thread from running
ALTER TABLE.
Some of the above problems are mentioned in Bug 1405, which can
be closed with this patch.
This patch does also contain some minor fixes for other forgotten
conversions. Still known problems are reported as bugs 21370,
21373, and 21387.
mysql-test/r/alter_table.result:
Bug#18775 - Temporary table from alter table visible to other threads
Continued implementation of WL#1324 (table name to filename encoding)
Added test results.
mysql-test/r/backup.result:
Bug#18775 - Temporary table from alter table visible to other threads
Continued implementation of WL#1324 (table name to filename encoding)
Added test results.
mysql-test/r/repair.result:
Bug#18775 - Temporary table from alter table visible to other threads
Continued implementation of WL#1324 (table name to filename encoding)
Added test results.
mysql-test/t/alter_table.test:
Bug#18775 - Temporary table from alter table visible to other threads
Continued implementation of WL#1324 (table name to filename encoding)
Added test cases.
mysql-test/t/backup.test:
Bug#18775 - Temporary table from alter table visible to other threads
Continued implementation of WL#1324 (table name to filename encoding)
Added test cases.
mysql-test/t/repair.test:
Bug#18775 - Temporary table from alter table visible to other threads
Continued implementation of WL#1324 (table name to filename encoding)
Added a test case.
sql/ha_myisam.cc:
Bug#18775 - Temporary table from alter table visible to other threads
Continued implementation of WL#1324 (table name to filename encoding)
Added missing table name mapping calls to backup() and restore().
sql/ha_myisammrg.cc:
Bug#18775 - Temporary table from alter table visible to other threads
Continued implementation of WL#1324 (table name to filename encoding)
Added an zero argument for the new 'flags' parameter.
sql/ha_ndbcluster.cc:
Bug#18775 - Temporary table from alter table visible to other threads
Continued implementation of WL#1324 (table name to filename encoding)
Added an zero argument for the new 'flags' parameter.
sql/ha_ndbcluster_binlog.cc:
Bug#18775 - Temporary table from alter table visible to other threads
Continued implementation of WL#1324 (table name to filename encoding)
Added an zero argument for the new 'flags' parameter.
sql/ha_ndbcluster_binlog.h:
Bug#18775 - Temporary table from alter table visible to other threads
Continued implementation of WL#1324 (table name to filename encoding)
Removed unnecessary check for wrong temp file prefix.
sql/mysql_priv.h:
Bug#18775 - Temporary table from alter table visible to other threads
Continued implementation of WL#1324 (table name to filename encoding)
Extended quick_rm_table(), mysql_rename_table(), and
build_table_filename() by an flags argument, which can indicate
temporary table names that should not be converted.
Added symbolic flag values.
sql/sql_acl.cc:
Bug#18775 - Temporary table from alter table visible to other threads
Continued implementation of WL#1324 (table name to filename encoding)
Added an zero argument for the new 'flags' parameter.
sql/sql_base.cc:
Bug#18775 - Temporary table from alter table visible to other threads
Continued implementation of WL#1324 (table name to filename encoding)
Fixed a comment.
Added DBUG calls.
sql/sql_db.cc:
Bug#18775 - Temporary table from alter table visible to other threads
Continued implementation of WL#1324 (table name to filename encoding)
Added an zero argument for the new 'flags' parameter.
sql/sql_delete.cc:
Bug#18775 - Temporary table from alter table visible to other threads
Continued implementation of WL#1324 (table name to filename encoding)
Added an zero argument for the new 'flags' parameter.
sql/sql_insert.cc:
Bug#18775 - Temporary table from alter table visible to other threads
Continued implementation of WL#1324 (table name to filename encoding)
Added an zero argument for the new 'flags' parameter.
sql/sql_partition.cc:
Bug#18775 - Temporary table from alter table visible to other threads
Continued implementation of WL#1324 (table name to filename encoding)
Added an zero argument for the new 'flags' parameter.
sql/sql_rename.cc:
Bug#18775 - Temporary table from alter table visible to other threads
Continued implementation of WL#1324 (table name to filename encoding)
Added an zero argument for the new 'flags' parameter.
sql/sql_show.cc:
Bug#18775 - Temporary table from alter table visible to other threads
Continued implementation of WL#1324 (table name to filename encoding)
Reverted the former fix for this bug. tmp_file_prefix is now used
verbatim in the comparison of file names.
sql/sql_table.cc:
Bug#18775 - Temporary table from alter table visible to other threads
Continued implementation of WL#1324 (table name to filename encoding)
Added a check for a tmp_file_prefix file name to
filename_to_tablename(). These names are now accepted without
conversion.
Extended quick_rm_table(), mysql_rename_table(), and
build_table_filename() by an flags argument, which can indicate
temporary table names that should not be converted.
Removed the table to file name conversion from
build_tmptable_filename().
Disabled REPAIR TABLE ... USE_FRM for temporary tables.
Added the forgotten conversion to mysql_alter_table() for the case
of ALTER TABLE ... RENAME.
Added comments and DBUG calls.
sql/sql_trigger.cc:
Bug#18775 - Temporary table from alter table visible to other threads
Continued implementation of WL#1324 (table name to filename encoding)
Added an zero argument for the new 'flags' parameter.
sql/sql_view.cc:
Bug#18775 - Temporary table from alter table visible to other threads
Continued implementation of WL#1324 (table name to filename encoding)
Added an zero argument for the new 'flags' parameter.
sql/table.cc:
Bug#18775 - Temporary table from alter table visible to other threads
Continued implementation of WL#1324 (table name to filename encoding)
Replaced a literal ".frm" by reg_ext.
Added DBUG calls.
storage/innobase/row/row0mysql.c:
Bug#18775 - Temporary table from alter table visible to other threads
Continued implementation of WL#1324 (table name to filename encoding)
Changed back the encoded temp file prefix to #sql.
2006-08-02 17:57:06 +02:00
|
|
|
triggers_file_ext, 0);
|
2004-09-07 14:29:46 +02:00
|
|
|
file.str= file_buff;
|
2005-12-31 06:01:26 +01:00
|
|
|
trigname_file.length= build_table_filename(trigname_buff, FN_REFLEN-1,
|
|
|
|
tables->db,
|
|
|
|
lex->spname->m_name.str,
|
Bug#18775 - Temporary table from alter table visible to other threads
Continued implementation of WL#1324 (table name to filename encoding)
The intermediate (not temporary) files of the new table
during ALTER TABLE was visible for SHOW TABLES. These
intermediate files are copies of the original table with
the changes done by ALTER TABLE. After all the data is
copied over from the original table, these files are renamed
to the original tables file names. So they are not temporary
files. They persist after ALTER TABLE, but just with another
name.
In 5.0 the intermediate files are invisible for SHOW TABLES
because all file names beginning with "#sql" were suppressed.
This failed since 5.1.6 because even temporary table names were
converted when making file names from them. The prefix became
converted to "@0023sql". Converting the prefix during SHOW TABLES
would suppress the listing of user tables that start with "#sql".
The solution of the problem is to continue the implementation of
the table name to file name conversion feature. One requirement
is to suppress the conversion for temporary table names.
This change is straightforward for real temporary tables as there
is a function that creates temporary file names.
But the generated path names are located in TMPDIR and have no
relation to the internal table name. This cannot be used for
ALTER TABLE. Its intermediate files need to be in the same
directory as the old table files. And it is necessary to be
able to deduce the same path from the same table name repeatedly.
Consequently the intermediate table files must be handled like normal
tables. Their internal names shall start with tmp_file_prefix
(#sql) and they shall not be converted like normal table names.
I added a flags parameter to all relevant functions that are
called from ALTER TABLE. It is used to suppress the conversion
for the intermediate table files.
The outcome is that the suppression of #sql in SHOW TABLES
works again. It does not suppress user tables as these are
converted to @0023sql on file level.
This patch does also fix ALTER TABLE ... RENAME, which could not
rename a table with non-ASCII characters in its name.
It does also fix the problem that a user could create a table like
`#sql-xxxx-yyyy`, where xxxx is mysqld's pid and yyyy is the thread
ID of some other thread, which prevented this thread from running
ALTER TABLE.
Some of the above problems are mentioned in Bug 1405, which can
be closed with this patch.
This patch does also contain some minor fixes for other forgotten
conversions. Still known problems are reported as bugs 21370,
21373, and 21387.
mysql-test/r/alter_table.result:
Bug#18775 - Temporary table from alter table visible to other threads
Continued implementation of WL#1324 (table name to filename encoding)
Added test results.
mysql-test/r/backup.result:
Bug#18775 - Temporary table from alter table visible to other threads
Continued implementation of WL#1324 (table name to filename encoding)
Added test results.
mysql-test/r/repair.result:
Bug#18775 - Temporary table from alter table visible to other threads
Continued implementation of WL#1324 (table name to filename encoding)
Added test results.
mysql-test/t/alter_table.test:
Bug#18775 - Temporary table from alter table visible to other threads
Continued implementation of WL#1324 (table name to filename encoding)
Added test cases.
mysql-test/t/backup.test:
Bug#18775 - Temporary table from alter table visible to other threads
Continued implementation of WL#1324 (table name to filename encoding)
Added test cases.
mysql-test/t/repair.test:
Bug#18775 - Temporary table from alter table visible to other threads
Continued implementation of WL#1324 (table name to filename encoding)
Added a test case.
sql/ha_myisam.cc:
Bug#18775 - Temporary table from alter table visible to other threads
Continued implementation of WL#1324 (table name to filename encoding)
Added missing table name mapping calls to backup() and restore().
sql/ha_myisammrg.cc:
Bug#18775 - Temporary table from alter table visible to other threads
Continued implementation of WL#1324 (table name to filename encoding)
Added an zero argument for the new 'flags' parameter.
sql/ha_ndbcluster.cc:
Bug#18775 - Temporary table from alter table visible to other threads
Continued implementation of WL#1324 (table name to filename encoding)
Added an zero argument for the new 'flags' parameter.
sql/ha_ndbcluster_binlog.cc:
Bug#18775 - Temporary table from alter table visible to other threads
Continued implementation of WL#1324 (table name to filename encoding)
Added an zero argument for the new 'flags' parameter.
sql/ha_ndbcluster_binlog.h:
Bug#18775 - Temporary table from alter table visible to other threads
Continued implementation of WL#1324 (table name to filename encoding)
Removed unnecessary check for wrong temp file prefix.
sql/mysql_priv.h:
Bug#18775 - Temporary table from alter table visible to other threads
Continued implementation of WL#1324 (table name to filename encoding)
Extended quick_rm_table(), mysql_rename_table(), and
build_table_filename() by an flags argument, which can indicate
temporary table names that should not be converted.
Added symbolic flag values.
sql/sql_acl.cc:
Bug#18775 - Temporary table from alter table visible to other threads
Continued implementation of WL#1324 (table name to filename encoding)
Added an zero argument for the new 'flags' parameter.
sql/sql_base.cc:
Bug#18775 - Temporary table from alter table visible to other threads
Continued implementation of WL#1324 (table name to filename encoding)
Fixed a comment.
Added DBUG calls.
sql/sql_db.cc:
Bug#18775 - Temporary table from alter table visible to other threads
Continued implementation of WL#1324 (table name to filename encoding)
Added an zero argument for the new 'flags' parameter.
sql/sql_delete.cc:
Bug#18775 - Temporary table from alter table visible to other threads
Continued implementation of WL#1324 (table name to filename encoding)
Added an zero argument for the new 'flags' parameter.
sql/sql_insert.cc:
Bug#18775 - Temporary table from alter table visible to other threads
Continued implementation of WL#1324 (table name to filename encoding)
Added an zero argument for the new 'flags' parameter.
sql/sql_partition.cc:
Bug#18775 - Temporary table from alter table visible to other threads
Continued implementation of WL#1324 (table name to filename encoding)
Added an zero argument for the new 'flags' parameter.
sql/sql_rename.cc:
Bug#18775 - Temporary table from alter table visible to other threads
Continued implementation of WL#1324 (table name to filename encoding)
Added an zero argument for the new 'flags' parameter.
sql/sql_show.cc:
Bug#18775 - Temporary table from alter table visible to other threads
Continued implementation of WL#1324 (table name to filename encoding)
Reverted the former fix for this bug. tmp_file_prefix is now used
verbatim in the comparison of file names.
sql/sql_table.cc:
Bug#18775 - Temporary table from alter table visible to other threads
Continued implementation of WL#1324 (table name to filename encoding)
Added a check for a tmp_file_prefix file name to
filename_to_tablename(). These names are now accepted without
conversion.
Extended quick_rm_table(), mysql_rename_table(), and
build_table_filename() by an flags argument, which can indicate
temporary table names that should not be converted.
Removed the table to file name conversion from
build_tmptable_filename().
Disabled REPAIR TABLE ... USE_FRM for temporary tables.
Added the forgotten conversion to mysql_alter_table() for the case
of ALTER TABLE ... RENAME.
Added comments and DBUG calls.
sql/sql_trigger.cc:
Bug#18775 - Temporary table from alter table visible to other threads
Continued implementation of WL#1324 (table name to filename encoding)
Added an zero argument for the new 'flags' parameter.
sql/sql_view.cc:
Bug#18775 - Temporary table from alter table visible to other threads
Continued implementation of WL#1324 (table name to filename encoding)
Added an zero argument for the new 'flags' parameter.
sql/table.cc:
Bug#18775 - Temporary table from alter table visible to other threads
Continued implementation of WL#1324 (table name to filename encoding)
Replaced a literal ".frm" by reg_ext.
Added DBUG calls.
storage/innobase/row/row0mysql.c:
Bug#18775 - Temporary table from alter table visible to other threads
Continued implementation of WL#1324 (table name to filename encoding)
Changed back the encoded temp file prefix to #sql.
2006-08-02 17:57:06 +02:00
|
|
|
trigname_file_ext, 0);
|
2005-07-19 18:06:49 +02:00
|
|
|
trigname_file.str= trigname_buff;
|
|
|
|
|
|
|
|
/* Use the filesystem to enforce trigger namespace constraints. */
|
2005-12-31 06:01:26 +01:00
|
|
|
if (!access(trigname_buff, F_OK))
|
2005-07-19 18:06:49 +02:00
|
|
|
{
|
|
|
|
my_error(ER_TRG_ALREADY_EXISTS, MYF(0));
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
trigname.trigger_table.str= tables->table_name;
|
|
|
|
trigname.trigger_table.length= tables->table_name_length;
|
|
|
|
|
2005-12-31 06:01:26 +01:00
|
|
|
if (sql_create_definition_file(NULL, &trigname_file, &trigname_file_type,
|
2005-07-19 18:06:49 +02:00
|
|
|
(gptr)&trigname, trigname_file_parameters, 0))
|
|
|
|
return 1;
|
2004-09-07 14:29:46 +02:00
|
|
|
|
|
|
|
/*
|
|
|
|
Soon we will invalidate table object and thus Table_triggers_list object
|
|
|
|
so don't care about place to which trg_def->ptr points and other
|
|
|
|
invariants (e.g. we don't bother to update names_list)
|
|
|
|
|
|
|
|
QQ: Hmm... probably we should not care about setting up active thread
|
|
|
|
mem_root too.
|
|
|
|
*/
|
|
|
|
if (!(trg_def= (LEX_STRING *)alloc_root(&table->mem_root,
|
|
|
|
sizeof(LEX_STRING))) ||
|
2005-07-28 21:39:11 +02:00
|
|
|
definitions_list.push_back(trg_def, &table->mem_root) ||
|
|
|
|
!(trg_sql_mode= (ulonglong*)alloc_root(&table->mem_root,
|
|
|
|
sizeof(ulonglong))) ||
|
2005-11-10 20:25:03 +01:00
|
|
|
definition_modes_list.push_back(trg_sql_mode, &table->mem_root) ||
|
|
|
|
!(trg_definer= (LEX_STRING*) alloc_root(&table->mem_root,
|
|
|
|
sizeof(LEX_STRING))) ||
|
|
|
|
definers_list.push_back(trg_definer, &table->mem_root))
|
2005-07-19 18:06:49 +02:00
|
|
|
goto err_with_cleanup;
|
2004-09-07 14:29:46 +02:00
|
|
|
|
2005-07-28 21:39:11 +02:00
|
|
|
*trg_sql_mode= thd->variables.sql_mode;
|
2004-09-07 14:29:46 +02:00
|
|
|
|
2005-11-10 20:25:03 +01:00
|
|
|
#ifndef NO_EMBEDDED_ACCESS_CHECKS
|
2006-03-01 12:13:07 +01:00
|
|
|
if (lex->definer && !is_acl_user(lex->definer->host.str,
|
|
|
|
lex->definer->user.str))
|
2005-11-10 20:25:03 +01:00
|
|
|
{
|
|
|
|
push_warning_printf(thd,
|
|
|
|
MYSQL_ERROR::WARN_LEVEL_NOTE,
|
|
|
|
ER_NO_SUCH_USER,
|
|
|
|
ER(ER_NO_SUCH_USER),
|
|
|
|
lex->definer->user.str,
|
|
|
|
lex->definer->host.str);
|
|
|
|
}
|
|
|
|
#endif /* NO_EMBEDDED_ACCESS_CHECKS */
|
|
|
|
|
2006-03-01 12:13:07 +01:00
|
|
|
if (lex->definer)
|
|
|
|
{
|
|
|
|
/* SUID trigger. */
|
|
|
|
|
2006-08-24 16:48:26 +02:00
|
|
|
definer_user= lex->definer->user;
|
|
|
|
definer_host= lex->definer->host;
|
2005-11-10 20:25:03 +01:00
|
|
|
|
2006-03-01 12:13:07 +01:00
|
|
|
trg_definer->str= trg_definer_holder;
|
2006-08-24 16:48:26 +02:00
|
|
|
trg_definer->length= strxmov(trg_definer->str, definer_user.str, "@",
|
|
|
|
definer_host.str, NullS) - trg_definer->str;
|
2006-03-01 12:13:07 +01:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
/* non-SUID trigger. */
|
|
|
|
|
2006-08-24 16:48:26 +02:00
|
|
|
definer_user.str= 0;
|
|
|
|
definer_user.length= 0;
|
2006-03-01 12:13:07 +01:00
|
|
|
|
2006-08-24 16:48:26 +02:00
|
|
|
definer_host.str= 0;
|
|
|
|
definer_host.length= 0;
|
2006-03-01 12:13:07 +01:00
|
|
|
|
|
|
|
trg_definer->str= (char*) "";
|
|
|
|
trg_definer->length= 0;
|
|
|
|
}
|
2005-11-10 20:25:03 +01:00
|
|
|
|
2006-08-24 16:48:26 +02:00
|
|
|
/*
|
|
|
|
Create well-formed trigger definition query. Original query is not
|
|
|
|
appropriated, because definer-clause can be not truncated.
|
|
|
|
*/
|
|
|
|
|
|
|
|
stmt_query->append(STRING_WITH_LEN("CREATE "));
|
|
|
|
|
|
|
|
if (trg_definer)
|
|
|
|
{
|
|
|
|
/*
|
|
|
|
Append definer-clause if the trigger is SUID (a usual trigger in
|
|
|
|
new MySQL versions).
|
|
|
|
*/
|
|
|
|
|
|
|
|
append_definer(thd, stmt_query, &definer_user, &definer_host);
|
|
|
|
}
|
|
|
|
|
|
|
|
stmt_query->append(thd->lex->stmt_definition_begin,
|
|
|
|
(char *) thd->lex->sphead->m_body_begin -
|
|
|
|
thd->lex->stmt_definition_begin +
|
|
|
|
thd->lex->sphead->m_body.length);
|
|
|
|
|
|
|
|
trg_def->str= stmt_query->c_ptr();
|
|
|
|
trg_def->length= stmt_query->length();
|
|
|
|
|
|
|
|
/* Create trigger definition file. */
|
|
|
|
|
2005-12-31 06:01:26 +01:00
|
|
|
if (!sql_create_definition_file(NULL, &file, &triggers_file_type,
|
2006-02-24 21:50:36 +01:00
|
|
|
(gptr)this, triggers_file_parameters, 0))
|
2005-07-19 18:06:49 +02:00
|
|
|
return 0;
|
|
|
|
|
|
|
|
err_with_cleanup:
|
2006-02-27 18:00:07 +01:00
|
|
|
my_delete(trigname_buff, MYF(MY_WME));
|
2005-07-19 18:06:49 +02:00
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
Deletes the .TRG file for a table
|
|
|
|
|
|
|
|
SYNOPSIS
|
|
|
|
rm_trigger_file()
|
|
|
|
path - char buffer of size FN_REFLEN to be used
|
|
|
|
for constructing path to .TRG file.
|
|
|
|
db - table's database name
|
|
|
|
table_name - table's name
|
|
|
|
|
|
|
|
RETURN VALUE
|
|
|
|
False - success
|
|
|
|
True - error
|
|
|
|
*/
|
|
|
|
|
2006-02-24 21:50:36 +01:00
|
|
|
static bool rm_trigger_file(char *path, const char *db,
|
|
|
|
const char *table_name)
|
2005-07-19 18:06:49 +02:00
|
|
|
{
|
Bug#18775 - Temporary table from alter table visible to other threads
Continued implementation of WL#1324 (table name to filename encoding)
The intermediate (not temporary) files of the new table
during ALTER TABLE was visible for SHOW TABLES. These
intermediate files are copies of the original table with
the changes done by ALTER TABLE. After all the data is
copied over from the original table, these files are renamed
to the original tables file names. So they are not temporary
files. They persist after ALTER TABLE, but just with another
name.
In 5.0 the intermediate files are invisible for SHOW TABLES
because all file names beginning with "#sql" were suppressed.
This failed since 5.1.6 because even temporary table names were
converted when making file names from them. The prefix became
converted to "@0023sql". Converting the prefix during SHOW TABLES
would suppress the listing of user tables that start with "#sql".
The solution of the problem is to continue the implementation of
the table name to file name conversion feature. One requirement
is to suppress the conversion for temporary table names.
This change is straightforward for real temporary tables as there
is a function that creates temporary file names.
But the generated path names are located in TMPDIR and have no
relation to the internal table name. This cannot be used for
ALTER TABLE. Its intermediate files need to be in the same
directory as the old table files. And it is necessary to be
able to deduce the same path from the same table name repeatedly.
Consequently the intermediate table files must be handled like normal
tables. Their internal names shall start with tmp_file_prefix
(#sql) and they shall not be converted like normal table names.
I added a flags parameter to all relevant functions that are
called from ALTER TABLE. It is used to suppress the conversion
for the intermediate table files.
The outcome is that the suppression of #sql in SHOW TABLES
works again. It does not suppress user tables as these are
converted to @0023sql on file level.
This patch does also fix ALTER TABLE ... RENAME, which could not
rename a table with non-ASCII characters in its name.
It does also fix the problem that a user could create a table like
`#sql-xxxx-yyyy`, where xxxx is mysqld's pid and yyyy is the thread
ID of some other thread, which prevented this thread from running
ALTER TABLE.
Some of the above problems are mentioned in Bug 1405, which can
be closed with this patch.
This patch does also contain some minor fixes for other forgotten
conversions. Still known problems are reported as bugs 21370,
21373, and 21387.
mysql-test/r/alter_table.result:
Bug#18775 - Temporary table from alter table visible to other threads
Continued implementation of WL#1324 (table name to filename encoding)
Added test results.
mysql-test/r/backup.result:
Bug#18775 - Temporary table from alter table visible to other threads
Continued implementation of WL#1324 (table name to filename encoding)
Added test results.
mysql-test/r/repair.result:
Bug#18775 - Temporary table from alter table visible to other threads
Continued implementation of WL#1324 (table name to filename encoding)
Added test results.
mysql-test/t/alter_table.test:
Bug#18775 - Temporary table from alter table visible to other threads
Continued implementation of WL#1324 (table name to filename encoding)
Added test cases.
mysql-test/t/backup.test:
Bug#18775 - Temporary table from alter table visible to other threads
Continued implementation of WL#1324 (table name to filename encoding)
Added test cases.
mysql-test/t/repair.test:
Bug#18775 - Temporary table from alter table visible to other threads
Continued implementation of WL#1324 (table name to filename encoding)
Added a test case.
sql/ha_myisam.cc:
Bug#18775 - Temporary table from alter table visible to other threads
Continued implementation of WL#1324 (table name to filename encoding)
Added missing table name mapping calls to backup() and restore().
sql/ha_myisammrg.cc:
Bug#18775 - Temporary table from alter table visible to other threads
Continued implementation of WL#1324 (table name to filename encoding)
Added an zero argument for the new 'flags' parameter.
sql/ha_ndbcluster.cc:
Bug#18775 - Temporary table from alter table visible to other threads
Continued implementation of WL#1324 (table name to filename encoding)
Added an zero argument for the new 'flags' parameter.
sql/ha_ndbcluster_binlog.cc:
Bug#18775 - Temporary table from alter table visible to other threads
Continued implementation of WL#1324 (table name to filename encoding)
Added an zero argument for the new 'flags' parameter.
sql/ha_ndbcluster_binlog.h:
Bug#18775 - Temporary table from alter table visible to other threads
Continued implementation of WL#1324 (table name to filename encoding)
Removed unnecessary check for wrong temp file prefix.
sql/mysql_priv.h:
Bug#18775 - Temporary table from alter table visible to other threads
Continued implementation of WL#1324 (table name to filename encoding)
Extended quick_rm_table(), mysql_rename_table(), and
build_table_filename() by an flags argument, which can indicate
temporary table names that should not be converted.
Added symbolic flag values.
sql/sql_acl.cc:
Bug#18775 - Temporary table from alter table visible to other threads
Continued implementation of WL#1324 (table name to filename encoding)
Added an zero argument for the new 'flags' parameter.
sql/sql_base.cc:
Bug#18775 - Temporary table from alter table visible to other threads
Continued implementation of WL#1324 (table name to filename encoding)
Fixed a comment.
Added DBUG calls.
sql/sql_db.cc:
Bug#18775 - Temporary table from alter table visible to other threads
Continued implementation of WL#1324 (table name to filename encoding)
Added an zero argument for the new 'flags' parameter.
sql/sql_delete.cc:
Bug#18775 - Temporary table from alter table visible to other threads
Continued implementation of WL#1324 (table name to filename encoding)
Added an zero argument for the new 'flags' parameter.
sql/sql_insert.cc:
Bug#18775 - Temporary table from alter table visible to other threads
Continued implementation of WL#1324 (table name to filename encoding)
Added an zero argument for the new 'flags' parameter.
sql/sql_partition.cc:
Bug#18775 - Temporary table from alter table visible to other threads
Continued implementation of WL#1324 (table name to filename encoding)
Added an zero argument for the new 'flags' parameter.
sql/sql_rename.cc:
Bug#18775 - Temporary table from alter table visible to other threads
Continued implementation of WL#1324 (table name to filename encoding)
Added an zero argument for the new 'flags' parameter.
sql/sql_show.cc:
Bug#18775 - Temporary table from alter table visible to other threads
Continued implementation of WL#1324 (table name to filename encoding)
Reverted the former fix for this bug. tmp_file_prefix is now used
verbatim in the comparison of file names.
sql/sql_table.cc:
Bug#18775 - Temporary table from alter table visible to other threads
Continued implementation of WL#1324 (table name to filename encoding)
Added a check for a tmp_file_prefix file name to
filename_to_tablename(). These names are now accepted without
conversion.
Extended quick_rm_table(), mysql_rename_table(), and
build_table_filename() by an flags argument, which can indicate
temporary table names that should not be converted.
Removed the table to file name conversion from
build_tmptable_filename().
Disabled REPAIR TABLE ... USE_FRM for temporary tables.
Added the forgotten conversion to mysql_alter_table() for the case
of ALTER TABLE ... RENAME.
Added comments and DBUG calls.
sql/sql_trigger.cc:
Bug#18775 - Temporary table from alter table visible to other threads
Continued implementation of WL#1324 (table name to filename encoding)
Added an zero argument for the new 'flags' parameter.
sql/sql_view.cc:
Bug#18775 - Temporary table from alter table visible to other threads
Continued implementation of WL#1324 (table name to filename encoding)
Added an zero argument for the new 'flags' parameter.
sql/table.cc:
Bug#18775 - Temporary table from alter table visible to other threads
Continued implementation of WL#1324 (table name to filename encoding)
Replaced a literal ".frm" by reg_ext.
Added DBUG calls.
storage/innobase/row/row0mysql.c:
Bug#18775 - Temporary table from alter table visible to other threads
Continued implementation of WL#1324 (table name to filename encoding)
Changed back the encoded temp file prefix to #sql.
2006-08-02 17:57:06 +02:00
|
|
|
build_table_filename(path, FN_REFLEN-1, db, table_name, triggers_file_ext, 0);
|
2005-07-19 18:06:49 +02:00
|
|
|
return my_delete(path, MYF(MY_WME));
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
Deletes the .TRN file for a trigger
|
|
|
|
|
|
|
|
SYNOPSIS
|
|
|
|
rm_trigname_file()
|
|
|
|
path - char buffer of size FN_REFLEN to be used
|
|
|
|
for constructing path to .TRN file.
|
|
|
|
db - trigger's database name
|
|
|
|
table_name - trigger's name
|
|
|
|
|
|
|
|
RETURN VALUE
|
|
|
|
False - success
|
|
|
|
True - error
|
|
|
|
*/
|
|
|
|
|
2006-02-24 21:50:36 +01:00
|
|
|
static bool rm_trigname_file(char *path, const char *db,
|
|
|
|
const char *trigger_name)
|
2005-07-19 18:06:49 +02:00
|
|
|
{
|
Bug#18775 - Temporary table from alter table visible to other threads
Continued implementation of WL#1324 (table name to filename encoding)
The intermediate (not temporary) files of the new table
during ALTER TABLE was visible for SHOW TABLES. These
intermediate files are copies of the original table with
the changes done by ALTER TABLE. After all the data is
copied over from the original table, these files are renamed
to the original tables file names. So they are not temporary
files. They persist after ALTER TABLE, but just with another
name.
In 5.0 the intermediate files are invisible for SHOW TABLES
because all file names beginning with "#sql" were suppressed.
This failed since 5.1.6 because even temporary table names were
converted when making file names from them. The prefix became
converted to "@0023sql". Converting the prefix during SHOW TABLES
would suppress the listing of user tables that start with "#sql".
The solution of the problem is to continue the implementation of
the table name to file name conversion feature. One requirement
is to suppress the conversion for temporary table names.
This change is straightforward for real temporary tables as there
is a function that creates temporary file names.
But the generated path names are located in TMPDIR and have no
relation to the internal table name. This cannot be used for
ALTER TABLE. Its intermediate files need to be in the same
directory as the old table files. And it is necessary to be
able to deduce the same path from the same table name repeatedly.
Consequently the intermediate table files must be handled like normal
tables. Their internal names shall start with tmp_file_prefix
(#sql) and they shall not be converted like normal table names.
I added a flags parameter to all relevant functions that are
called from ALTER TABLE. It is used to suppress the conversion
for the intermediate table files.
The outcome is that the suppression of #sql in SHOW TABLES
works again. It does not suppress user tables as these are
converted to @0023sql on file level.
This patch does also fix ALTER TABLE ... RENAME, which could not
rename a table with non-ASCII characters in its name.
It does also fix the problem that a user could create a table like
`#sql-xxxx-yyyy`, where xxxx is mysqld's pid and yyyy is the thread
ID of some other thread, which prevented this thread from running
ALTER TABLE.
Some of the above problems are mentioned in Bug 1405, which can
be closed with this patch.
This patch does also contain some minor fixes for other forgotten
conversions. Still known problems are reported as bugs 21370,
21373, and 21387.
mysql-test/r/alter_table.result:
Bug#18775 - Temporary table from alter table visible to other threads
Continued implementation of WL#1324 (table name to filename encoding)
Added test results.
mysql-test/r/backup.result:
Bug#18775 - Temporary table from alter table visible to other threads
Continued implementation of WL#1324 (table name to filename encoding)
Added test results.
mysql-test/r/repair.result:
Bug#18775 - Temporary table from alter table visible to other threads
Continued implementation of WL#1324 (table name to filename encoding)
Added test results.
mysql-test/t/alter_table.test:
Bug#18775 - Temporary table from alter table visible to other threads
Continued implementation of WL#1324 (table name to filename encoding)
Added test cases.
mysql-test/t/backup.test:
Bug#18775 - Temporary table from alter table visible to other threads
Continued implementation of WL#1324 (table name to filename encoding)
Added test cases.
mysql-test/t/repair.test:
Bug#18775 - Temporary table from alter table visible to other threads
Continued implementation of WL#1324 (table name to filename encoding)
Added a test case.
sql/ha_myisam.cc:
Bug#18775 - Temporary table from alter table visible to other threads
Continued implementation of WL#1324 (table name to filename encoding)
Added missing table name mapping calls to backup() and restore().
sql/ha_myisammrg.cc:
Bug#18775 - Temporary table from alter table visible to other threads
Continued implementation of WL#1324 (table name to filename encoding)
Added an zero argument for the new 'flags' parameter.
sql/ha_ndbcluster.cc:
Bug#18775 - Temporary table from alter table visible to other threads
Continued implementation of WL#1324 (table name to filename encoding)
Added an zero argument for the new 'flags' parameter.
sql/ha_ndbcluster_binlog.cc:
Bug#18775 - Temporary table from alter table visible to other threads
Continued implementation of WL#1324 (table name to filename encoding)
Added an zero argument for the new 'flags' parameter.
sql/ha_ndbcluster_binlog.h:
Bug#18775 - Temporary table from alter table visible to other threads
Continued implementation of WL#1324 (table name to filename encoding)
Removed unnecessary check for wrong temp file prefix.
sql/mysql_priv.h:
Bug#18775 - Temporary table from alter table visible to other threads
Continued implementation of WL#1324 (table name to filename encoding)
Extended quick_rm_table(), mysql_rename_table(), and
build_table_filename() by an flags argument, which can indicate
temporary table names that should not be converted.
Added symbolic flag values.
sql/sql_acl.cc:
Bug#18775 - Temporary table from alter table visible to other threads
Continued implementation of WL#1324 (table name to filename encoding)
Added an zero argument for the new 'flags' parameter.
sql/sql_base.cc:
Bug#18775 - Temporary table from alter table visible to other threads
Continued implementation of WL#1324 (table name to filename encoding)
Fixed a comment.
Added DBUG calls.
sql/sql_db.cc:
Bug#18775 - Temporary table from alter table visible to other threads
Continued implementation of WL#1324 (table name to filename encoding)
Added an zero argument for the new 'flags' parameter.
sql/sql_delete.cc:
Bug#18775 - Temporary table from alter table visible to other threads
Continued implementation of WL#1324 (table name to filename encoding)
Added an zero argument for the new 'flags' parameter.
sql/sql_insert.cc:
Bug#18775 - Temporary table from alter table visible to other threads
Continued implementation of WL#1324 (table name to filename encoding)
Added an zero argument for the new 'flags' parameter.
sql/sql_partition.cc:
Bug#18775 - Temporary table from alter table visible to other threads
Continued implementation of WL#1324 (table name to filename encoding)
Added an zero argument for the new 'flags' parameter.
sql/sql_rename.cc:
Bug#18775 - Temporary table from alter table visible to other threads
Continued implementation of WL#1324 (table name to filename encoding)
Added an zero argument for the new 'flags' parameter.
sql/sql_show.cc:
Bug#18775 - Temporary table from alter table visible to other threads
Continued implementation of WL#1324 (table name to filename encoding)
Reverted the former fix for this bug. tmp_file_prefix is now used
verbatim in the comparison of file names.
sql/sql_table.cc:
Bug#18775 - Temporary table from alter table visible to other threads
Continued implementation of WL#1324 (table name to filename encoding)
Added a check for a tmp_file_prefix file name to
filename_to_tablename(). These names are now accepted without
conversion.
Extended quick_rm_table(), mysql_rename_table(), and
build_table_filename() by an flags argument, which can indicate
temporary table names that should not be converted.
Removed the table to file name conversion from
build_tmptable_filename().
Disabled REPAIR TABLE ... USE_FRM for temporary tables.
Added the forgotten conversion to mysql_alter_table() for the case
of ALTER TABLE ... RENAME.
Added comments and DBUG calls.
sql/sql_trigger.cc:
Bug#18775 - Temporary table from alter table visible to other threads
Continued implementation of WL#1324 (table name to filename encoding)
Added an zero argument for the new 'flags' parameter.
sql/sql_view.cc:
Bug#18775 - Temporary table from alter table visible to other threads
Continued implementation of WL#1324 (table name to filename encoding)
Added an zero argument for the new 'flags' parameter.
sql/table.cc:
Bug#18775 - Temporary table from alter table visible to other threads
Continued implementation of WL#1324 (table name to filename encoding)
Replaced a literal ".frm" by reg_ext.
Added DBUG calls.
storage/innobase/row/row0mysql.c:
Bug#18775 - Temporary table from alter table visible to other threads
Continued implementation of WL#1324 (table name to filename encoding)
Changed back the encoded temp file prefix to #sql.
2006-08-02 17:57:06 +02:00
|
|
|
build_table_filename(path, FN_REFLEN-1,
|
|
|
|
db, trigger_name, trigname_file_ext, 0);
|
2005-07-19 18:06:49 +02:00
|
|
|
return my_delete(path, MYF(MY_WME));
|
2004-09-07 14:29:46 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2006-02-24 21:50:36 +01:00
|
|
|
/*
|
|
|
|
Helper function that saves .TRG file for Table_triggers_list object.
|
|
|
|
|
|
|
|
SYNOPSIS
|
|
|
|
save_trigger_file()
|
|
|
|
triggers Table_triggers_list object for which file should be saved
|
|
|
|
db Name of database for subject table
|
|
|
|
table_name Name of subject table
|
|
|
|
|
|
|
|
RETURN VALUE
|
|
|
|
FALSE Success
|
|
|
|
TRUE Error
|
|
|
|
*/
|
|
|
|
|
|
|
|
static bool save_trigger_file(Table_triggers_list *triggers, const char *db,
|
|
|
|
const char *table_name)
|
|
|
|
{
|
2006-02-27 18:00:07 +01:00
|
|
|
char file_buff[FN_REFLEN];
|
|
|
|
LEX_STRING file;
|
2006-02-24 21:50:36 +01:00
|
|
|
|
2006-02-27 18:00:07 +01:00
|
|
|
file.length= build_table_filename(file_buff, FN_REFLEN-1, db, table_name,
|
Bug#18775 - Temporary table from alter table visible to other threads
Continued implementation of WL#1324 (table name to filename encoding)
The intermediate (not temporary) files of the new table
during ALTER TABLE was visible for SHOW TABLES. These
intermediate files are copies of the original table with
the changes done by ALTER TABLE. After all the data is
copied over from the original table, these files are renamed
to the original tables file names. So they are not temporary
files. They persist after ALTER TABLE, but just with another
name.
In 5.0 the intermediate files are invisible for SHOW TABLES
because all file names beginning with "#sql" were suppressed.
This failed since 5.1.6 because even temporary table names were
converted when making file names from them. The prefix became
converted to "@0023sql". Converting the prefix during SHOW TABLES
would suppress the listing of user tables that start with "#sql".
The solution of the problem is to continue the implementation of
the table name to file name conversion feature. One requirement
is to suppress the conversion for temporary table names.
This change is straightforward for real temporary tables as there
is a function that creates temporary file names.
But the generated path names are located in TMPDIR and have no
relation to the internal table name. This cannot be used for
ALTER TABLE. Its intermediate files need to be in the same
directory as the old table files. And it is necessary to be
able to deduce the same path from the same table name repeatedly.
Consequently the intermediate table files must be handled like normal
tables. Their internal names shall start with tmp_file_prefix
(#sql) and they shall not be converted like normal table names.
I added a flags parameter to all relevant functions that are
called from ALTER TABLE. It is used to suppress the conversion
for the intermediate table files.
The outcome is that the suppression of #sql in SHOW TABLES
works again. It does not suppress user tables as these are
converted to @0023sql on file level.
This patch does also fix ALTER TABLE ... RENAME, which could not
rename a table with non-ASCII characters in its name.
It does also fix the problem that a user could create a table like
`#sql-xxxx-yyyy`, where xxxx is mysqld's pid and yyyy is the thread
ID of some other thread, which prevented this thread from running
ALTER TABLE.
Some of the above problems are mentioned in Bug 1405, which can
be closed with this patch.
This patch does also contain some minor fixes for other forgotten
conversions. Still known problems are reported as bugs 21370,
21373, and 21387.
mysql-test/r/alter_table.result:
Bug#18775 - Temporary table from alter table visible to other threads
Continued implementation of WL#1324 (table name to filename encoding)
Added test results.
mysql-test/r/backup.result:
Bug#18775 - Temporary table from alter table visible to other threads
Continued implementation of WL#1324 (table name to filename encoding)
Added test results.
mysql-test/r/repair.result:
Bug#18775 - Temporary table from alter table visible to other threads
Continued implementation of WL#1324 (table name to filename encoding)
Added test results.
mysql-test/t/alter_table.test:
Bug#18775 - Temporary table from alter table visible to other threads
Continued implementation of WL#1324 (table name to filename encoding)
Added test cases.
mysql-test/t/backup.test:
Bug#18775 - Temporary table from alter table visible to other threads
Continued implementation of WL#1324 (table name to filename encoding)
Added test cases.
mysql-test/t/repair.test:
Bug#18775 - Temporary table from alter table visible to other threads
Continued implementation of WL#1324 (table name to filename encoding)
Added a test case.
sql/ha_myisam.cc:
Bug#18775 - Temporary table from alter table visible to other threads
Continued implementation of WL#1324 (table name to filename encoding)
Added missing table name mapping calls to backup() and restore().
sql/ha_myisammrg.cc:
Bug#18775 - Temporary table from alter table visible to other threads
Continued implementation of WL#1324 (table name to filename encoding)
Added an zero argument for the new 'flags' parameter.
sql/ha_ndbcluster.cc:
Bug#18775 - Temporary table from alter table visible to other threads
Continued implementation of WL#1324 (table name to filename encoding)
Added an zero argument for the new 'flags' parameter.
sql/ha_ndbcluster_binlog.cc:
Bug#18775 - Temporary table from alter table visible to other threads
Continued implementation of WL#1324 (table name to filename encoding)
Added an zero argument for the new 'flags' parameter.
sql/ha_ndbcluster_binlog.h:
Bug#18775 - Temporary table from alter table visible to other threads
Continued implementation of WL#1324 (table name to filename encoding)
Removed unnecessary check for wrong temp file prefix.
sql/mysql_priv.h:
Bug#18775 - Temporary table from alter table visible to other threads
Continued implementation of WL#1324 (table name to filename encoding)
Extended quick_rm_table(), mysql_rename_table(), and
build_table_filename() by an flags argument, which can indicate
temporary table names that should not be converted.
Added symbolic flag values.
sql/sql_acl.cc:
Bug#18775 - Temporary table from alter table visible to other threads
Continued implementation of WL#1324 (table name to filename encoding)
Added an zero argument for the new 'flags' parameter.
sql/sql_base.cc:
Bug#18775 - Temporary table from alter table visible to other threads
Continued implementation of WL#1324 (table name to filename encoding)
Fixed a comment.
Added DBUG calls.
sql/sql_db.cc:
Bug#18775 - Temporary table from alter table visible to other threads
Continued implementation of WL#1324 (table name to filename encoding)
Added an zero argument for the new 'flags' parameter.
sql/sql_delete.cc:
Bug#18775 - Temporary table from alter table visible to other threads
Continued implementation of WL#1324 (table name to filename encoding)
Added an zero argument for the new 'flags' parameter.
sql/sql_insert.cc:
Bug#18775 - Temporary table from alter table visible to other threads
Continued implementation of WL#1324 (table name to filename encoding)
Added an zero argument for the new 'flags' parameter.
sql/sql_partition.cc:
Bug#18775 - Temporary table from alter table visible to other threads
Continued implementation of WL#1324 (table name to filename encoding)
Added an zero argument for the new 'flags' parameter.
sql/sql_rename.cc:
Bug#18775 - Temporary table from alter table visible to other threads
Continued implementation of WL#1324 (table name to filename encoding)
Added an zero argument for the new 'flags' parameter.
sql/sql_show.cc:
Bug#18775 - Temporary table from alter table visible to other threads
Continued implementation of WL#1324 (table name to filename encoding)
Reverted the former fix for this bug. tmp_file_prefix is now used
verbatim in the comparison of file names.
sql/sql_table.cc:
Bug#18775 - Temporary table from alter table visible to other threads
Continued implementation of WL#1324 (table name to filename encoding)
Added a check for a tmp_file_prefix file name to
filename_to_tablename(). These names are now accepted without
conversion.
Extended quick_rm_table(), mysql_rename_table(), and
build_table_filename() by an flags argument, which can indicate
temporary table names that should not be converted.
Removed the table to file name conversion from
build_tmptable_filename().
Disabled REPAIR TABLE ... USE_FRM for temporary tables.
Added the forgotten conversion to mysql_alter_table() for the case
of ALTER TABLE ... RENAME.
Added comments and DBUG calls.
sql/sql_trigger.cc:
Bug#18775 - Temporary table from alter table visible to other threads
Continued implementation of WL#1324 (table name to filename encoding)
Added an zero argument for the new 'flags' parameter.
sql/sql_view.cc:
Bug#18775 - Temporary table from alter table visible to other threads
Continued implementation of WL#1324 (table name to filename encoding)
Added an zero argument for the new 'flags' parameter.
sql/table.cc:
Bug#18775 - Temporary table from alter table visible to other threads
Continued implementation of WL#1324 (table name to filename encoding)
Replaced a literal ".frm" by reg_ext.
Added DBUG calls.
storage/innobase/row/row0mysql.c:
Bug#18775 - Temporary table from alter table visible to other threads
Continued implementation of WL#1324 (table name to filename encoding)
Changed back the encoded temp file prefix to #sql.
2006-08-02 17:57:06 +02:00
|
|
|
triggers_file_ext, 0);
|
2006-02-27 18:00:07 +01:00
|
|
|
file.str= file_buff;
|
|
|
|
return sql_create_definition_file(NULL, &file, &triggers_file_type,
|
|
|
|
(gptr)triggers, triggers_file_parameters,
|
|
|
|
0);
|
2006-02-24 21:50:36 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2004-09-07 14:29:46 +02:00
|
|
|
/*
|
|
|
|
Drop trigger for table.
|
|
|
|
|
|
|
|
SYNOPSIS
|
|
|
|
drop_trigger()
|
2006-08-24 16:48:26 +02:00
|
|
|
thd - current thread context
|
|
|
|
(including trigger definition in LEX)
|
|
|
|
tables - table list containing one open table for which trigger
|
|
|
|
is dropped.
|
|
|
|
stmt_query - [OUT] after successful return, this string contains
|
|
|
|
well-formed statement for creation this trigger.
|
2004-09-07 14:29:46 +02:00
|
|
|
|
|
|
|
RETURN VALUE
|
|
|
|
False - success
|
|
|
|
True - error
|
|
|
|
*/
|
2006-08-24 16:48:26 +02:00
|
|
|
bool Table_triggers_list::drop_trigger(THD *thd, TABLE_LIST *tables,
|
|
|
|
String *stmt_query)
|
2004-09-07 14:29:46 +02:00
|
|
|
{
|
|
|
|
LEX *lex= thd->lex;
|
|
|
|
LEX_STRING *name;
|
|
|
|
List_iterator_fast<LEX_STRING> it_name(names_list);
|
|
|
|
List_iterator<LEX_STRING> it_def(definitions_list);
|
2005-07-28 21:39:11 +02:00
|
|
|
List_iterator<ulonglong> it_mod(definition_modes_list);
|
2005-11-10 20:25:03 +01:00
|
|
|
List_iterator<LEX_STRING> it_definer(definers_list);
|
2005-07-19 18:06:49 +02:00
|
|
|
char path[FN_REFLEN];
|
2004-09-07 14:29:46 +02:00
|
|
|
|
2006-08-24 16:48:26 +02:00
|
|
|
stmt_query->append(thd->query, thd->query_length);
|
|
|
|
|
2004-09-07 14:29:46 +02:00
|
|
|
while ((name= it_name++))
|
|
|
|
{
|
|
|
|
it_def++;
|
2005-07-28 21:39:11 +02:00
|
|
|
it_mod++;
|
2005-11-10 20:25:03 +01:00
|
|
|
it_definer++;
|
2004-09-07 14:29:46 +02:00
|
|
|
|
2005-07-31 11:49:55 +02:00
|
|
|
if (my_strcasecmp(table_alias_charset, lex->spname->m_name.str,
|
2004-09-07 14:29:46 +02:00
|
|
|
name->str) == 0)
|
|
|
|
{
|
|
|
|
/*
|
|
|
|
Again we don't care much about other things required for
|
|
|
|
clean trigger removing since table will be reopened anyway.
|
|
|
|
*/
|
|
|
|
it_def.remove();
|
2005-07-28 21:39:11 +02:00
|
|
|
it_mod.remove();
|
2005-11-10 20:25:03 +01:00
|
|
|
it_definer.remove();
|
2004-09-07 14:29:46 +02:00
|
|
|
|
|
|
|
if (definitions_list.is_empty())
|
|
|
|
{
|
|
|
|
/*
|
|
|
|
TODO: Probably instead of removing .TRG file we should move
|
|
|
|
to archive directory but this should be done as part of
|
|
|
|
parse_file.cc functionality (because we will need it
|
|
|
|
elsewhere).
|
|
|
|
*/
|
2005-07-19 18:06:49 +02:00
|
|
|
if (rm_trigger_file(path, tables->db, tables->table_name))
|
|
|
|
return 1;
|
2004-09-07 14:29:46 +02:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2006-02-24 21:50:36 +01:00
|
|
|
if (save_trigger_file(this, tables->db, tables->table_name))
|
2005-07-19 18:06:49 +02:00
|
|
|
return 1;
|
2004-09-07 14:29:46 +02:00
|
|
|
}
|
2005-07-19 18:06:49 +02:00
|
|
|
|
|
|
|
if (rm_trigname_file(path, tables->db, lex->spname->m_name.str))
|
|
|
|
return 1;
|
|
|
|
return 0;
|
2004-09-07 14:29:46 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2004-11-12 13:34:00 +01:00
|
|
|
my_message(ER_TRG_DOES_NOT_EXIST, ER(ER_TRG_DOES_NOT_EXIST), MYF(0));
|
2004-09-07 14:29:46 +02:00
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
Table_triggers_list::~Table_triggers_list()
|
|
|
|
{
|
2005-07-19 18:06:49 +02:00
|
|
|
for (int i= 0; i < (int)TRG_EVENT_MAX; i++)
|
|
|
|
for (int j= 0; j < (int)TRG_ACTION_MAX; j++)
|
2004-09-07 14:29:46 +02:00
|
|
|
delete bodies[i][j];
|
|
|
|
|
2005-05-24 20:19:33 +02:00
|
|
|
if (record1_field)
|
|
|
|
for (Field **fld_ptr= record1_field; *fld_ptr; fld_ptr++)
|
2004-09-07 14:29:46 +02:00
|
|
|
delete *fld_ptr;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2004-11-24 10:24:02 +01:00
|
|
|
/*
|
2005-05-24 20:19:33 +02:00
|
|
|
Prepare array of Field objects referencing to TABLE::record[1] instead
|
|
|
|
of record[0] (they will represent OLD.* row values in ON UPDATE trigger
|
|
|
|
and in ON DELETE trigger which will be called during REPLACE execution).
|
2004-11-24 10:24:02 +01:00
|
|
|
|
|
|
|
SYNOPSIS
|
2005-05-24 20:19:33 +02:00
|
|
|
prepare_record1_accessors()
|
2004-11-24 10:24:02 +01:00
|
|
|
table - pointer to TABLE object for which we are creating fields.
|
|
|
|
|
|
|
|
RETURN VALUE
|
|
|
|
False - success
|
|
|
|
True - error
|
|
|
|
*/
|
2005-05-24 20:19:33 +02:00
|
|
|
bool Table_triggers_list::prepare_record1_accessors(TABLE *table)
|
2004-11-24 10:24:02 +01:00
|
|
|
{
|
|
|
|
Field **fld, **old_fld;
|
|
|
|
|
2005-05-24 20:19:33 +02:00
|
|
|
if (!(record1_field= (Field **)alloc_root(&table->mem_root,
|
|
|
|
(table->s->fields + 1) *
|
|
|
|
sizeof(Field*))))
|
2004-11-24 10:24:02 +01:00
|
|
|
return 1;
|
|
|
|
|
2005-05-24 20:19:33 +02:00
|
|
|
for (fld= table->field, old_fld= record1_field; *fld; fld++, old_fld++)
|
2004-11-24 10:24:02 +01:00
|
|
|
{
|
|
|
|
/*
|
|
|
|
QQ: it is supposed that it is ok to use this function for field
|
|
|
|
cloning...
|
|
|
|
*/
|
2006-06-26 20:57:18 +02:00
|
|
|
if (!(*old_fld= (*fld)->new_field(&table->mem_root, table,
|
|
|
|
table == (*fld)->table)))
|
2004-11-24 10:24:02 +01:00
|
|
|
return 1;
|
Table definition cache, part 2
The table opening process now works the following way:
- Create common TABLE_SHARE object
- Read the .frm file and unpack it into the TABLE_SHARE object
- Create a TABLE object based on the information in the TABLE_SHARE
object and open a handler to the table object
Other noteworthy changes:
- In TABLE_SHARE the most common strings are now LEX_STRING's
- Better error message when table is not found
- Variable table_cache is now renamed 'table_open_cache'
- New variable 'table_definition_cache' that is the number of table defintions that will be cached
- strxnmov() calls are now fixed to avoid overflows
- strxnmov() will now always add one end \0 to result
- engine objects are now created with a TABLE_SHARE object instead of a TABLE object.
- After creating a field object one must call field->init(table) before using it
- For a busy system this change will give you:
- Less memory usage for table object
- Faster opening of tables (if it's has been in use or is in table definition cache)
- Allow you to cache many table definitions objects
- Faster drop of table
mysql-test/mysql-test-run.sh:
Fixed some problems with --gdb option
Test both with socket and tcp/ip port that all old servers are killed
mysql-test/r/flush_table.result:
More tests with lock table with 2 threads + flush table
mysql-test/r/information_schema.result:
Removed old (now wrong) result
mysql-test/r/innodb.result:
Better error messages (thanks to TDC patch)
mysql-test/r/merge.result:
Extra flush table test
mysql-test/r/ndb_bitfield.result:
Better error messages (thanks to TDC patch)
mysql-test/r/ndb_partition_error.result:
Better error messages (thanks to TDC patch)
mysql-test/r/query_cache.result:
Remove tables left from old tests
mysql-test/r/temp_table.result:
Test truncate with temporary tables
mysql-test/r/variables.result:
Table_cache -> Table_open_cache
mysql-test/t/flush_table.test:
More tests with lock table with 2 threads + flush table
mysql-test/t/merge.test:
Extra flush table test
mysql-test/t/multi_update.test:
Added 'sleep' to make test predictable
mysql-test/t/query_cache.test:
Remove tables left from old tests
mysql-test/t/temp_table.test:
Test truncate with temporary tables
mysql-test/t/variables.test:
Table_cache -> Table_open_cache
mysql-test/valgrind.supp:
Remove warning that may happens becasue threads dies in different order
mysys/hash.c:
Fixed wrong DBUG_PRINT
mysys/mf_dirname.c:
More DBUG
mysys/mf_pack.c:
Better comment
mysys/mf_tempdir.c:
More DBUG
Ensure that we call cleanup_dirname() on all temporary directory paths.
If we don't do this, we will get a failure when comparing temporary table
names as in some cases the temporary table name is run through convert_dirname())
mysys/my_alloc.c:
Indentation fix
sql/examples/ha_example.cc:
We new use TABLE_SHARE instead of TABLE when creating engine handlers
sql/examples/ha_example.h:
We new use TABLE_SHARE instead of TABLE when creating engine handlers
sql/examples/ha_tina.cc:
We new use TABLE_SHARE instead of TABLE when creating engine handlers
sql/examples/ha_tina.h:
We new use TABLE_SHARE instead of TABLE when creating engine handlers
sql/field.cc:
Update for table definition cache:
- Field creation now takes TABLE_SHARE instead of TABLE as argument
(This is becasue field definitions are now cached in TABLE_SHARE)
When a field is created, one now must call field->init(TABLE) before using it
- Use s->db instead of s->table_cache_key
- Added Field::clone() to create a field in TABLE from a field in TABLE_SHARE
- make_field() takes TABLE_SHARE as argument instead of TABLE
- move_field() -> move_field_offset()
sql/field.h:
Update for table definition cache:
- Field creation now takes TABLE_SHARE instead of TABLE as argument
(This is becasue field definitions are now cached in TABLE_SHARE)
When a field is created, one now must call field->init(TABLE) before using it
- Added Field::clone() to create a field in TABLE from a field in TABLE_SHARE
- make_field() takes TABLE_SHARE as argument instead of TABLE
- move_field() -> move_field_offset()
sql/ha_archive.cc:
We new use TABLE_SHARE instead of TABLE when creating engine handlers
sql/ha_archive.h:
We new use TABLE_SHARE instead of TABLE when creating engine handlers
sql/ha_berkeley.cc:
We new use TABLE_SHARE instead of TABLE when creating engine handlers
Changed name of argument create() to not hide internal 'table' variable.
table->s -> table_share
sql/ha_berkeley.h:
We new use TABLE_SHARE instead of TABLE when creating engine handlers
sql/ha_blackhole.cc:
We new use TABLE_SHARE instead of TABLE when creating engine handlers
sql/ha_blackhole.h:
We new use TABLE_SHARE instead of TABLE when creating engine handlers
sql/ha_federated.cc:
We new use TABLE_SHARE instead of TABLE when creating engine handlers
Fixed comments
Remove index variable and replace with pointers (simple optimization)
move_field() -> move_field_offset()
Removed some strlen() calls
sql/ha_federated.h:
We new use TABLE_SHARE instead of TABLE when creating engine handlers
sql/ha_heap.cc:
We new use TABLE_SHARE instead of TABLE when creating engine handlers
Simplify delete_table() and create() as the given file names are now without extension
sql/ha_heap.h:
We new use TABLE_SHARE instead of TABLE when creating engine handlers
sql/ha_innodb.cc:
We new use TABLE_SHARE instead of TABLE when creating engine handlers
sql/ha_innodb.h:
We new use TABLE_SHARE instead of TABLE when creating engine handlers
sql/ha_myisam.cc:
We new use TABLE_SHARE instead of TABLE when creating engine handlers
Remove not needed fn_format()
Fixed for new table->s structure
sql/ha_myisam.h:
We new use TABLE_SHARE instead of TABLE when creating engine handlers
sql/ha_myisammrg.cc:
We new use TABLE_SHARE instead of TABLE when creating engine handlers
Don't set 'is_view' for MERGE tables
Use new interface to find_temporary_table()
sql/ha_myisammrg.h:
We new use TABLE_SHARE instead of TABLE when creating engine handlers
Added flag HA_NO_COPY_ON_ALTER
sql/ha_ndbcluster.cc:
We new use TABLE_SHARE instead of TABLE when creating engine handlers
Fixed wrong calls to strxnmov()
Give error HA_ERR_TABLE_DEF_CHANGED if table definition has changed
drop_table -> intern_drop_table()
table->s -> table_share
Move part_info to TABLE
Fixed comments & DBUG print's
New arguments to print_error()
sql/ha_ndbcluster.h:
We new use TABLE_SHARE instead of TABLE when creating engine handlers
sql/ha_partition.cc:
We new use TABLE_SHARE instead of TABLE when creating engine handlers
We can't set up or use part_info when creating handler as there is not yet any table object
New ha_intialise() to work with TDC (Done by Mikael)
sql/ha_partition.h:
We new use TABLE_SHARE instead of TABLE when creating engine handlers
Got set_part_info() from Mikael
sql/handler.cc:
We new use TABLE_SHARE instead of TABLE when creating engine handlers
ha_delete_table() now also takes database as an argument
handler::ha_open() now takes TABLE as argument
ha_open() now calls ha_allocate_read_write_set()
Simplify ha_allocate_read_write_set()
Remove ha_deallocate_read_write_set()
Use table_share (Cached by table definition cache)
sql/handler.h:
New table flag: HA_NO_COPY_ON_ALTER (used by merge tables)
Remove ha_deallocate_read_write_set()
get_new_handler() now takes TABLE_SHARE as argument
ha_delete_table() now gets database as argument
sql/item.cc:
table_name and db are now LEX_STRING objects
When creating fields, we have now have to call field->init(table)
move_field -> move_field_offset()
sql/item.h:
tmp_table_field_from_field_type() now takes an extra paramenter 'fixed_length' to allow one to force usage of CHAR
instead of BLOB
sql/item_cmpfunc.cc:
Fixed call to tmp_table_field_from_field_type()
sql/item_create.cc:
Assert if new not handled cast type
sql/item_func.cc:
When creating fields, we have now have to call field->init(table)
dummy_table used by 'sp' now needs a TABLE_SHARE object
sql/item_subselect.cc:
Trivial code cleanups
sql/item_sum.cc:
When creating fields, we have now have to call field->init(table)
sql/item_timefunc.cc:
Item_func_str_to_date::tmp_table_field() now replaced by call to
tmp_table_field_from_field_type() (see item_timefunc.h)
sql/item_timefunc.h:
Simply tmp_table_field()
sql/item_uniq.cc:
When creating fields, we have now have to call field->init(table)
sql/key.cc:
Added 'KEY' argument to 'find_ref_key' to simplify code
sql/lock.cc:
More debugging
Use create_table_def_key() to create key for table cache
Allocate TABLE_SHARE properly when creating name lock
Fix that locked_table_name doesn't test same table twice
sql/mysql_priv.h:
New functions for table definition cache
New interfaces to a lot of functions.
New faster interface to find_temporary_table() and close_temporary_table()
sql/mysqld.cc:
Added support for table definition cache of size 'table_def_size'
Fixed som calls to strnmov()
Changed name of 'table_cache' to 'table_open_cache'
sql/opt_range.cc:
Use new interfaces
Fixed warnings from valgrind
sql/parse_file.cc:
Safer calls to strxnmov()
Fixed typo
sql/set_var.cc:
Added variable 'table_definition_cache'
Variable table_cache renamed to 'table_open_cache'
sql/slave.cc:
Use new interface
sql/sp.cc:
Proper use of TABLE_SHARE
sql/sp_head.cc:
Remove compiler warnings
We have now to call field->init(table)
sql/sp_head.h:
Pointers to parsed strings are now const
sql/sql_acl.cc:
table_name is now a LEX_STRING
sql/sql_base.cc:
Main implementation of table definition cache
(The #ifdef's are there for the future when table definition cache will replace open table cache)
Now table definitions are cached indepndent of open tables, which will speed up things when a table is in use at once from several places
Views are not yet cached; For the moment we only cache if a table is a view or not.
Faster implementation of find_temorary_table()
Replace 'wait_for_refresh()' with the more general function 'wait_for_condition()'
Drop table is slightly faster as we can use the table definition cache to know the type of the table
sql/sql_cache.cc:
table_cache_key and table_name are now LEX_STRING
'sDBUG print fixes
sql/sql_class.cc:
table_cache_key is now a LEX_STRING
safer strxnmov()
sql/sql_class.h:
Added number of open table shares (table definitions)
sql/sql_db.cc:
safer strxnmov()
sql/sql_delete.cc:
Use new interface to find_temporary_table()
sql/sql_derived.cc:
table_name is now a LEX_STRING
sql/sql_handler.cc:
TABLE_SHARE->db and TABLE_SHARE->table_name are now LEX_STRING's
sql/sql_insert.cc:
TABLE_SHARE->db and TABLE_SHARE->table_name are now LEX_STRING's
sql/sql_lex.cc:
Make parsed string a const (to quickly find out if anything is trying to change the query string)
sql/sql_lex.h:
Make parsed string a const (to quickly find out if anything is trying to change the query string)
sql/sql_load.cc:
Safer strxnmov()
sql/sql_parse.cc:
Better error if wrong DB name
sql/sql_partition.cc:
part_info moved to TABLE from TABLE_SHARE
Indentation changes
sql/sql_select.cc:
Indentation fixes
Call field->init(TABLE) for new created fields
Update create_tmp_table() to use TABLE_SHARE properly
sql/sql_select.h:
Call field->init(TABLE) for new created fields
sql/sql_show.cc:
table_name is now a LEX_STRING
part_info moved to TABLE
sql/sql_table.cc:
Use table definition cache to speed up delete of tables
Fixed calls to functions with new interfaces
Don't use 'share_not_to_be_used'
Instead of doing openfrm() when doing repair, we now have to call
get_table_share() followed by open_table_from_share().
Replace some fn_format() with faster unpack_filename().
Safer strxnmov()
part_info is now in TABLE
Added Mikaels patch for partition and ALTER TABLE
Instead of using 'TABLE_SHARE->is_view' use 'table_flags() & HA_NO_COPY_ON_ALTER
sql/sql_test.cc:
table_name and table_cache_key are now LEX_STRING's
sql/sql_trigger.cc:
TABLE_SHARE->db and TABLE_SHARE->table_name are now LEX_STRING's
safer strxnmov()
Removed compiler warnings
sql/sql_update.cc:
Call field->init(TABLE) after field is created
sql/sql_view.cc:
safer strxnmov()
Create common TABLE_SHARE object for views to allow us to cache if table is a view
sql/structs.h:
Added SHOW_TABLE_DEFINITIONS
sql/table.cc:
Creation and destruct of TABLE_SHARE objects that are common for many TABLE objects
The table opening process now works the following way:
- Create common TABLE_SHARE object
- Read the .frm file and unpack it into the TABLE_SHARE object
- Create a TABLE object based on the information in the TABLE_SHARE
object and open a handler to the table object
open_table_def() is written in such a way that it should be trival to add parsing of the .frm files in new formats
sql/table.h:
TABLE objects for the same database table now share a common TABLE_SHARE object
In TABLE_SHARE the most common strings are now LEX_STRING's
sql/unireg.cc:
Changed arguments to rea_create_table() to have same order as other functions
Call field->init(table) for new created fields
sql/unireg.h:
Added OPEN_VIEW
strings/strxnmov.c:
Change strxnmov() to always add end \0
This makes usage of strxnmov() safer as most of MySQL code assumes that strxnmov() will create a null terminated string
2005-11-23 21:45:02 +01:00
|
|
|
(*old_fld)->move_field_offset((my_ptrdiff_t)(table->record[1] -
|
2004-11-24 10:24:02 +01:00
|
|
|
table->record[0]));
|
|
|
|
}
|
|
|
|
*old_fld= 0;
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2005-09-15 01:56:09 +02:00
|
|
|
/*
|
|
|
|
Adjust Table_triggers_list with new TABLE pointer.
|
|
|
|
|
|
|
|
SYNOPSIS
|
|
|
|
set_table()
|
|
|
|
new_table - new pointer to TABLE instance
|
|
|
|
*/
|
|
|
|
|
|
|
|
void Table_triggers_list::set_table(TABLE *new_table)
|
|
|
|
{
|
|
|
|
table= new_table;
|
|
|
|
for (Field **field= table->triggers->record1_field ; *field ; field++)
|
|
|
|
{
|
|
|
|
(*field)->table= (*field)->orig_table= new_table;
|
|
|
|
(*field)->table_name= &new_table->alias;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2004-09-07 14:29:46 +02:00
|
|
|
/*
|
|
|
|
Check whenever .TRG file for table exist and load all triggers it contains.
|
|
|
|
|
|
|
|
SYNOPSIS
|
|
|
|
check_n_load()
|
|
|
|
thd - current thread context
|
|
|
|
db - table's database name
|
|
|
|
table_name - table's name
|
|
|
|
table - pointer to table object
|
2005-07-19 18:06:49 +02:00
|
|
|
names_only - stop after loading trigger names
|
2004-09-07 14:29:46 +02:00
|
|
|
|
|
|
|
RETURN VALUE
|
|
|
|
False - success
|
|
|
|
True - error
|
|
|
|
*/
|
2005-07-19 18:06:49 +02:00
|
|
|
|
2004-09-07 14:29:46 +02:00
|
|
|
bool Table_triggers_list::check_n_load(THD *thd, const char *db,
|
2005-07-19 18:06:49 +02:00
|
|
|
const char *table_name, TABLE *table,
|
|
|
|
bool names_only)
|
2004-09-07 14:29:46 +02:00
|
|
|
{
|
|
|
|
char path_buff[FN_REFLEN];
|
|
|
|
LEX_STRING path;
|
|
|
|
File_parser *parser;
|
2005-07-27 13:17:05 +02:00
|
|
|
LEX_STRING save_db;
|
2004-09-07 14:29:46 +02:00
|
|
|
|
|
|
|
DBUG_ENTER("Table_triggers_list::check_n_load");
|
|
|
|
|
2005-12-31 06:01:26 +01:00
|
|
|
path.length= build_table_filename(path_buff, FN_REFLEN-1,
|
Bug#18775 - Temporary table from alter table visible to other threads
Continued implementation of WL#1324 (table name to filename encoding)
The intermediate (not temporary) files of the new table
during ALTER TABLE was visible for SHOW TABLES. These
intermediate files are copies of the original table with
the changes done by ALTER TABLE. After all the data is
copied over from the original table, these files are renamed
to the original tables file names. So they are not temporary
files. They persist after ALTER TABLE, but just with another
name.
In 5.0 the intermediate files are invisible for SHOW TABLES
because all file names beginning with "#sql" were suppressed.
This failed since 5.1.6 because even temporary table names were
converted when making file names from them. The prefix became
converted to "@0023sql". Converting the prefix during SHOW TABLES
would suppress the listing of user tables that start with "#sql".
The solution of the problem is to continue the implementation of
the table name to file name conversion feature. One requirement
is to suppress the conversion for temporary table names.
This change is straightforward for real temporary tables as there
is a function that creates temporary file names.
But the generated path names are located in TMPDIR and have no
relation to the internal table name. This cannot be used for
ALTER TABLE. Its intermediate files need to be in the same
directory as the old table files. And it is necessary to be
able to deduce the same path from the same table name repeatedly.
Consequently the intermediate table files must be handled like normal
tables. Their internal names shall start with tmp_file_prefix
(#sql) and they shall not be converted like normal table names.
I added a flags parameter to all relevant functions that are
called from ALTER TABLE. It is used to suppress the conversion
for the intermediate table files.
The outcome is that the suppression of #sql in SHOW TABLES
works again. It does not suppress user tables as these are
converted to @0023sql on file level.
This patch does also fix ALTER TABLE ... RENAME, which could not
rename a table with non-ASCII characters in its name.
It does also fix the problem that a user could create a table like
`#sql-xxxx-yyyy`, where xxxx is mysqld's pid and yyyy is the thread
ID of some other thread, which prevented this thread from running
ALTER TABLE.
Some of the above problems are mentioned in Bug 1405, which can
be closed with this patch.
This patch does also contain some minor fixes for other forgotten
conversions. Still known problems are reported as bugs 21370,
21373, and 21387.
mysql-test/r/alter_table.result:
Bug#18775 - Temporary table from alter table visible to other threads
Continued implementation of WL#1324 (table name to filename encoding)
Added test results.
mysql-test/r/backup.result:
Bug#18775 - Temporary table from alter table visible to other threads
Continued implementation of WL#1324 (table name to filename encoding)
Added test results.
mysql-test/r/repair.result:
Bug#18775 - Temporary table from alter table visible to other threads
Continued implementation of WL#1324 (table name to filename encoding)
Added test results.
mysql-test/t/alter_table.test:
Bug#18775 - Temporary table from alter table visible to other threads
Continued implementation of WL#1324 (table name to filename encoding)
Added test cases.
mysql-test/t/backup.test:
Bug#18775 - Temporary table from alter table visible to other threads
Continued implementation of WL#1324 (table name to filename encoding)
Added test cases.
mysql-test/t/repair.test:
Bug#18775 - Temporary table from alter table visible to other threads
Continued implementation of WL#1324 (table name to filename encoding)
Added a test case.
sql/ha_myisam.cc:
Bug#18775 - Temporary table from alter table visible to other threads
Continued implementation of WL#1324 (table name to filename encoding)
Added missing table name mapping calls to backup() and restore().
sql/ha_myisammrg.cc:
Bug#18775 - Temporary table from alter table visible to other threads
Continued implementation of WL#1324 (table name to filename encoding)
Added an zero argument for the new 'flags' parameter.
sql/ha_ndbcluster.cc:
Bug#18775 - Temporary table from alter table visible to other threads
Continued implementation of WL#1324 (table name to filename encoding)
Added an zero argument for the new 'flags' parameter.
sql/ha_ndbcluster_binlog.cc:
Bug#18775 - Temporary table from alter table visible to other threads
Continued implementation of WL#1324 (table name to filename encoding)
Added an zero argument for the new 'flags' parameter.
sql/ha_ndbcluster_binlog.h:
Bug#18775 - Temporary table from alter table visible to other threads
Continued implementation of WL#1324 (table name to filename encoding)
Removed unnecessary check for wrong temp file prefix.
sql/mysql_priv.h:
Bug#18775 - Temporary table from alter table visible to other threads
Continued implementation of WL#1324 (table name to filename encoding)
Extended quick_rm_table(), mysql_rename_table(), and
build_table_filename() by an flags argument, which can indicate
temporary table names that should not be converted.
Added symbolic flag values.
sql/sql_acl.cc:
Bug#18775 - Temporary table from alter table visible to other threads
Continued implementation of WL#1324 (table name to filename encoding)
Added an zero argument for the new 'flags' parameter.
sql/sql_base.cc:
Bug#18775 - Temporary table from alter table visible to other threads
Continued implementation of WL#1324 (table name to filename encoding)
Fixed a comment.
Added DBUG calls.
sql/sql_db.cc:
Bug#18775 - Temporary table from alter table visible to other threads
Continued implementation of WL#1324 (table name to filename encoding)
Added an zero argument for the new 'flags' parameter.
sql/sql_delete.cc:
Bug#18775 - Temporary table from alter table visible to other threads
Continued implementation of WL#1324 (table name to filename encoding)
Added an zero argument for the new 'flags' parameter.
sql/sql_insert.cc:
Bug#18775 - Temporary table from alter table visible to other threads
Continued implementation of WL#1324 (table name to filename encoding)
Added an zero argument for the new 'flags' parameter.
sql/sql_partition.cc:
Bug#18775 - Temporary table from alter table visible to other threads
Continued implementation of WL#1324 (table name to filename encoding)
Added an zero argument for the new 'flags' parameter.
sql/sql_rename.cc:
Bug#18775 - Temporary table from alter table visible to other threads
Continued implementation of WL#1324 (table name to filename encoding)
Added an zero argument for the new 'flags' parameter.
sql/sql_show.cc:
Bug#18775 - Temporary table from alter table visible to other threads
Continued implementation of WL#1324 (table name to filename encoding)
Reverted the former fix for this bug. tmp_file_prefix is now used
verbatim in the comparison of file names.
sql/sql_table.cc:
Bug#18775 - Temporary table from alter table visible to other threads
Continued implementation of WL#1324 (table name to filename encoding)
Added a check for a tmp_file_prefix file name to
filename_to_tablename(). These names are now accepted without
conversion.
Extended quick_rm_table(), mysql_rename_table(), and
build_table_filename() by an flags argument, which can indicate
temporary table names that should not be converted.
Removed the table to file name conversion from
build_tmptable_filename().
Disabled REPAIR TABLE ... USE_FRM for temporary tables.
Added the forgotten conversion to mysql_alter_table() for the case
of ALTER TABLE ... RENAME.
Added comments and DBUG calls.
sql/sql_trigger.cc:
Bug#18775 - Temporary table from alter table visible to other threads
Continued implementation of WL#1324 (table name to filename encoding)
Added an zero argument for the new 'flags' parameter.
sql/sql_view.cc:
Bug#18775 - Temporary table from alter table visible to other threads
Continued implementation of WL#1324 (table name to filename encoding)
Added an zero argument for the new 'flags' parameter.
sql/table.cc:
Bug#18775 - Temporary table from alter table visible to other threads
Continued implementation of WL#1324 (table name to filename encoding)
Replaced a literal ".frm" by reg_ext.
Added DBUG calls.
storage/innobase/row/row0mysql.c:
Bug#18775 - Temporary table from alter table visible to other threads
Continued implementation of WL#1324 (table name to filename encoding)
Changed back the encoded temp file prefix to #sql.
2006-08-02 17:57:06 +02:00
|
|
|
db, table_name, triggers_file_ext, 0);
|
2004-09-07 14:29:46 +02:00
|
|
|
path.str= path_buff;
|
|
|
|
|
|
|
|
// QQ: should we analyze errno somehow ?
|
|
|
|
if (access(path_buff, F_OK))
|
|
|
|
DBUG_RETURN(0);
|
|
|
|
|
|
|
|
/*
|
2005-11-10 20:25:03 +01:00
|
|
|
File exists so we got to load triggers.
|
2004-09-07 14:29:46 +02:00
|
|
|
FIXME: A lot of things to do here e.g. how about other funcs and being
|
|
|
|
more paranoical ?
|
|
|
|
*/
|
|
|
|
|
|
|
|
if ((parser= sql_parse_prepare(&path, &table->mem_root, 1)))
|
|
|
|
{
|
2005-07-31 11:49:55 +02:00
|
|
|
if (is_equal(&triggers_file_type, parser->type()))
|
2004-09-07 14:29:46 +02:00
|
|
|
{
|
2004-09-08 22:46:01 +02:00
|
|
|
Table_triggers_list *triggers=
|
2005-05-24 20:19:33 +02:00
|
|
|
new (&table->mem_root) Table_triggers_list(table);
|
2005-11-20 19:47:07 +01:00
|
|
|
Handle_old_incorrect_sql_modes_hook sql_modes_hook(path.str);
|
2004-09-07 14:29:46 +02:00
|
|
|
|
2004-09-08 22:46:01 +02:00
|
|
|
if (!triggers)
|
2004-09-07 14:29:46 +02:00
|
|
|
DBUG_RETURN(1);
|
|
|
|
|
2005-07-28 21:39:11 +02:00
|
|
|
/*
|
2005-11-10 20:25:03 +01:00
|
|
|
We don't have the following attributes in old versions of .TRG file, so
|
|
|
|
we should initialize the list for safety:
|
|
|
|
- sql_modes;
|
|
|
|
- definers;
|
2005-07-28 21:39:11 +02:00
|
|
|
*/
|
|
|
|
triggers->definition_modes_list.empty();
|
2005-11-10 20:25:03 +01:00
|
|
|
triggers->definers_list.empty();
|
2005-07-28 21:39:11 +02:00
|
|
|
|
2004-09-08 22:46:01 +02:00
|
|
|
if (parser->parse((gptr)triggers, &table->mem_root,
|
2005-11-20 19:47:07 +01:00
|
|
|
triggers_file_parameters,
|
|
|
|
TRG_NUM_REQUIRED_PARAMETERS,
|
|
|
|
&sql_modes_hook))
|
2004-09-07 14:29:46 +02:00
|
|
|
DBUG_RETURN(1);
|
|
|
|
|
2005-07-28 21:39:11 +02:00
|
|
|
List_iterator_fast<LEX_STRING> it(triggers->definitions_list);
|
2006-11-30 02:40:42 +01:00
|
|
|
LEX_STRING *trg_create_str;
|
2005-07-28 21:39:11 +02:00
|
|
|
ulonglong *trg_sql_mode;
|
|
|
|
|
|
|
|
if (triggers->definition_modes_list.is_empty() &&
|
|
|
|
!triggers->definitions_list.is_empty())
|
|
|
|
{
|
|
|
|
/*
|
|
|
|
It is old file format => we should fill list of sql_modes.
|
|
|
|
|
|
|
|
We use one mode (current) for all triggers, because we have not
|
|
|
|
information about mode in old format.
|
|
|
|
*/
|
|
|
|
if (!(trg_sql_mode= (ulonglong*)alloc_root(&table->mem_root,
|
|
|
|
sizeof(ulonglong))))
|
|
|
|
{
|
|
|
|
DBUG_RETURN(1); // EOM
|
|
|
|
}
|
|
|
|
*trg_sql_mode= global_system_variables.sql_mode;
|
2005-11-10 20:25:03 +01:00
|
|
|
while (it++)
|
2005-07-28 21:39:11 +02:00
|
|
|
{
|
|
|
|
if (triggers->definition_modes_list.push_back(trg_sql_mode,
|
|
|
|
&table->mem_root))
|
|
|
|
{
|
|
|
|
DBUG_RETURN(1); // EOM
|
|
|
|
}
|
|
|
|
}
|
|
|
|
it.rewind();
|
|
|
|
}
|
|
|
|
|
2005-11-10 20:25:03 +01:00
|
|
|
if (triggers->definers_list.is_empty() &&
|
|
|
|
!triggers->definitions_list.is_empty())
|
|
|
|
{
|
|
|
|
/*
|
|
|
|
It is old file format => we should fill list of definers.
|
|
|
|
|
|
|
|
If there is no definer information, we should not switch context to
|
|
|
|
definer when checking privileges. I.e. privileges for such triggers
|
|
|
|
are checked for "invoker" rather than for "definer".
|
|
|
|
*/
|
|
|
|
|
|
|
|
LEX_STRING *trg_definer;
|
|
|
|
|
|
|
|
if (! (trg_definer= (LEX_STRING*)alloc_root(&table->mem_root,
|
|
|
|
sizeof(LEX_STRING))))
|
|
|
|
DBUG_RETURN(1); // EOM
|
|
|
|
|
Table definition cache, part 2
The table opening process now works the following way:
- Create common TABLE_SHARE object
- Read the .frm file and unpack it into the TABLE_SHARE object
- Create a TABLE object based on the information in the TABLE_SHARE
object and open a handler to the table object
Other noteworthy changes:
- In TABLE_SHARE the most common strings are now LEX_STRING's
- Better error message when table is not found
- Variable table_cache is now renamed 'table_open_cache'
- New variable 'table_definition_cache' that is the number of table defintions that will be cached
- strxnmov() calls are now fixed to avoid overflows
- strxnmov() will now always add one end \0 to result
- engine objects are now created with a TABLE_SHARE object instead of a TABLE object.
- After creating a field object one must call field->init(table) before using it
- For a busy system this change will give you:
- Less memory usage for table object
- Faster opening of tables (if it's has been in use or is in table definition cache)
- Allow you to cache many table definitions objects
- Faster drop of table
mysql-test/mysql-test-run.sh:
Fixed some problems with --gdb option
Test both with socket and tcp/ip port that all old servers are killed
mysql-test/r/flush_table.result:
More tests with lock table with 2 threads + flush table
mysql-test/r/information_schema.result:
Removed old (now wrong) result
mysql-test/r/innodb.result:
Better error messages (thanks to TDC patch)
mysql-test/r/merge.result:
Extra flush table test
mysql-test/r/ndb_bitfield.result:
Better error messages (thanks to TDC patch)
mysql-test/r/ndb_partition_error.result:
Better error messages (thanks to TDC patch)
mysql-test/r/query_cache.result:
Remove tables left from old tests
mysql-test/r/temp_table.result:
Test truncate with temporary tables
mysql-test/r/variables.result:
Table_cache -> Table_open_cache
mysql-test/t/flush_table.test:
More tests with lock table with 2 threads + flush table
mysql-test/t/merge.test:
Extra flush table test
mysql-test/t/multi_update.test:
Added 'sleep' to make test predictable
mysql-test/t/query_cache.test:
Remove tables left from old tests
mysql-test/t/temp_table.test:
Test truncate with temporary tables
mysql-test/t/variables.test:
Table_cache -> Table_open_cache
mysql-test/valgrind.supp:
Remove warning that may happens becasue threads dies in different order
mysys/hash.c:
Fixed wrong DBUG_PRINT
mysys/mf_dirname.c:
More DBUG
mysys/mf_pack.c:
Better comment
mysys/mf_tempdir.c:
More DBUG
Ensure that we call cleanup_dirname() on all temporary directory paths.
If we don't do this, we will get a failure when comparing temporary table
names as in some cases the temporary table name is run through convert_dirname())
mysys/my_alloc.c:
Indentation fix
sql/examples/ha_example.cc:
We new use TABLE_SHARE instead of TABLE when creating engine handlers
sql/examples/ha_example.h:
We new use TABLE_SHARE instead of TABLE when creating engine handlers
sql/examples/ha_tina.cc:
We new use TABLE_SHARE instead of TABLE when creating engine handlers
sql/examples/ha_tina.h:
We new use TABLE_SHARE instead of TABLE when creating engine handlers
sql/field.cc:
Update for table definition cache:
- Field creation now takes TABLE_SHARE instead of TABLE as argument
(This is becasue field definitions are now cached in TABLE_SHARE)
When a field is created, one now must call field->init(TABLE) before using it
- Use s->db instead of s->table_cache_key
- Added Field::clone() to create a field in TABLE from a field in TABLE_SHARE
- make_field() takes TABLE_SHARE as argument instead of TABLE
- move_field() -> move_field_offset()
sql/field.h:
Update for table definition cache:
- Field creation now takes TABLE_SHARE instead of TABLE as argument
(This is becasue field definitions are now cached in TABLE_SHARE)
When a field is created, one now must call field->init(TABLE) before using it
- Added Field::clone() to create a field in TABLE from a field in TABLE_SHARE
- make_field() takes TABLE_SHARE as argument instead of TABLE
- move_field() -> move_field_offset()
sql/ha_archive.cc:
We new use TABLE_SHARE instead of TABLE when creating engine handlers
sql/ha_archive.h:
We new use TABLE_SHARE instead of TABLE when creating engine handlers
sql/ha_berkeley.cc:
We new use TABLE_SHARE instead of TABLE when creating engine handlers
Changed name of argument create() to not hide internal 'table' variable.
table->s -> table_share
sql/ha_berkeley.h:
We new use TABLE_SHARE instead of TABLE when creating engine handlers
sql/ha_blackhole.cc:
We new use TABLE_SHARE instead of TABLE when creating engine handlers
sql/ha_blackhole.h:
We new use TABLE_SHARE instead of TABLE when creating engine handlers
sql/ha_federated.cc:
We new use TABLE_SHARE instead of TABLE when creating engine handlers
Fixed comments
Remove index variable and replace with pointers (simple optimization)
move_field() -> move_field_offset()
Removed some strlen() calls
sql/ha_federated.h:
We new use TABLE_SHARE instead of TABLE when creating engine handlers
sql/ha_heap.cc:
We new use TABLE_SHARE instead of TABLE when creating engine handlers
Simplify delete_table() and create() as the given file names are now without extension
sql/ha_heap.h:
We new use TABLE_SHARE instead of TABLE when creating engine handlers
sql/ha_innodb.cc:
We new use TABLE_SHARE instead of TABLE when creating engine handlers
sql/ha_innodb.h:
We new use TABLE_SHARE instead of TABLE when creating engine handlers
sql/ha_myisam.cc:
We new use TABLE_SHARE instead of TABLE when creating engine handlers
Remove not needed fn_format()
Fixed for new table->s structure
sql/ha_myisam.h:
We new use TABLE_SHARE instead of TABLE when creating engine handlers
sql/ha_myisammrg.cc:
We new use TABLE_SHARE instead of TABLE when creating engine handlers
Don't set 'is_view' for MERGE tables
Use new interface to find_temporary_table()
sql/ha_myisammrg.h:
We new use TABLE_SHARE instead of TABLE when creating engine handlers
Added flag HA_NO_COPY_ON_ALTER
sql/ha_ndbcluster.cc:
We new use TABLE_SHARE instead of TABLE when creating engine handlers
Fixed wrong calls to strxnmov()
Give error HA_ERR_TABLE_DEF_CHANGED if table definition has changed
drop_table -> intern_drop_table()
table->s -> table_share
Move part_info to TABLE
Fixed comments & DBUG print's
New arguments to print_error()
sql/ha_ndbcluster.h:
We new use TABLE_SHARE instead of TABLE when creating engine handlers
sql/ha_partition.cc:
We new use TABLE_SHARE instead of TABLE when creating engine handlers
We can't set up or use part_info when creating handler as there is not yet any table object
New ha_intialise() to work with TDC (Done by Mikael)
sql/ha_partition.h:
We new use TABLE_SHARE instead of TABLE when creating engine handlers
Got set_part_info() from Mikael
sql/handler.cc:
We new use TABLE_SHARE instead of TABLE when creating engine handlers
ha_delete_table() now also takes database as an argument
handler::ha_open() now takes TABLE as argument
ha_open() now calls ha_allocate_read_write_set()
Simplify ha_allocate_read_write_set()
Remove ha_deallocate_read_write_set()
Use table_share (Cached by table definition cache)
sql/handler.h:
New table flag: HA_NO_COPY_ON_ALTER (used by merge tables)
Remove ha_deallocate_read_write_set()
get_new_handler() now takes TABLE_SHARE as argument
ha_delete_table() now gets database as argument
sql/item.cc:
table_name and db are now LEX_STRING objects
When creating fields, we have now have to call field->init(table)
move_field -> move_field_offset()
sql/item.h:
tmp_table_field_from_field_type() now takes an extra paramenter 'fixed_length' to allow one to force usage of CHAR
instead of BLOB
sql/item_cmpfunc.cc:
Fixed call to tmp_table_field_from_field_type()
sql/item_create.cc:
Assert if new not handled cast type
sql/item_func.cc:
When creating fields, we have now have to call field->init(table)
dummy_table used by 'sp' now needs a TABLE_SHARE object
sql/item_subselect.cc:
Trivial code cleanups
sql/item_sum.cc:
When creating fields, we have now have to call field->init(table)
sql/item_timefunc.cc:
Item_func_str_to_date::tmp_table_field() now replaced by call to
tmp_table_field_from_field_type() (see item_timefunc.h)
sql/item_timefunc.h:
Simply tmp_table_field()
sql/item_uniq.cc:
When creating fields, we have now have to call field->init(table)
sql/key.cc:
Added 'KEY' argument to 'find_ref_key' to simplify code
sql/lock.cc:
More debugging
Use create_table_def_key() to create key for table cache
Allocate TABLE_SHARE properly when creating name lock
Fix that locked_table_name doesn't test same table twice
sql/mysql_priv.h:
New functions for table definition cache
New interfaces to a lot of functions.
New faster interface to find_temporary_table() and close_temporary_table()
sql/mysqld.cc:
Added support for table definition cache of size 'table_def_size'
Fixed som calls to strnmov()
Changed name of 'table_cache' to 'table_open_cache'
sql/opt_range.cc:
Use new interfaces
Fixed warnings from valgrind
sql/parse_file.cc:
Safer calls to strxnmov()
Fixed typo
sql/set_var.cc:
Added variable 'table_definition_cache'
Variable table_cache renamed to 'table_open_cache'
sql/slave.cc:
Use new interface
sql/sp.cc:
Proper use of TABLE_SHARE
sql/sp_head.cc:
Remove compiler warnings
We have now to call field->init(table)
sql/sp_head.h:
Pointers to parsed strings are now const
sql/sql_acl.cc:
table_name is now a LEX_STRING
sql/sql_base.cc:
Main implementation of table definition cache
(The #ifdef's are there for the future when table definition cache will replace open table cache)
Now table definitions are cached indepndent of open tables, which will speed up things when a table is in use at once from several places
Views are not yet cached; For the moment we only cache if a table is a view or not.
Faster implementation of find_temorary_table()
Replace 'wait_for_refresh()' with the more general function 'wait_for_condition()'
Drop table is slightly faster as we can use the table definition cache to know the type of the table
sql/sql_cache.cc:
table_cache_key and table_name are now LEX_STRING
'sDBUG print fixes
sql/sql_class.cc:
table_cache_key is now a LEX_STRING
safer strxnmov()
sql/sql_class.h:
Added number of open table shares (table definitions)
sql/sql_db.cc:
safer strxnmov()
sql/sql_delete.cc:
Use new interface to find_temporary_table()
sql/sql_derived.cc:
table_name is now a LEX_STRING
sql/sql_handler.cc:
TABLE_SHARE->db and TABLE_SHARE->table_name are now LEX_STRING's
sql/sql_insert.cc:
TABLE_SHARE->db and TABLE_SHARE->table_name are now LEX_STRING's
sql/sql_lex.cc:
Make parsed string a const (to quickly find out if anything is trying to change the query string)
sql/sql_lex.h:
Make parsed string a const (to quickly find out if anything is trying to change the query string)
sql/sql_load.cc:
Safer strxnmov()
sql/sql_parse.cc:
Better error if wrong DB name
sql/sql_partition.cc:
part_info moved to TABLE from TABLE_SHARE
Indentation changes
sql/sql_select.cc:
Indentation fixes
Call field->init(TABLE) for new created fields
Update create_tmp_table() to use TABLE_SHARE properly
sql/sql_select.h:
Call field->init(TABLE) for new created fields
sql/sql_show.cc:
table_name is now a LEX_STRING
part_info moved to TABLE
sql/sql_table.cc:
Use table definition cache to speed up delete of tables
Fixed calls to functions with new interfaces
Don't use 'share_not_to_be_used'
Instead of doing openfrm() when doing repair, we now have to call
get_table_share() followed by open_table_from_share().
Replace some fn_format() with faster unpack_filename().
Safer strxnmov()
part_info is now in TABLE
Added Mikaels patch for partition and ALTER TABLE
Instead of using 'TABLE_SHARE->is_view' use 'table_flags() & HA_NO_COPY_ON_ALTER
sql/sql_test.cc:
table_name and table_cache_key are now LEX_STRING's
sql/sql_trigger.cc:
TABLE_SHARE->db and TABLE_SHARE->table_name are now LEX_STRING's
safer strxnmov()
Removed compiler warnings
sql/sql_update.cc:
Call field->init(TABLE) after field is created
sql/sql_view.cc:
safer strxnmov()
Create common TABLE_SHARE object for views to allow us to cache if table is a view
sql/structs.h:
Added SHOW_TABLE_DEFINITIONS
sql/table.cc:
Creation and destruct of TABLE_SHARE objects that are common for many TABLE objects
The table opening process now works the following way:
- Create common TABLE_SHARE object
- Read the .frm file and unpack it into the TABLE_SHARE object
- Create a TABLE object based on the information in the TABLE_SHARE
object and open a handler to the table object
open_table_def() is written in such a way that it should be trival to add parsing of the .frm files in new formats
sql/table.h:
TABLE objects for the same database table now share a common TABLE_SHARE object
In TABLE_SHARE the most common strings are now LEX_STRING's
sql/unireg.cc:
Changed arguments to rea_create_table() to have same order as other functions
Call field->init(table) for new created fields
sql/unireg.h:
Added OPEN_VIEW
strings/strxnmov.c:
Change strxnmov() to always add end \0
This makes usage of strxnmov() safer as most of MySQL code assumes that strxnmov() will create a null terminated string
2005-11-23 21:45:02 +01:00
|
|
|
trg_definer->str= (char*) "";
|
2005-11-10 20:25:03 +01:00
|
|
|
trg_definer->length= 0;
|
|
|
|
|
|
|
|
while (it++)
|
|
|
|
{
|
|
|
|
if (triggers->definers_list.push_back(trg_definer,
|
|
|
|
&table->mem_root))
|
|
|
|
{
|
|
|
|
DBUG_RETURN(1); // EOM
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
it.rewind();
|
|
|
|
}
|
|
|
|
|
2005-07-28 21:39:11 +02:00
|
|
|
DBUG_ASSERT(triggers->definition_modes_list.elements ==
|
|
|
|
triggers->definitions_list.elements);
|
2005-11-10 20:25:03 +01:00
|
|
|
DBUG_ASSERT(triggers->definers_list.elements ==
|
|
|
|
triggers->definitions_list.elements);
|
|
|
|
|
2004-09-08 22:46:01 +02:00
|
|
|
table->triggers= triggers;
|
2004-09-07 14:29:46 +02:00
|
|
|
|
2005-07-09 19:51:59 +02:00
|
|
|
/*
|
|
|
|
Construct key that will represent triggers for this table in the set
|
|
|
|
of routines used by statement.
|
|
|
|
*/
|
|
|
|
triggers->sroutines_key.length= 1+strlen(db)+1+strlen(table_name)+1;
|
|
|
|
if (!(triggers->sroutines_key.str=
|
|
|
|
alloc_root(&table->mem_root, triggers->sroutines_key.length)))
|
|
|
|
DBUG_RETURN(1);
|
|
|
|
triggers->sroutines_key.str[0]= TYPE_ENUM_TRIGGER;
|
2005-07-28 15:10:14 +02:00
|
|
|
strxmov(triggers->sroutines_key.str+1, db, ".", table_name, NullS);
|
2005-07-09 19:51:59 +02:00
|
|
|
|
2005-05-24 20:19:33 +02:00
|
|
|
/*
|
|
|
|
TODO: This could be avoided if there is no triggers
|
|
|
|
for UPDATE and DELETE.
|
|
|
|
*/
|
2005-07-19 18:06:49 +02:00
|
|
|
if (!names_only && triggers->prepare_record1_accessors(table))
|
2004-09-07 14:29:46 +02:00
|
|
|
DBUG_RETURN(1);
|
|
|
|
|
2005-07-28 21:39:11 +02:00
|
|
|
List_iterator_fast<ulonglong> itm(triggers->definition_modes_list);
|
2006-01-24 18:15:12 +01:00
|
|
|
List_iterator_fast<LEX_STRING> it_definer(triggers->definers_list);
|
2004-09-07 14:29:46 +02:00
|
|
|
LEX *old_lex= thd->lex, lex;
|
2005-11-22 23:50:37 +01:00
|
|
|
sp_rcontext *save_spcont= thd->spcont;
|
2005-07-28 21:39:11 +02:00
|
|
|
ulong save_sql_mode= thd->variables.sql_mode;
|
2006-02-24 21:50:36 +01:00
|
|
|
LEX_STRING *on_table_name;
|
2004-09-07 14:29:46 +02:00
|
|
|
|
|
|
|
thd->lex= &lex;
|
|
|
|
|
2005-07-27 13:17:05 +02:00
|
|
|
save_db.str= thd->db;
|
|
|
|
save_db.length= thd->db_length;
|
A fix and a test case for
Bug#19022 "Memory bug when switching db during trigger execution"
Bug#17199 "Problem when view calls function from another database."
Bug#18444 "Fully qualified stored function names don't work correctly in
SELECT statements"
Documentation note: this patch introduces a change in behaviour of prepared
statements.
This patch adds a few new invariants with regard to how THD::db should
be used. These invariants should be preserved in future:
- one should never refer to THD::db by pointer and always make a deep copy
(strmake, strdup)
- one should never compare two databases by pointer, but use strncmp or
my_strncasecmp
- TABLE_LIST object table->db should be always initialized in the parser or
by creator of the object.
For prepared statements it means that if the current database is changed
after a statement is prepared, the database that was current at prepare
remains active. This also means that you can not prepare a statement that
implicitly refers to the current database if the latter is not set.
This is not documented, and therefore needs documentation. This is NOT a
change in behavior for almost all SQL statements except:
- ALTER TABLE t1 RENAME t2
- OPTIMIZE TABLE t1
- ANALYZE TABLE t1
- TRUNCATE TABLE t1 --
until this patch t1 or t2 could be evaluated at the first execution of
prepared statement.
CURRENT_DATABASE() still works OK and is evaluated at every execution
of prepared statement.
Note, that in stored routines this is not an issue as the default
database is the database of the stored procedure and "use" statement
is prohibited in stored routines.
This patch makes obsolete the use of check_db_used (it was never used in the
old code too) and all other places that check for table->db and assign it
from THD::db if it's NULL, except the parser.
How this patch was created: THD::{db,db_length} were replaced with a
LEX_STRING, THD::db. All the places that refer to THD::{db,db_length} were
manually checked and:
- if the place uses thd->db by pointer, it was fixed to make a deep copy
- if a place compared two db pointers, it was fixed to compare them by value
(via strcmp/my_strcasecmp, whatever was approproate)
Then this intermediate patch was used to write a smaller patch that does the
same thing but without a rename.
TODO in 5.1:
- remove check_db_used
- deploy THD::set_db in mysql_change_db
See also comments to individual files.
mysql-test/r/create.result:
Modify the result file: a database can never be NULL.
mysql-test/r/ps.result:
Update test results (Bug#17199 et al)
mysql-test/r/sp.result:
Update test results (Bug#17199 et al)
mysql-test/t/create.test:
Update the id of the returned error.
mysql-test/t/ps.test:
Add test coverage for prepared statements and current database. In scope of
work on Bug#17199 "Problem when view calls function from another database."
mysql-test/t/sp.test:
Add a test case for Bug#17199 "Problem when view calls function from another
database." and Bug#18444 "Fully qualified stored function names don't work
correctly in SELECT statements". Test a complementary problem.
sql/item_strfunc.cc:
Touch the code that reads thd->db (cleanup).
sql/log_event.cc:
While we are at it, replace direct access to thd->db with a method.
Should simplify future conversion of THD::db to LEX_STRING.
sql/slave.cc:
While we are at it, replace direct access to thd->db with a method.
Should simplify future conversion of THD::db to LEX_STRING.
sql/slave.h:
Remove a declaration for a method that is used only in one module.
sql/sp.cc:
Rewrite sp_use_new_db: this is a cleanup that I needed in order to understand
this function and ensure that it has no bugs.
sql/sp.h:
Add a new declaration for sp_use_new_db (uses LEX_STRINGs) and a comment.
sql/sp_head.cc:
- drop sp_name_current_db_new - a creator of sp_name class that was used
when sp_name was created for an identifier without an explicitly initialized
database. Now we pass thd->db to constructor of sp_name right in the
parser.
- rewrite sp_head::init_strings: name->m_db is always set now
- use the new variant of sp_use_new_db
- we don't need to update thd->db with SP MEM_ROOT pointer anymore when
parsing a stored procedure, as noone will refer to it (yes!)
sql/sp_head.h:
- remove unneded methods and members
sql/sql_class.h:
- introduce 3 THD methods to work with THD::db:
.set_db to assign the current database
.reset_db to reset the current database (temporarily) or set it to NULL
.opt_copy_db_to - to deep-copy thd->db to a pointer if it's not NULL
sql/sql_db.cc:
While we are at it, replace direct access to thd->db with a method.
Should simplify future conversion of THD::db to LEX_STRING.
sql/sql_insert.cc:
- replace checks with asserts: table_list->db must be always set in the parser.
sql/sql_lex.h:
- add a comment
sql/sql_parse.cc:
- implement the invariant described in the changeset comment.
- remove juggling with lex->sphead in SQLCOM_CREATE_PROCEDURE:
now db_load_routine uses its own LEX object and doesn't damage the main
LEX.
- add DBUG_ASSERT(0) to unused "check_db_used"
sql/sql_table.cc:
- replace a check with an assert (table_ident->db)
sql/sql_trigger.cc:
While we are at it, replace direct access to thd->db with a method.
Should simplify future conversion of THD::db to LEX_STRING.
sql/sql_udf.cc:
- use thd->set_db instead of direct modification of to thd->db
sql/sql_view.cc:
- replace a check with an assert (view->db)
sql/sql_yacc.yy:
- make sure that we always copy table->db or name->db or ident->db or
select_lex->db from thd->db if the former is not set. If thd->db
is not set but is accessed, return an error.
sql/tztime.cc:
- be nice, never copy thd->db by pointer.
2006-06-26 22:47:52 +02:00
|
|
|
thd->reset_db((char*) db, strlen(db));
|
2004-09-07 14:29:46 +02:00
|
|
|
while ((trg_create_str= it++))
|
|
|
|
{
|
2005-07-28 21:39:11 +02:00
|
|
|
trg_sql_mode= itm++;
|
2005-11-10 20:25:03 +01:00
|
|
|
LEX_STRING *trg_definer= it_definer++;
|
2006-01-24 18:15:12 +01:00
|
|
|
|
2005-07-28 21:39:11 +02:00
|
|
|
thd->variables.sql_mode= (ulong)*trg_sql_mode;
|
2004-11-03 11:39:38 +01:00
|
|
|
lex_start(thd, (uchar*)trg_create_str->str, trg_create_str->length);
|
2004-11-24 10:24:02 +01:00
|
|
|
|
2005-11-22 23:50:37 +01:00
|
|
|
thd->spcont= 0;
|
2006-03-10 01:44:08 +01:00
|
|
|
if (MYSQLparse((void *)thd) || thd->is_fatal_error)
|
2004-09-07 14:29:46 +02:00
|
|
|
{
|
|
|
|
/*
|
2005-11-10 20:25:03 +01:00
|
|
|
Free lex associated resources.
|
2004-09-07 14:29:46 +02:00
|
|
|
QQ: Do we really need all this stuff here ?
|
|
|
|
*/
|
2005-07-19 18:06:49 +02:00
|
|
|
delete lex.sphead;
|
2004-09-07 14:29:46 +02:00
|
|
|
goto err_with_lex_cleanup;
|
|
|
|
}
|
|
|
|
|
2006-11-30 02:40:42 +01:00
|
|
|
lex.sphead->set_info(0, 0, &lex.sp_chistics, (ulong) *trg_sql_mode);
|
2005-11-10 20:25:03 +01:00
|
|
|
|
2004-09-08 22:46:01 +02:00
|
|
|
triggers->bodies[lex.trg_chistics.event]
|
2004-09-07 14:29:46 +02:00
|
|
|
[lex.trg_chistics.action_time]= lex.sphead;
|
2005-11-10 20:25:03 +01:00
|
|
|
|
|
|
|
if (!trg_definer->length)
|
|
|
|
{
|
|
|
|
/*
|
|
|
|
This trigger was created/imported from the previous version of
|
|
|
|
MySQL, which does not support triggers definers. We should emit
|
|
|
|
warning here.
|
|
|
|
*/
|
|
|
|
|
|
|
|
push_warning_printf(thd, MYSQL_ERROR::WARN_LEVEL_WARN,
|
|
|
|
ER_TRG_NO_DEFINER, ER(ER_TRG_NO_DEFINER),
|
|
|
|
(const char*) db,
|
|
|
|
(const char*) lex.sphead->m_name.str);
|
|
|
|
|
|
|
|
/*
|
|
|
|
Set definer to the '' to correct displaying in the information
|
|
|
|
schema.
|
|
|
|
*/
|
|
|
|
|
Table definition cache, part 2
The table opening process now works the following way:
- Create common TABLE_SHARE object
- Read the .frm file and unpack it into the TABLE_SHARE object
- Create a TABLE object based on the information in the TABLE_SHARE
object and open a handler to the table object
Other noteworthy changes:
- In TABLE_SHARE the most common strings are now LEX_STRING's
- Better error message when table is not found
- Variable table_cache is now renamed 'table_open_cache'
- New variable 'table_definition_cache' that is the number of table defintions that will be cached
- strxnmov() calls are now fixed to avoid overflows
- strxnmov() will now always add one end \0 to result
- engine objects are now created with a TABLE_SHARE object instead of a TABLE object.
- After creating a field object one must call field->init(table) before using it
- For a busy system this change will give you:
- Less memory usage for table object
- Faster opening of tables (if it's has been in use or is in table definition cache)
- Allow you to cache many table definitions objects
- Faster drop of table
mysql-test/mysql-test-run.sh:
Fixed some problems with --gdb option
Test both with socket and tcp/ip port that all old servers are killed
mysql-test/r/flush_table.result:
More tests with lock table with 2 threads + flush table
mysql-test/r/information_schema.result:
Removed old (now wrong) result
mysql-test/r/innodb.result:
Better error messages (thanks to TDC patch)
mysql-test/r/merge.result:
Extra flush table test
mysql-test/r/ndb_bitfield.result:
Better error messages (thanks to TDC patch)
mysql-test/r/ndb_partition_error.result:
Better error messages (thanks to TDC patch)
mysql-test/r/query_cache.result:
Remove tables left from old tests
mysql-test/r/temp_table.result:
Test truncate with temporary tables
mysql-test/r/variables.result:
Table_cache -> Table_open_cache
mysql-test/t/flush_table.test:
More tests with lock table with 2 threads + flush table
mysql-test/t/merge.test:
Extra flush table test
mysql-test/t/multi_update.test:
Added 'sleep' to make test predictable
mysql-test/t/query_cache.test:
Remove tables left from old tests
mysql-test/t/temp_table.test:
Test truncate with temporary tables
mysql-test/t/variables.test:
Table_cache -> Table_open_cache
mysql-test/valgrind.supp:
Remove warning that may happens becasue threads dies in different order
mysys/hash.c:
Fixed wrong DBUG_PRINT
mysys/mf_dirname.c:
More DBUG
mysys/mf_pack.c:
Better comment
mysys/mf_tempdir.c:
More DBUG
Ensure that we call cleanup_dirname() on all temporary directory paths.
If we don't do this, we will get a failure when comparing temporary table
names as in some cases the temporary table name is run through convert_dirname())
mysys/my_alloc.c:
Indentation fix
sql/examples/ha_example.cc:
We new use TABLE_SHARE instead of TABLE when creating engine handlers
sql/examples/ha_example.h:
We new use TABLE_SHARE instead of TABLE when creating engine handlers
sql/examples/ha_tina.cc:
We new use TABLE_SHARE instead of TABLE when creating engine handlers
sql/examples/ha_tina.h:
We new use TABLE_SHARE instead of TABLE when creating engine handlers
sql/field.cc:
Update for table definition cache:
- Field creation now takes TABLE_SHARE instead of TABLE as argument
(This is becasue field definitions are now cached in TABLE_SHARE)
When a field is created, one now must call field->init(TABLE) before using it
- Use s->db instead of s->table_cache_key
- Added Field::clone() to create a field in TABLE from a field in TABLE_SHARE
- make_field() takes TABLE_SHARE as argument instead of TABLE
- move_field() -> move_field_offset()
sql/field.h:
Update for table definition cache:
- Field creation now takes TABLE_SHARE instead of TABLE as argument
(This is becasue field definitions are now cached in TABLE_SHARE)
When a field is created, one now must call field->init(TABLE) before using it
- Added Field::clone() to create a field in TABLE from a field in TABLE_SHARE
- make_field() takes TABLE_SHARE as argument instead of TABLE
- move_field() -> move_field_offset()
sql/ha_archive.cc:
We new use TABLE_SHARE instead of TABLE when creating engine handlers
sql/ha_archive.h:
We new use TABLE_SHARE instead of TABLE when creating engine handlers
sql/ha_berkeley.cc:
We new use TABLE_SHARE instead of TABLE when creating engine handlers
Changed name of argument create() to not hide internal 'table' variable.
table->s -> table_share
sql/ha_berkeley.h:
We new use TABLE_SHARE instead of TABLE when creating engine handlers
sql/ha_blackhole.cc:
We new use TABLE_SHARE instead of TABLE when creating engine handlers
sql/ha_blackhole.h:
We new use TABLE_SHARE instead of TABLE when creating engine handlers
sql/ha_federated.cc:
We new use TABLE_SHARE instead of TABLE when creating engine handlers
Fixed comments
Remove index variable and replace with pointers (simple optimization)
move_field() -> move_field_offset()
Removed some strlen() calls
sql/ha_federated.h:
We new use TABLE_SHARE instead of TABLE when creating engine handlers
sql/ha_heap.cc:
We new use TABLE_SHARE instead of TABLE when creating engine handlers
Simplify delete_table() and create() as the given file names are now without extension
sql/ha_heap.h:
We new use TABLE_SHARE instead of TABLE when creating engine handlers
sql/ha_innodb.cc:
We new use TABLE_SHARE instead of TABLE when creating engine handlers
sql/ha_innodb.h:
We new use TABLE_SHARE instead of TABLE when creating engine handlers
sql/ha_myisam.cc:
We new use TABLE_SHARE instead of TABLE when creating engine handlers
Remove not needed fn_format()
Fixed for new table->s structure
sql/ha_myisam.h:
We new use TABLE_SHARE instead of TABLE when creating engine handlers
sql/ha_myisammrg.cc:
We new use TABLE_SHARE instead of TABLE when creating engine handlers
Don't set 'is_view' for MERGE tables
Use new interface to find_temporary_table()
sql/ha_myisammrg.h:
We new use TABLE_SHARE instead of TABLE when creating engine handlers
Added flag HA_NO_COPY_ON_ALTER
sql/ha_ndbcluster.cc:
We new use TABLE_SHARE instead of TABLE when creating engine handlers
Fixed wrong calls to strxnmov()
Give error HA_ERR_TABLE_DEF_CHANGED if table definition has changed
drop_table -> intern_drop_table()
table->s -> table_share
Move part_info to TABLE
Fixed comments & DBUG print's
New arguments to print_error()
sql/ha_ndbcluster.h:
We new use TABLE_SHARE instead of TABLE when creating engine handlers
sql/ha_partition.cc:
We new use TABLE_SHARE instead of TABLE when creating engine handlers
We can't set up or use part_info when creating handler as there is not yet any table object
New ha_intialise() to work with TDC (Done by Mikael)
sql/ha_partition.h:
We new use TABLE_SHARE instead of TABLE when creating engine handlers
Got set_part_info() from Mikael
sql/handler.cc:
We new use TABLE_SHARE instead of TABLE when creating engine handlers
ha_delete_table() now also takes database as an argument
handler::ha_open() now takes TABLE as argument
ha_open() now calls ha_allocate_read_write_set()
Simplify ha_allocate_read_write_set()
Remove ha_deallocate_read_write_set()
Use table_share (Cached by table definition cache)
sql/handler.h:
New table flag: HA_NO_COPY_ON_ALTER (used by merge tables)
Remove ha_deallocate_read_write_set()
get_new_handler() now takes TABLE_SHARE as argument
ha_delete_table() now gets database as argument
sql/item.cc:
table_name and db are now LEX_STRING objects
When creating fields, we have now have to call field->init(table)
move_field -> move_field_offset()
sql/item.h:
tmp_table_field_from_field_type() now takes an extra paramenter 'fixed_length' to allow one to force usage of CHAR
instead of BLOB
sql/item_cmpfunc.cc:
Fixed call to tmp_table_field_from_field_type()
sql/item_create.cc:
Assert if new not handled cast type
sql/item_func.cc:
When creating fields, we have now have to call field->init(table)
dummy_table used by 'sp' now needs a TABLE_SHARE object
sql/item_subselect.cc:
Trivial code cleanups
sql/item_sum.cc:
When creating fields, we have now have to call field->init(table)
sql/item_timefunc.cc:
Item_func_str_to_date::tmp_table_field() now replaced by call to
tmp_table_field_from_field_type() (see item_timefunc.h)
sql/item_timefunc.h:
Simply tmp_table_field()
sql/item_uniq.cc:
When creating fields, we have now have to call field->init(table)
sql/key.cc:
Added 'KEY' argument to 'find_ref_key' to simplify code
sql/lock.cc:
More debugging
Use create_table_def_key() to create key for table cache
Allocate TABLE_SHARE properly when creating name lock
Fix that locked_table_name doesn't test same table twice
sql/mysql_priv.h:
New functions for table definition cache
New interfaces to a lot of functions.
New faster interface to find_temporary_table() and close_temporary_table()
sql/mysqld.cc:
Added support for table definition cache of size 'table_def_size'
Fixed som calls to strnmov()
Changed name of 'table_cache' to 'table_open_cache'
sql/opt_range.cc:
Use new interfaces
Fixed warnings from valgrind
sql/parse_file.cc:
Safer calls to strxnmov()
Fixed typo
sql/set_var.cc:
Added variable 'table_definition_cache'
Variable table_cache renamed to 'table_open_cache'
sql/slave.cc:
Use new interface
sql/sp.cc:
Proper use of TABLE_SHARE
sql/sp_head.cc:
Remove compiler warnings
We have now to call field->init(table)
sql/sp_head.h:
Pointers to parsed strings are now const
sql/sql_acl.cc:
table_name is now a LEX_STRING
sql/sql_base.cc:
Main implementation of table definition cache
(The #ifdef's are there for the future when table definition cache will replace open table cache)
Now table definitions are cached indepndent of open tables, which will speed up things when a table is in use at once from several places
Views are not yet cached; For the moment we only cache if a table is a view or not.
Faster implementation of find_temorary_table()
Replace 'wait_for_refresh()' with the more general function 'wait_for_condition()'
Drop table is slightly faster as we can use the table definition cache to know the type of the table
sql/sql_cache.cc:
table_cache_key and table_name are now LEX_STRING
'sDBUG print fixes
sql/sql_class.cc:
table_cache_key is now a LEX_STRING
safer strxnmov()
sql/sql_class.h:
Added number of open table shares (table definitions)
sql/sql_db.cc:
safer strxnmov()
sql/sql_delete.cc:
Use new interface to find_temporary_table()
sql/sql_derived.cc:
table_name is now a LEX_STRING
sql/sql_handler.cc:
TABLE_SHARE->db and TABLE_SHARE->table_name are now LEX_STRING's
sql/sql_insert.cc:
TABLE_SHARE->db and TABLE_SHARE->table_name are now LEX_STRING's
sql/sql_lex.cc:
Make parsed string a const (to quickly find out if anything is trying to change the query string)
sql/sql_lex.h:
Make parsed string a const (to quickly find out if anything is trying to change the query string)
sql/sql_load.cc:
Safer strxnmov()
sql/sql_parse.cc:
Better error if wrong DB name
sql/sql_partition.cc:
part_info moved to TABLE from TABLE_SHARE
Indentation changes
sql/sql_select.cc:
Indentation fixes
Call field->init(TABLE) for new created fields
Update create_tmp_table() to use TABLE_SHARE properly
sql/sql_select.h:
Call field->init(TABLE) for new created fields
sql/sql_show.cc:
table_name is now a LEX_STRING
part_info moved to TABLE
sql/sql_table.cc:
Use table definition cache to speed up delete of tables
Fixed calls to functions with new interfaces
Don't use 'share_not_to_be_used'
Instead of doing openfrm() when doing repair, we now have to call
get_table_share() followed by open_table_from_share().
Replace some fn_format() with faster unpack_filename().
Safer strxnmov()
part_info is now in TABLE
Added Mikaels patch for partition and ALTER TABLE
Instead of using 'TABLE_SHARE->is_view' use 'table_flags() & HA_NO_COPY_ON_ALTER
sql/sql_test.cc:
table_name and table_cache_key are now LEX_STRING's
sql/sql_trigger.cc:
TABLE_SHARE->db and TABLE_SHARE->table_name are now LEX_STRING's
safer strxnmov()
Removed compiler warnings
sql/sql_update.cc:
Call field->init(TABLE) after field is created
sql/sql_view.cc:
safer strxnmov()
Create common TABLE_SHARE object for views to allow us to cache if table is a view
sql/structs.h:
Added SHOW_TABLE_DEFINITIONS
sql/table.cc:
Creation and destruct of TABLE_SHARE objects that are common for many TABLE objects
The table opening process now works the following way:
- Create common TABLE_SHARE object
- Read the .frm file and unpack it into the TABLE_SHARE object
- Create a TABLE object based on the information in the TABLE_SHARE
object and open a handler to the table object
open_table_def() is written in such a way that it should be trival to add parsing of the .frm files in new formats
sql/table.h:
TABLE objects for the same database table now share a common TABLE_SHARE object
In TABLE_SHARE the most common strings are now LEX_STRING's
sql/unireg.cc:
Changed arguments to rea_create_table() to have same order as other functions
Call field->init(table) for new created fields
sql/unireg.h:
Added OPEN_VIEW
strings/strxnmov.c:
Change strxnmov() to always add end \0
This makes usage of strxnmov() safer as most of MySQL code assumes that strxnmov() will create a null terminated string
2005-11-23 21:45:02 +01:00
|
|
|
lex.sphead->set_definer((char*) "", 0);
|
2005-11-10 20:25:03 +01:00
|
|
|
|
|
|
|
/*
|
|
|
|
Triggers without definer information are executed under the
|
|
|
|
authorization of the invoker.
|
|
|
|
*/
|
|
|
|
|
|
|
|
lex.sphead->m_chistics->suid= SP_IS_NOT_SUID;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
lex.sphead->set_definer(trg_definer->str, trg_definer->length);
|
|
|
|
|
2005-07-28 21:39:11 +02:00
|
|
|
if (triggers->names_list.push_back(&lex.sphead->m_name,
|
|
|
|
&table->mem_root))
|
2005-07-19 18:06:49 +02:00
|
|
|
goto err_with_lex_cleanup;
|
2004-09-07 14:29:46 +02:00
|
|
|
|
2006-02-24 21:50:36 +01:00
|
|
|
if (!(on_table_name= (LEX_STRING*) alloc_root(&table->mem_root,
|
|
|
|
sizeof(LEX_STRING))))
|
|
|
|
goto err_with_lex_cleanup;
|
|
|
|
*on_table_name= lex.ident;
|
|
|
|
if (triggers->on_table_names_list.push_back(on_table_name, &table->mem_root))
|
|
|
|
goto err_with_lex_cleanup;
|
|
|
|
|
|
|
|
/*
|
|
|
|
Let us check that we correctly update trigger definitions when we
|
|
|
|
rename tables with triggers.
|
|
|
|
*/
|
|
|
|
DBUG_ASSERT(!my_strcasecmp(table_alias_charset, lex.query_tables->db, db) &&
|
|
|
|
!my_strcasecmp(table_alias_charset, lex.query_tables->table_name,
|
|
|
|
table_name));
|
|
|
|
|
2005-07-19 18:06:49 +02:00
|
|
|
if (names_only)
|
|
|
|
{
|
|
|
|
lex_end(&lex);
|
|
|
|
continue;
|
|
|
|
}
|
2004-09-07 14:29:46 +02:00
|
|
|
|
2004-11-24 10:24:02 +01:00
|
|
|
/*
|
2006-07-01 23:51:10 +02:00
|
|
|
Gather all Item_trigger_field objects representing access to fields
|
|
|
|
in old/new versions of row in trigger into lists containing all such
|
|
|
|
objects for the triggers with same action and timing.
|
|
|
|
*/
|
|
|
|
triggers->trigger_fields[lex.trg_chistics.event]
|
|
|
|
[lex.trg_chistics.action_time]=
|
|
|
|
(Item_trigger_field *)(lex.trg_table_fields.first);
|
|
|
|
/*
|
|
|
|
Also let us bind these objects to Field objects in table being
|
2004-11-24 10:24:02 +01:00
|
|
|
opened.
|
|
|
|
|
2005-07-28 21:39:11 +02:00
|
|
|
We ignore errors here, because if even something is wrong we still
|
|
|
|
will be willing to open table to perform some operations (e.g.
|
|
|
|
SELECT)...
|
2004-11-24 10:24:02 +01:00
|
|
|
Anyway some things can be checked only during trigger execution.
|
|
|
|
*/
|
|
|
|
for (Item_trigger_field *trg_field=
|
|
|
|
(Item_trigger_field *)(lex.trg_table_fields.first);
|
|
|
|
trg_field;
|
|
|
|
trg_field= trg_field->next_trg_field)
|
2006-01-24 18:15:12 +01:00
|
|
|
{
|
|
|
|
trg_field->setup_field(thd, table,
|
|
|
|
&triggers->subject_table_grants[lex.trg_chistics.event]
|
|
|
|
[lex.trg_chistics.action_time]);
|
|
|
|
}
|
2005-11-10 20:25:03 +01:00
|
|
|
|
2004-09-07 14:29:46 +02:00
|
|
|
lex_end(&lex);
|
|
|
|
}
|
A fix and a test case for
Bug#19022 "Memory bug when switching db during trigger execution"
Bug#17199 "Problem when view calls function from another database."
Bug#18444 "Fully qualified stored function names don't work correctly in
SELECT statements"
Documentation note: this patch introduces a change in behaviour of prepared
statements.
This patch adds a few new invariants with regard to how THD::db should
be used. These invariants should be preserved in future:
- one should never refer to THD::db by pointer and always make a deep copy
(strmake, strdup)
- one should never compare two databases by pointer, but use strncmp or
my_strncasecmp
- TABLE_LIST object table->db should be always initialized in the parser or
by creator of the object.
For prepared statements it means that if the current database is changed
after a statement is prepared, the database that was current at prepare
remains active. This also means that you can not prepare a statement that
implicitly refers to the current database if the latter is not set.
This is not documented, and therefore needs documentation. This is NOT a
change in behavior for almost all SQL statements except:
- ALTER TABLE t1 RENAME t2
- OPTIMIZE TABLE t1
- ANALYZE TABLE t1
- TRUNCATE TABLE t1 --
until this patch t1 or t2 could be evaluated at the first execution of
prepared statement.
CURRENT_DATABASE() still works OK and is evaluated at every execution
of prepared statement.
Note, that in stored routines this is not an issue as the default
database is the database of the stored procedure and "use" statement
is prohibited in stored routines.
This patch makes obsolete the use of check_db_used (it was never used in the
old code too) and all other places that check for table->db and assign it
from THD::db if it's NULL, except the parser.
How this patch was created: THD::{db,db_length} were replaced with a
LEX_STRING, THD::db. All the places that refer to THD::{db,db_length} were
manually checked and:
- if the place uses thd->db by pointer, it was fixed to make a deep copy
- if a place compared two db pointers, it was fixed to compare them by value
(via strcmp/my_strcasecmp, whatever was approproate)
Then this intermediate patch was used to write a smaller patch that does the
same thing but without a rename.
TODO in 5.1:
- remove check_db_used
- deploy THD::set_db in mysql_change_db
See also comments to individual files.
mysql-test/r/create.result:
Modify the result file: a database can never be NULL.
mysql-test/r/ps.result:
Update test results (Bug#17199 et al)
mysql-test/r/sp.result:
Update test results (Bug#17199 et al)
mysql-test/t/create.test:
Update the id of the returned error.
mysql-test/t/ps.test:
Add test coverage for prepared statements and current database. In scope of
work on Bug#17199 "Problem when view calls function from another database."
mysql-test/t/sp.test:
Add a test case for Bug#17199 "Problem when view calls function from another
database." and Bug#18444 "Fully qualified stored function names don't work
correctly in SELECT statements". Test a complementary problem.
sql/item_strfunc.cc:
Touch the code that reads thd->db (cleanup).
sql/log_event.cc:
While we are at it, replace direct access to thd->db with a method.
Should simplify future conversion of THD::db to LEX_STRING.
sql/slave.cc:
While we are at it, replace direct access to thd->db with a method.
Should simplify future conversion of THD::db to LEX_STRING.
sql/slave.h:
Remove a declaration for a method that is used only in one module.
sql/sp.cc:
Rewrite sp_use_new_db: this is a cleanup that I needed in order to understand
this function and ensure that it has no bugs.
sql/sp.h:
Add a new declaration for sp_use_new_db (uses LEX_STRINGs) and a comment.
sql/sp_head.cc:
- drop sp_name_current_db_new - a creator of sp_name class that was used
when sp_name was created for an identifier without an explicitly initialized
database. Now we pass thd->db to constructor of sp_name right in the
parser.
- rewrite sp_head::init_strings: name->m_db is always set now
- use the new variant of sp_use_new_db
- we don't need to update thd->db with SP MEM_ROOT pointer anymore when
parsing a stored procedure, as noone will refer to it (yes!)
sql/sp_head.h:
- remove unneded methods and members
sql/sql_class.h:
- introduce 3 THD methods to work with THD::db:
.set_db to assign the current database
.reset_db to reset the current database (temporarily) or set it to NULL
.opt_copy_db_to - to deep-copy thd->db to a pointer if it's not NULL
sql/sql_db.cc:
While we are at it, replace direct access to thd->db with a method.
Should simplify future conversion of THD::db to LEX_STRING.
sql/sql_insert.cc:
- replace checks with asserts: table_list->db must be always set in the parser.
sql/sql_lex.h:
- add a comment
sql/sql_parse.cc:
- implement the invariant described in the changeset comment.
- remove juggling with lex->sphead in SQLCOM_CREATE_PROCEDURE:
now db_load_routine uses its own LEX object and doesn't damage the main
LEX.
- add DBUG_ASSERT(0) to unused "check_db_used"
sql/sql_table.cc:
- replace a check with an assert (table_ident->db)
sql/sql_trigger.cc:
While we are at it, replace direct access to thd->db with a method.
Should simplify future conversion of THD::db to LEX_STRING.
sql/sql_udf.cc:
- use thd->set_db instead of direct modification of to thd->db
sql/sql_view.cc:
- replace a check with an assert (view->db)
sql/sql_yacc.yy:
- make sure that we always copy table->db or name->db or ident->db or
select_lex->db from thd->db if the former is not set. If thd->db
is not set but is accessed, return an error.
sql/tztime.cc:
- be nice, never copy thd->db by pointer.
2006-06-26 22:47:52 +02:00
|
|
|
thd->reset_db(save_db.str, save_db.length);
|
2004-09-07 14:29:46 +02:00
|
|
|
thd->lex= old_lex;
|
2005-11-23 01:49:44 +01:00
|
|
|
thd->spcont= save_spcont;
|
2005-07-28 21:39:11 +02:00
|
|
|
thd->variables.sql_mode= save_sql_mode;
|
2004-09-07 14:29:46 +02:00
|
|
|
|
|
|
|
DBUG_RETURN(0);
|
|
|
|
|
|
|
|
err_with_lex_cleanup:
|
|
|
|
// QQ: anything else ?
|
|
|
|
lex_end(&lex);
|
|
|
|
thd->lex= old_lex;
|
2005-11-22 23:50:37 +01:00
|
|
|
thd->spcont= save_spcont;
|
2005-07-28 21:39:11 +02:00
|
|
|
thd->variables.sql_mode= save_sql_mode;
|
A fix and a test case for
Bug#19022 "Memory bug when switching db during trigger execution"
Bug#17199 "Problem when view calls function from another database."
Bug#18444 "Fully qualified stored function names don't work correctly in
SELECT statements"
Documentation note: this patch introduces a change in behaviour of prepared
statements.
This patch adds a few new invariants with regard to how THD::db should
be used. These invariants should be preserved in future:
- one should never refer to THD::db by pointer and always make a deep copy
(strmake, strdup)
- one should never compare two databases by pointer, but use strncmp or
my_strncasecmp
- TABLE_LIST object table->db should be always initialized in the parser or
by creator of the object.
For prepared statements it means that if the current database is changed
after a statement is prepared, the database that was current at prepare
remains active. This also means that you can not prepare a statement that
implicitly refers to the current database if the latter is not set.
This is not documented, and therefore needs documentation. This is NOT a
change in behavior for almost all SQL statements except:
- ALTER TABLE t1 RENAME t2
- OPTIMIZE TABLE t1
- ANALYZE TABLE t1
- TRUNCATE TABLE t1 --
until this patch t1 or t2 could be evaluated at the first execution of
prepared statement.
CURRENT_DATABASE() still works OK and is evaluated at every execution
of prepared statement.
Note, that in stored routines this is not an issue as the default
database is the database of the stored procedure and "use" statement
is prohibited in stored routines.
This patch makes obsolete the use of check_db_used (it was never used in the
old code too) and all other places that check for table->db and assign it
from THD::db if it's NULL, except the parser.
How this patch was created: THD::{db,db_length} were replaced with a
LEX_STRING, THD::db. All the places that refer to THD::{db,db_length} were
manually checked and:
- if the place uses thd->db by pointer, it was fixed to make a deep copy
- if a place compared two db pointers, it was fixed to compare them by value
(via strcmp/my_strcasecmp, whatever was approproate)
Then this intermediate patch was used to write a smaller patch that does the
same thing but without a rename.
TODO in 5.1:
- remove check_db_used
- deploy THD::set_db in mysql_change_db
See also comments to individual files.
mysql-test/r/create.result:
Modify the result file: a database can never be NULL.
mysql-test/r/ps.result:
Update test results (Bug#17199 et al)
mysql-test/r/sp.result:
Update test results (Bug#17199 et al)
mysql-test/t/create.test:
Update the id of the returned error.
mysql-test/t/ps.test:
Add test coverage for prepared statements and current database. In scope of
work on Bug#17199 "Problem when view calls function from another database."
mysql-test/t/sp.test:
Add a test case for Bug#17199 "Problem when view calls function from another
database." and Bug#18444 "Fully qualified stored function names don't work
correctly in SELECT statements". Test a complementary problem.
sql/item_strfunc.cc:
Touch the code that reads thd->db (cleanup).
sql/log_event.cc:
While we are at it, replace direct access to thd->db with a method.
Should simplify future conversion of THD::db to LEX_STRING.
sql/slave.cc:
While we are at it, replace direct access to thd->db with a method.
Should simplify future conversion of THD::db to LEX_STRING.
sql/slave.h:
Remove a declaration for a method that is used only in one module.
sql/sp.cc:
Rewrite sp_use_new_db: this is a cleanup that I needed in order to understand
this function and ensure that it has no bugs.
sql/sp.h:
Add a new declaration for sp_use_new_db (uses LEX_STRINGs) and a comment.
sql/sp_head.cc:
- drop sp_name_current_db_new - a creator of sp_name class that was used
when sp_name was created for an identifier without an explicitly initialized
database. Now we pass thd->db to constructor of sp_name right in the
parser.
- rewrite sp_head::init_strings: name->m_db is always set now
- use the new variant of sp_use_new_db
- we don't need to update thd->db with SP MEM_ROOT pointer anymore when
parsing a stored procedure, as noone will refer to it (yes!)
sql/sp_head.h:
- remove unneded methods and members
sql/sql_class.h:
- introduce 3 THD methods to work with THD::db:
.set_db to assign the current database
.reset_db to reset the current database (temporarily) or set it to NULL
.opt_copy_db_to - to deep-copy thd->db to a pointer if it's not NULL
sql/sql_db.cc:
While we are at it, replace direct access to thd->db with a method.
Should simplify future conversion of THD::db to LEX_STRING.
sql/sql_insert.cc:
- replace checks with asserts: table_list->db must be always set in the parser.
sql/sql_lex.h:
- add a comment
sql/sql_parse.cc:
- implement the invariant described in the changeset comment.
- remove juggling with lex->sphead in SQLCOM_CREATE_PROCEDURE:
now db_load_routine uses its own LEX object and doesn't damage the main
LEX.
- add DBUG_ASSERT(0) to unused "check_db_used"
sql/sql_table.cc:
- replace a check with an assert (table_ident->db)
sql/sql_trigger.cc:
While we are at it, replace direct access to thd->db with a method.
Should simplify future conversion of THD::db to LEX_STRING.
sql/sql_udf.cc:
- use thd->set_db instead of direct modification of to thd->db
sql/sql_view.cc:
- replace a check with an assert (view->db)
sql/sql_yacc.yy:
- make sure that we always copy table->db or name->db or ident->db or
select_lex->db from thd->db if the former is not set. If thd->db
is not set but is accessed, return an error.
sql/tztime.cc:
- be nice, never copy thd->db by pointer.
2006-06-26 22:47:52 +02:00
|
|
|
thd->reset_db(save_db.str, save_db.length);
|
2004-09-07 14:29:46 +02:00
|
|
|
DBUG_RETURN(1);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
We don't care about this error message much because .TRG files will
|
|
|
|
be merged into .FRM anyway.
|
|
|
|
*/
|
now my_printf_error is not better then my_error, but my_error call is shorter
used only one implementation of format parser of (printf)
fixed multistatement
include/mysqld_error.h:
newerror messages
mysql-test/t/key.test:
unknown error replaced with real error
mysys/my_error.c:
my_error & my_printf_error use my_vsprintf
sql/field_conv.cc:
now my_printf_error is not better then my_error, but my_error call is shorter
sql/ha_innodb.cc:
now my_printf_error is not better then my_error, but my_error call is shorter
sql/handler.cc:
now my_printf_error is not better then my_error, but my_error call is shorter
sql/item.cc:
now my_printf_error is not better then my_error, but my_error call is shorter
sql/item_cmpfunc.cc:
now my_printf_error is not better then my_error, but my_error call is shorter
sql/item_func.cc:
now my_printf_error is not better then my_error, but my_error call is shorter
sql/item_strfunc.cc:
now my_printf_error is not better then my_error, but my_error call is shorter
sql/lock.cc:
now my_printf_error is not better then my_error, but my_error call is shorter
sql/log.cc:
now my_printf_error is not better then my_error, but my_error call is shorter
sql/parse_file.cc:
now my_printf_error is not better then my_error, but my_error call is shorter
sql/procedure.cc:
now my_printf_error is not better then my_error, but my_error call is shorter
sql/protocol.cc:
no need reset thd->lex->found_colon to break multiline sequance now, send_error called too late
sql/repl_failsafe.cc:
now my_printf_error is not better then my_error, but my_error call is shorter
sql/set_var.cc:
now my_printf_error is not better then my_error, but my_error call is shorter
sql/share/czech/errmsg.txt:
new errors converted from unknown error
sql/share/danish/errmsg.txt:
new errors converted from unknown error
sql/share/dutch/errmsg.txt:
new errors converted from unknown error
sql/share/english/errmsg.txt:
new errors converted from unknown error
sql/share/estonian/errmsg.txt:
new errors converted from unknown error
sql/share/french/errmsg.txt:
new errors converted from unknown error
sql/share/german/errmsg.txt:
new errors converted from unknown error
sql/share/greek/errmsg.txt:
new errors converted from unknown error
sql/share/hungarian/errmsg.txt:
new errors converted from unknown error
sql/share/italian/errmsg.txt:
new errors converted from unknown error
sql/share/japanese/errmsg.txt:
new errors converted from unknown error
sql/share/korean/errmsg.txt:
new errors converted from unknown error
sql/share/norwegian-ny/errmsg.txt:
new errors converted from unknown error
sql/share/norwegian/errmsg.txt:
new errors converted from unknown error
sql/share/polish/errmsg.txt:
new errors converted from unknown error
sql/share/portuguese/errmsg.txt:
new errors converted from unknown error
sql/share/romanian/errmsg.txt:
new errors converted from unknown error
sql/share/russian/errmsg.txt:
new errors converted from unknown error
sql/share/serbian/errmsg.txt:
new errors converted from unknown error
sql/share/slovak/errmsg.txt:
new errors converted from unknown error
sql/share/spanish/errmsg.txt:
new errors converted from unknown error
sql/share/swedish/errmsg.txt:
new errors converted from unknown error
sql/share/ukrainian/errmsg.txt:
new errors converted from unknown error
sql/slave.cc:
now my_printf_error is not better then my_error, but my_error call is shorter
sql/sp.cc:
now my_printf_error is not better then my_error, but my_error call is shorter
sql/sp_head.cc:
now my_printf_error is not better then my_error, but my_error call is shorter
sql/sql_acl.cc:
now my_printf_error is not better then my_error, but my_error call is shorter
sql/sql_analyse.cc:
now my_printf_error is not better then my_error, but my_error call is shorter
sql/sql_base.cc:
now my_printf_error is not better then my_error, but my_error call is shorter
sql/sql_class.cc:
now my_printf_error is not better then my_error, but my_error call is shorter
sql/sql_db.cc:
now my_printf_error is not better then my_error, but my_error call is shorter
sql/sql_delete.cc:
now my_printf_error is not better then my_error, but my_error call is shorter
sql/sql_handler.cc:
now my_printf_error is not better then my_error, but my_error call is shorter
sql/sql_insert.cc:
now my_printf_error is not better then my_error, but my_error call is shorter
sql/sql_load.cc:
now my_printf_error is not better then my_error, but my_error call is shorter
sql/sql_map.cc:
now my_printf_error is not better then my_error, but my_error call is shorter
sql/sql_parse.cc:
now my_printf_error is not better then my_error, but my_error call is shorter
multi-row command fixed
sql/sql_prepare.cc:
now my_printf_error is not better then my_error, but my_error call is shorter
remover send_error ingected from 4.1
sql/sql_rename.cc:
now my_printf_error is not better then my_error, but my_error call is shorter
sql/sql_repl.cc:
now my_printf_error is not better then my_error, but my_error call is shorter
sql/sql_select.cc:
now my_printf_error is not better then my_error, but my_error call is shorter
sql/sql_show.cc:
now my_printf_error is not better then my_error, but my_error call is shorter
sql/sql_table.cc:
now my_printf_error is not better then my_error, but my_error call is shorter
sql/sql_trigger.cc:
now my_printf_error is not better then my_error, but my_error call is shorter
sql/sql_udf.cc:
now my_printf_error is not better then my_error, but my_error call is shorter
sql/sql_update.cc:
now my_printf_error is not better then my_error, but my_error call is shorter
sql/sql_view.cc:
now my_printf_error is not better then my_error, but my_error call is shorter
sql/sql_yacc.yy:
now my_printf_error is not better then my_error, but my_error call is shorter
sql/table.cc:
now my_printf_error is not better then my_error, but my_error call is shorter
strings/my_vsnprintf.c:
* format support added to my_vsprint
2004-11-13 18:35:51 +01:00
|
|
|
my_error(ER_WRONG_OBJECT, MYF(0),
|
2005-07-31 11:49:55 +02:00
|
|
|
table_name, triggers_file_ext+1, "TRIGGER");
|
2004-09-07 14:29:46 +02:00
|
|
|
DBUG_RETURN(1);
|
|
|
|
}
|
|
|
|
|
|
|
|
DBUG_RETURN(1);
|
|
|
|
}
|
2005-07-19 18:06:49 +02:00
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
Obtains and returns trigger metadata
|
|
|
|
|
|
|
|
SYNOPSIS
|
|
|
|
get_trigger_info()
|
|
|
|
thd - current thread context
|
|
|
|
event - trigger event type
|
|
|
|
time_type - trigger action time
|
|
|
|
name - returns name of trigger
|
|
|
|
stmt - returns statement of trigger
|
2005-07-28 21:39:11 +02:00
|
|
|
sql_mode - returns sql_mode of trigger
|
2005-11-10 20:25:03 +01:00
|
|
|
definer_user - returns definer/creator of trigger. The caller is
|
|
|
|
responsible to allocate enough space for storing definer
|
|
|
|
information.
|
2005-07-19 18:06:49 +02:00
|
|
|
|
|
|
|
RETURN VALUE
|
|
|
|
False - success
|
|
|
|
True - error
|
|
|
|
*/
|
|
|
|
|
|
|
|
bool Table_triggers_list::get_trigger_info(THD *thd, trg_event_type event,
|
|
|
|
trg_action_time_type time_type,
|
|
|
|
LEX_STRING *trigger_name,
|
2005-07-28 21:39:11 +02:00
|
|
|
LEX_STRING *trigger_stmt,
|
2005-11-10 20:25:03 +01:00
|
|
|
ulong *sql_mode,
|
|
|
|
LEX_STRING *definer)
|
2005-07-19 18:06:49 +02:00
|
|
|
{
|
|
|
|
sp_head *body;
|
|
|
|
DBUG_ENTER("get_trigger_info");
|
|
|
|
if ((body= bodies[event][time_type]))
|
|
|
|
{
|
|
|
|
*trigger_name= body->m_name;
|
|
|
|
*trigger_stmt= body->m_body;
|
2005-07-28 21:39:11 +02:00
|
|
|
*sql_mode= body->m_sql_mode;
|
2005-11-10 20:25:03 +01:00
|
|
|
|
|
|
|
if (body->m_chistics->suid == SP_IS_NOT_SUID)
|
|
|
|
{
|
|
|
|
definer->str[0]= 0;
|
|
|
|
definer->length= 0;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
definer->length= strxmov(definer->str, body->m_definer_user.str, "@",
|
|
|
|
body->m_definer_host.str, NullS) - definer->str;
|
|
|
|
}
|
|
|
|
|
2005-07-19 18:06:49 +02:00
|
|
|
DBUG_RETURN(0);
|
|
|
|
}
|
|
|
|
DBUG_RETURN(1);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
Find trigger's table from trigger identifier and add it to
|
|
|
|
the statement table list.
|
|
|
|
|
|
|
|
SYNOPSIS
|
|
|
|
mysql_table_for_trigger()
|
|
|
|
thd - current thread context
|
|
|
|
trig - identifier for trigger
|
Bug#23703 (DROP TRIGGER needs an IF EXISTS)
This change set implements the DROP TRIGGER IF EXISTS functionality.
This fix is considered a bug and not a feature, because without it,
there is no known method to write a database creation script that can create
a trigger without failing, when executed on a database that may or may not
contain already a trigger of the same name.
Implementing this functionality closes an orthogonality gap between triggers
and stored procedures / stored functions (which do support the DROP IF
EXISTS syntax).
In sql_trigger.cc, in mysql_create_or_drop_trigger,
the code has been reordered to:
- perform the tests that do not depend on the file system (access()),
- get the locks (wait_if_global_read_lock, LOCK_open)
- call access()
- perform the operation
- write to the binlog
- unlock (LOCK_open, start_waiting_global_read_lock)
This is to ensure that all the code that depends on the presence of the
trigger file is executed in the same critical section,
and prevents race conditions similar to the case fixed by Bug 14262 :
- thread 1 executes DROP TRIGGER IF EXISTS, access() returns a failure
- thread 2 executes CREATE TRIGGER
- thread 2 logs CREATE TRIGGER
- thread 1 logs DROP TRIGGER IF EXISTS
The patch itself is based on code contributed by the MySQL community,
under the terms of the Contributor License Agreement (See Bug 18161).
mysql-test/r/rpl_trigger.result:
DROP TRIGGER IF EXISTS
mysql-test/r/trigger.result:
DROP TRIGGER IF EXISTS
mysql-test/t/rpl_trigger.test:
DROP TRIGGER IF EXISTS
mysql-test/t/trigger.test:
DROP TRIGGER IF EXISTS
sql/sql_trigger.cc:
DROP TRIGGER IF EXISTS
sql/sql_yacc.yy:
DROP TRIGGER IF EXISTS
2006-11-13 23:40:22 +01:00
|
|
|
if_exists - treat a not existing trigger as a warning if TRUE
|
|
|
|
table - pointer to TABLE_LIST object for the table trigger (output)
|
2005-07-19 18:06:49 +02:00
|
|
|
|
|
|
|
RETURN VALUE
|
Bug#23703 (DROP TRIGGER needs an IF EXISTS)
This change set implements the DROP TRIGGER IF EXISTS functionality.
This fix is considered a bug and not a feature, because without it,
there is no known method to write a database creation script that can create
a trigger without failing, when executed on a database that may or may not
contain already a trigger of the same name.
Implementing this functionality closes an orthogonality gap between triggers
and stored procedures / stored functions (which do support the DROP IF
EXISTS syntax).
In sql_trigger.cc, in mysql_create_or_drop_trigger,
the code has been reordered to:
- perform the tests that do not depend on the file system (access()),
- get the locks (wait_if_global_read_lock, LOCK_open)
- call access()
- perform the operation
- write to the binlog
- unlock (LOCK_open, start_waiting_global_read_lock)
This is to ensure that all the code that depends on the presence of the
trigger file is executed in the same critical section,
and prevents race conditions similar to the case fixed by Bug 14262 :
- thread 1 executes DROP TRIGGER IF EXISTS, access() returns a failure
- thread 2 executes CREATE TRIGGER
- thread 2 logs CREATE TRIGGER
- thread 1 logs DROP TRIGGER IF EXISTS
The patch itself is based on code contributed by the MySQL community,
under the terms of the Contributor License Agreement (See Bug 18161).
mysql-test/r/rpl_trigger.result:
DROP TRIGGER IF EXISTS
mysql-test/r/trigger.result:
DROP TRIGGER IF EXISTS
mysql-test/t/rpl_trigger.test:
DROP TRIGGER IF EXISTS
mysql-test/t/trigger.test:
DROP TRIGGER IF EXISTS
sql/sql_trigger.cc:
DROP TRIGGER IF EXISTS
sql/sql_yacc.yy:
DROP TRIGGER IF EXISTS
2006-11-13 23:40:22 +01:00
|
|
|
0 Success
|
|
|
|
1 Error
|
2005-07-19 18:06:49 +02:00
|
|
|
*/
|
|
|
|
|
Bug#23703 (DROP TRIGGER needs an IF EXISTS)
This change set implements the DROP TRIGGER IF EXISTS functionality.
This fix is considered a bug and not a feature, because without it,
there is no known method to write a database creation script that can create
a trigger without failing, when executed on a database that may or may not
contain already a trigger of the same name.
Implementing this functionality closes an orthogonality gap between triggers
and stored procedures / stored functions (which do support the DROP IF
EXISTS syntax).
In sql_trigger.cc, in mysql_create_or_drop_trigger,
the code has been reordered to:
- perform the tests that do not depend on the file system (access()),
- get the locks (wait_if_global_read_lock, LOCK_open)
- call access()
- perform the operation
- write to the binlog
- unlock (LOCK_open, start_waiting_global_read_lock)
This is to ensure that all the code that depends on the presence of the
trigger file is executed in the same critical section,
and prevents race conditions similar to the case fixed by Bug 14262 :
- thread 1 executes DROP TRIGGER IF EXISTS, access() returns a failure
- thread 2 executes CREATE TRIGGER
- thread 2 logs CREATE TRIGGER
- thread 1 logs DROP TRIGGER IF EXISTS
The patch itself is based on code contributed by the MySQL community,
under the terms of the Contributor License Agreement (See Bug 18161).
mysql-test/r/rpl_trigger.result:
DROP TRIGGER IF EXISTS
mysql-test/r/trigger.result:
DROP TRIGGER IF EXISTS
mysql-test/t/rpl_trigger.test:
DROP TRIGGER IF EXISTS
mysql-test/t/trigger.test:
DROP TRIGGER IF EXISTS
sql/sql_trigger.cc:
DROP TRIGGER IF EXISTS
sql/sql_yacc.yy:
DROP TRIGGER IF EXISTS
2006-11-13 23:40:22 +01:00
|
|
|
static int
|
|
|
|
add_table_for_trigger(THD *thd, sp_name *trig, bool if_exists,
|
|
|
|
TABLE_LIST **table)
|
2005-07-19 18:06:49 +02:00
|
|
|
{
|
|
|
|
LEX *lex= thd->lex;
|
|
|
|
char path_buff[FN_REFLEN];
|
|
|
|
LEX_STRING path;
|
|
|
|
File_parser *parser;
|
|
|
|
struct st_trigname trigname;
|
2006-03-27 23:01:51 +02:00
|
|
|
Handle_old_incorrect_trigger_table_hook trigger_table_hook(
|
|
|
|
path_buff, &trigname.trigger_table);
|
|
|
|
|
2005-07-19 18:06:49 +02:00
|
|
|
DBUG_ENTER("add_table_for_trigger");
|
Bug#23703 (DROP TRIGGER needs an IF EXISTS)
This change set implements the DROP TRIGGER IF EXISTS functionality.
This fix is considered a bug and not a feature, because without it,
there is no known method to write a database creation script that can create
a trigger without failing, when executed on a database that may or may not
contain already a trigger of the same name.
Implementing this functionality closes an orthogonality gap between triggers
and stored procedures / stored functions (which do support the DROP IF
EXISTS syntax).
In sql_trigger.cc, in mysql_create_or_drop_trigger,
the code has been reordered to:
- perform the tests that do not depend on the file system (access()),
- get the locks (wait_if_global_read_lock, LOCK_open)
- call access()
- perform the operation
- write to the binlog
- unlock (LOCK_open, start_waiting_global_read_lock)
This is to ensure that all the code that depends on the presence of the
trigger file is executed in the same critical section,
and prevents race conditions similar to the case fixed by Bug 14262 :
- thread 1 executes DROP TRIGGER IF EXISTS, access() returns a failure
- thread 2 executes CREATE TRIGGER
- thread 2 logs CREATE TRIGGER
- thread 1 logs DROP TRIGGER IF EXISTS
The patch itself is based on code contributed by the MySQL community,
under the terms of the Contributor License Agreement (See Bug 18161).
mysql-test/r/rpl_trigger.result:
DROP TRIGGER IF EXISTS
mysql-test/r/trigger.result:
DROP TRIGGER IF EXISTS
mysql-test/t/rpl_trigger.test:
DROP TRIGGER IF EXISTS
mysql-test/t/trigger.test:
DROP TRIGGER IF EXISTS
sql/sql_trigger.cc:
DROP TRIGGER IF EXISTS
sql/sql_yacc.yy:
DROP TRIGGER IF EXISTS
2006-11-13 23:40:22 +01:00
|
|
|
DBUG_ASSERT(table != NULL);
|
2005-07-19 18:06:49 +02:00
|
|
|
|
2005-12-31 06:01:26 +01:00
|
|
|
path.length= build_table_filename(path_buff, FN_REFLEN-1,
|
|
|
|
trig->m_db.str, trig->m_name.str,
|
Bug#18775 - Temporary table from alter table visible to other threads
Continued implementation of WL#1324 (table name to filename encoding)
The intermediate (not temporary) files of the new table
during ALTER TABLE was visible for SHOW TABLES. These
intermediate files are copies of the original table with
the changes done by ALTER TABLE. After all the data is
copied over from the original table, these files are renamed
to the original tables file names. So they are not temporary
files. They persist after ALTER TABLE, but just with another
name.
In 5.0 the intermediate files are invisible for SHOW TABLES
because all file names beginning with "#sql" were suppressed.
This failed since 5.1.6 because even temporary table names were
converted when making file names from them. The prefix became
converted to "@0023sql". Converting the prefix during SHOW TABLES
would suppress the listing of user tables that start with "#sql".
The solution of the problem is to continue the implementation of
the table name to file name conversion feature. One requirement
is to suppress the conversion for temporary table names.
This change is straightforward for real temporary tables as there
is a function that creates temporary file names.
But the generated path names are located in TMPDIR and have no
relation to the internal table name. This cannot be used for
ALTER TABLE. Its intermediate files need to be in the same
directory as the old table files. And it is necessary to be
able to deduce the same path from the same table name repeatedly.
Consequently the intermediate table files must be handled like normal
tables. Their internal names shall start with tmp_file_prefix
(#sql) and they shall not be converted like normal table names.
I added a flags parameter to all relevant functions that are
called from ALTER TABLE. It is used to suppress the conversion
for the intermediate table files.
The outcome is that the suppression of #sql in SHOW TABLES
works again. It does not suppress user tables as these are
converted to @0023sql on file level.
This patch does also fix ALTER TABLE ... RENAME, which could not
rename a table with non-ASCII characters in its name.
It does also fix the problem that a user could create a table like
`#sql-xxxx-yyyy`, where xxxx is mysqld's pid and yyyy is the thread
ID of some other thread, which prevented this thread from running
ALTER TABLE.
Some of the above problems are mentioned in Bug 1405, which can
be closed with this patch.
This patch does also contain some minor fixes for other forgotten
conversions. Still known problems are reported as bugs 21370,
21373, and 21387.
mysql-test/r/alter_table.result:
Bug#18775 - Temporary table from alter table visible to other threads
Continued implementation of WL#1324 (table name to filename encoding)
Added test results.
mysql-test/r/backup.result:
Bug#18775 - Temporary table from alter table visible to other threads
Continued implementation of WL#1324 (table name to filename encoding)
Added test results.
mysql-test/r/repair.result:
Bug#18775 - Temporary table from alter table visible to other threads
Continued implementation of WL#1324 (table name to filename encoding)
Added test results.
mysql-test/t/alter_table.test:
Bug#18775 - Temporary table from alter table visible to other threads
Continued implementation of WL#1324 (table name to filename encoding)
Added test cases.
mysql-test/t/backup.test:
Bug#18775 - Temporary table from alter table visible to other threads
Continued implementation of WL#1324 (table name to filename encoding)
Added test cases.
mysql-test/t/repair.test:
Bug#18775 - Temporary table from alter table visible to other threads
Continued implementation of WL#1324 (table name to filename encoding)
Added a test case.
sql/ha_myisam.cc:
Bug#18775 - Temporary table from alter table visible to other threads
Continued implementation of WL#1324 (table name to filename encoding)
Added missing table name mapping calls to backup() and restore().
sql/ha_myisammrg.cc:
Bug#18775 - Temporary table from alter table visible to other threads
Continued implementation of WL#1324 (table name to filename encoding)
Added an zero argument for the new 'flags' parameter.
sql/ha_ndbcluster.cc:
Bug#18775 - Temporary table from alter table visible to other threads
Continued implementation of WL#1324 (table name to filename encoding)
Added an zero argument for the new 'flags' parameter.
sql/ha_ndbcluster_binlog.cc:
Bug#18775 - Temporary table from alter table visible to other threads
Continued implementation of WL#1324 (table name to filename encoding)
Added an zero argument for the new 'flags' parameter.
sql/ha_ndbcluster_binlog.h:
Bug#18775 - Temporary table from alter table visible to other threads
Continued implementation of WL#1324 (table name to filename encoding)
Removed unnecessary check for wrong temp file prefix.
sql/mysql_priv.h:
Bug#18775 - Temporary table from alter table visible to other threads
Continued implementation of WL#1324 (table name to filename encoding)
Extended quick_rm_table(), mysql_rename_table(), and
build_table_filename() by an flags argument, which can indicate
temporary table names that should not be converted.
Added symbolic flag values.
sql/sql_acl.cc:
Bug#18775 - Temporary table from alter table visible to other threads
Continued implementation of WL#1324 (table name to filename encoding)
Added an zero argument for the new 'flags' parameter.
sql/sql_base.cc:
Bug#18775 - Temporary table from alter table visible to other threads
Continued implementation of WL#1324 (table name to filename encoding)
Fixed a comment.
Added DBUG calls.
sql/sql_db.cc:
Bug#18775 - Temporary table from alter table visible to other threads
Continued implementation of WL#1324 (table name to filename encoding)
Added an zero argument for the new 'flags' parameter.
sql/sql_delete.cc:
Bug#18775 - Temporary table from alter table visible to other threads
Continued implementation of WL#1324 (table name to filename encoding)
Added an zero argument for the new 'flags' parameter.
sql/sql_insert.cc:
Bug#18775 - Temporary table from alter table visible to other threads
Continued implementation of WL#1324 (table name to filename encoding)
Added an zero argument for the new 'flags' parameter.
sql/sql_partition.cc:
Bug#18775 - Temporary table from alter table visible to other threads
Continued implementation of WL#1324 (table name to filename encoding)
Added an zero argument for the new 'flags' parameter.
sql/sql_rename.cc:
Bug#18775 - Temporary table from alter table visible to other threads
Continued implementation of WL#1324 (table name to filename encoding)
Added an zero argument for the new 'flags' parameter.
sql/sql_show.cc:
Bug#18775 - Temporary table from alter table visible to other threads
Continued implementation of WL#1324 (table name to filename encoding)
Reverted the former fix for this bug. tmp_file_prefix is now used
verbatim in the comparison of file names.
sql/sql_table.cc:
Bug#18775 - Temporary table from alter table visible to other threads
Continued implementation of WL#1324 (table name to filename encoding)
Added a check for a tmp_file_prefix file name to
filename_to_tablename(). These names are now accepted without
conversion.
Extended quick_rm_table(), mysql_rename_table(), and
build_table_filename() by an flags argument, which can indicate
temporary table names that should not be converted.
Removed the table to file name conversion from
build_tmptable_filename().
Disabled REPAIR TABLE ... USE_FRM for temporary tables.
Added the forgotten conversion to mysql_alter_table() for the case
of ALTER TABLE ... RENAME.
Added comments and DBUG calls.
sql/sql_trigger.cc:
Bug#18775 - Temporary table from alter table visible to other threads
Continued implementation of WL#1324 (table name to filename encoding)
Added an zero argument for the new 'flags' parameter.
sql/sql_view.cc:
Bug#18775 - Temporary table from alter table visible to other threads
Continued implementation of WL#1324 (table name to filename encoding)
Added an zero argument for the new 'flags' parameter.
sql/table.cc:
Bug#18775 - Temporary table from alter table visible to other threads
Continued implementation of WL#1324 (table name to filename encoding)
Replaced a literal ".frm" by reg_ext.
Added DBUG calls.
storage/innobase/row/row0mysql.c:
Bug#18775 - Temporary table from alter table visible to other threads
Continued implementation of WL#1324 (table name to filename encoding)
Changed back the encoded temp file prefix to #sql.
2006-08-02 17:57:06 +02:00
|
|
|
trigname_file_ext, 0);
|
2005-07-19 18:06:49 +02:00
|
|
|
path.str= path_buff;
|
|
|
|
|
|
|
|
if (access(path_buff, F_OK))
|
|
|
|
{
|
Bug#23703 (DROP TRIGGER needs an IF EXISTS)
This change set implements the DROP TRIGGER IF EXISTS functionality.
This fix is considered a bug and not a feature, because without it,
there is no known method to write a database creation script that can create
a trigger without failing, when executed on a database that may or may not
contain already a trigger of the same name.
Implementing this functionality closes an orthogonality gap between triggers
and stored procedures / stored functions (which do support the DROP IF
EXISTS syntax).
In sql_trigger.cc, in mysql_create_or_drop_trigger,
the code has been reordered to:
- perform the tests that do not depend on the file system (access()),
- get the locks (wait_if_global_read_lock, LOCK_open)
- call access()
- perform the operation
- write to the binlog
- unlock (LOCK_open, start_waiting_global_read_lock)
This is to ensure that all the code that depends on the presence of the
trigger file is executed in the same critical section,
and prevents race conditions similar to the case fixed by Bug 14262 :
- thread 1 executes DROP TRIGGER IF EXISTS, access() returns a failure
- thread 2 executes CREATE TRIGGER
- thread 2 logs CREATE TRIGGER
- thread 1 logs DROP TRIGGER IF EXISTS
The patch itself is based on code contributed by the MySQL community,
under the terms of the Contributor License Agreement (See Bug 18161).
mysql-test/r/rpl_trigger.result:
DROP TRIGGER IF EXISTS
mysql-test/r/trigger.result:
DROP TRIGGER IF EXISTS
mysql-test/t/rpl_trigger.test:
DROP TRIGGER IF EXISTS
mysql-test/t/trigger.test:
DROP TRIGGER IF EXISTS
sql/sql_trigger.cc:
DROP TRIGGER IF EXISTS
sql/sql_yacc.yy:
DROP TRIGGER IF EXISTS
2006-11-13 23:40:22 +01:00
|
|
|
if (if_exists)
|
|
|
|
{
|
|
|
|
push_warning_printf(thd,
|
|
|
|
MYSQL_ERROR::WARN_LEVEL_NOTE,
|
|
|
|
ER_TRG_DOES_NOT_EXIST,
|
|
|
|
ER(ER_TRG_DOES_NOT_EXIST));
|
|
|
|
*table= NULL;
|
|
|
|
DBUG_RETURN(0);
|
|
|
|
}
|
|
|
|
|
2005-07-19 18:06:49 +02:00
|
|
|
my_error(ER_TRG_DOES_NOT_EXIST, MYF(0));
|
Bug#23703 (DROP TRIGGER needs an IF EXISTS)
This change set implements the DROP TRIGGER IF EXISTS functionality.
This fix is considered a bug and not a feature, because without it,
there is no known method to write a database creation script that can create
a trigger without failing, when executed on a database that may or may not
contain already a trigger of the same name.
Implementing this functionality closes an orthogonality gap between triggers
and stored procedures / stored functions (which do support the DROP IF
EXISTS syntax).
In sql_trigger.cc, in mysql_create_or_drop_trigger,
the code has been reordered to:
- perform the tests that do not depend on the file system (access()),
- get the locks (wait_if_global_read_lock, LOCK_open)
- call access()
- perform the operation
- write to the binlog
- unlock (LOCK_open, start_waiting_global_read_lock)
This is to ensure that all the code that depends on the presence of the
trigger file is executed in the same critical section,
and prevents race conditions similar to the case fixed by Bug 14262 :
- thread 1 executes DROP TRIGGER IF EXISTS, access() returns a failure
- thread 2 executes CREATE TRIGGER
- thread 2 logs CREATE TRIGGER
- thread 1 logs DROP TRIGGER IF EXISTS
The patch itself is based on code contributed by the MySQL community,
under the terms of the Contributor License Agreement (See Bug 18161).
mysql-test/r/rpl_trigger.result:
DROP TRIGGER IF EXISTS
mysql-test/r/trigger.result:
DROP TRIGGER IF EXISTS
mysql-test/t/rpl_trigger.test:
DROP TRIGGER IF EXISTS
mysql-test/t/trigger.test:
DROP TRIGGER IF EXISTS
sql/sql_trigger.cc:
DROP TRIGGER IF EXISTS
sql/sql_yacc.yy:
DROP TRIGGER IF EXISTS
2006-11-13 23:40:22 +01:00
|
|
|
DBUG_RETURN(1);
|
2005-07-19 18:06:49 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
if (!(parser= sql_parse_prepare(&path, thd->mem_root, 1)))
|
Bug#23703 (DROP TRIGGER needs an IF EXISTS)
This change set implements the DROP TRIGGER IF EXISTS functionality.
This fix is considered a bug and not a feature, because without it,
there is no known method to write a database creation script that can create
a trigger without failing, when executed on a database that may or may not
contain already a trigger of the same name.
Implementing this functionality closes an orthogonality gap between triggers
and stored procedures / stored functions (which do support the DROP IF
EXISTS syntax).
In sql_trigger.cc, in mysql_create_or_drop_trigger,
the code has been reordered to:
- perform the tests that do not depend on the file system (access()),
- get the locks (wait_if_global_read_lock, LOCK_open)
- call access()
- perform the operation
- write to the binlog
- unlock (LOCK_open, start_waiting_global_read_lock)
This is to ensure that all the code that depends on the presence of the
trigger file is executed in the same critical section,
and prevents race conditions similar to the case fixed by Bug 14262 :
- thread 1 executes DROP TRIGGER IF EXISTS, access() returns a failure
- thread 2 executes CREATE TRIGGER
- thread 2 logs CREATE TRIGGER
- thread 1 logs DROP TRIGGER IF EXISTS
The patch itself is based on code contributed by the MySQL community,
under the terms of the Contributor License Agreement (See Bug 18161).
mysql-test/r/rpl_trigger.result:
DROP TRIGGER IF EXISTS
mysql-test/r/trigger.result:
DROP TRIGGER IF EXISTS
mysql-test/t/rpl_trigger.test:
DROP TRIGGER IF EXISTS
mysql-test/t/trigger.test:
DROP TRIGGER IF EXISTS
sql/sql_trigger.cc:
DROP TRIGGER IF EXISTS
sql/sql_yacc.yy:
DROP TRIGGER IF EXISTS
2006-11-13 23:40:22 +01:00
|
|
|
DBUG_RETURN(1);
|
2005-07-19 18:06:49 +02:00
|
|
|
|
2005-07-31 11:49:55 +02:00
|
|
|
if (!is_equal(&trigname_file_type, parser->type()))
|
2005-07-19 18:06:49 +02:00
|
|
|
{
|
2005-07-31 11:49:55 +02:00
|
|
|
my_error(ER_WRONG_OBJECT, MYF(0), trig->m_name.str, trigname_file_ext+1,
|
2005-07-19 18:06:49 +02:00
|
|
|
"TRIGGERNAME");
|
Bug#23703 (DROP TRIGGER needs an IF EXISTS)
This change set implements the DROP TRIGGER IF EXISTS functionality.
This fix is considered a bug and not a feature, because without it,
there is no known method to write a database creation script that can create
a trigger without failing, when executed on a database that may or may not
contain already a trigger of the same name.
Implementing this functionality closes an orthogonality gap between triggers
and stored procedures / stored functions (which do support the DROP IF
EXISTS syntax).
In sql_trigger.cc, in mysql_create_or_drop_trigger,
the code has been reordered to:
- perform the tests that do not depend on the file system (access()),
- get the locks (wait_if_global_read_lock, LOCK_open)
- call access()
- perform the operation
- write to the binlog
- unlock (LOCK_open, start_waiting_global_read_lock)
This is to ensure that all the code that depends on the presence of the
trigger file is executed in the same critical section,
and prevents race conditions similar to the case fixed by Bug 14262 :
- thread 1 executes DROP TRIGGER IF EXISTS, access() returns a failure
- thread 2 executes CREATE TRIGGER
- thread 2 logs CREATE TRIGGER
- thread 1 logs DROP TRIGGER IF EXISTS
The patch itself is based on code contributed by the MySQL community,
under the terms of the Contributor License Agreement (See Bug 18161).
mysql-test/r/rpl_trigger.result:
DROP TRIGGER IF EXISTS
mysql-test/r/trigger.result:
DROP TRIGGER IF EXISTS
mysql-test/t/rpl_trigger.test:
DROP TRIGGER IF EXISTS
mysql-test/t/trigger.test:
DROP TRIGGER IF EXISTS
sql/sql_trigger.cc:
DROP TRIGGER IF EXISTS
sql/sql_yacc.yy:
DROP TRIGGER IF EXISTS
2006-11-13 23:40:22 +01:00
|
|
|
DBUG_RETURN(1);
|
2005-07-19 18:06:49 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
if (parser->parse((gptr)&trigname, thd->mem_root,
|
2005-11-20 19:47:07 +01:00
|
|
|
trigname_file_parameters, 1,
|
2006-03-27 23:01:51 +02:00
|
|
|
&trigger_table_hook))
|
Bug#23703 (DROP TRIGGER needs an IF EXISTS)
This change set implements the DROP TRIGGER IF EXISTS functionality.
This fix is considered a bug and not a feature, because without it,
there is no known method to write a database creation script that can create
a trigger without failing, when executed on a database that may or may not
contain already a trigger of the same name.
Implementing this functionality closes an orthogonality gap between triggers
and stored procedures / stored functions (which do support the DROP IF
EXISTS syntax).
In sql_trigger.cc, in mysql_create_or_drop_trigger,
the code has been reordered to:
- perform the tests that do not depend on the file system (access()),
- get the locks (wait_if_global_read_lock, LOCK_open)
- call access()
- perform the operation
- write to the binlog
- unlock (LOCK_open, start_waiting_global_read_lock)
This is to ensure that all the code that depends on the presence of the
trigger file is executed in the same critical section,
and prevents race conditions similar to the case fixed by Bug 14262 :
- thread 1 executes DROP TRIGGER IF EXISTS, access() returns a failure
- thread 2 executes CREATE TRIGGER
- thread 2 logs CREATE TRIGGER
- thread 1 logs DROP TRIGGER IF EXISTS
The patch itself is based on code contributed by the MySQL community,
under the terms of the Contributor License Agreement (See Bug 18161).
mysql-test/r/rpl_trigger.result:
DROP TRIGGER IF EXISTS
mysql-test/r/trigger.result:
DROP TRIGGER IF EXISTS
mysql-test/t/rpl_trigger.test:
DROP TRIGGER IF EXISTS
mysql-test/t/trigger.test:
DROP TRIGGER IF EXISTS
sql/sql_trigger.cc:
DROP TRIGGER IF EXISTS
sql/sql_yacc.yy:
DROP TRIGGER IF EXISTS
2006-11-13 23:40:22 +01:00
|
|
|
DBUG_RETURN(1);
|
2005-07-19 18:06:49 +02:00
|
|
|
|
|
|
|
/* We need to reset statement table list to be PS/SP friendly. */
|
|
|
|
lex->query_tables= 0;
|
|
|
|
lex->query_tables_last= &lex->query_tables;
|
Bug#23703 (DROP TRIGGER needs an IF EXISTS)
This change set implements the DROP TRIGGER IF EXISTS functionality.
This fix is considered a bug and not a feature, because without it,
there is no known method to write a database creation script that can create
a trigger without failing, when executed on a database that may or may not
contain already a trigger of the same name.
Implementing this functionality closes an orthogonality gap between triggers
and stored procedures / stored functions (which do support the DROP IF
EXISTS syntax).
In sql_trigger.cc, in mysql_create_or_drop_trigger,
the code has been reordered to:
- perform the tests that do not depend on the file system (access()),
- get the locks (wait_if_global_read_lock, LOCK_open)
- call access()
- perform the operation
- write to the binlog
- unlock (LOCK_open, start_waiting_global_read_lock)
This is to ensure that all the code that depends on the presence of the
trigger file is executed in the same critical section,
and prevents race conditions similar to the case fixed by Bug 14262 :
- thread 1 executes DROP TRIGGER IF EXISTS, access() returns a failure
- thread 2 executes CREATE TRIGGER
- thread 2 logs CREATE TRIGGER
- thread 1 logs DROP TRIGGER IF EXISTS
The patch itself is based on code contributed by the MySQL community,
under the terms of the Contributor License Agreement (See Bug 18161).
mysql-test/r/rpl_trigger.result:
DROP TRIGGER IF EXISTS
mysql-test/r/trigger.result:
DROP TRIGGER IF EXISTS
mysql-test/t/rpl_trigger.test:
DROP TRIGGER IF EXISTS
mysql-test/t/trigger.test:
DROP TRIGGER IF EXISTS
sql/sql_trigger.cc:
DROP TRIGGER IF EXISTS
sql/sql_yacc.yy:
DROP TRIGGER IF EXISTS
2006-11-13 23:40:22 +01:00
|
|
|
*table= sp_add_to_query_tables(thd, lex, trig->m_db.str,
|
|
|
|
trigname.trigger_table.str, TL_IGNORE);
|
|
|
|
|
|
|
|
if (! *table)
|
|
|
|
DBUG_RETURN(1);
|
|
|
|
|
|
|
|
DBUG_RETURN(0);
|
2005-07-19 18:06:49 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
Drop all triggers for table.
|
|
|
|
|
|
|
|
SYNOPSIS
|
|
|
|
drop_all_triggers()
|
|
|
|
thd - current thread context
|
|
|
|
db - schema for table
|
|
|
|
name - name for table
|
|
|
|
|
|
|
|
NOTE
|
|
|
|
The calling thread should hold the LOCK_open mutex;
|
|
|
|
|
|
|
|
RETURN VALUE
|
|
|
|
False - success
|
|
|
|
True - error
|
|
|
|
*/
|
|
|
|
|
|
|
|
bool Table_triggers_list::drop_all_triggers(THD *thd, char *db, char *name)
|
|
|
|
{
|
|
|
|
TABLE table;
|
|
|
|
char path[FN_REFLEN];
|
|
|
|
bool result= 0;
|
|
|
|
DBUG_ENTER("drop_all_triggers");
|
|
|
|
|
|
|
|
bzero(&table, sizeof(table));
|
|
|
|
init_alloc_root(&table.mem_root, 8192, 0);
|
|
|
|
|
|
|
|
safe_mutex_assert_owner(&LOCK_open);
|
|
|
|
|
|
|
|
if (Table_triggers_list::check_n_load(thd, db, name, &table, 1))
|
|
|
|
{
|
|
|
|
result= 1;
|
|
|
|
goto end;
|
|
|
|
}
|
|
|
|
if (table.triggers)
|
|
|
|
{
|
|
|
|
LEX_STRING *trigger;
|
|
|
|
List_iterator_fast<LEX_STRING> it_name(table.triggers->names_list);
|
|
|
|
|
|
|
|
while ((trigger= it_name++))
|
|
|
|
{
|
|
|
|
if (rm_trigname_file(path, db, trigger->str))
|
|
|
|
{
|
|
|
|
/*
|
|
|
|
Instead of immediately bailing out with error if we were unable
|
|
|
|
to remove .TRN file we will try to drop other files.
|
|
|
|
*/
|
|
|
|
result= 1;
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (rm_trigger_file(path, db, name))
|
|
|
|
{
|
|
|
|
result= 1;
|
|
|
|
goto end;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
end:
|
|
|
|
if (table.triggers)
|
|
|
|
delete table.triggers;
|
|
|
|
free_root(&table.mem_root, MYF(0));
|
|
|
|
DBUG_RETURN(result);
|
|
|
|
}
|
2005-08-15 17:15:12 +02:00
|
|
|
|
|
|
|
|
2006-02-24 21:50:36 +01:00
|
|
|
/*
|
|
|
|
Update .TRG file after renaming triggers' subject table
|
|
|
|
(change name of table in triggers' definitions).
|
|
|
|
|
|
|
|
SYNOPSIS
|
|
|
|
change_table_name_in_triggers()
|
|
|
|
thd Thread context
|
|
|
|
db_name Database of subject table
|
|
|
|
old_table_name Old subject table's name
|
|
|
|
new_table_name New subject table's name
|
|
|
|
|
|
|
|
RETURN VALUE
|
|
|
|
FALSE Success
|
|
|
|
TRUE Failure
|
|
|
|
*/
|
|
|
|
|
|
|
|
bool
|
|
|
|
Table_triggers_list::change_table_name_in_triggers(THD *thd,
|
|
|
|
const char *db_name,
|
|
|
|
LEX_STRING *old_table_name,
|
|
|
|
LEX_STRING *new_table_name)
|
|
|
|
{
|
|
|
|
char path_buff[FN_REFLEN];
|
|
|
|
LEX_STRING *def, *on_table_name, new_def;
|
|
|
|
ulong save_sql_mode= thd->variables.sql_mode;
|
|
|
|
List_iterator_fast<LEX_STRING> it_def(definitions_list);
|
|
|
|
List_iterator_fast<LEX_STRING> it_on_table_name(on_table_names_list);
|
|
|
|
List_iterator_fast<ulonglong> it_mode(definition_modes_list);
|
|
|
|
uint on_q_table_name_len, before_on_len;
|
|
|
|
String buff;
|
|
|
|
|
|
|
|
DBUG_ASSERT(definitions_list.elements == on_table_names_list.elements &&
|
|
|
|
definitions_list.elements == definition_modes_list.elements);
|
|
|
|
|
|
|
|
while ((def= it_def++))
|
|
|
|
{
|
|
|
|
on_table_name= it_on_table_name++;
|
2006-11-30 02:40:42 +01:00
|
|
|
thd->variables.sql_mode= (ulong) *(it_mode++);
|
2006-02-24 21:50:36 +01:00
|
|
|
|
|
|
|
/* Construct CREATE TRIGGER statement with new table name. */
|
|
|
|
buff.length(0);
|
|
|
|
before_on_len= on_table_name->str - def->str;
|
|
|
|
buff.append(def->str, before_on_len);
|
|
|
|
buff.append(STRING_WITH_LEN("ON "));
|
|
|
|
append_identifier(thd, &buff, new_table_name->str, new_table_name->length);
|
2006-03-04 14:55:06 +01:00
|
|
|
buff.append(STRING_WITH_LEN(" "));
|
2006-02-24 21:50:36 +01:00
|
|
|
on_q_table_name_len= buff.length() - before_on_len;
|
|
|
|
buff.append(on_table_name->str + on_table_name->length,
|
|
|
|
def->length - (before_on_len + on_table_name->length));
|
|
|
|
/*
|
|
|
|
It is OK to allocate some memory on table's MEM_ROOT since this
|
|
|
|
table instance will be thrown out at the end of rename anyway.
|
|
|
|
*/
|
|
|
|
new_def.str= memdup_root(&table->mem_root, buff.ptr(), buff.length());
|
|
|
|
new_def.length= buff.length();
|
|
|
|
on_table_name->str= new_def.str + before_on_len;
|
|
|
|
on_table_name->length= on_q_table_name_len;
|
|
|
|
*def= new_def;
|
|
|
|
}
|
|
|
|
|
|
|
|
thd->variables.sql_mode= save_sql_mode;
|
|
|
|
|
|
|
|
if (thd->is_fatal_error)
|
|
|
|
return TRUE; /* OOM */
|
|
|
|
|
|
|
|
if (save_trigger_file(this, db_name, new_table_name->str))
|
|
|
|
return TRUE;
|
|
|
|
if (rm_trigger_file(path_buff, db_name, old_table_name->str))
|
|
|
|
{
|
|
|
|
(void) rm_trigger_file(path_buff, db_name, new_table_name->str);
|
|
|
|
return TRUE;
|
|
|
|
}
|
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
Iterate though Table_triggers_list::names_list list and update .TRN files
|
|
|
|
after renaming triggers' subject table.
|
|
|
|
|
|
|
|
SYNOPSIS
|
|
|
|
change_table_name_in_trignames()
|
|
|
|
db_name Database of subject table
|
|
|
|
new_table_name New subject table's name
|
|
|
|
stopper Pointer to Table_triggers_list::names_list at
|
|
|
|
which we should stop updating.
|
|
|
|
|
|
|
|
RETURN VALUE
|
|
|
|
0 Success
|
|
|
|
non-0 Failure, pointer to Table_triggers_list::names_list element
|
|
|
|
for which update failed.
|
|
|
|
*/
|
|
|
|
|
|
|
|
LEX_STRING*
|
|
|
|
Table_triggers_list::change_table_name_in_trignames(const char *db_name,
|
|
|
|
LEX_STRING *new_table_name,
|
|
|
|
LEX_STRING *stopper)
|
|
|
|
{
|
2006-02-27 18:00:07 +01:00
|
|
|
char trigname_buff[FN_REFLEN];
|
2006-02-24 21:50:36 +01:00
|
|
|
struct st_trigname trigname;
|
2006-02-27 18:00:07 +01:00
|
|
|
LEX_STRING trigname_file;
|
2006-02-24 21:50:36 +01:00
|
|
|
LEX_STRING *trigger;
|
|
|
|
List_iterator_fast<LEX_STRING> it_name(names_list);
|
|
|
|
|
|
|
|
while ((trigger= it_name++) != stopper)
|
|
|
|
{
|
2006-02-27 18:00:07 +01:00
|
|
|
trigname_file.length= build_table_filename(trigname_buff, FN_REFLEN-1,
|
|
|
|
db_name, trigger->str,
|
Bug#18775 - Temporary table from alter table visible to other threads
Continued implementation of WL#1324 (table name to filename encoding)
The intermediate (not temporary) files of the new table
during ALTER TABLE was visible for SHOW TABLES. These
intermediate files are copies of the original table with
the changes done by ALTER TABLE. After all the data is
copied over from the original table, these files are renamed
to the original tables file names. So they are not temporary
files. They persist after ALTER TABLE, but just with another
name.
In 5.0 the intermediate files are invisible for SHOW TABLES
because all file names beginning with "#sql" were suppressed.
This failed since 5.1.6 because even temporary table names were
converted when making file names from them. The prefix became
converted to "@0023sql". Converting the prefix during SHOW TABLES
would suppress the listing of user tables that start with "#sql".
The solution of the problem is to continue the implementation of
the table name to file name conversion feature. One requirement
is to suppress the conversion for temporary table names.
This change is straightforward for real temporary tables as there
is a function that creates temporary file names.
But the generated path names are located in TMPDIR and have no
relation to the internal table name. This cannot be used for
ALTER TABLE. Its intermediate files need to be in the same
directory as the old table files. And it is necessary to be
able to deduce the same path from the same table name repeatedly.
Consequently the intermediate table files must be handled like normal
tables. Their internal names shall start with tmp_file_prefix
(#sql) and they shall not be converted like normal table names.
I added a flags parameter to all relevant functions that are
called from ALTER TABLE. It is used to suppress the conversion
for the intermediate table files.
The outcome is that the suppression of #sql in SHOW TABLES
works again. It does not suppress user tables as these are
converted to @0023sql on file level.
This patch does also fix ALTER TABLE ... RENAME, which could not
rename a table with non-ASCII characters in its name.
It does also fix the problem that a user could create a table like
`#sql-xxxx-yyyy`, where xxxx is mysqld's pid and yyyy is the thread
ID of some other thread, which prevented this thread from running
ALTER TABLE.
Some of the above problems are mentioned in Bug 1405, which can
be closed with this patch.
This patch does also contain some minor fixes for other forgotten
conversions. Still known problems are reported as bugs 21370,
21373, and 21387.
mysql-test/r/alter_table.result:
Bug#18775 - Temporary table from alter table visible to other threads
Continued implementation of WL#1324 (table name to filename encoding)
Added test results.
mysql-test/r/backup.result:
Bug#18775 - Temporary table from alter table visible to other threads
Continued implementation of WL#1324 (table name to filename encoding)
Added test results.
mysql-test/r/repair.result:
Bug#18775 - Temporary table from alter table visible to other threads
Continued implementation of WL#1324 (table name to filename encoding)
Added test results.
mysql-test/t/alter_table.test:
Bug#18775 - Temporary table from alter table visible to other threads
Continued implementation of WL#1324 (table name to filename encoding)
Added test cases.
mysql-test/t/backup.test:
Bug#18775 - Temporary table from alter table visible to other threads
Continued implementation of WL#1324 (table name to filename encoding)
Added test cases.
mysql-test/t/repair.test:
Bug#18775 - Temporary table from alter table visible to other threads
Continued implementation of WL#1324 (table name to filename encoding)
Added a test case.
sql/ha_myisam.cc:
Bug#18775 - Temporary table from alter table visible to other threads
Continued implementation of WL#1324 (table name to filename encoding)
Added missing table name mapping calls to backup() and restore().
sql/ha_myisammrg.cc:
Bug#18775 - Temporary table from alter table visible to other threads
Continued implementation of WL#1324 (table name to filename encoding)
Added an zero argument for the new 'flags' parameter.
sql/ha_ndbcluster.cc:
Bug#18775 - Temporary table from alter table visible to other threads
Continued implementation of WL#1324 (table name to filename encoding)
Added an zero argument for the new 'flags' parameter.
sql/ha_ndbcluster_binlog.cc:
Bug#18775 - Temporary table from alter table visible to other threads
Continued implementation of WL#1324 (table name to filename encoding)
Added an zero argument for the new 'flags' parameter.
sql/ha_ndbcluster_binlog.h:
Bug#18775 - Temporary table from alter table visible to other threads
Continued implementation of WL#1324 (table name to filename encoding)
Removed unnecessary check for wrong temp file prefix.
sql/mysql_priv.h:
Bug#18775 - Temporary table from alter table visible to other threads
Continued implementation of WL#1324 (table name to filename encoding)
Extended quick_rm_table(), mysql_rename_table(), and
build_table_filename() by an flags argument, which can indicate
temporary table names that should not be converted.
Added symbolic flag values.
sql/sql_acl.cc:
Bug#18775 - Temporary table from alter table visible to other threads
Continued implementation of WL#1324 (table name to filename encoding)
Added an zero argument for the new 'flags' parameter.
sql/sql_base.cc:
Bug#18775 - Temporary table from alter table visible to other threads
Continued implementation of WL#1324 (table name to filename encoding)
Fixed a comment.
Added DBUG calls.
sql/sql_db.cc:
Bug#18775 - Temporary table from alter table visible to other threads
Continued implementation of WL#1324 (table name to filename encoding)
Added an zero argument for the new 'flags' parameter.
sql/sql_delete.cc:
Bug#18775 - Temporary table from alter table visible to other threads
Continued implementation of WL#1324 (table name to filename encoding)
Added an zero argument for the new 'flags' parameter.
sql/sql_insert.cc:
Bug#18775 - Temporary table from alter table visible to other threads
Continued implementation of WL#1324 (table name to filename encoding)
Added an zero argument for the new 'flags' parameter.
sql/sql_partition.cc:
Bug#18775 - Temporary table from alter table visible to other threads
Continued implementation of WL#1324 (table name to filename encoding)
Added an zero argument for the new 'flags' parameter.
sql/sql_rename.cc:
Bug#18775 - Temporary table from alter table visible to other threads
Continued implementation of WL#1324 (table name to filename encoding)
Added an zero argument for the new 'flags' parameter.
sql/sql_show.cc:
Bug#18775 - Temporary table from alter table visible to other threads
Continued implementation of WL#1324 (table name to filename encoding)
Reverted the former fix for this bug. tmp_file_prefix is now used
verbatim in the comparison of file names.
sql/sql_table.cc:
Bug#18775 - Temporary table from alter table visible to other threads
Continued implementation of WL#1324 (table name to filename encoding)
Added a check for a tmp_file_prefix file name to
filename_to_tablename(). These names are now accepted without
conversion.
Extended quick_rm_table(), mysql_rename_table(), and
build_table_filename() by an flags argument, which can indicate
temporary table names that should not be converted.
Removed the table to file name conversion from
build_tmptable_filename().
Disabled REPAIR TABLE ... USE_FRM for temporary tables.
Added the forgotten conversion to mysql_alter_table() for the case
of ALTER TABLE ... RENAME.
Added comments and DBUG calls.
sql/sql_trigger.cc:
Bug#18775 - Temporary table from alter table visible to other threads
Continued implementation of WL#1324 (table name to filename encoding)
Added an zero argument for the new 'flags' parameter.
sql/sql_view.cc:
Bug#18775 - Temporary table from alter table visible to other threads
Continued implementation of WL#1324 (table name to filename encoding)
Added an zero argument for the new 'flags' parameter.
sql/table.cc:
Bug#18775 - Temporary table from alter table visible to other threads
Continued implementation of WL#1324 (table name to filename encoding)
Replaced a literal ".frm" by reg_ext.
Added DBUG calls.
storage/innobase/row/row0mysql.c:
Bug#18775 - Temporary table from alter table visible to other threads
Continued implementation of WL#1324 (table name to filename encoding)
Changed back the encoded temp file prefix to #sql.
2006-08-02 17:57:06 +02:00
|
|
|
trigname_file_ext, 0);
|
2006-02-24 21:50:36 +01:00
|
|
|
trigname_file.str= trigname_buff;
|
|
|
|
|
|
|
|
trigname.trigger_table= *new_table_name;
|
|
|
|
|
2006-02-27 18:00:07 +01:00
|
|
|
if (sql_create_definition_file(NULL, &trigname_file, &trigname_file_type,
|
|
|
|
(gptr)&trigname, trigname_file_parameters,
|
|
|
|
0))
|
2006-02-24 21:50:36 +01:00
|
|
|
return trigger;
|
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
Update .TRG and .TRN files after renaming triggers' subject table.
|
|
|
|
|
|
|
|
SYNOPSIS
|
|
|
|
change_table_name()
|
|
|
|
thd Thread context
|
|
|
|
db Old database of subject table
|
|
|
|
old_table Old name of subject table
|
|
|
|
new_db New database for subject table
|
|
|
|
new_table New name of subject table
|
|
|
|
|
|
|
|
NOTE
|
|
|
|
This method tries to leave trigger related files in consistent state,
|
|
|
|
i.e. it either will complete successfully, or will fail leaving files
|
|
|
|
in their initial state.
|
2006-03-24 12:58:18 +01:00
|
|
|
Also this method assumes that subject table is not renamed to itself.
|
2006-02-24 21:50:36 +01:00
|
|
|
|
|
|
|
RETURN VALUE
|
|
|
|
FALSE Success
|
|
|
|
TRUE Error
|
|
|
|
*/
|
|
|
|
|
|
|
|
bool Table_triggers_list::change_table_name(THD *thd, const char *db,
|
|
|
|
const char *old_table,
|
|
|
|
const char *new_db,
|
|
|
|
const char *new_table)
|
|
|
|
{
|
|
|
|
TABLE table;
|
|
|
|
bool result= 0;
|
|
|
|
LEX_STRING *err_trigname;
|
|
|
|
DBUG_ENTER("change_table_name");
|
|
|
|
|
|
|
|
bzero(&table, sizeof(table));
|
|
|
|
init_alloc_root(&table.mem_root, 8192, 0);
|
|
|
|
|
|
|
|
safe_mutex_assert_owner(&LOCK_open);
|
|
|
|
|
2006-03-24 12:58:18 +01:00
|
|
|
DBUG_ASSERT(my_strcasecmp(table_alias_charset, db, new_db) ||
|
|
|
|
my_strcasecmp(table_alias_charset, old_table, new_table));
|
|
|
|
|
2006-02-24 21:50:36 +01:00
|
|
|
if (Table_triggers_list::check_n_load(thd, db, old_table, &table, TRUE))
|
|
|
|
{
|
|
|
|
result= 1;
|
|
|
|
goto end;
|
|
|
|
}
|
|
|
|
if (table.triggers)
|
|
|
|
{
|
2006-05-19 14:01:04 +02:00
|
|
|
LEX_STRING old_table_name= { (char *) old_table, strlen(old_table) };
|
|
|
|
LEX_STRING new_table_name= { (char *) new_table, strlen(new_table) };
|
2006-02-24 21:50:36 +01:00
|
|
|
/*
|
|
|
|
Since triggers should be in the same schema as their subject tables
|
|
|
|
moving table with them between two schemas raises too many questions.
|
|
|
|
(E.g. what should happen if in new schema we already have trigger
|
|
|
|
with same name ?).
|
|
|
|
*/
|
|
|
|
if (my_strcasecmp(table_alias_charset, db, new_db))
|
|
|
|
{
|
|
|
|
my_error(ER_TRG_IN_WRONG_SCHEMA, MYF(0));
|
|
|
|
result= 1;
|
|
|
|
goto end;
|
|
|
|
}
|
|
|
|
if (table.triggers->change_table_name_in_triggers(thd, db,
|
|
|
|
&old_table_name,
|
|
|
|
&new_table_name))
|
|
|
|
{
|
|
|
|
result= 1;
|
|
|
|
goto end;
|
|
|
|
}
|
|
|
|
if ((err_trigname= table.triggers->change_table_name_in_trignames(
|
|
|
|
db, &new_table_name, 0)))
|
|
|
|
{
|
|
|
|
/*
|
|
|
|
If we were unable to update one of .TRN files properly we will
|
|
|
|
revert all changes that we have done and report about error.
|
|
|
|
We assume that we will be able to undo our changes without errors
|
|
|
|
(we can't do much if there will be an error anyway).
|
|
|
|
*/
|
|
|
|
(void) table.triggers->change_table_name_in_trignames(db,
|
|
|
|
&old_table_name,
|
|
|
|
err_trigname);
|
|
|
|
(void) table.triggers->change_table_name_in_triggers(thd, db,
|
|
|
|
&new_table_name,
|
|
|
|
&old_table_name);
|
|
|
|
result= 1;
|
|
|
|
goto end;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
end:
|
|
|
|
delete table.triggers;
|
|
|
|
free_root(&table.mem_root, MYF(0));
|
|
|
|
DBUG_RETURN(result);
|
|
|
|
}
|
|
|
|
|
2005-08-15 17:15:12 +02:00
|
|
|
|
|
|
|
bool Table_triggers_list::process_triggers(THD *thd, trg_event_type event,
|
|
|
|
trg_action_time_type time_type,
|
|
|
|
bool old_row_is_record1)
|
|
|
|
{
|
2005-12-07 15:01:17 +01:00
|
|
|
bool err_status= FALSE;
|
2005-11-10 20:25:03 +01:00
|
|
|
sp_head *sp_trigger= bodies[event][time_type];
|
2005-08-15 17:15:12 +02:00
|
|
|
|
2005-11-10 20:25:03 +01:00
|
|
|
if (sp_trigger)
|
2005-08-15 17:15:12 +02:00
|
|
|
{
|
|
|
|
Sub_statement_state statement_state;
|
|
|
|
|
|
|
|
if (old_row_is_record1)
|
|
|
|
{
|
|
|
|
old_field= record1_field;
|
|
|
|
new_field= table->field;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
new_field= record1_field;
|
|
|
|
old_field= table->field;
|
|
|
|
}
|
2005-11-10 20:25:03 +01:00
|
|
|
#ifndef NO_EMBEDDED_ACCESS_CHECKS
|
|
|
|
Security_context *save_ctx;
|
|
|
|
|
|
|
|
if (sp_change_security_context(thd, sp_trigger, &save_ctx))
|
|
|
|
return TRUE;
|
|
|
|
|
|
|
|
/*
|
2006-01-24 18:15:12 +01:00
|
|
|
Fetch information about table-level privileges to GRANT_INFO structure for
|
|
|
|
subject table. Check of privileges that will use it and information about
|
|
|
|
column-level privileges will happen in Item_trigger_field::fix_fields().
|
2005-11-10 20:25:03 +01:00
|
|
|
*/
|
2006-02-01 11:28:45 +01:00
|
|
|
|
2006-01-24 18:15:12 +01:00
|
|
|
fill_effective_table_privileges(thd,
|
|
|
|
&subject_table_grants[event][time_type],
|
2006-02-06 13:23:17 +01:00
|
|
|
table->s->db.str, table->s->table_name.str);
|
2006-02-01 11:28:45 +01:00
|
|
|
|
2006-02-06 13:23:17 +01:00
|
|
|
/* Check that the definer has TRIGGER privilege on the subject table. */
|
2005-11-10 20:25:03 +01:00
|
|
|
|
2006-02-06 13:23:17 +01:00
|
|
|
if (!(subject_table_grants[event][time_type].privilege & TRIGGER_ACL))
|
|
|
|
{
|
|
|
|
char priv_desc[128];
|
|
|
|
get_privilege_desc(priv_desc, sizeof(priv_desc), TRIGGER_ACL);
|
|
|
|
|
|
|
|
my_error(ER_TABLEACCESS_DENIED_ERROR, MYF(0), priv_desc,
|
|
|
|
thd->security_ctx->priv_user, thd->security_ctx->host_or_ip,
|
2006-02-08 10:54:54 +01:00
|
|
|
table->s->table_name.str);
|
2006-02-06 13:23:17 +01:00
|
|
|
|
|
|
|
sp_restore_security_context(thd, save_ctx);
|
|
|
|
return TRUE;
|
2005-11-10 20:25:03 +01:00
|
|
|
}
|
|
|
|
#endif // NO_EMBEDDED_ACCESS_CHECKS
|
|
|
|
|
2005-08-15 17:15:12 +02:00
|
|
|
thd->reset_sub_statement_state(&statement_state, SUB_STMT_TRIGGER);
|
Bug#18630: Arguments of suid routine calculated in wrong security
context.
Routine arguments were evaluated in the security context of the routine
itself, not in the caller's context.
The bug is fixed the following way:
- Item_func_sp::find_and_check_access() has been split into two
functions: Item_func_sp::find_and_check_access() itself only
finds the function and check that the caller have EXECUTE privilege
on it. New function set_routine_security_ctx() changes security
context for SUID routines and checks that definer have EXECUTE
privilege too.
- new function sp_head::execute_trigger() is called from
Table_triggers_list::process_triggers() instead of
sp_head::execute_function(), and is effectively just as the
sp_head::execute_function() is, with all non-trigger related code
removed, and added trigger-specific security context switch.
- call to Item_func_sp::find_and_check_access() stays outside
of sp_head::execute_function(), and there is a code in
sql_parse.cc before the call to sp_head::execute_procedure() that
checks that the caller have EXECUTE privilege, but both
sp_head::execute_function() and sp_head::execute_procedure() call
set_routine_security_ctx() after evaluating their parameters,
and restore the context after the body is executed.
mysql-test/r/sp-security.result:
Add test case for bug#18630: Arguments of suid routine calculated
in wrong security context.
mysql-test/t/sp-security.test:
Add result for bug#18630: Arguments of suid routine calculated
in wrong security context.
sql/item_func.cc:
Do not change security context before executing the function, as it
will be changed after argument evaluation.
Do not change security context in Item_func_sp::find_and_check_access().
sql/item_func.h:
Change prototype for Item_func_sp::find_and_check_access().
sql/sp_head.cc:
Add set_routine_security_ctx() function.
Add sp_head::execute_trigger() method.
Change security context in sp_head::execute_trigger(), and in
sp_head::execute_function() and sp_head::execute_procedure()
after argument evaluation.
Move pop_all_cursors() call to sp_head::execute().
sql/sp_head.h:
Add declaration for sp_head::execute_trigger() and
set_routine_security_ctx().
sql/sql_parse.cc:
Do not change security context before executing the procedure, as it
will be changed after argument evaluation.
sql/sql_trigger.cc:
Call new sp_head::execute_trigger() instead of
sp_head::execute_function(), which is responsible to switch
security context.
2006-07-13 15:12:31 +02:00
|
|
|
err_status= sp_trigger->execute_trigger
|
Manual merge 5.0->5.1. Post-merge fixes.
client/mysqldump.c:
A post-merge fix - 'sock' was renamed to 'mysql'
mysql-test/r/events_bugs.result:
A post merge fix: now we strip rear comments from the query before
it gets into the log.
mysql-test/r/func_group.result:
A post merge fix: default clause is now printed uppercase.
mysql-test/r/im_life_cycle.result:
Fix my mistake in manual resolve.
mysql-test/r/mysqlcheck.result:
use test; - after we drop client_test_db there is no current database.
This cleanup is present in 5.1 only, but the test that was added in
5.0 assumes there is a current database, test.
mysql-test/r/mysqldump.result:
Ignore results of execution of mysqldump: we can't rely on
MASTER_LOG_POS in test results, it's different for statement
and row level logging.
mysql-test/r/mysqlshow.result:
A post-merge fix: information schema contains a few more tables
in 5.1
mysql-test/r/mysqltest.result:
A post merge fix: add 5.1 test end separator.
mysql-test/r/ndb_basic.result:
A post-merge fix: add test end separators.
mysql-test/r/rpl_switch_stm_row_mixed.result:
A post merge fix: length of varbinary column is now 3 times less.
Assuming a side effect of some other change. Length of any
field is not relevant in this test.
mysql-test/r/rpl_view.result:
Add an end of test marker.
mysql-test/r/show_check.result:
Remove duplicate results. Add results from a merged test case.
mysql-test/r/sp-error.result:
Add test end separators.
mysql-test/r/sp-security.result:
Post-merge fix: use test after the current database is dropped.
mysql-test/r/sp.result:
Remove a duplicate result (bad merge that left a copy of
the test case for Bug#19862 in the test suite).
mysql-test/r/strict.result:
An after-merge fix for a new test case: in 5.1 we issue a more accurate
error message: "Incorrect value" instead of "Truncated value". I reason
it so that in case of an error nothing is truncated, really.
Also found similar changes in other test cases.
mysql-test/r/type_datetime.result:
Fix the text of an error.
mysql-test/r/union.result:
A post-merge fix: CHARACTER SET is now uppercase.
mysql-test/t/mysqlcheck.test:
A post-merge fix: use test, after current database is dropped, there
is no current database.
mysql-test/t/mysqldump.test:
Disable result log: it's dependent on binlog position.
mysql-test/t/sp-security.test:
use test
sql/item_sum.cc:
Adjust the call to the constructor after the merge.
sql/sp_head.cc:
Add a missing DBUG_VOID_RETURN, move security checks out of
execute_trigger to Table_triggers_list: in 5.1 we check for
TRIGGER privilege, not SUPER privilege to execute triggers, so these
checks lack table context inside execute_trigger and have to be
performed when we have table object on hand.
sql/sql_db.cc:
A post-merge fix: adjust load_db_opt_by_name and check_db_dir_existence
(new functions added in 5.0) to be tablename-to-filename encoding
friendly.
sql/sql_lex.cc:
A post-merge fix: make skip_rear_comments operate on const uchar *s.
sql/sql_lex.h:
A post-merge fix.
sql/sql_show.cc:
A post-merge fix: fix a bad merge, rename orig_sql_command -> sql_command.
sql/sql_trigger.cc:
A post-merge fix: move security checks to process_triggers
from execute_trigger.
sql/sql_view.cc:
Adjust to the new signature of skip_rear_comments.
sql/sql_yacc.yy:
Adjust to the new signature of init_strings.
2006-08-14 11:27:11 +02:00
|
|
|
(thd, table->s->db.str, table->s->table_name.str,
|
Bug#18630: Arguments of suid routine calculated in wrong security
context.
Routine arguments were evaluated in the security context of the routine
itself, not in the caller's context.
The bug is fixed the following way:
- Item_func_sp::find_and_check_access() has been split into two
functions: Item_func_sp::find_and_check_access() itself only
finds the function and check that the caller have EXECUTE privilege
on it. New function set_routine_security_ctx() changes security
context for SUID routines and checks that definer have EXECUTE
privilege too.
- new function sp_head::execute_trigger() is called from
Table_triggers_list::process_triggers() instead of
sp_head::execute_function(), and is effectively just as the
sp_head::execute_function() is, with all non-trigger related code
removed, and added trigger-specific security context switch.
- call to Item_func_sp::find_and_check_access() stays outside
of sp_head::execute_function(), and there is a code in
sql_parse.cc before the call to sp_head::execute_procedure() that
checks that the caller have EXECUTE privilege, but both
sp_head::execute_function() and sp_head::execute_procedure() call
set_routine_security_ctx() after evaluating their parameters,
and restore the context after the body is executed.
mysql-test/r/sp-security.result:
Add test case for bug#18630: Arguments of suid routine calculated
in wrong security context.
mysql-test/t/sp-security.test:
Add result for bug#18630: Arguments of suid routine calculated
in wrong security context.
sql/item_func.cc:
Do not change security context before executing the function, as it
will be changed after argument evaluation.
Do not change security context in Item_func_sp::find_and_check_access().
sql/item_func.h:
Change prototype for Item_func_sp::find_and_check_access().
sql/sp_head.cc:
Add set_routine_security_ctx() function.
Add sp_head::execute_trigger() method.
Change security context in sp_head::execute_trigger(), and in
sp_head::execute_function() and sp_head::execute_procedure()
after argument evaluation.
Move pop_all_cursors() call to sp_head::execute().
sql/sp_head.h:
Add declaration for sp_head::execute_trigger() and
set_routine_security_ctx().
sql/sql_parse.cc:
Do not change security context before executing the procedure, as it
will be changed after argument evaluation.
sql/sql_trigger.cc:
Call new sp_head::execute_trigger() instead of
sp_head::execute_function(), which is responsible to switch
security context.
2006-07-13 15:12:31 +02:00
|
|
|
&subject_table_grants[event][time_type]);
|
2005-08-15 17:15:12 +02:00
|
|
|
thd->restore_sub_statement_state(&statement_state);
|
2005-11-10 20:25:03 +01:00
|
|
|
|
|
|
|
#ifndef NO_EMBEDDED_ACCESS_CHECKS
|
|
|
|
sp_restore_security_context(thd, save_ctx);
|
|
|
|
#endif // NO_EMBEDDED_ACCESS_CHECKS
|
2005-08-15 17:15:12 +02:00
|
|
|
}
|
|
|
|
|
2005-12-07 15:01:17 +01:00
|
|
|
return err_status;
|
2005-08-15 17:15:12 +02:00
|
|
|
}
|
2005-11-20 19:47:07 +01:00
|
|
|
|
|
|
|
|
2006-07-01 23:51:10 +02:00
|
|
|
/*
|
|
|
|
Mark fields of subject table which we read/set in its triggers as such.
|
|
|
|
|
|
|
|
SYNOPSIS
|
|
|
|
mark_fields_used()
|
|
|
|
thd Current thread context
|
|
|
|
event Type of event triggers for which we are going to inspect
|
|
|
|
|
|
|
|
DESCRIPTION
|
|
|
|
This method marks fields of subject table which are read/set in its
|
2006-07-06 11:33:23 +02:00
|
|
|
triggers as such (by properly updating TABLE::read_set/write_set)
|
2006-07-01 23:51:10 +02:00
|
|
|
and thus informs handler that values for these fields should be
|
|
|
|
retrieved/stored during execution of statement.
|
|
|
|
*/
|
|
|
|
|
2006-07-06 11:33:23 +02:00
|
|
|
void Table_triggers_list::mark_fields_used(trg_event_type event)
|
2006-07-01 23:51:10 +02:00
|
|
|
{
|
|
|
|
int action_time;
|
|
|
|
Item_trigger_field *trg_field;
|
|
|
|
|
|
|
|
for (action_time= 0; action_time < (int)TRG_ACTION_MAX; action_time++)
|
|
|
|
{
|
|
|
|
for (trg_field= trigger_fields[event][action_time]; trg_field;
|
|
|
|
trg_field= trg_field->next_trg_field)
|
|
|
|
{
|
|
|
|
/* We cannot mark fields which does not present in table. */
|
|
|
|
if (trg_field->field_idx != (uint)-1)
|
2006-07-06 11:33:23 +02:00
|
|
|
{
|
|
|
|
bitmap_set_bit(table->read_set, trg_field->field_idx);
|
|
|
|
if (trg_field->get_settable_routine_parameter())
|
|
|
|
bitmap_set_bit(table->write_set, trg_field->field_idx);
|
|
|
|
}
|
2006-07-01 23:51:10 +02:00
|
|
|
}
|
|
|
|
}
|
2006-07-06 11:33:23 +02:00
|
|
|
table->file->column_bitmaps_signal();
|
2006-07-01 23:51:10 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2005-11-20 19:47:07 +01:00
|
|
|
/*
|
|
|
|
Trigger BUG#14090 compatibility hook
|
|
|
|
|
|
|
|
SYNOPSIS
|
|
|
|
Handle_old_incorrect_sql_modes_hook::process_unknown_string()
|
|
|
|
unknown_key [in/out] reference on the line with unknown
|
|
|
|
parameter and the parsing point
|
|
|
|
base [in] base address for parameter writing (structure
|
|
|
|
like TABLE)
|
|
|
|
mem_root [in] MEM_ROOT for parameters allocation
|
|
|
|
end [in] the end of the configuration
|
|
|
|
|
|
|
|
NOTE: this hook process back compatibility for incorrectly written
|
|
|
|
sql_modes parameter (see BUG#14090).
|
|
|
|
|
|
|
|
RETURN
|
|
|
|
FALSE OK
|
|
|
|
TRUE Error
|
|
|
|
*/
|
|
|
|
|
2006-01-05 23:47:49 +01:00
|
|
|
#define INVALID_SQL_MODES_LENGTH 13
|
|
|
|
|
2005-11-20 19:47:07 +01:00
|
|
|
bool
|
|
|
|
Handle_old_incorrect_sql_modes_hook::process_unknown_string(char *&unknown_key,
|
|
|
|
gptr base,
|
|
|
|
MEM_ROOT *mem_root,
|
|
|
|
char *end)
|
|
|
|
{
|
2006-03-27 23:01:51 +02:00
|
|
|
DBUG_ENTER("Handle_old_incorrect_sql_modes_hook::process_unknown_string");
|
2006-11-27 00:47:38 +01:00
|
|
|
DBUG_PRINT("info", ("unknown key: %60s", unknown_key));
|
2006-01-05 23:47:49 +01:00
|
|
|
|
2005-11-20 19:47:07 +01:00
|
|
|
if (unknown_key + INVALID_SQL_MODES_LENGTH + 1 < end &&
|
|
|
|
unknown_key[INVALID_SQL_MODES_LENGTH] == '=' &&
|
|
|
|
!memcmp(unknown_key, STRING_WITH_LEN("sql_modes")))
|
|
|
|
{
|
2006-01-05 23:47:49 +01:00
|
|
|
char *ptr= unknown_key + INVALID_SQL_MODES_LENGTH + 1;
|
|
|
|
|
2005-11-20 19:47:07 +01:00
|
|
|
DBUG_PRINT("info", ("sql_modes affected by BUG#14090 detected"));
|
|
|
|
push_warning_printf(current_thd,
|
|
|
|
MYSQL_ERROR::WARN_LEVEL_NOTE,
|
|
|
|
ER_OLD_FILE_FORMAT,
|
|
|
|
ER(ER_OLD_FILE_FORMAT),
|
|
|
|
(char *)path, "TRIGGER");
|
|
|
|
if (get_file_options_ulllist(ptr, end, unknown_key, base,
|
|
|
|
&sql_modes_parameters, mem_root))
|
|
|
|
{
|
|
|
|
DBUG_RETURN(TRUE);
|
|
|
|
}
|
|
|
|
/*
|
|
|
|
Set parsing pointer to the last symbol of string (\n)
|
|
|
|
1) to avoid problem with \0 in the junk after sql_modes
|
|
|
|
2) to speed up skipping this line by parser.
|
|
|
|
*/
|
|
|
|
unknown_key= ptr-1;
|
|
|
|
}
|
|
|
|
DBUG_RETURN(FALSE);
|
|
|
|
}
|
2006-03-27 23:01:51 +02:00
|
|
|
|
|
|
|
/*
|
|
|
|
Trigger BUG#15921 compatibility hook. For details see
|
|
|
|
Handle_old_incorrect_sql_modes_hook::process_unknown_string().
|
|
|
|
*/
|
|
|
|
|
|
|
|
#define INVALID_TRIGGER_TABLE_LENGTH 15
|
|
|
|
|
|
|
|
bool
|
|
|
|
Handle_old_incorrect_trigger_table_hook::
|
|
|
|
process_unknown_string(char *&unknown_key, gptr base, MEM_ROOT *mem_root,
|
|
|
|
char *end)
|
|
|
|
{
|
|
|
|
DBUG_ENTER("Handle_old_incorrect_trigger_table_hook::process_unknown_string");
|
2006-11-27 00:47:38 +01:00
|
|
|
DBUG_PRINT("info", ("unknown key: %60s", unknown_key));
|
2006-03-27 23:01:51 +02:00
|
|
|
|
|
|
|
if (unknown_key + INVALID_TRIGGER_TABLE_LENGTH + 1 < end &&
|
|
|
|
unknown_key[INVALID_TRIGGER_TABLE_LENGTH] == '=' &&
|
|
|
|
!memcmp(unknown_key, STRING_WITH_LEN("trigger_table")))
|
|
|
|
{
|
|
|
|
char *ptr= unknown_key + INVALID_TRIGGER_TABLE_LENGTH + 1;
|
|
|
|
|
|
|
|
DBUG_PRINT("info", ("trigger_table affected by BUG#15921 detected"));
|
|
|
|
push_warning_printf(current_thd,
|
|
|
|
MYSQL_ERROR::WARN_LEVEL_NOTE,
|
|
|
|
ER_OLD_FILE_FORMAT,
|
|
|
|
ER(ER_OLD_FILE_FORMAT),
|
|
|
|
(char *)path, "TRIGGER");
|
|
|
|
|
|
|
|
if (!(ptr= parse_escaped_string(ptr, end, mem_root, trigger_table_value)))
|
|
|
|
{
|
|
|
|
my_error(ER_FPARSER_ERROR_IN_PARAMETER, MYF(0), "trigger_table",
|
|
|
|
unknown_key);
|
|
|
|
DBUG_RETURN(TRUE);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Set parsing pointer to the last symbol of string (\n). */
|
|
|
|
unknown_key= ptr-1;
|
|
|
|
}
|
|
|
|
DBUG_RETURN(FALSE);
|
|
|
|
}
|