Commit 2f8b0ab3 authored by unknown's avatar unknown
Browse files

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

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


sql/item.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
parents 6a931667 af84ae00

client/mysql.cc

+3 −2
Original line number Diff line number Diff line
@@ -1971,7 +1971,7 @@ print_field_types(MYSQL_RES *result) 
  MYSQL_FIELD	*field;  

  while ((field = mysql_fetch_field(result)))

  {

    tee_fprintf(PAGER,"Catalog:    '%s'\nDatabase:   '%s'\nTable:      '%s'\nName:       '%s'\nType:       %d\nLength:     %d\nMax length: %d\nIs_null:    %d\nFlags:      %d\nDecimals:   %d\n\n",

    tee_fprintf(PAGER,"Catalog:    '%s'\nDatabase:   '%s'\nTable:      '%s'\nName:       '%s'\nType:       %d\nLength:     %ld\nMax length: %ld\nIs_null:    %d\nFlags:      %u\nDecimals:   %u\n\n",

		field->catalog, field->db, field->table, field->name,

		(int) field->type,

		field->length, field->max_length,
@@ -2017,7 +2017,8 @@ print_table_data(MYSQL_RES *result) 
    (void) tee_fputs("|", PAGER);

    for (uint off=0; (field = mysql_fetch_field(result)) ; off++)

    {

      tee_fprintf(PAGER, " %-*s|",min(field->max_length,MAX_COLUMN_LENGTH),

      tee_fprintf(PAGER, " %-*s|",(int) min(field->max_length,

                                            MAX_COLUMN_LENGTH),

		  field->name);

      num_flag[off]= IS_NUM(field->type);

    }

client/mysqltest.c

+6 −5
Original line number Diff line number Diff line
@@ -362,8 +362,7 @@ DYNAMIC_STRING ds_res; 
static void die(const char *fmt, ...);

static void init_var_hash();

static VAR* var_from_env(const char *, const char *);

static byte* get_var_key(const byte* rec, uint* len,

			 my_bool __attribute__((unused)) t);

static byte* get_var_key(const byte* rec, uint* len, my_bool t);

static VAR* var_init(VAR* v, const char *name, int name_len, const char *val,

		     int val_len);
@@ -1807,6 +1806,10 @@ int read_line(char* buf, int size) 
      continue;

    }



    /* Line counting is independent of state */

    if (c == '\n')

      (*lineno)++;



    switch(state) {

    case R_NORMAL:

      /*  Only accept '{' in the beginning of a line */
@@ -1822,14 +1825,12 @@ int read_line(char* buf, int size) 
      else if (c == '\n')

      {

	state = R_LINE_START;

	(*lineno)++;

      }

      break;

    case R_COMMENT:

      if (c == '\n')

      {

	*p= 0;

	(*lineno)++;

	DBUG_RETURN(0);

      }

      break;
@@ -1841,7 +1842,7 @@ int read_line(char* buf, int size) 
      else if (my_isspace(charset_info, c))

      {

	if (c == '\n')

	  start_lineno= ++*lineno;		/* Query hasn't started yet */

	  start_lineno= *lineno;		/* Query hasn't started yet */

	no_save= 1;

      }

      else if (c == '}')

heap/hp_hash.c

+2 −2
Original line number Diff line number Diff line
@@ -585,7 +585,7 @@ uint hp_rb_make_key(HP_KEYDEF *keydef, byte *key, 
                              char_length / seg->charset->mbmaxlen);

      set_if_smaller(char_length, seg->length); /* QQ: ok to remove? */

      if (char_length < seg->length)

        seg->charset->cset->fill(seg->charset, key + char_length, 

        seg->charset->cset->fill(seg->charset, (char*) key + char_length, 

                                 seg->length - char_length, ' ');

    }

    memcpy(key, rec + seg->start, (size_t) char_length);
@@ -634,7 +634,7 @@ uint hp_rb_pack_key(HP_KEYDEF *keydef, uchar *key, const uchar *old, 
                              char_length / seg->charset->mbmaxlen);

      set_if_smaller(char_length, seg->length); /* QQ: ok to remove? */

      if (char_length < seg->length)

        seg->charset->cset->fill(seg->charset, key + char_length, 

        seg->charset->cset->fill(seg->charset, (char*) key + char_length, 

                                 seg->length - char_length, ' ');

    }

    memcpy(key, old, (size_t) char_length);

innobase/dict/dict0load.c

+13 −13
Original line number Diff line number Diff line
@@ -92,7 +92,7 @@ dict_get_first_table_name_in_db( 


		/* We found one */



		char*	table_name = mem_strdupl(field, len);

                char*	table_name = mem_strdupl((char*) field, len);

		

		btr_pcur_close(&pcur);

		mtr_commit(&mtr);
@@ -154,7 +154,7 @@ dict_print(void) 


		/* We found one */



		char*	table_name = mem_strdupl(field, len);

                char*	table_name = mem_strdupl((char*) field, len);



		btr_pcur_store_position(&pcur, &mtr);
@@ -246,7 +246,7 @@ dict_check_tablespaces_or_store_max_id( 


		/* We found one */



		char*	name = mem_strdupl(field, len);

                char*	name = mem_strdupl((char*) field, len);



		field = rec_get_nth_field(rec, 9, &len);

		ut_a(len == 4);
@@ -347,7 +347,7 @@ dict_load_columns( 
			dict_table_get_first_index(sys_columns), 4))->name));



		field = rec_get_nth_field(rec, 4, &len);

		name = mem_heap_strdupl(heap, field, len);

		name = mem_heap_strdupl(heap, (char*) field, len);



		field = rec_get_nth_field(rec, 5, &len);

		mtype = mach_read_from_4(field);
@@ -494,7 +494,7 @@ dict_load_fields( 
		field = rec_get_nth_field(rec, 4, &len);



		dict_mem_index_add_field(index,

			mem_heap_strdupl(heap, field, len), 0, prefix_len);

                                         mem_heap_strdupl(heap, (char*) field, len), 0, prefix_len);



		btr_pcur_move_to_next_user_rec(&pcur, &mtr);

	}
@@ -597,7 +597,7 @@ dict_load_indexes( 
			dict_table_get_first_index(sys_indexes), 4))->name));

		

		field = rec_get_nth_field(rec, 4, &name_len);

		name_buf = mem_heap_strdupl(heap, field, name_len);

		name_buf = mem_heap_strdupl(heap, (char*) field, name_len);



		field = rec_get_nth_field(rec, 5, &len);

		n_fields = mach_read_from_4(field);
