Commit 32944ad2 authored by unknown's avatar unknown
Browse files

Merge mysql.com:/home/alik/MySQL/devel/5.0-bug15103 

into  mysql.com:/home/alik/MySQL/devel/5.1-tree


include/config-win.h:
  Auto merged
mysql-test/r/information_schema.result:
  Auto merged
mysql-test/r/mysqldump.result:
  Auto merged
mysql-test/r/rpl_ddl.result:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
parents d3f0247e 4eb2b162

include/config-win.h

+11 −9
Original line number Diff line number Diff line
@@ -108,11 +108,17 @@ functions */ 
#undef _REENTRANT			/* Crashes something for win32 */

#undef SAFE_MUTEX			/* Can't be used on windows */



#define LONGLONG_MIN	((__int64) 0x8000000000000000)

#define LONGLONG_MAX	((__int64) 0x7FFFFFFFFFFFFFFF)

#define ULONGLONG_MAX	((unsigned __int64) 0xFFFFFFFFFFFFFFFF)

#if defined(_MSC_VER) && _MSC_VER >= 1310

#define LL(A)           A##ll

#define ULL(A)          A##ull

#else

#define LL(A)           ((__int64) A)

#define ULL(A)          ((unsigned __int64) A)

#endif



#define LONGLONG_MIN	LL(0x8000000000000000)

#define LONGLONG_MAX	LL(0x7FFFFFFFFFFFFFFF)

#define ULONGLONG_MAX	ULL(0xFFFFFFFFFFFFFFFF)



/* Type information */
@@ -345,11 +351,7 @@ inline double ulonglong2double(ulonglong value) 
#define SPRINTF_RETURNS_INT

#define HAVE_SETFILEPOINTER

#define HAVE_VIO_READ_BUFF



#if defined(_WIN64) && defined(_M_X64)

/* Avoid type conflicts with built-in functions. */

#define HAVE_STRNLEN

#endif



#ifndef __NT__

#undef FILE_SHARE_DELETE

include/sha1.h

+3 −3
Original line number Diff line number Diff line
@@ -60,8 +60,8 @@ typedef struct SHA1_CONTEXT 


C_MODE_START



int sha1_reset( SHA1_CONTEXT* );

int sha1_input( SHA1_CONTEXT*, const uint8 *, unsigned int );

int sha1_result( SHA1_CONTEXT* , uint8 Message_Digest[SHA1_HASH_SIZE] );

int mysql_sha1_reset(SHA1_CONTEXT*);

int mysql_sha1_input(SHA1_CONTEXT*, const uint8 *, unsigned int);

int mysql_sha1_result(SHA1_CONTEXT* , uint8 Message_Digest[SHA1_HASH_SIZE]);



C_MODE_END

mysql-test/r/information_schema.result

+6 −12
Original line number Diff line number Diff line
@@ -838,40 +838,34 @@ end if; 
end|

show triggers;

Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer

trg1	INSERT	t1	

begin

trg1	INSERT	t1	begin

if new.j > 10 then

set new.j := 10;

end if;

end	BEFORE	NULL		root@localhost

trg2	UPDATE	t1	

begin

trg2	UPDATE	t1	begin

if old.i % 2 = 0 then

set new.j := -1;

end if;

end	BEFORE	NULL		root@localhost

trg3	UPDATE	t1	

begin

trg3	UPDATE	t1	begin

if new.j = -1 then

set @fired:= "Yes";

end if;

end	AFTER	NULL		root@localhost

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	DEFINER

NULL	test	trg1	INSERT	NULL	test	t1	0	NULL	

begin

NULL	test	trg1	INSERT	NULL	test	t1	0	NULL	begin

if new.j > 10 then

set new.j := 10;

end if;

end	ROW	BEFORE	NULL	NULL	OLD	NEW	NULL		root@localhost

NULL	test	trg2	UPDATE	NULL	test	t1	0	NULL	

begin

NULL	test	trg2	UPDATE	NULL	test	t1	0	NULL	begin

if old.i % 2 = 0 then

set new.j := -1;

end if;

end	ROW	BEFORE	NULL	NULL	OLD	NEW	NULL		root@localhost

NULL	test	trg3	UPDATE	NULL	test	t1	0	NULL	

begin

NULL	test	trg3	UPDATE	NULL	test	t1	0	NULL	begin

if new.j = -1 then

set @fired:= "Yes";

end if;

mysql-test/r/mysqldump.result

+11 −19
Original line number Diff line number Diff line
@@ -2006,8 +2006,7 @@ end| 
set sql_mode=default|

show triggers like "t1";

Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer

trg1	INSERT	t1	

begin

trg1	INSERT	t1	begin

if new.a > 10 then

set new.a := 10;

set new.a := 11;
@@ -2016,8 +2015,7 @@ end BEFORE 0000-00-00 00:00:00 root@localhost 
trg2	UPDATE	t1	begin

if old.a % 2 = 0 then set new.b := 12; end if;

