Commit 24bbc92b authored by unknown's avatar unknown
Browse files

Merge bk-internal.mysql.com:/home/bk/mysql-5.1-marvel 

into  mysql.com:/home/my/mysql-5.1


BUILD/SETUP.sh:
  Auto merged
mysql-test/t/create.test:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/table.cc:
  Auto merged
tests/mysql_client_test.c:
  Auto merged
sql/log_event.cc:
  Manual merge
sql/sql_binlog.cc:
  Manual merge
parents 6ea76b81 f7004087

.bzrignore

+1 −0
Original line number Diff line number Diff line
@@ -1252,6 +1252,7 @@ mysql-test/r/*.err 
mysql-test/r/*.log

mysql-test/r/*.out

mysql-test/r/*.reject

mysql-test/r/*.warnings

mysql-test/r/alter_table.err

mysql-test/r/archive.err

mysql-test/r/backup.log

client/client_priv.h

+2 −1
Original line number Diff line number Diff line
@@ -58,5 +58,6 @@ enum options_client 
  OPT_IGNORE_TABLE,OPT_INSERT_IGNORE,OPT_SHOW_WARNINGS,OPT_DROP_DATABASE,

  OPT_TZ_UTC, OPT_AUTO_CLOSE, OPT_CREATE_SLAP_SCHEMA,

  OPT_MYSQL_REPLACE_INTO, OPT_BASE64_OUTPUT, OPT_SERVER_ID,

  OPT_FIX_TABLE_NAMES, OPT_FIX_DB_NAMES, OPT_SSL_VERIFY_SERVER_CERT

  OPT_FIX_TABLE_NAMES, OPT_FIX_DB_NAMES, OPT_SSL_VERIFY_SERVER_CERT,

  OPT_DEBUG_INFO, OPT_COLUMN_TYPES

};

client/mysql.cc

+14 −9
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ 
#include <locale.h>

#endif



const char *VER= "14.12";

const char *VER= "14.13";



/* Don't try to make a nice table if the data is too big */

#define MAX_COLUMN_LENGTH	     1024
@@ -140,6 +140,7 @@ static my_bool info_flag=0,ignore_errors=0,wait_flag=0,quick=0, 
	       default_charset_used= 0, opt_secure_auth= 0,

               default_pager_set= 0, opt_sigint_ignore= 0,

               show_warnings= 0, executing_query= 0, interrupted_query= 0;

static my_bool column_types_flag;

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;
@@ -545,7 +546,7 @@ sig_handler mysql_end(int sig) 
  my_free(current_prompt,MYF(MY_ALLOW_ZERO_PTR));

  mysql_server_end();

  free_defaults(defaults_argv);

  my_end(info_flag ? MY_CHECK_ERROR | MY_GIVE_INFO : 0);

  my_end(info_flag ? MY_CHECK_ERROR : 0);

  exit(status.exit_status);

}
@@ -600,12 +601,13 @@ static struct my_option my_long_options[] = 
  {"character-sets-dir", OPT_CHARSETS_DIR,

   "Directory where character sets are.", (gptr*) &charsets_dir,

   (gptr*) &charsets_dir, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},

  {"default-character-set", OPT_DEFAULT_CHARSET,

   "Set the default character set.", (gptr*) &default_charset,

   (gptr*) &default_charset, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},

  {"column-type-info", OPT_COLUMN_TYPES, "Display column type information.",

   (gptr*) &column_types_flag, (gptr*) &column_types_flag,

   0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},

  {"compress", 'C', "Use compression in server/client protocol.",

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

   0, 0, 0},



#ifdef DBUG_OFF

  {"debug", '#', "This is a non-debug version. Catch this and exit",

   0,0, 0, GET_DISABLED, OPT_ARG, 0, 0, 0, 0, 0, 0},
@@ -613,8 +615,13 @@ static struct my_option my_long_options[] = 
  {"debug", '#', "Output debug log", (gptr*) &default_dbug_option,

   (gptr*) &default_dbug_option, 0, GET_STR, OPT_ARG, 0, 0, 0, 0, 0, 0},

