Commit 8037213d authored by unknown's avatar unknown
Browse files

Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0 

into gluh.mysql.r18.ru:/home/gluh/MySQL/mysql-5.0


sql/sql_parse.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
parents 2bb14c6f f32743b7

BUILD/compile-ia64-debug-max

+1 −1
Original line number Diff line number Diff line
@@ -9,5 +9,5 @@ then 
   (cd gemini && aclocal && autoheader && aclocal && automake && autoconf)

fi



CC=ecc CFLAGS="-w1 -DEXTRA_DEBUG -DSAFEMALLOC -DSAFE_MUTEX -O2" CXX=ecc CXXFLAGS="-w1 -DEXTRA_DEBUG -DSAFEMALLOC -DSAFE_MUTEX -O2" ./configure --prefix=/usr/local/mysql --with-extra-charsets=complex --enable-thread-safe-client --with-mysqld-ldflags=-all-static  --with-client-ldflags=-all-static  --with-debug --with-innodb --with-embedded-server

CC=ecc CFLAGS="-w1 -DEXTRA_DEBUG -DSAFEMALLOC -DSAFE_MUTEX -O2" CXX=ecc CXXFLAGS="-w1 -DEXTRA_DEBUG -DSAFEMALLOC -DSAFE_MUTEX -O2" ./configure --prefix=/usr/local/mysql --with-extra-charsets=complex --enable-thread-safe-client --with-mysqld-ldflags=-all-static  --with-client-ldflags=-all-static  --with-debug --with-innodb --with-embedded-server --with-archive-storage-engine

gmake

config/ac-macros/character_sets.m4

+17 −0
Original line number Diff line number Diff line
@@ -405,3 +405,20 @@ AC_DEFINE_UNQUOTED([MYSQL_DEFAULT_CHARSET_NAME], ["$default_charset"], 
                   [Define the default charset name])

AC_DEFINE_UNQUOTED([MYSQL_DEFAULT_COLLATION_NAME], ["$default_collation"],

                   [Define the default charset name])



# Shall we build the UCA-based Unicode collations

AC_ARG_WITH(uca,

    [  --without-uca           Skip building of the national Unicode collations.],

    [with_uca=$withval],

    [with_uca=yes]

)



AC_MSG_CHECKING([whether to compile national Unicode collations])



if test "$with_uca" = "yes"

then

  AC_MSG_RESULT(yes)

  AC_DEFINE([HAVE_UCA_COLLATIONS], [1], [national Unicode collations])

else

  AC_MSG_RESULT(no)

fi

extra/perror.c

+12 −1
Original line number Diff line number Diff line
@@ -189,6 +189,7 @@ int main(int argc,char *argv[]) 
{

  int error,code,found;

  const char *msg;

  char *unknown_error = 0;

  MY_INIT(argv[0]);



  if (get_options(&argc,&argv))
@@ -217,7 +218,12 @@ int main(int argc,char *argv[]) 
      string 'Unknown Error'.  To avoid printing it we try to find the

      error string by asking for an impossible big error message.

    */

    const char *unknown_error= strerror(10000);

    msg = strerror(10000);



    /* allocate a buffer for unknown_error since strerror always returns the same pointer 

      on some platforms such as Windows */

    unknown_error = malloc( strlen(msg)+1 );

    strcpy( unknown_error, msg );



    for ( ; argc-- > 0 ; argv++)

    {
@@ -267,6 +273,11 @@ int main(int argc,char *argv[]) 
      }

    }

  }



  /* if we allocated a buffer for unknown_error, free it now */

  if (unknown_error)

	  free(unknown_error);



  exit(error);

  return error;

}

innobase/include/rem0rec.ic

+9 −1
Original line number Diff line number Diff line
@@ -279,7 +279,15 @@ rec_get_next_offs( 
		/* Note that for 64 KiB pages, field_value can 'wrap around'

		and the debug assertion is not valid */



		ut_ad((int16_t)field_value

		/* In the following assertion, field_value is interpreted

		as signed 16-bit integer in 2's complement arithmetics.

		If all platforms defined int16_t in the standard headers,

		the expression could be written simpler as

		(int16_t) field_value + ut_align_offset(...) < UNIV_PAGE_SIZE

		*/

		ut_ad((field_value >= 32768

			? field_value - 65536

			: field_value)

		       + ut_align_offset(rec, UNIV_PAGE_SIZE)

		      < UNIV_PAGE_SIZE);

#endif

innobase/include/trx0roll.h

+15 −0
Original line number Diff line number Diff line
@@ -225,6 +225,21 @@ trx_savepoint_for_mysql( 
						position corresponding to this

						connection at the time of the

						savepoint */

						

/***********************************************************************

Releases a named savepoint. Savepoints which

were set after this savepoint are deleted. */



ulint

trx_release_savepoint_for_mysql(

/*================================*/

						/* out: if no savepoint

						of the name found then

						DB_NO_SAVEPOINT,

						otherwise DB_SUCCESS */

	trx_t*		trx,			/* in: transaction handle */

	const char*	savepoint_name);	/* in: savepoint name */



/***********************************************************************

Frees savepoint structs. */