@@ -805,7 +805,7 @@ dict_load_table( 
		table->mix_id = mach_read_from_8(field);



		field = rec_get_nth_field(rec, 8, &len);

		table->cluster_name = mem_heap_strdupl(heap, field, len);

		table->cluster_name = mem_heap_strdupl(heap, (char*) field, len);

#endif

	}
@@ -938,7 +938,7 @@ dict_load_table_on_id( 
	/* Now we get the table name from the record */

	field = rec_get_nth_field(rec, 1, &len);

	/* Load the table definition to memory */

	table = dict_load_table(mem_heap_strdupl(heap, field, len));

	table = dict_load_table(mem_heap_strdupl(heap, (char*) field, len));

	

	btr_pcur_close(&pcur);

	mtr_commit(&mtr);
@@ -1030,11 +1030,11 @@ dict_load_foreign_cols( 


		field = rec_get_nth_field(rec, 4, &len);

		foreign->foreign_col_names[i] =

			mem_heap_strdupl(foreign->heap, field, len);

                        mem_heap_strdupl(foreign->heap, (char*) field, len);



		field = rec_get_nth_field(rec, 5, &len);

		foreign->referenced_col_names[i] =

			mem_heap_strdupl(foreign->heap, field, len);

                  mem_heap_strdupl(foreign->heap, (char*) field, len);



		btr_pcur_move_to_next_user_rec(&pcur, &mtr);

	}
@@ -1138,11 +1138,11 @@ dict_load_foreign( 


	field = rec_get_nth_field(rec, 3, &len);

	foreign->foreign_table_name =

		mem_heap_strdupl(foreign->heap, field, len);

                mem_heap_strdupl(foreign->heap, (char*) field, len);

	

	field = rec_get_nth_field(rec, 4, &len);

	foreign->referenced_table_name =

		mem_heap_strdupl(foreign->heap, field, len);

                mem_heap_strdupl(foreign->heap, (char*) field, len);



	btr_pcur_close(&pcur);

	mtr_commit(&mtr);
@@ -1256,7 +1256,7 @@ dict_load_foreigns( 


	/* Now we get a foreign key constraint id */

	field = rec_get_nth_field(rec, 1, &len);

	id = mem_heap_strdupl(heap, field, len);

	id = mem_heap_strdupl(heap, (char*) field, len);

	

	btr_pcur_store_position(&pcur, &mtr);

innobase/include/mem0mem.h

+2 −4
Original line number Diff line number Diff line
@@ -136,10 +136,8 @@ void 
mem_heap_free_func(

/*===============*/

	mem_heap_t*   	heap,  		/* in, own: heap to be freed */

	const char*	file_name __attribute__((unused)),

					/* in: file name where freed */

	ulint    	line  __attribute__((unused)));

					/* in: line where freed */

	const char*	file_name, 	/* in: file name where freed */

	ulint    	line);		/* in: line where freed */

/*******************************************************************

Allocates n bytes of memory from a memory heap. */

UNIV_INLINE