Commit 21189de3 authored by unknown's avatar unknown
Browse files

Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0 

into  sanja.is.com.ua:/home/bell/mysql/bk/work-trigger-5.0
parents c15cab96 a66928bb

mysql-test/r/information_schema.result

+9 −8
Original line number Diff line number Diff line
@@ -713,6 +713,7 @@ information_schema ROUTINES SQL_MODE 
information_schema	VIEWS	VIEW_DEFINITION

information_schema	TRIGGERS	ACTION_CONDITION

information_schema	TRIGGERS	ACTION_STATEMENT

information_schema	TRIGGERS	SQL_MODE

select table_name, column_name, data_type from information_schema.columns

where data_type = 'datetime';

table_name	column_name	data_type
@@ -790,7 +791,7 @@ set @fired:= "Yes"; 
end if;

end|

show triggers;

Trigger	Event	Table	Statement	Timing	Created

Trigger	Event	Table	Statement	Timing	Created	sql_mode

trg1	INSERT	t1	

begin

if new.j > 10 then
@@ -810,7 +811,7 @@ set @fired:= "Yes"; 
end if;

end	AFTER	NULL	

select * from information_schema.triggers;

TRIGGER_CATALOG	TRIGGER_SCHEMA	TRIGGER_NAME	EVENT_MANIPULATION	EVENT_OBJECT_CATALOG	EVENT_OBJECT_SCHEMA	EVENT_OBJECT_TABLE	ACTION_ORDER	ACTION_CONDITION	ACTION_STATEMENT	ACTION_ORIENTATION	ACTION_TIMING	ACTION_REFERENCE_OLD_TABLE	ACTION_REFERENCE_NEW_TABLE	ACTION_REFERENCE_OLD_ROW	ACTION_REFERENCE_NEW_ROW	CREATED

TRIGGER_CATALOG	TRIGGER_SCHEMA	TRIGGER_NAME	EVENT_MANIPULATION	EVENT_OBJECT_CATALOG	EVENT_OBJECT_SCHEMA	EVENT_OBJECT_TABLE	ACTION_ORDER	ACTION_CONDITION	ACTION_STATEMENT	ACTION_ORIENTATION	ACTION_TIMING	ACTION_REFERENCE_OLD_TABLE	ACTION_REFERENCE_NEW_TABLE	ACTION_REFERENCE_OLD_ROW	ACTION_REFERENCE_NEW_ROW	CREATED	SQL_MODE

NULL	test	trg1	INSERT	NULL	test	t1	0	NULL	

begin

if new.j > 10 then

mysql-test/r/trigger.result

+47 −0
Original line number Diff line number Diff line
@@ -595,3 +595,50 @@ update t1 set col2 = 4; 
ERROR 42000: FUNCTION test.bug5893 does not exist

drop trigger t1_bu;

drop table t1;

set sql_mode='ansi';

create table t1 ("t1 column" int);

create trigger t1_bi before insert on t1 for each row set new."t1 column" = 5;

set sql_mode=default;

insert into t1 values (0);

create trigger t1_af after insert on t1 for each row set @a=10;

insert into t1 values (0);

select * from t1;

t1 column

5

5

select @a;

@a

10

show triggers;

Trigger	Event	Table	Statement	Timing	Created	sql_mode

t1_bi	INSERT	t1	set new."t1 column" = 5	BEFORE	#	REAL_AS_FLOAT,PIPES_AS_CONCAT,ANSI_QUOTES,IGNORE_SPACE,ANSI

t1_af	INSERT	t1	 set @a=10	AFTER	#	

select * from information_schema.triggers;

TRIGGER_CATALOG	TRIGGER_SCHEMA	TRIGGER_NAME	EVENT_MANIPULATION	EVENT_OBJECT_CATALOG	EVENT_OBJECT_SCHEMA	EVENT_OBJECT_TABLE	ACTION_ORDER	ACTION_CONDITION	ACTION_STATEMENT	ACTION_ORIENTATION	ACTION_TIMING	ACTION_REFERENCE_OLD_TABLE	ACTION_REFERENCE_NEW_TABLE	ACTION_REFERENCE_OLD_ROW	ACTION_REFERENCE_NEW_ROW	CREATED	SQL_MODE

NULL	test	t1_bi	INSERT	NULL	test	t1	0	NULL	set new."t1 column" = 5	ROW	BEFORE	NULL	NULL	OLD	NEW	#	REAL_AS_FLOAT,PIPES_AS_CONCAT,ANSI_QUOTES,IGNORE_SPACE,ANSI

NULL	test	t1_af	INSERT	NULL	test	t1	0	NULL	 set @a=10	ROW	AFTER	NULL	NULL	OLD	NEW	#	

