Commit e42a7761 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


BitKeeper/etc/logging_ok:
  auto-union
sql/item.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
parents a9cb1d76 28ea63a6

BitKeeper/etc/logging_ok

+1 −0
Original line number Diff line number Diff line
@@ -48,6 +48,7 @@ dlenev@build.mysql.com 
dlenev@jabberwock.localdomain

dlenev@mysql.com

ejonore@mc03.ndb.mysql.com

gbichot@production.mysql.com

gbichot@quadita2.mysql.com

gbichot@quadxeon.mysql.com

georg@beethoven.local

Docs/mysqld_error.txt

+2 −0
Original line number Diff line number Diff line
@@ -595,3 +595,5 @@ character-set=latin1 
"Invalid ON UPDATE clause for '%-.64s' field",

#define ER_UNSUPPORTED_PS 1295

"This command is not supported in the prepared statement protocol yet",

#define ER_CANT_CREATE_USER_WITH_GRANT 1296

"You are not allowed to create a user with GRANT"

client/mysqlbinlog.cc

+1 −1
Original line number Diff line number Diff line
@@ -33,9 +33,9 @@ 
#undef MYSQL_SERVER

#include "client_priv.h"

#include <my_time.h>

#include "log_event.h"

/* That one is necessary for defines of OPTION_NO_FOREIGN_KEY_CHECKS etc */

#include "mysql_priv.h" 

#include "log_event.h"



#define BIN_LOG_HEADER_SIZE	4

#define PROBE_HEADER_LEN	(EVENT_LEN_OFFSET+4)

client/mysqldump.c

+2 −3
Original line number Diff line number Diff line
@@ -1396,10 +1396,9 @@ static uint getTableStructure(char *table, char* db) 
      /* Get MySQL specific create options */

      if (create_options)

      {

	char show_name_buff[FN_REFLEN];

	char show_name_buff[NAME_LEN*2+2+24];



	/* Check memory for quote_for_like() */

	DBUG_ASSERT(2*sizeof(table) < sizeof(show_name_buff));

        my_snprintf(buff, sizeof(buff), "show table status like %s",

		    quote_for_like(table, show_name_buff));

client/mysqlshow.c

+62 −16
Original line number Diff line number Diff line
@@ -28,7 +28,8 @@ 
#include <sslopt-vars.h>



static my_string host=0,opt_password=0,user=0;

static my_bool opt_show_keys=0,opt_compress=0,opt_status=0, tty_password=0;

static my_bool opt_show_keys= 0, opt_compress= 0, opt_status= 0, 

  tty_password= 0, opt_table_type= 0;

static uint opt_verbose=0;

static char *default_charset= (char*) MYSQL_DEFAULT_CHARSET_NAME;
@@ -193,6 +194,9 @@ static struct my_option my_long_options[] = 
   "Base name of shared memory.", (gptr*) &shared_memory_base_name, (gptr*) &shared_memory_base_name,

   0, GET_STR_ALLOC, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},

#endif

  {"show-table-type", 't', "Show table type column.",

   (gptr*) &opt_table_type, (gptr*) &opt_table_type, 0, GET_BOOL,

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

  {"socket", 'S', "Socket file to use for connection.",

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

   REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
@@ -418,7 +422,7 @@ list_tables(MYSQL *mysql,const char *db,const char *table) 
{

  const char *header;

  uint head_length, counter = 0;

  char query[255], rows[64], fields[16];

  char query[255], rows[NAME_LEN], fields[16];

  MYSQL_FIELD *field;

  MYSQL_RES *result;

  MYSQL_ROW row, rrow;
@@ -429,7 +433,20 @@ list_tables(MYSQL *mysql,const char *db,const char *table) 
	    mysql_error(mysql));

    return 1;

  }

  if (!(result=mysql_list_tables(mysql,table)))

  if (table)

  {

    /*

      We just hijack the 'rows' variable for a bit to store the escaped

      table name

    */

    mysql_escape_string(rows, table, sizeof(rows));

    my_snprintf(query, sizeof(query), "show%s tables like '%s'",

                opt_table_type ? " full" : "", rows);

  }

  else

    my_snprintf(query, sizeof(query), "show%s tables",

                opt_table_type ? " full" : "");

  if (mysql_query(mysql, query) || !(result= mysql_store_result(mysql)))

  {

    fprintf(stderr,"%s: Cannot list tables in %s: %s\n",my_progname,db,

	    mysql_error(mysql));
@@ -446,12 +463,27 @@ list_tables(MYSQL *mysql,const char *db,const char *table) 
  if (head_length < field->max_length)

    head_length=field->max_length;



  if (opt_table_type)

  {

    if (!opt_verbose)

      print_header(header,head_length,"table_type",10,NullS);

    else if (opt_verbose == 1)

      print_header(header,head_length,"table_type",10,"Columns",8,NullS);

    else

    {

      print_header(header,head_length,"table_type",10,"Columns",8,

		   "Total Rows",10,NullS);

    }

  }

  else

  {

    if (!opt_verbose)

      print_header(header,head_length,NullS);

    else if (opt_verbose == 1)

      print_header(header,head_length,"Columns",8,NullS);

    else

      print_header(header,head_length,"Columns",8, "Total Rows",10,NullS);

  }



  while ((row = mysql_fetch_row(result)))

  {
@@ -500,6 +532,17 @@ list_tables(MYSQL *mysql,const char *db,const char *table) 
	strmov(rows,"N/A");

      }

    }

    if (opt_table_type)

    {

      if (!opt_verbose)

	print_row(row[0],head_length,row[1],10,NullS);

      else if (opt_verbose == 1)

	print_row(row[0],head_length,row[1],10,fields,8,NullS);

      else

	print_row(row[0],head_length,row[1],10,fields,8,rows,10,NullS);

    }

    else

    {

      if (!opt_verbose)

	print_row(row[0],head_length,NullS);

      else if (opt_verbose == 1)
@@ -507,10 +550,13 @@ list_tables(MYSQL *mysql,const char *db,const char *table) 
      else

	print_row(row[0],head_length, fields,8, rows,10, NullS);

    }

  }



  print_trailer(head_length,

		(opt_verbose > 0 ? 8 : 0),

		(opt_verbose > 1 ? 10 :0),

		(opt_table_type ? 10 : opt_verbose > 0 ? 8 : 0),

		(opt_table_type ? (opt_verbose > 0 ? 8 : 0) 

		 : (opt_verbose > 1 ? 10 :0)),

		!opt_table_type ? 0 : opt_verbose > 1 ? 10 :0,

		0);



  if (counter && opt_verbose)