#endif

  {"debug-info", 'T', "Print some debug info at exit.", (gptr*) &info_flag,

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

  {"database", 'D', "Database to use.", (gptr*) &current_db,

   (gptr*) &current_db, 0, GET_STR_ALLOC, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},

  {"default-character-set", OPT_DEFAULT_CHARSET,

   "Set the default character set.", (gptr*) &default_charset,

   (gptr*) &default_charset, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},

  {"delimiter", OPT_DELIMITER, "Delimiter to be used.", (gptr*) &delimiter_str,

   (gptr*) &delimiter_str, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},

  {"execute", 'e', "Execute command and quit. (Disables --force and history file)", 0,
@@ -711,8 +718,6 @@ static struct my_option my_long_options[] = 
#include "sslopt-longopts.h"

  {"table", 't', "Output in table format.", (gptr*) &output_tables,

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

  {"debug-info", 'T', "Print some debug info at exit.", (gptr*) &info_flag,

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

  {"tee", OPT_TEE,

   "Append everything into outfile. See interactive help (\\h) also. Does not work in batch mode. Disable with --disable-tee. This option is disabled by default.",

   0, 0, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
@@ -2085,7 +2090,7 @@ com_go(String *buffer,char *line __attribute__((unused))) 
      time_buff[0]=0;

    if (result)

    {

      if (!mysql_num_rows(result) && ! quick && !info_flag)

      if (!mysql_num_rows(result) && ! quick && !column_types_flag)

      {

	strmov(buff, "Empty set");

      }
@@ -2324,7 +2329,7 @@ print_table_data(MYSQL_RES *result) 
  bool		*num_flag;



  num_flag=(bool*) my_alloca(sizeof(bool)*mysql_num_fields(result));

  if (info_flag)

  if (column_types_flag)

  {

    print_field_types(result);

    if (!mysql_num_rows(result))

client/mysql_upgrade.c

+1 −1
Original line number Diff line number Diff line
@@ -629,7 +629,7 @@ int main(int argc, char **argv) 
  if (upgrade_defaults_created)

    my_delete(upgrade_defaults_path, MYF(0));

  

  my_end(info_flag ? MY_CHECK_ERROR | MY_GIVE_INFO : 0);

  my_end(info_flag ? MY_CHECK_ERROR : 0);

  return ret;

}

client/mysqladmin.cc

+5 −3
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ 
#include "../ndb/src/mgmclient/ndb_mgmclient.h"

#endif



#define ADMIN_VERSION "8.41"

#define ADMIN_VERSION "8.42"

#define MAX_MYSQL_VAR 256

#define SHUTDOWN_DEF_TIMEOUT 3600		/* Wait for shutdown */

#define MAX_TRUNC_LENGTH 3
@@ -41,7 +41,7 @@ ulonglong last_values[MAX_MYSQL_VAR]; 
static int interval=0;

static my_bool option_force=0,interrupted=0,new_line=0,

               opt_compress=0, opt_relative=0, opt_verbose=0, opt_vertical=0,

               tty_password=0;

               tty_password= 0, info_flag= 0;

static uint tcp_port = 0, option_wait = 0, option_silent=0, nr_iterations,

            opt_count_iterations= 0;

static ulong opt_connect_timeout, opt_shutdown_timeout;
@@ -136,6 +136,8 @@ static struct my_option my_long_options[] = 
   REQUIRED_ARG, 0, 0, 0, 0, 0, 0},

  {"debug", '#', "Output debug log. Often this is 'd:t:o,filename'.",

   0, 0, 0, GET_STR, OPT_ARG, 0, 0, 0, 0, 0, 0},

  {"debug-info", OPT_DEBUG_INFO, "Print some debug info at exit.", (gptr*) &info_flag,

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

  {"force", 'f',

   "Don't ask for confirmation on drop database; with multiple commands, continue even if an error occurs.",

   (gptr*) &option_force, (gptr*) &option_force, 0, GET_BOOL, NO_ARG, 0, 0,
@@ -412,7 +414,7 @@ int main(int argc,char *argv[]) 
  my_free(shared_memory_base_name,MYF(MY_ALLOW_ZERO_PTR));

#endif

  free_defaults(save_argv);

  my_end(0);

  my_end(info_flag ? MY_CHECK_ERROR : 0);

  exit(error ? 1 : 0);

  return 0;

}