Commit fd5000f6 authored by joerg@trift2.'s avatar joerg@trift2.
Browse files

Merge trift2.:/MySQL/M50/mysql-5.0 

into  trift2.:/MySQL/M50/push-5.0
parents 7c4f906b dba978a7

.bzrignore

+2 −0
Original line number Diff line number Diff line
@@ -1351,3 +1351,5 @@ win/vs71cache.txt 
win/vs8cache.txt

zlib/*.ds?

zlib/*.vcproj

scripts/make_win_src_distribution_old

server-tools/instance-manager/net_serv.cc

Docs/Makefile.am

+1 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ 
# along with this program; if not, write to the Free Software

# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA



EXTRA_DIST =		mysql.info INSTALL-BINARY

EXTRA_DIST =		mysql.info INSTALL-BINARY @extra_docs@



# make sure that "make install" installs the info page, too

# automake only seems to take care of this automatically,

configure.in

+5 −0
Original line number Diff line number Diff line
@@ -2452,10 +2452,15 @@ AC_ARG_WITH(docs, 
if test "$with_docs" = "yes"

then

  docs_dirs="Docs"

  if test -f "$srcdir/Docs/manual.chm" ; then

    extra_docs="manual.chm"

  fi

else

  docs_dirs=""

  extra_docs=""

fi

AC_SUBST(docs_dirs)

AC_SUBST(extra_docs)



# Shall we build the man pages?

AC_ARG_WITH(man,

include/my_global.h

+25 −30
Original line number Diff line number Diff line
@@ -109,36 +109,31 @@ 
  The macros below are used to allow build of Universal/fat binaries of

  MySQL and MySQL applications under darwin. 

*/

#ifdef TARGET_FAT_BINARY

#if defined(__APPLE__) && defined(__MACH__)

#  undef SIZEOF_CHARP 

#  undef SIZEOF_SHORT 

#  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_SHORT 2

#  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

#  if defined(__i386__) || defined(__ppc__)

#    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(__x86_64__) || defined(__ppc64__)

#    define SIZEOF_CHARP 8

#    define SIZEOF_LONG 8

#  else

#    error Building FAT binary for an unknown architecture.

#  endif

#endif /* TARGET_FAT_BINARY */

#  if defined(__ppc__) || defined(__ppc64__)

#    define WORDS_BIGENDIAN

#  endif

#endif /* defined(__APPLE__) && defined(__MACH__) */





/*

mysql-test/suite/funcs_1/r/innodb_views.result

+11 −4
Original line number Diff line number Diff line
@@ -9841,6 +9841,13 @@ SELECT f3 AS "pure column f3: ", f1 + f3 AS "sum of columns f1 + f3 = ", 
'->' || CAST(f3 AS CHAR) || '<-'

         AS "expression with '||'=CONCAT and CAST(DECIMAL column AS CHAR):"

FROM t1 WHERE f1 = 2;

CREATE OR REPLACE VIEW v1 AS

SELECT f3 AS "pure column f3: ", f1 + f3 AS "sum of columns f1 + f3 = ",

3 * (- 0.11111E+1) AS "product of constants 3 * (- 0.11111E+1): ",

'->' || CAST(f3 AS CHAR) || '<-'

         AS "expression with '||'=CONCAT and CAST(DECIMAL column AS CHAR): "

FROM t1 WHERE f1 = 2;

ERROR 42000: Incorrect column name 'pure column f3: '

SELECT * FROM v1;

pure column f3:	2.20000

sum of columns f1 + f3 =	4.20000