Commit 598df75b authored by unknown's avatar unknown
Browse files

merge 


BitKeeper/etc/logging_ok:
  auto-union
configure.in:
  Auto merged
libmysqld/Makefile.am:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
sql/field.cc:
  Auto merged
sql/field.h:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/ha_ndbcluster.h:
  Auto merged
sql/handler.cc:
  Auto merged
sql/handler.h:
  Auto merged
sql/item.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_delete.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged
sql/table.cc:
  Auto merged
sql/unireg.cc:
  Auto merged
storage/innobase/row/row0mysql.c:
  Auto merged
storage/myisam/mi_create.c:
  Auto merged
storage/myisam/mi_dynrec.c:
  Auto merged
storage/myisam/mi_key.c:
  Auto merged
storage/myisam/mi_locking.c:
  Auto merged
storage/myisam/mi_static.c:
  Auto merged
storage/myisam/mi_statrec.c:
  Auto merged
storage/myisam/mi_write.c:
  Auto merged
storage/myisam/myisamdef.h:
  Auto merged
storage/ndb/src/cw/cpcd/APIService.cpp:
  Auto merged
storage/ndb/src/cw/cpcd/APIService.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdict/Dbdict.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdict/SchemaFile.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdict/printSchemaFile.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Auto merged
storage/ndb/test/ndbapi/testNodeRestart.cpp:
  Auto merged
storage/ndb/test/ndbapi/testScan.cpp:
  Auto merged
storage/ndb/test/run-test/main.cpp:
  Auto merged
storage/ndb/test/run-test/run-test.hpp:
  Auto merged
parents d7451f73 9b07cafe

BUILD/check-cpu

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

  *Pentium*M*pro*)

    cpu_flag="pentium-m";

    cpu_flag_old="pentium";

  ;;

  *Athlon*64*)

    cpu_flag="athlon64";

BitKeeper/etc/config

+1 −0
Original line number Diff line number Diff line
@@ -69,6 +69,7 @@ pager: 
hours: 

[serg:]checkout:get

[arjen:]checkout:get

[kostja:]checkout:get

[nick:]checkout:get

checkout:edit

eoln:unix

BitKeeper/etc/logging_ok

+2 −0
Original line number Diff line number Diff line
@@ -58,6 +58,7 @@ evgen@moonbone.local 
gbichot@production.mysql.com

gbichot@quadita2.mysql.com

gbichot@quadxeon.mysql.com

geert@kriem.kemuri.org

georg@beethoven.local

georg@beethoven.site

georg@lmy002.wdf.sap.corp
@@ -127,6 +128,7 @@ kaa@polly.local 
kaj@work.mysql.com

kent@mysql.com

konstantin@mysql.com

kosipov@production.mysql.com

kostja@oak.local

lars@mysql.com

lenz@kallisto.mysql.com

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_IGNORE_TABLE,OPT_INSERT_IGNORE,OPT_SHOW_WARNINGS

};

client/mysql.cc

+69 −5
Original line number Diff line number Diff line
@@ -135,7 +135,8 @@ static my_bool info_flag=0,ignore_errors=0,wait_flag=0,quick=0, 
               opt_xml=0,opt_nopager=1, opt_outfile=0, named_cmds= 0,

	       tty_password= 0, opt_nobeep=0, opt_reconnect=1,

	       default_charset_used= 0, opt_secure_auth= 0,

               default_pager_set= 0, opt_sigint_ignore= 0;

               default_pager_set= 0, opt_sigint_ignore= 0,

         show_warnings = 0;

static ulong opt_max_allowed_packet, opt_net_buffer_length;

static uint verbose=0,opt_silent=0,opt_mysql_port=0, opt_local_infile=0;

static my_string opt_mysql_unix_port=0;
@@ -194,7 +195,8 @@ static int com_quit(String *str,char*), 
	   com_use(String *str,char*), com_source(String *str, char*),

	   com_rehash(String *str, char*), com_tee(String *str, char*),

           com_notee(String *str, char*),

           com_prompt(String *str, char*), com_delimiter(String *str, char*);

           com_prompt(String *str, char*), com_delimiter(String *str, char*),

     com_warnings(String *str, char*), com_nowarnings(String *str, char*);



#ifdef USE_POPEN

