Commit 0939d7cf authored by unknown's avatar unknown
Browse files

Merge mysql.com:/home/jonas/src/mysql-5.0 

into mysql.com:/home/jonas/src/mysql-5.0-ndb


ndb/src/common/transporter/SCI_Transporter.cpp:
  Auto merged
sql/sql_select.cc:
  Auto merged
parents fe9d2f93 cf4cbe07

BUILD/check-cpu

+4 −0
Original line number Diff line number Diff line
@@ -72,6 +72,7 @@ case "$cpu_family--$model_name" in 
    ;;

  *ppc)

    cpu_flag="powerpc";

    no_march=1;

    ;;

  *)

    cpu_flag="";
@@ -106,6 +107,9 @@ case "$cc_ver--$cc_verno" in 
      cpu_flag="$cpu_flag_old"

    fi

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

    if test -n "$no_march"; then

      check_cpu_cflags="-mcpu=$cpu_flag"

    fi

    ;;

  *)

    check_cpu_cflags=""

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_INSERT_IGNORE,OPT_SHOW_WARNINGS

  OPT_IGNORE_TABLE,OPT_INSERT_IGNORE,OPT_SHOW_WARNINGS,OPT_DROP_DATABASE

};

client/mysqldump.c

+15 −4
Original line number Diff line number Diff line
@@ -85,7 +85,7 @@ static my_bool verbose=0,tFlag=0,dFlag=0,quick= 1, extended_insert= 1, 
		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_ignore=0,

                opt_complete_insert= 0;

                opt_complete_insert= 0, opt_drop_database= 0;

static ulong opt_max_allowed_packet, opt_net_buffer_length;

static MYSQL mysql_connection,*sock=0;

static my_bool insert_pat_inited=0;
@@ -161,6 +161,9 @@ static struct my_option my_long_options[] = 
   "Dump all the databases. This will be same as --databases with all databases selected.",

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

   0, 0},

  {"add-drop-database", OPT_DROP_DATABASE, "Add a 'DROP DATABASE' before each create.",

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

   0},

  {"add-drop-table", OPT_DROP, "Add a 'drop table' before each create.",

   (gptr*) &opt_drop, (gptr*) &opt_drop, 0, GET_BOOL, NO_ARG, 1, 0, 0, 0, 0,

   0},
@@ -1144,9 +1147,9 @@ static uint get_table_structure(char *table, char *db) 
  else

    dynstr_set(&insert_pat, "");



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

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

                  opt_delayed ? " DELAYED " :

    opt_ignore ? " IGNORE " : "";

                  opt_ignore ? " IGNORE " : "");



  if (verbose)

    fprintf(stderr, "-- Retrieving table structure for table %s...\n", table);
@@ -2116,12 +2119,20 @@ static int init_dumping(char *database) 
        if (mysql_query(sock, qbuf) || !(dbinfo = mysql_store_result(sock)))

        {

          /* Old server version, dump generic CREATE DATABASE */

          if (opt_drop_database)

            fprintf(md_result_file,

                    "\n/*!40000 DROP DATABASE IF EXISTS %s;*/\n",

                    qdatabase);

	  fprintf(md_result_file,

		  "\nCREATE DATABASE /*!32312 IF NOT EXISTS*/ %s;\n",

		  qdatabase);

	}

	else

        {

          if (opt_drop_database)

            fprintf(md_result_file,

                    "\n/*!40000 DROP DATABASE IF EXISTS %s*/;\n",

                    qdatabase);

	  row = mysql_fetch_row(dbinfo);

	  if (row[1])

	  {

include/my_global.h

+3 −1
Original line number Diff line number Diff line
@@ -310,12 +310,14 @@ C_MODE_END 
#endif

#if defined(__ia64__)

#define new my_arg_new

#define need_to_restore_new 1

#endif

C_MODE_START

#include <asm/atomic.h>

C_MODE_END

#if defined(__ia64__)

#ifdef need_to_restore_new /* probably safer than #ifdef new */

#undef new

#undef need_to_restore_new

#endif

#endif

#include <errno.h>				/* Recommended by debian */

mysql-test/r/mysql.result

0 → 100644
+50 −0
Original line number Diff line number Diff line 
drop table if exists t1;

create table t1(a int);

insert into t1 values(1);



Test default delimiter ;

a

1



Test delimiter without arg



Test delimiter :

a

1



Test delimiter :

a

1



Test delimiter :;

a

1



Test delimiter //

a

1



Test delimiter MySQL

a

1



Test delimiter delimiter

a

1



Test delimiter : from command line

a

1



Test delimiter :; from command line

a

1



Test 'go' command(vertical output) G

*************************** 1. row ***************************

a: 1



Test  'go' command g

a

1

drop table t1;