Commit 31bec292 authored by unknown's avatar unknown
Browse files

Merge mysql.com:/home/cps/mysql/trees/mysql-5.0 

into mysql.com:/home/cps/mysql/devel/im-fix-review
parents 83cce1ca 1fbeaf71

BUILD/SETUP.sh

+2 −2
Original line number Diff line number Diff line
@@ -48,8 +48,8 @@ global_warnings="-Wimplicit -Wreturn-type -Wswitch -Wtrigraphs -Wcomment -W -Wch 
c_warnings="$global_warnings -Wunused"

cxx_warnings="$global_warnings -Woverloaded-virtual -Wsign-promo -Wreorder -Wctor-dtor-privacy -Wnon-virtual-dtor"



base_max_configs="--with-innodb --with-bdb --with-ndbcluster --with-archive-storage-engine --with-raid --with-openssl --with-raid --with-vio"

max_leave_isam_configs="--with-innodb --with-bdb --with-ndbcluster --with-archive-storage-engine --with-federated-storage-engine --with-raid --with-openssl --with-raid --with-vio --with-embedded-server"

base_max_configs="--with-innodb --with-berkeley-db --with-ndbcluster --with-archive-storage-engine --with-raid --with-openssl --with-raid --with-vio"

max_leave_isam_configs="--with-innodb --with-berkeley-db --with-ndbcluster --with-archive-storage-engine --with-federated-storage-engine --with-raid --with-openssl --with-raid --with-vio --with-embedded-server"

max_no_es_configs="$max_leave_isam_configs --without-isam"

max_configs="$max_no_es_configs --with-embedded-server"

BitKeeper/etc/logging_ok

+1 −0
Original line number Diff line number Diff line
@@ -222,6 +222,7 @@ serg@sergbook.mysql.com 
sergefp@mysql.com

sinisa@rhols221.adsl.netsonic.fi

stewart@mysql.com

svoj@mysql.com

tfr@beta.frontier86.ee

tfr@indrek.tfr.cafe.ee

tfr@sarvik.tfr.cafe.ee

client/mysqltest.c

+8 −1
Original line number Diff line number Diff line
@@ -253,6 +253,7 @@ VAR var_reg[10]; 
/*Perl/shell-like variable registers */

HASH var_hash;

my_bool disable_query_log=0, disable_result_log=0, disable_warnings=0;

my_bool disable_ps_warnings= 0;

my_bool disable_info= 1;			/* By default off */

my_bool abort_on_error= 1;
@@ -283,6 +284,7 @@ Q_ENABLE_RESULT_LOG, Q_DISABLE_RESULT_LOG, 
Q_SERVER_START, Q_SERVER_STOP,Q_REQUIRE_MANAGER,

Q_WAIT_FOR_SLAVE_TO_STOP,

Q_ENABLE_WARNINGS, Q_DISABLE_WARNINGS,

Q_ENABLE_PS_WARNINGS, Q_DISABLE_PS_WARNINGS,

Q_ENABLE_INFO, Q_DISABLE_INFO,

Q_ENABLE_METADATA, Q_DISABLE_METADATA,

Q_EXEC, Q_DELIMITER,
@@ -360,6 +362,8 @@ const char *command_names[]= 
  "wait_for_slave_to_stop",

  "enable_warnings",

  "disable_warnings",

  "enable_ps_warnings",

  "disable_ps_warnings",

  "enable_info",

  "disable_info",

  "enable_metadata",