static int com_nopager(String *str, char*), com_pager(String *str, char*),
@@ -266,6 +268,10 @@ static COMMANDS commands[] = { 
    "Set outfile [to_outfile]. Append everything into given outfile." },

  { "use",    'u', com_use,    1,

    "Use another database. Takes database name as argument." },

  { "warnings", 'W', com_warnings,  0,

    "Show warnings after every statement." },

  { "nowarning", 'w', com_nowarnings, 0,

    "Don't show warnings after every statement." },

  /* Get bash-like expansion for some commands */

  { "create table",     0, 0, 0, ""},

  { "create database",  0, 0, 0, ""},
@@ -323,6 +329,7 @@ static void print_table_data_html(MYSQL_RES *result); 
static void print_table_data_xml(MYSQL_RES *result);

static void print_tab_data(MYSQL_RES *result);

static void print_table_data_vertically(MYSQL_RES *result);

static void print_warnings(void);

static ulong start_timer(void);

static void end_timer(ulong start_time,char *buff);

static void mysql_end_timer(ulong start_time,char *buff);
@@ -693,6 +700,9 @@ static struct my_option my_long_options[] = 
  {"secure-auth", OPT_SECURE_AUTH, "Refuse client connecting to server if it"

    " uses old (pre-4.1.1) protocol", (gptr*) &opt_secure_auth,

    (gptr*) &opt_secure_auth, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},

  {"show-warnings", OPT_SHOW_WARNINGS, "Show warnings after every statement.",

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

    0, 0, 0, 0, 0, 0},

  { 0, 0, 0, 0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0}

};
@@ -1962,6 +1972,13 @@ com_go(String *buffer,char *line __attribute__((unused))) 
  if (err >= 1)

    error= put_error(&mysql);



  if (show_warnings == 1 && warnings >= 1) /* Show warnings if any */

  {

    init_pager();

    print_warnings();

    end_pager();

  }



  if (!error && !status.batch && 

      (mysql.server_status & SERVER_STATUS_DB_DROPPED))

    get_current_db();
@@ -2077,7 +2094,8 @@ print_table_data(MYSQL_RES *result) 
    separator.fill(separator.length()+length+2,'-');

    separator.append('+');

  }

  tee_puts(separator.c_ptr_safe(), PAGER);

  separator.append('\0');                       // End marker for \0

  tee_puts((char*) separator.ptr(), PAGER);

  if (column_names)

  {

    mysql_field_seek(result,0);
@@ -2090,7 +2108,7 @@ print_table_data(MYSQL_RES *result) 
      num_flag[off]= IS_NUM(field->type);

    }

    (void) tee_fputs("\n", PAGER);

    tee_puts(separator.c_ptr(), PAGER);

    tee_puts((char*) separator.ptr(), PAGER);

  }



  while ((cur= mysql_fetch_row(result)))
@@ -2119,7 +2137,7 @@ print_table_data(MYSQL_RES *result) 
    }

    (void) tee_fputs("\n", PAGER);

  }

  tee_puts(separator.c_ptr(), PAGER);

  tee_puts((char*) separator.ptr(), PAGER);

  my_afree((gptr) num_flag);

}
@@ -2219,6 +2237,35 @@ print_table_data_vertically(MYSQL_RES *result) 
  }

}



/* print_warnings should be called right after executing a statement */

static void

print_warnings()

{

  char query[30];

  MYSQL_RES    *result;

  MYSQL_ROW    cur;

  MYSQL_FIELD  *field;



  /* Get the warnings */

  strmov(query,"show warnings");

  mysql_real_query_for_lazy(query,strlen(query));

  mysql_store_result_for_lazy(&result);



  /* Bail out when no warnings */

  my_ulonglong num_rows = mysql_num_rows(result);

  if (num_rows == 0) 

  {

    mysql_free_result(result);

    return;

  }



  /* Print the warnings */

  while ((cur= mysql_fetch_row(result)))

  {

    tee_fprintf(PAGER, "%s (Code %s): %s\n", cur[0], cur[1], cur[2]);

  }

  mysql_free_result(result);

}



static const char

*array_value(const char **array, char key)
@@ -2715,6 +2762,23 @@ com_use(String *buffer __attribute__((unused)), char *line) 
  return 0;

}



static int

com_warnings(String *buffer __attribute__((unused)),

   char *line __attribute__((unused)))

{

  show_warnings = 1;

  put_info("Show warnings enabled.",INFO_INFO);

  return 0;

}



static int

com_nowarnings(String *buffer __attribute__((unused)),

   char *line __attribute__((unused)))

{

  show_warnings = 0;

  put_info("Show warnings disabled.",INFO_INFO);

  return 0;

}



/*

  Gets argument from a command on the command line. If get_next_arg is