Commit 7c04ced1 authored by unknown's avatar unknown
Browse files

Merge bk-internal:/home/bk/mysql-3.23/ 

into serg.mylan:/usr/home/serg/Abk/mysql


client/mysqldump.c:
  Auto merged
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
parents b2a96d9b 418467e3

BitKeeper/etc/logging_ok

+3 −0
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ bar@bar.mysql.r18.ru 
bar@bar.udmsearch.izhnet.ru

bell@sanja.is.com.ua

bk@admin.bk

guilhem@mysql.com

heikki@donna.mysql.fi

heikki@hundin.mysql.fi

jani@hynda.mysql.fi
@@ -31,8 +32,10 @@ salle@geopard.(none) 
salle@geopard.online.bg

sasha@mysql.sashanet.com

serg@build.mysql2.com

serg@serg.mylan

serg@serg.mysql.com

serg@sergbook.mysql.com

sinisa@rhols221.adsl.netsonic.fi

vva@eagle.mysql.r18.ru

walrus@mysql.com

zak@balfor.local

client/client_priv.h

+2 −1
Original line number Diff line number Diff line
@@ -30,4 +30,5 @@ enum options { OPT_CHARSETS_DIR=256, OPT_DEFAULT_CHARSET, 
	       OPT_LOW_PRIORITY, OPT_AUTO_REPAIR, OPT_COMPRESS,

	       OPT_DROP, OPT_LOCKS, OPT_KEYWORDS, OPT_DELAYED, OPT_OPTIMIZE,

	       OPT_FTB, OPT_LTB, OPT_ENC, OPT_O_ENC, OPT_ESC, OPT_TABLES,

	       OPT_MASTER_DATA, OPT_AUTOCOMMIT, OPT_LOCAL_INFILE};
 
	       OPT_MASTER_DATA, OPT_AUTOCOMMIT, OPT_LOCAL_INFILE,

               OPT_DELETE_MASTER_LOGS};

client/mysqldump.c

+17 −8
Original line number Diff line number Diff line
@@ -73,7 +73,8 @@ static my_bool verbose=0,tFlag=0,cFlag=0,dFlag=0,quick=0, extended_insert = 0, 
		ignore=0,opt_drop=0,opt_keywords=0,opt_lock=0,opt_compress=0,

                opt_delayed=0,create_options=0,opt_quoted=0,opt_databases=0,

	        opt_alldbs=0,opt_create_db=0,opt_first_slave=0,

                opt_autocommit=0,opt_master_data,opt_disable_keys=0,opt_xml=0;

                opt_autocommit=0,opt_master_data,opt_disable_keys=0,opt_xml=0,

                opt_delete_master_logs=0;

static MYSQL  mysql_connection,*sock=0;

static char  insert_pat[12 * 1024],*opt_password=0,*current_user=0,

             *current_host=0,*path=0,*fields_terminated=0,
@@ -101,6 +102,7 @@ static struct option long_options[] = 
  {"debug",		optional_argument,	0, '#'},

  {"default-character-set", required_argument,  0, OPT_DEFAULT_CHARSET},

  {"delayed-insert",	no_argument,    0,	OPT_DELAYED},

  {"delete-master-logs", no_argument,    0,	OPT_DELETE_MASTER_LOGS},

  {"disable-keys",	no_argument,    0,	'K'},

  {"extended-insert",   no_argument,    0,	'e'},

  {"fields-terminated-by", required_argument,   0, (int) OPT_FTB},
@@ -206,9 +208,12 @@ static void usage(void) 
  --add-locks		Add locks around insert statements.\n\

  --allow-keywords	Allow creation of column names that are keywords.\n\

  --delayed-insert      Insert rows with INSERT DELAYED.\n\

  --delete-master-logs  Issue RESET MASTER on the master just after taking\n\

                        the dump, and before unlocking tables.\n\

                        This will automatically enable --first-slave.\n\

  --master-data         This will cause the master position and filename to \n\

                        be appended to your output. This will automagically \n\

                        enable --first-slave.\n\

                        be appended to your output, before unlocking tables.\n\

                        This will automatically enable --first-slave.\n\

  -F, --flush-logs	Flush logs file in server before starting dump.\n\

  -f, --force		Continue even if we get an sql-error.\n\

  -h, --host=...	Connect to host.\n");
@@ -317,6 +322,10 @@ static int get_options(int *argc,char ***argv) 
      opt_master_data=1;

      opt_first_slave=1;

      break;

    case OPT_DELETE_MASTER_LOGS:

      opt_delete_master_logs=1;

      opt_first_slave=1;

      break;

    case OPT_AUTOCOMMIT:

      opt_autocommit=1;

      break;
@@ -1489,6 +1498,11 @@ int main(int argc, char **argv) 


  if (opt_first_slave)

  {

    if (opt_delete_master_logs && mysql_query(sock, "FLUSH MASTER"))

    {

      my_printf_error(0, "Error: Couldn't execute 'FLUSH MASTER': %s",

		      MYF(0), mysql_error(sock));

    }

    if (opt_master_data)

    {

      if (mysql_query(sock, "SHOW MASTER STATUS") ||
@@ -1511,11 +1525,6 @@ int main(int argc, char **argv) 
	mysql_free_result(master);

      }

    }

    if (mysql_query(sock, "FLUSH MASTER"))

    {

      my_printf_error(0, "Error: Couldn't execute 'FLUSH MASTER': %s",

		      MYF(0), mysql_error(sock));

    }

    if (mysql_query(sock, "UNLOCK TABLES"))

    {

      my_printf_error(0, "Error: Couldn't execute 'UNLOCK TABLES': %s",

myisam/mi_dynrec.c

+2 −2
Original line number Diff line number Diff line
@@ -62,8 +62,8 @@ int _mi_write_blob_record(MI_INFO *info, const byte *record) 


  extra=ALIGN_SIZE(MI_MAX_DYN_BLOCK_HEADER)+MI_SPLIT_LENGTH+

    MI_DYN_DELETE_BLOCK_HEADER+1;

  reclength=info->s->base.pack_reclength+

    _my_calc_total_blob_length(info,record)+ extra;

  reclength= (info->s->base.pack_reclength+ info->s->base.pack_bits+

	      _my_calc_total_blob_length(info,record)+ extra);

  if (reclength > MI_DYN_MAX_ROW_LENGTH)

  {

    my_errno=HA_ERR_TO_BIG_ROW;

mysql-test/r/innodb.result

+10 −0
Original line number Diff line number Diff line
@@ -501,3 +501,13 @@ table type possible_keys key key_len ref rows Extra 
t1	ALL	NULL	NULL	NULL	NULL	4	

Field	Type	Null	Key	Default	Extra

testint	int(11)			1	

a	b

1	1

102	2

103	3

4	4

5	5

6	6

7	7

8	8

9	9