end	BEFORE	0000-00-00 00:00:00		root@localhost

trg3	UPDATE	t1	

begin

trg3	UPDATE	t1	begin

if new.a = -1 then

set @fired:= "Yes";

end if;
@@ -2055,8 +2053,7 @@ UNLOCK TABLES; 
/*!50003 SET @OLD_SQL_MODE=@@SQL_MODE*/;

DELIMITER ;;

/*!50003 SET SESSION SQL_MODE="" */;;

/*!50003 CREATE */ /*!50017 DEFINER=`root`@`localhost` */ /*!50003 TRIGGER `trg1` BEFORE INSERT ON `t1` FOR EACH ROW

begin

/*!50003 CREATE */ /*!50017 DEFINER=`root`@`localhost` */ /*!50003 TRIGGER `trg1` BEFORE INSERT ON `t1` FOR EACH ROW begin

if new.a > 10 then

set new.a := 10;

set new.a := 11;
@@ -2069,8 +2066,7 @@ if old.a % 2 = 0 then set new.b := 12; end if; 
end */;;



/*!50003 SET SESSION SQL_MODE="STRICT_TRANS_TABLES,STRICT_ALL_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,TRADITIONAL,NO_AUTO_CREATE_USER" */;;

/*!50003 CREATE */ /*!50017 DEFINER=`root`@`localhost` */ /*!50003 TRIGGER `trg3` AFTER UPDATE ON `t1` FOR EACH ROW

begin

/*!50003 CREATE */ /*!50017 DEFINER=`root`@`localhost` */ /*!50003 TRIGGER `trg3` AFTER UPDATE ON `t1` FOR EACH ROW begin

if new.a = -1 then

set @fired:= "Yes";

end if;
@@ -2092,8 +2088,7 @@ UNLOCK TABLES; 
/*!50003 SET @OLD_SQL_MODE=@@SQL_MODE*/;

DELIMITER ;;

/*!50003 SET SESSION SQL_MODE="STRICT_TRANS_TABLES,STRICT_ALL_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,TRADITIONAL,NO_AUTO_CREATE_USER" */;;

/*!50003 CREATE */ /*!50017 DEFINER=`root`@`localhost` */ /*!50003 TRIGGER `trg4` BEFORE INSERT ON `t2` FOR EACH ROW

begin

/*!50003 CREATE */ /*!50017 DEFINER=`root`@`localhost` */ /*!50003 TRIGGER `trg4` BEFORE INSERT ON `t2` FOR EACH ROW begin

if new.a > 10 then

set @fired:= "No";

end if;
@@ -2165,8 +2160,7 @@ t1 
t2

show triggers;

Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer

trg1	INSERT	t1	

begin

trg1	INSERT	t1	begin

if new.a > 10 then

set new.a := 10;

set new.a := 11;
@@ -2175,14 +2169,12 @@ end BEFORE # root@localhost 
trg2	UPDATE	t1	begin

if old.a % 2 = 0 then set new.b := 12; end if;

end	BEFORE	#		root@localhost

trg3	UPDATE	t1	

begin

trg3	UPDATE	t1	begin

if new.a = -1 then

set @fired:= "Yes";

end if;

end	AFTER	#	STRICT_TRANS_TABLES,STRICT_ALL_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,TRADITIONAL,NO_AUTO_CREATE_USER	root@localhost

trg4	INSERT	t2	

begin

trg4	INSERT	t2	begin

if new.a > 10 then

set @fired:= "No";

end if;

mysql-test/r/trigger-compat.result

+2 −4
Original line number Diff line number Diff line
@@ -34,7 +34,5 @@ Warning 1454 No definer attribute for trigger 'mysqltest_db1'.'wl2818_trg1'. The 


SELECT * FROM INFORMATION_SCHEMA.TRIGGERS ORDER BY trigger_name;

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	DEFINER

NULL	mysqltest_db1	wl2818_trg1	INSERT	NULL	mysqltest_db1	t1	0	NULL	

INSERT INTO t2 VALUES(CURRENT_USER())	ROW	BEFORE	NULL	NULL	OLD	NEW	NULL		

NULL	mysqltest_db1	wl2818_trg2	INSERT	NULL	mysqltest_db1	t1	0	NULL	

INSERT INTO t2 VALUES(CURRENT_USER())	ROW	AFTER	NULL	NULL	OLD	NEW	NULL		mysqltest_dfn@localhost
 
NULL	mysqltest_db1	wl2818_trg1	INSERT	NULL	mysqltest_db1	t1	0	NULL	INSERT INTO t2 VALUES(CURRENT_USER())	ROW	BEFORE	NULL	NULL	OLD	NEW	NULL		

NULL	mysqltest_db1	wl2818_trg2	INSERT	NULL	mysqltest_db1	t1	0	NULL	INSERT INTO t2 VALUES(CURRENT_USER())	ROW	AFTER	NULL	NULL	OLD	NEW	NULL		mysqltest_dfn@localhost