Commit 6e79678d authored by unknown's avatar unknown
Browse files

Merge from 4.1 


BitKeeper/deleted/.del-ha_isam.cc~4dce65904db2675e:
  Auto merged
BitKeeper/deleted/.del-ha_isammrg.cc~dc682e4755d77a2e:
  Auto merged
client/sql_string.cc:
  Auto merged
client/sql_string.h:
  Auto merged
include/my_global.h:
  Auto merged
include/my_sys.h:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
mysys/my_open.c:
  Auto merged
mysys/raid.cc:
  Auto merged
ndb/src/kernel/blocks/dbtux/Dbtux.hpp:
  Auto merged
sql/field.cc:
  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_func.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/item_uniq.h:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/log_event.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_analyse.cc:
  Auto merged
sql/sql_analyse.h:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_map.cc:
  Auto merged
sql/sql_olap.cc:
  Auto merged
sql/sql_string.cc:
  Auto merged
sql/sql_udf.cc:
  Auto merged
sql/tztime.cc:
  Auto merged
sql/opt_range.cc:
  Manual merge
sql/sql_parse.cc:
  Use select_lex pointer instead of lex->select_lex
sql/sql_repl.cc:
  Function moved to log.cc, fix made there instead
sql/sql_class.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
parents c8b88e8e ab88a1d2

client/sql_string.cc

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 


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



#ifdef __GNUC__

#ifdef USE_PRAGMA_IMPLEMENTATION

#pragma implementation				// gcc: Class implementation

#endif

client/sql_string.h

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 


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



#ifdef __GNUC__

#ifdef USE_PRAGMA_INTERFACE

#pragma interface			/* gcc class implementation */

#endif

include/my_global.h

+5 −0
Original line number Diff line number Diff line
@@ -48,6 +48,11 @@ 
#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

include/my_sys.h

+1 −0
Original line number Diff line number Diff line
@@ -605,6 +605,7 @@ extern int my_access(const char *path, int amode); 
#else

#define my_access access

#endif

extern int check_if_legal_filename(const char *path);



#ifndef TERMINATE

extern void TERMINATE(FILE *file);

mysql-test/mysql-test-run.sh

+2 −2
Original line number Diff line number Diff line
@@ -1212,8 +1212,8 @@ start_master() 
           $NOT_FIRST_MASTER_EXTRA_OPTS"

  fi



  CUR_MYERR=$MASTER_MYERR

  CUR_MYSOCK=$MASTER_MYSOCK

  CUR_MYERR=$MASTER_MYERR$1

  CUR_MYSOCK=$MASTER_MYSOCK$1



  # For embedded server we collect the server flags and return

  if [ "x$USE_EMBEDDED_SERVER" = "x1" ] ; then