drop table t1;

set sql_mode="traditional";

create table t1 (a date);

insert into t1 values ('2004-01-00');

ERROR 22007: Incorrect date value: '2004-01-00' for column 'a' at row 1

set sql_mode="";

create trigger t1_bi before insert on t1 for each row set new.a = '2004-01-00';

set sql_mode="traditional";

insert into t1 values ('2004-01-01');

select * from t1;

a

2004-01-00

set sql_mode=default;

show create table t1;

Table	Create Table

t1	CREATE TABLE `t1` (

  `a` date default NULL

) ENGINE=MyISAM DEFAULT CHARSET=latin1

show triggers;

Trigger	Event	Table	Statement	Timing	Created	sql_mode

t1_bi	INSERT	t1	 set new.a = '2004-01-00'	BEFORE	#	

select * from information_schema.triggers;

TRIGGER_CATALOG	TRIGGER_SCHEMA	TRIGGER_NAME	EVENT_MANIPULATION	EVENT_OBJECT_CATALOG	EVENT_OBJECT_SCHEMA	EVENT_OBJECT_TABLE	ACTION_ORDER	ACTION_CONDITION	ACTION_STATEMENT	ACTION_ORIENTATION	ACTION_TIMING	ACTION_REFERENCE_OLD_TABLE	ACTION_REFERENCE_NEW_TABLE	ACTION_REFERENCE_OLD_ROW	ACTION_REFERENCE_NEW_ROW	CREATED	SQL_MODE

NULL	test	t1_bi	INSERT	NULL	test	t1	0	NULL	 set new.a = '2004-01-00'	ROW	BEFORE	NULL	NULL	OLD	NEW	#	

drop table t1;

mysql-test/t/trigger.test

+36 −0
Original line number Diff line number Diff line
@@ -610,3 +610,39 @@ update t1 set col2 = 4; 
# This should not crash server too.

drop trigger t1_bu;

drop table t1;



#

# storing and restoring parsing modes for triggers (BUG#5891)

#

set sql_mode='ansi';

create table t1 ("t1 column" int);

create trigger t1_bi before insert on t1 for each row set new."t1 column" = 5;

set sql_mode=default;

insert into t1 values (0);

# create trigger with different sql_mode

create trigger t1_af after insert on t1 for each row set @a=10;

insert into t1 values (0);

select * from t1;

select @a;

--replace_column 6 #

show triggers;

--replace_column 17 #

select * from information_schema.triggers;

drop table t1;

# check that rigger preserve sql_mode during execution

set sql_mode="traditional";

create table t1 (a date);

-- error 1292

insert into t1 values ('2004-01-00');

set sql_mode="";

create trigger t1_bi before insert on t1 for each row set new.a = '2004-01-00';

set sql_mode="traditional";

insert into t1 values ('2004-01-01');

select * from t1;

set sql_mode=default;

show create table t1;

--replace_column 6 #

show triggers;

--replace_column 17 #

select * from information_schema.triggers;

drop table t1;

sql/mysqld.cc

+41 −4
Original line number Diff line number Diff line
@@ -227,14 +227,51 @@ static const char *sql_mode_names[] = 
  "NO_DIR_IN_CREATE",

  "POSTGRESQL", "ORACLE", "MSSQL", "DB2", "MAXDB", "NO_KEY_OPTIONS",

  "NO_TABLE_OPTIONS", "NO_FIELD_OPTIONS", "MYSQL323", "MYSQL40", "ANSI",

  "NO_AUTO_VALUE_ON_ZERO", "NO_BACKSLASH_ESCAPES", "STRICT_TRANS_TABLES", "STRICT_ALL_TABLES",

  "NO_ZERO_IN_DATE", "NO_ZERO_DATE", "ALLOW_INVALID_DATES", "ERROR_FOR_DIVISION_BY_ZERO",

  "NO_AUTO_VALUE_ON_ZERO", "NO_BACKSLASH_ESCAPES", "STRICT_TRANS_TABLES",

  "STRICT_ALL_TABLES",

  "NO_ZERO_IN_DATE", "NO_ZERO_DATE", "ALLOW_INVALID_DATES",

  "ERROR_FOR_DIVISION_BY_ZERO",

  "TRADITIONAL", "NO_AUTO_CREATE_USER", "HIGH_NOT_PRECEDENCE",

  "NO_ENGINE_SUBSTITUTION",

  NullS

};

static const unsigned int sql_mode_names_len[]=

