Commit c0c013e5 authored by unknown's avatar unknown
Browse files

Merge mysql.com:/home/my/mysql-5.0 

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


BitKeeper/etc/ignore:
  auto-union
include/heap.h:
  Auto merged
include/my_pthread.h:
  Auto merged
mysql-test/r/show_check.result:
  Auto merged
mysql-test/r/type_bit.result:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
storage/heap/ha_heap.cc:
  Auto merged
mysys/my_thr_init.c:
  Manual merge
sql/mysqld.cc:
  Manual merge
sql/sql_class.h:
  Manual merge
sql/table.cc:
  Manual merge
parents 6bcbd7df 42fd48da

.bzrignore

+5 −0
Original line number Diff line number Diff line
@@ -212,6 +212,11 @@ bdb/dist/autom4te.cache/requests 
bdb/dist/autom4te.cache/traces.0

bdb/dist/config.hin

bdb/dist/configure

bdb/dist/db.h

bdb/dist/db_config.h

bdb/dist/db_cxx.h

bdb/dist/db_int.h

bdb/dist/include.tcl

bdb/dist/tags

bdb/dist/template/db_server_proc

bdb/dist/template/gen_client_ret

include/heap.h

+4 −4
Original line number Diff line number Diff line
@@ -46,8 +46,8 @@ typedef struct st_heapinfo /* Struct from heap_info */ 
  ulong records;			/* Records in database */

  ulong deleted;			/* Deleted records in database */

  ulong max_records;

  ulong data_length;

  ulong index_length;

  ulonglong data_length;

  ulonglong index_length;

  uint reclength;			/* Length of one record */

  int errkey;

  ulonglong auto_increment;
@@ -135,7 +135,7 @@ typedef struct st_heap_share 
  HP_BLOCK block;

  HP_KEYDEF  *keydef;

  ulong min_records,max_records;	/* Params to open */

  ulong data_length,index_length,max_table_size;

  ulonglong data_length,index_length,max_table_size;

  uint key_stat_version;                /* version to indicate insert/delete */

  uint records;				/* records */

  uint blength;				/* records rounded up to 2^n */
@@ -187,7 +187,7 @@ typedef struct st_heap_create_info 
{

  uint auto_key;                        /* keynr [1 - maxkey] for auto key */

  uint auto_key_type;

  ulong max_table_size;

  ulonglong max_table_size;

  ulonglong auto_increment;

  my_bool with_auto_increment;

} HP_CREATE_INFO;

include/my_pthread.h

+1 −2
Original line number Diff line number Diff line
@@ -599,14 +599,13 @@ struct st_my_thread_var 
};



extern struct st_my_thread_var *_my_thread_var(void) __attribute__ ((const));

extern uint my_thread_end_wait_time;

#define my_thread_var (_my_thread_var())

#define my_errno my_thread_var->thr_errno

/*

  Keep track of shutdown,signal, and main threads so that my_end() will not

  report errors with them

*/

extern pthread_t shutdown_th, main_th, signal_th;



	/* statistics_xxx functions are for not essential statistic */



#ifndef thread_safe_increment

mysql-test/r/show_check.result

+1 −1
Original line number Diff line number Diff line
@@ -334,7 +334,7 @@ SET sql_quote_show_create= @old_sql_quote_show_create; 
SET sql_mode= @old_sql_mode;

select @@max_heap_table_size;

@@max_heap_table_size

1047552

1048576

CREATE TABLE t1 (

a int(11) default NULL,

KEY a USING BTREE (a)

mysql-test/r/type_bit.result

+8 −0
Original line number Diff line number Diff line
@@ -610,4 +610,12 @@ select hex(a), b from t1; 
hex(a)	b

1	2

drop table t1;

create table t1(bit_field bit(2), int_field int, key a(bit_field));

insert into t1 values (1,2);

handler t1 open as t1;

handler t1 read a=(1);

bit_field	int_field

	2

handler t1 close;

drop table t1;

End of 5.0 tests