Commit 387bc8b5 authored by unknown's avatar unknown
Browse files

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

into quadita2.mysql.com:/nfstmp1/guilhem/mysql-5.0-4ita
parents dc41e6e0 b69cd35a

BUILD/check-cpu

+32 −0
Original line number Diff line number Diff line
@@ -19,8 +19,23 @@ if test -r /proc/cpuinfo ; then 
  if test -z "$model_name" ; then

    model_name=`uname -m`

  fi

else

  # Fallback when there is no /proc/cpuinfo

  case "`uname -s`" in

    FreeBSD)

      cpu_family=`uname -m`;

      model_name=`sysctl -b hw.model`

      ;;

    *)

      cpu_family=`uname -m`;

      model_name="unknown";

      ;;

  esac

fi



cpu_flag=""

cpu_flag_old=""



case "$cpu_family--$model_name" in

  Alpha*EV6*)

    cpu_flag="ev6";
@@ -28,11 +43,24 @@ case "$cpu_family--$model_name" in 
  *Xeon*)

    cpu_flag="nocona";

    ;;

  *Pentium*4*Mobile*CPU*)

    cpu_flag="pentium4m";

  ;;

  *Pentium*4*CPU*)

    cpu_flag="pentium4";

    ;;

  *Pentium*III*Mobile*CPU*)

    cpu_flag="pentium3m";

  ;;

  *Pentium*III*CPU*)

    cpu_flag="pentium3";

  ;;

  *Pentium*M*pro*)

    cpu_flag="pentium-m";

  ;;

  *Athlon*64*)

    cpu_flag="athlon64";

    cpu_flag_old="athlon";

    ;;

  *Athlon*)

    cpu_flag="athlon";
@@ -72,6 +100,10 @@ case "$cc_ver--$cc_verno" in 
    check_cpu_cflags="-mtune=$cpu_flag -march=$cpu_flag"

    ;;

  *GCC*)

    # Fix for older compiler versions

    if test -n "$cpu_flag_old"; then

      cpu_flag="$cpu_flag_old"

    fi

    check_cpu_cflags="-mcpu=$cpu_flag -march=$cpu_flag"

    ;;

  *)

BitKeeper/etc/logging_ok

+2 −0
Original line number Diff line number Diff line
@@ -115,6 +115,7 @@ jcole@sarvik.tfr.cafe.ee 
jcole@tetra.spaceapes.com

jimw@mysql.com

joerg@mysql.com

joerg@trift-lap.fambruehe

jon@gigan.

jonas@mysql.com

joreland@bk-internal.mysql.com
@@ -180,6 +181,7 @@ mwagner@cash.mwagner.org 
mwagner@evoq.mwagner.org

mwagner@here.mwagner.org

mwagner@mysql.com

mwagner@ultrafly.mysql.com

mwagner@work.mysql.com

mydev@mysql.com

mysql@home.(none)

client/client_priv.h

+1 −1
Original line number Diff line number Diff line
@@ -49,5 +49,5 @@ enum options_client 
#ifdef HAVE_NDBCLUSTER_DB

  OPT_NDBCLUSTER, OPT_NDB_CONNECTSTRING,

#endif

  OPT_IGNORE_TABLE

  OPT_IGNORE_TABLE,OPT_INSERT_IGNORE

};

client/mysql.cc

