Commit 4374aaa5 authored by unknown's avatar unknown
Browse files

Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1 

into gw.mysql.r18.ru:/usr/home/ram/work/4.1.b6551
parents d2a3420d 0f0935ef

client/mysqldump.c

+7 −7
Original line number Diff line number Diff line
@@ -150,6 +150,9 @@ 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},

  {"comments", 'i', "Write additional information.",

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

   1, 0, 0, 0, 0, 0},

  {"compatible", OPT_COMPATIBLE,

   "Change the dump to be compatible with a given mode. By default tables are dumped in a format optimized for MySQL. Legal modes are: ansi, mysql323, mysql40, postgresql, oracle, mssql, db2, maxdb, no_key_options, no_table_options, no_field_options. One can use several modes separated by commas. Note: Requires MySQL server version 4.1.0 or higher. This option is ignored with earlier server versions.",

   (gptr*) &opt_compatible_mode_str, (gptr*) &opt_compatible_mode_str, 0,
@@ -225,6 +228,9 @@ static struct my_option my_long_options[] = 
   0, 0, 0, 0, 0, 0},

  {"help", '?', "Display this help message and exit.", 0, 0, 0, GET_NO_ARG,

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

  {"hex-blob", OPT_HEXBLOB, "Dump binary strings (BINARY, "

    "VARBINARY, BLOB) in hexadecimal format.",

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

  {"host", 'h', "Connect to host.", (gptr*) &current_host,

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

  {"lines-terminated-by", OPT_LTB, "Lines in the i.file are terminated by ...",
@@ -344,13 +350,7 @@ static struct my_option my_long_options[] = 
  {"net_buffer_length", OPT_NET_BUFFER_LENGTH, "",

    (gptr*) &opt_net_buffer_length, (gptr*) &opt_net_buffer_length, 0,

    GET_ULONG, REQUIRED_ARG, 1024*1024L-1025, 4096, 16*1024L*1024L,

    MALLOC_OVERHEAD-1024, 1024, 0},

  {"comments", 'i', "Write additional information.",

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

   1, 0, 0, 0, 0, 0},

  {"hex-blob", OPT_HEXBLOB, "Dump BLOBs in HEX.",

   (gptr*) &opt_hex_blob, (gptr*) &opt_hex_blob, 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}

    MALLOC_OVERHEAD-1024, 1024, 0}

};



static const char *load_default_groups[]= { "mysqldump","client",0 };

innobase/trx/trx0purge.c

+0 −24
Original line number Diff line number Diff line
@@ -1069,30 +1069,6 @@ trx_purge(void) 
		}

	}



	/* Determine how much data manipulation language (DML) statements

	need to be delayed in order to reduce the lagging of the purge

	thread. */

	srv_dml_needed_delay = 0; /* in microseconds; default: no delay */



	/* If we cannot advance the 'purge view' because of an old

	'consistent read view', then the DML statements cannot be delayed.

	Also, srv_max_purge_lag <= 0 means 'infinity'. */

	if (srv_max_purge_lag > 0

			&& !UT_LIST_GET_LAST(trx_sys->view_list)) {

		float	ratio = (float) trx_sys->rseg_history_len

				/ srv_max_purge_lag;

		if (ratio > ULINT_MAX / 10000) {

			/* Avoid overflow: maximum delay is 4295 seconds */

			srv_dml_needed_delay = ULINT_MAX;

		} else if (ratio > 1) {

			/* If the history list length exceeds the

			innodb_max_purge_lag, the

			data manipulation statements are delayed

			by at least 5000 microseconds. */

			srv_dml_needed_delay = (ulint) ((ratio - .5) * 10000);

		}

	}



	purge_sys->view = read_view_oldest_copy_or_open_new(NULL,

							purge_sys->heap);

	mutex_exit(&kernel_mutex);

myisam/mi_check.c

+8 −0
Original line number Diff line number Diff line
@@ -656,6 +656,14 @@ static int chk_index(MI_CHECK *param, MI_INFO *info, MI_KEYDEF *keyinfo, 
        if (chk_index_down(param,info,&info->s->ft2_keyinfo,record,

                           temp_buff,&tmp_keys,key_checksum,1))

          goto err;

        if (tmp_keys + subkeys)

        {

          mi_check_print_error(param,"Number of words in the 2nd level tree "

                                  "does not match the number in the header. "

                                  "Parent word in on the page %s, offset %d",

                                  llstr(page,llbuff), old_keypos-buff);

          goto err;

        }

        (*keys)+=tmp_keys-1;

        continue;

      }

myisam/mi_write.c

+1 −0
Original line number Diff line number Diff line
@@ -372,6 +372,7 @@ static int w_search(register MI_INFO *info, register MI_KEYDEF *keyinfo, 
        /* popular word. two-level tree. going down */

        my_off_t root=info->dupp_key_pos;

        keyinfo=&info->s->ft2_keyinfo;

        get_key_full_length_rdonly(off, key);

        key+=off;

        keypos-=keyinfo->keylength+nod_flag; /* we'll modify key entry 'in vivo' */

        error=_mi_ck_real_write_btree(info, keyinfo, key, 0,

mysql-test/mysql-test-run.sh

+1 −1
Original line number Diff line number Diff line
@@ -227,7 +227,7 @@ DO_CLIENT_GDB="" 
SLEEP_TIME_AFTER_RESTART=1

SLEEP_TIME_FOR_DELETE=10

SLEEP_TIME_FOR_FIRST_MASTER=400		# Enough time to create innodb tables

SLEEP_TIME_FOR_SECOND_MASTER=30

SLEEP_TIME_FOR_SECOND_MASTER=400

SLEEP_TIME_FOR_FIRST_SLAVE=400

SLEEP_TIME_FOR_SECOND_SLAVE=30

CHARACTER_SET=latin1