Commit bd47a7df authored by unknown's avatar unknown
Browse files

Merge with 4.1 


BitKeeper/etc/logging_ok:
  auto-union
client/sql_string.cc:
  Auto merged
configure.in:
  Auto merged
include/my_global.h:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/create.result:
  Auto merged
mysql-test/r/olap.result:
  Auto merged
mysql-test/r/warnings.result:
  Auto merged
mysql-test/t/create.test:
  Auto merged
mysql-test/t/warnings.test:
  Auto merged
mysys/raid.cc:
  Auto merged
scripts/make_binary_distribution.sh:
  Auto merged
sql/field.cc:
  Auto merged
BitKeeper/deleted/.del-ha_isam.cc~4dce65904db2675e:
  Auto merged
BitKeeper/deleted/.del-ha_isammrg.cc~dc682e4755d77a2e:
  Auto merged
sql/ha_berkeley.cc:
  Auto merged
sql/ha_blackhole.cc:
  Auto merged
sql/ha_heap.cc:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/ha_myisam.cc:
  Auto merged
sql/ha_myisammrg.cc:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/handler.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_geofunc.cc:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/item_subselect.cc:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/item_uniq.cc:
  Auto merged
sql/lock.cc:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/opt_range.h:
  Auto merged
sql/procedure.cc:
  Auto merged
sql/protocol.cc:
  Auto merged
sql/protocol_cursor.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_analyse.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_error.cc:
  Auto merged
sql/sql_handler.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_map.cc:
  Auto merged
sql/sql_olap.cc:
  Auto merged
sql/sql_repl.cc:
  Auto merged
sql/sql_string.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_udf.cc:
  Auto merged
sql/examples/ha_archive.cc:
  Auto merged
sql/examples/ha_example.cc:
  Auto merged
sql/examples/ha_tina.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/tztime.cc:
  Auto merged
strings/ctype-win1250ch.c:
  Auto merged
mysql-test/r/func_gconcat.result:
  merge & ensure that 4.1 and 5.0 source have tests in same order
mysql-test/r/innodb.result:
  merge & ensure that 4.1 and 5.0 source have tests in same order
mysql-test/t/func_gconcat.test:
  merge & ensure that 4.1 and 5.0 source have tests in same order
mysql-test/t/innodb.test:
  merge & ensure that 4.1 and 5.0 source have tests in same order
sql/item_func.cc:
  merge
sql/mysqld.cc:
  merge
sql/opt_range.cc:
  merge
sql/sql_parse.cc:
  merge
  Give better name to goto labels
sql/sql_select.cc:
  merge
parents f21e2364 936b9319

client/sql_string.cc

+1 −2
Original line number Diff line number Diff line
@@ -16,12 +16,11 @@ 


/* This file is originally from the mysql distribution. Coded by monty */



#include <my_global.h>



#ifdef USE_PRAGMA_IMPLEMENTATION

#pragma implementation				// gcc: Class implementation

#endif



#include <my_global.h>

#include <my_sys.h>

#include <m_string.h>

#include <m_ctype.h>

configure.in

+12 −1
Original line number Diff line number Diff line
@@ -1765,12 +1765,23 @@ if test "$ac_cv_sizeof_off_t" -eq 0 
then

  AC_MSG_ERROR("MySQL needs a off_t type.")

fi



# do we need #pragma interface/#pragma implementation ?

# yes if it's gcc 2.x, and not icc pretending to be gcc, and not cygwin

AC_MSG_CHECKING(the need for @%:@pragma interface/implementation)

# instead of trying to match SYSTEM_TYPE and CC_VERSION (that doesn't

# follow any standard), we'll use well-defined preprocessor macros:

AC_TRY_CPP([

#if !defined(__CYGWIN__) && !defined(__INTEL_COMPILER) && defined(__GNUC__) && (__GNUC__ < 3)

#error USE_PRAGMA_IMPLEMENTATION

#endif

],AC_MSG_RESULT(no) ,AC_MSG_RESULT(yes) ; CXXFLAGS="$CXXFLAGS -DUSE_PRAGMA_IMPLEMENTATION")



# This always gives a warning. Ignore it unless you are cross compiling

AC_C_BIGENDIAN

#---START: Used in for client configure

# Check base type of last arg to accept

MYSQL_TYPE_ACCEPT



#---END:

# Figure out what type of struct rlimit to use with setrlimit

MYSQL_TYPE_STRUCT_RLIMIT

include/my_global.h

+2 −14
Original line number Diff line number Diff line
@@ -43,16 +43,11 @@ 
#define HAVE_ERRNO_AS_DEFINE

#endif /* __CYGWIN__ */



/* Determine when to use "#pragma interface" */

#if !defined(__CYGWIN__) && !defined(__INTEL_COMPILER) && defined(__GNUC__) && (__GNUC__ < 3)

/* to make command line shorter we'll define USE_PRAGMA_INTERFACE here */

#ifdef USE_PRAGMA_IMPLEMENTATION

#define USE_PRAGMA_INTERFACE

#endif



/* Determine when to use "#pragma implementation" */

#if !defined(__INTEL_COMPILER) && defined(__GNUC__) && (__GNUC__ < 3)

#define USE_PRAGMA_IMPLEMENTATION

#endif



#if defined(i386) && !defined(__i386__)

#define __i386__

#endif
@@ -306,13 +301,6 @@ C_MODE_END 
#include <alloca.h>

#endif

#ifdef HAVE_ATOMIC_ADD

#define __SMP__

#ifdef HAVE_LINUX_CONFIG_H

#include <linux/config.h>	/* May define CONFIG_SMP */

#endif

#ifndef CONFIG_SMP

#define CONFIG_SMP

#endif

#if defined(__ia64__)

#define new my_arg_new

#define need_to_restore_new 1

mysql-test/lib/mtr_misc.pl

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ sub mtr_full_hostname () { 
  if ( $hostname !~ /\./ )

  {

    my $address=   gethostbyname($hostname)

      or die "Couldn't resolve $hostname : $!";

      or mtr_error("Couldn't resolve $hostname : $!");

    my $fullname=  gethostbyaddr($address, AF_INET);

    $hostname= $fullname if $fullname; 

  }

mysql-test/lib/mtr_process.pl

+14 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ sub mtr_spawn ($$$$$$); 
sub mtr_stop_mysqld_servers ($);

sub mtr_kill_leftovers ();

sub mtr_record_dead_children ();

sub mtr_exit ($);

sub sleep_until_file_created ($$$);



# static in C
@@ -784,4 +785,17 @@ sub sleep_until_file_created ($$$) { 
}





##############################################################################

#

#  When we exit, we kill off all children

#

##############################################################################



sub mtr_exit ($) {

  my $code= shift;

  local $SIG{HUP} = 'IGNORE';

  kill('HUP', -$$);

  exit($code);

}



1;