@@ -3021,6 +3025,7 @@ static int run_query_stmt(MYSQL *mysql, struct st_query *q, int flags) 


  /* We may have got warnings already, collect them if any */

  /* FIXME we only want this if the statement succeeds I think */ 

  if (!disable_ps_warnings)

    run_query_stmt_handle_warnings(mysql, ds);



  /*
@@ -3711,6 +3716,8 @@ int main(int argc, char **argv) 
      case Q_DISABLE_RESULT_LOG: disable_result_log=1; break;

      case Q_ENABLE_WARNINGS:    disable_warnings=0; break;

      case Q_DISABLE_WARNINGS:   disable_warnings=1; break;

      case Q_ENABLE_PS_WARNINGS:    disable_ps_warnings=0; break;

      case Q_DISABLE_PS_WARNINGS:   disable_ps_warnings=1; break;

      case Q_ENABLE_INFO:        disable_info=0; break;

      case Q_DISABLE_INFO:       disable_info=1; break;

      case Q_ENABLE_METADATA:    display_metadata=1; break;

configure.in

+0 −23
Original line number Diff line number Diff line
@@ -56,28 +56,6 @@ czech danish dutch english estonian french german greek hungarian \ 
italian japanese korean norwegian norwegian-ny polish portuguese \

romanian russian serbian slovak spanish swedish ukrainian"





# Generate make rules for all error messages

AVAILABLE_LANGUAGES_ERRORS=

AVAILABLE_LANGUAGES_ERRORS_RULES=$srcdir/ac_available_languages_fragment

rm -f $AVAILABLE_LANGUAGES_ERRORS_RULES

for i in $AVAILABLE_LANGUAGES

do

  AVAILABLE_LANGUAGES_ERRORS="$AVAILABLE_LANGUAGES_ERRORS $i/errmsg.sys"

  case $host_os in

    netware*)

      echo "$i/errmsg.sys: $i/errmsg.txt

	\$(top_builddir)/extra/comp_err.linux -C\$(srcdir)/charsets/ $i/errmsg.txt $i/errmsg.sys" \

      >> $AVAILABLE_LANGUAGES_ERRORS_RULES

      ;;

    *)

  echo "$i/errmsg.sys: $i/errmsg.txt

	\$(top_builddir)/extra/comp_err -C\$(srcdir)/charsets/ $i/errmsg.txt $i/errmsg.sys" \

    >> $AVAILABLE_LANGUAGES_ERRORS_RULES

      ;;

  esac

done



#####

#####
@@ -93,7 +71,6 @@ AC_DEFINE_UNQUOTED([DOT_FRM_VERSION], [$DOT_FRM_VERSION], 
AC_SUBST(SHARED_LIB_VERSION)

AC_SUBST(AVAILABLE_LANGUAGES)

AC_SUBST(AVAILABLE_LANGUAGES_ERRORS)

AC_SUBST_FILE(AVAILABLE_LANGUAGES_ERRORS_RULES)



AC_SUBST([NDB_VERSION_MAJOR])

AC_SUBST([NDB_VERSION_MINOR])

include/config-win.h

+15 −8
Original line number Diff line number Diff line
@@ -31,18 +31,25 @@ functions */ 


#define HAVE_SMEM 1



#if defined(__NT__)

#define SYSTEM_TYPE	"NT"

#elif defined(__WIN2000__)

#define SYSTEM_TYPE	"WIN2000"

#if defined(_WIN64) || defined(WIN64) 

#define SYSTEM_TYPE	"Win64" 

#elif defined(_WIN32) || defined(WIN32) 

#define SYSTEM_TYPE	"Win32" 

#else

#define SYSTEM_TYPE	"Win95/Win98"

#define SYSTEM_TYPE	"Windows"

#endif



#if defined(_WIN64) || defined(WIN64)

#define MACHINE_TYPE	"ia64"		/* Define to machine type name */

#if defined(_M_IA64) 

#define MACHINE_TYPE	"ia64" 

#elif defined(_M_IX86) 

#define MACHINE_TYPE	"ia32" 

#elif defined(_M_ALPHA) 

#define MACHINE_TYPE	"axp" 

#else

#define MACHINE_TYPE	"i32"		/* Define to machine type name */

#define MACHINE_TYPE	"unknown"	/* Define to machine type name */

#endif 

 

#if !(defined(_WIN64) || defined(WIN64)) 

#ifndef _WIN32

#define _WIN32				/* Compatible with old source */

#endif