{

  /*REAL_AS_FLOAT*/               13,

  /*PIPES_AS_CONCAT*/             15,

  /*ANSI_QUOTES*/                 11,

  /*IGNORE_SPACE*/                12,

  /*?*/                           1,

  /*ONLY_FULL_GROUP_BY*/          18,

  /*NO_UNSIGNED_SUBTRACTION*/     23,

  /*NO_DIR_IN_CREATE*/            16,

  /*POSTGRESQL*/                  10,

  /*ORACLE*/                      6,

  /*MSSQL*/                       5,

  /*DB2*/                         3,

  /*MAXDB*/                       5,

  /*NO_KEY_OPTIONS*/              14,

  /*NO_TABLE_OPTIONS*/            16,

  /*NO_FIELD_OPTIONS*/            16,

  /*MYSQL323*/                    8,

  /*MYSQL40*/                     7,

  /*ANSI*/                        4,

  /*NO_AUTO_VALUE_ON_ZERO*/       21,

  /*NO_BACKSLASH_ESCAPES*/        20,

  /*STRICT_TRANS_TABLES*/         19,

  /*STRICT_ALL_TABLES*/           17,

  /*NO_ZERO_IN_DATE*/             15,

  /*NO_ZERO_DATE*/                12,

  /*ALLOW_INVALID_DATES*/         19,

  /*ERROR_FOR_DIVISION_BY_ZERO*/  26,

  /*TRADITIONAL*/                 11,

  /*NO_AUTO_CREATE_USER*/         19,

  /*HIGH_NOT_PRECEDENCE*/         19,

  /*NO_ENGINE_SUBSTITUTION*/      22

};

TYPELIB sql_mode_typelib= { array_elements(sql_mode_names)-1,"",

			    sql_mode_names, NULL };

			    sql_mode_names,

                            (unsigned int *)sql_mode_names_len };

static const char *tc_heuristic_recover_names[]=

{

  "COMMIT", "ROLLBACK", NullS

sql/parse_file.cc

+64 −4
Original line number Diff line number Diff line
@@ -166,6 +166,25 @@ write_parameter(IO_CACHE *file, gptr base, File_option *parameter, 
    }

    break;

  }

  case FILE_OPTIONS_ULLLIST:

  {

    List_iterator_fast<ulonglong> it(*((List<ulonglong>*)

                                       (base + parameter->offset)));

    bool first= 1;

    ulonglong *val;

    while ((val= it++))

    {

      num.set(*val, &my_charset_bin);

      // We need ' ' after string to detect list continuation

      if ((!first && my_b_append(file, (const byte *)" ", 1)) ||

          my_b_append(file, (const byte *)num.ptr(), num.length()))

      {

        DBUG_RETURN(TRUE);

      }

      first= 0;

    }

    break;

  }

  default:

    DBUG_ASSERT(0); // never should happened

  }
@@ -615,6 +634,8 @@ File_parser::parse(gptr base, MEM_ROOT *mem_root, 
  char *eol;

  LEX_STRING *str;

  List<LEX_STRING> *list;

  ulonglong *num;

  List<ulonglong> *nlist;

  DBUG_ENTER("File_parser::parse");



  while (ptr < end && found < required)
@@ -741,6 +762,7 @@ File_parser::parse(gptr base, MEM_ROOT *mem_root, 
	      goto list_err_w_message;

	    }

	  }



end_of_list:

	  if (*(ptr++) != '\n')

	    goto list_err;
@@ -752,6 +774,44 @@ File_parser::parse(gptr base, MEM_ROOT *mem_root, 
list_err:

	  DBUG_RETURN(TRUE);

	}

        case FILE_OPTIONS_ULLLIST:

        {

          nlist= (List<ulonglong>*)(base + parameter->offset);

          nlist->empty();

          // list parsing

          while (ptr < end)

          {

            int not_used;

            char *num_end= end;

            if (!(num= (ulonglong*)alloc_root(mem_root, sizeof(ulonglong))) ||

                nlist->push_back(num, mem_root))

              goto nlist_err;

            *num= my_strtoll10(ptr, &num_end, &not_used);

            ptr= num_end;

            switch (*ptr) {

            case '\n':

              goto end_of_nlist;

            case ' ':

              // we cant go over buffer bounds, because we have \0 at the end

              ptr++;

              break;

            default:

              goto nlist_err_w_message;

            }

          }



end_of_nlist:

          if (*(ptr++) != '\n')

            goto nlist_err;

          break;



nlist_err_w_message:

          my_error(ER_FPARSER_ERROR_IN_PARAMETER, MYF(0),

                   parameter->name.str, line);

nlist_err:

          DBUG_RETURN(TRUE);



        }

	default:

	  DBUG_ASSERT(0); // never should happened

	}