Commit 68c2afa8 authored by monty@hundin.mysql.fi's avatar monty@hundin.mysql.fi
Browse files

Merge work:/home/bk/mysql-4.0 into hundin.mysql.fi:/my/bk/mysql-4.0

parents 69ad7aef 59e7c97d

include/global.h

+3 −3
Original line number Diff line number Diff line
@@ -781,9 +781,9 @@ typedef union { 
				  *((uchar*) (T))=  (uchar)(def_temp); \

				  *((uchar*) (T+1))=(uchar)((def_temp >> 8)); }

#define int3store(T,A)		{ /*lint -save -e734 */\

				  *((T))=(char) ((A));\

				  *((T)+1)=(char) (((A) >> 8));\

				  *((T)+2)=(char) (((A) >> 16)); \

				  *((uchar*)(T))=(uchar) ((A));\

				  *((uchar*) (T)+1)=(uchar) (((A) >> 8));\

				  *((uchar*)(T)+2)=(uchar) (((A) >> 16)); \

				  /*lint -restore */}

#define int4store(T,A)		{ *(T)=(char) ((A));\

				  *((T)+1)=(char) (((A) >> 8));\

include/mysql_com.h

+3 −3
Original line number Diff line number Diff line
@@ -146,15 +146,15 @@ enum enum_field_types { FIELD_TYPE_DECIMAL, FIELD_TYPE_TINY, 
#define FIELD_TYPE_CHAR FIELD_TYPE_TINY		/* For compability */

#define FIELD_TYPE_INTERVAL FIELD_TYPE_ENUM	/* For compability */



extern unsigned long max_allowed_packet;

extern unsigned long net_buffer_length;



#define net_new_transaction(net) ((net)->pkt_nr=0)



#ifdef __cplusplus

extern "C" {

#endif



extern unsigned long max_allowed_packet;

extern unsigned long net_buffer_length;



int	my_net_init(NET *net, Vio* vio);

void	net_end(NET *net);

void	net_clear(NET *net);

include/mysqld_error.h

+2 −1
Original line number Diff line number Diff line
@@ -217,4 +217,5 @@ 
#define ER_ERROR_WHEN_EXECUTING_COMMAND 1214

#define ER_WRONG_USAGE 1215

#define ER_WRONG_NUMBER_OF_COLUMNS_IN_SELECT 1216

#define ER_ERROR_MESSAGES 217
 
#define ER_CANT_UPDATE_WITH_READLOCK 1217

#define ER_ERROR_MESSAGES 218

myisam/mi_write.c

+6 −3
Original line number Diff line number Diff line
@@ -35,7 +35,10 @@ static int _mi_balance_page(MI_INFO *info,MI_KEYDEF *keyinfo,uchar *key, 
static uchar *_mi_find_last_pos(MI_KEYDEF *keyinfo, uchar *page,

				uchar *key, uint *return_key_length,

				uchar **after_key);



int _mi_ck_write_tree(register MI_INFO *info, uint keynr, uchar *key,

		      uint key_length);

int _mi_ck_write_btree(register MI_INFO *info, uint keynr, uchar *key,

		       uint key_length);



	/* Write new record to database */

mysql-test/r/select.result

+1 −1
Original line number Diff line number Diff line
@@ -1210,7 +1210,7 @@ fld1 fld1 
companynr	companyname

table	type	possible_keys	key	key_len	ref	rows	Extra

t2	ALL	NULL	NULL	NULL	NULL	1199	

t4	eq_ref	PRIMARY	PRIMARY	1	t2.companynr	1	where used; Not exists

t4	eq_ref	PRIMARY	PRIMARY	1	test.t2.companynr	1	where used; Not exists

table	type	possible_keys	key	key_len	ref	rows	Extra

t4	ALL	NULL	NULL	NULL	NULL	12	

t2	ALL	NULL	NULL	NULL	NULL	1199	where used; Not exists