Commit cbfbbcb4 authored by unknown's avatar unknown
Browse files

Merge kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build 

into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-work
parents 5c0f5324 268bce8f

include/my_global.h

+36 −0
Original line number Diff line number Diff line
@@ -92,6 +92,42 @@ 
#define NETWARE_SET_SCREEN_MODE(A)

#endif



/*

  The macros below are used to allow build of Universal/fat binaries of

  MySQL and MySQL applications under darwin. 

*/

#ifdef TARGET_FAT_BINARY

# undef SIZEOF_CHARP 

# undef SIZEOF_INT 

# undef SIZEOF_LONG 

# undef SIZEOF_LONG_LONG 

# undef SIZEOF_OFF_T 

# undef SIZEOF_SHORT 



#if defined(__i386__)

# undef WORDS_BIGENDIAN

# define SIZEOF_CHARP 4

# define SIZEOF_INT 4

# define SIZEOF_LONG 4

# define SIZEOF_LONG_LONG 8

# define SIZEOF_OFF_T 8

# define SIZEOF_SHORT 2



#elif defined(__ppc__)

# define WORDS_BIGENDIAN

# define SIZEOF_CHARP 4

# define SIZEOF_INT 4

# define SIZEOF_LONG 4

# define SIZEOF_LONG_LONG 8

# define SIZEOF_OFF_T 8

# define SIZEOF_SHORT 2



#else

# error Building FAT binary for an unknown architecture.

#endif

#endif /* TARGET_FAT_BINARY */





/*

  The macros below are borrowed from include/linux/compiler.h in the

  Linux kernel. Use them to indicate the likelyhood of the truthfulness

mysql-test/r/view.result

+4 −4
Original line number Diff line number Diff line
@@ -2686,12 +2686,12 @@ View Create View 
v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select (year(now()) - year(`t1`.`DOB`)) AS `Age` from `t1` having (`Age` < 75)

SELECT (year(now())-year(DOB)) AS Age FROM t1 HAVING Age < 75;

Age

42

38

43

39

SELECT * FROM v1;

Age

42

38

43

39

DROP VIEW v1;

DROP TABLE t1;

CREATE TABLE t1 (id int NOT NULL PRIMARY KEY, a char(6) DEFAULT 'xxx');