+9 −0
Original line number Diff line number Diff line
@@ -1100,6 +1100,7 @@ static bool add_line(String &buffer,char *line,char *in_string, 
  uchar inchar;

  char buff[80], *pos, *out;

  COMMANDS *com;

  bool need_space= 0;



  if (!line[0] && buffer.is_empty())

    return 0;
@@ -1208,6 +1209,7 @@ static bool add_line(String &buffer,char *line,char *in_string, 
    {

      pos++;

      *ml_comment= 0;

      need_space= 1;

    }      

    else

    {						// Add found char to buffer
@@ -1217,9 +1219,16 @@ static bool add_line(String &buffer,char *line,char *in_string, 
	       (inchar == '\'' || inchar == '"' || inchar == '`'))

	*in_string= (char) inchar;

      if (!*ml_comment)

      {

        if (need_space && !my_isspace(charset_info, (char)inchar))

        {

          *out++= ' ';

          need_space= 0;

        }

	*out++= (char) inchar;

      }

    }

  }

  if (out != line || !buffer.is_empty())

  {

    *out++='\n';

client/mysqldump.c

+12 −7
Original line number Diff line number Diff line
@@ -83,7 +83,7 @@ static my_bool verbose=0,tFlag=0,cFlag=0,dFlag=0,quick= 1, extended_insert= 1, 
		opt_autocommit=0,opt_disable_keys=1,opt_xml=0,

		opt_delete_master_logs=0, tty_password=0,

		opt_single_transaction=0, opt_comments= 0, opt_compact= 0,

		opt_hex_blob=0, opt_order_by_primary=0;

		opt_hex_blob=0, opt_order_by_primary=0, opt_ignore=0;

static ulong opt_max_allowed_packet, opt_net_buffer_length;

static MYSQL mysql_connection,*sock=0;

static char  insert_pat[12 * 1024],*opt_password=0,*current_user=0,
@@ -257,6 +257,9 @@ static struct my_option my_long_options[] = 
   "use the directive multiple times, once for each table.  Each table must "

   "be specified with both database and table names, e.g. --ignore-table=database.table",

   0, 0, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},

  {"insert-ignore", OPT_INSERT_IGNORE, "Insert rows with INSERT IGNORE.",

   (gptr*) &opt_ignore, (gptr*) &opt_ignore, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0,

   0, 0},

  {"lines-terminated-by", OPT_LTB, "Lines in the i.file are terminated by ...",

   (gptr*) &lines_terminated, (gptr*) &lines_terminated, 0, GET_STR,

   REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
@@ -1100,13 +1103,15 @@ static uint get_table_structure(char *table, char *db) 
  my_bool    init=0;

  uint       numFields;

  char	     *strpos, *result_table, *opt_quoted_table;

  const char *delayed;

  const char *insert_option;

  char	     name_buff[NAME_LEN+3],table_buff[NAME_LEN*2+3];

  char	     table_buff2[NAME_LEN*2+3];

  FILE       *sql_file = md_result_file;

  DBUG_ENTER("get_table_structure");



  delayed= opt_delayed ? " DELAYED " : "";

  insert_option= (opt_delayed && opt_ignore) ? " DELAYED IGNORE " : 

    opt_delayed ? " DELAYED " :

    opt_ignore ? " IGNORE " : "";



  if (verbose)

    fprintf(stderr, "-- Retrieving table structure for table %s...\n", table);
@@ -1190,11 +1195,11 @@ static uint get_table_structure(char *table, char *db) 


    if (cFlag)

      my_snprintf(insert_pat, sizeof(insert_pat), "INSERT %sINTO %s (", 

		  delayed, opt_quoted_table);

		  insert_option, opt_quoted_table);

    else

    {

      my_snprintf(insert_pat, sizeof(insert_pat), "INSERT %sINTO %s VALUES ", 

		  delayed, opt_quoted_table);

		  insert_option, opt_quoted_table);

      if (!extended_insert)

        strcat(insert_pat,"(");

    }
@@ -1258,11 +1263,11 @@ static uint get_table_structure(char *table, char *db) 
    }

    if (cFlag)

      my_snprintf(insert_pat, sizeof(insert_pat), "INSERT %sINTO %s (", 

		  delayed, result_table);

		  insert_option, result_table);

    else

    {

      my_snprintf(insert_pat, sizeof(insert_pat), "INSERT %sINTO %s VALUES ",

		  delayed, result_table);

		  insert_option, result_table);

      if (!extended_insert)

        strcat(insert_pat,"(");

    }