Commit e9c64ae2 authored by unknown's avatar unknown
Browse files

Merge mysql.com:/home/jimw/my/mysql-4.1-clean 

into  mysql.com:/home/jimw/my/mysql-5.0-clean


extra/perror.c:
  Auto merged
include/my_global.h:
  Auto merged
mysql-test/r/ps_1general.result:
  Auto merged
mysql-test/r/ps_2myisam.result:
  Auto merged
mysql-test/r/ps_3innodb.result:
  Auto merged
mysql-test/r/ps_4heap.result:
  Auto merged
mysql-test/r/ps_5merge.result:
  Auto merged
mysql-test/r/ps_6bdb.result:
  Auto merged
mysql-test/r/ps_7ndb.result:
  Auto merged
mysql-test/r/select.result:
  Auto merged
ndb/src/mgmsrv/ConfigInfo.cpp:
  Auto merged
ndb/src/mgmsrv/main.cpp:
  Auto merged
sql/des_key_file.cc:
  Auto merged
sql/field_conv.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/sql_prepare.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
tests/mysql_client_test.c:
  Auto merged
mysql-test/t/select.test:
  Resolve conflicts
scripts/mysqld_safe.sh:
  Resolve conflict
sql/item.cc:
  Resolve conflict, don't return FIELD_TYPE_BLOB since VARCHAR
  can be longer in 5.0 than 4.1.
sql/log_event.cc:
  Resolve conflict
sql/mysql_priv.h:
  Resolve conflict
sql/mysqld.cc:
  Remove incorrect fix (merge from 4.1)
sql/sql_show.cc:
  Resolve conflict
parents 6ae06030 abcd8b03

extra/perror.c

+1 −1
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ static struct my_option my_long_options[] = 
  {"info", 'I', "Synonym for --help.",  0, 0, 0, GET_NO_ARG,

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

#ifdef HAVE_NDBCLUSTER_DB

  {"ndb", 0, "Ndbcluster storage engine specific error codes.",  (gptr*) &ndb_code,

  {"ndb", 257, "Ndbcluster storage engine specific error codes.",  (gptr*) &ndb_code,

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

#endif

#ifdef HAVE_SYS_ERRLIST

include/my_global.h

+6 −3
Original line number Diff line number Diff line
@@ -1006,6 +1006,7 @@ do { doubleget_union _tmp; \ 
#define float8get(V,M) doubleget((V),(M))

#define float4store(V,M) memcpy((byte*) V,(byte*) (&M),sizeof(float))

#define floatstore(T,V)  memcpy((byte*)(T), (byte*)(&V),sizeof(float))

#define floatget(V,M)    memcpy((byte*) &V,(byte*) (M),sizeof(float))

#define float8store(V,M) doublestore((V),(M))

#endif /* __i386__ */
@@ -1176,6 +1177,7 @@ do { doubleget_union _tmp; \ 
                             *(((char*)T)+1)=(((A) >> 16));\

                             *(((char*)T)+0)=(((A) >> 24)); } while(0)



#define floatget(V,M)    memcpy_fixed((byte*) &V,(byte*) (M),sizeof(float))

#define floatstore(T,V)  memcpy_fixed((byte*) (T),(byte*)(&V),sizeof(float))

#define doubleget(V,M)	 memcpy_fixed((byte*) &V,(byte*) (M),sizeof(double))

#define doublestore(T,V) memcpy_fixed((byte*) (T),(byte*) &V,sizeof(double))
@@ -1192,6 +1194,7 @@ do { doubleget_union _tmp; \ 
#define longstore(T,V)	int4store(T,V)

#ifndef floatstore

#define floatstore(T,V)  memcpy_fixed((byte*) (T),(byte*) (&V),sizeof(float))

#define floatget(V,M)    memcpy_fixed((byte*) &V, (byte*) (M), sizeof(float))

#endif

#ifndef doubleget

#define doubleget(V,M)	 memcpy_fixed((byte*) &V,(byte*) (M),sizeof(double))

mysql-test/r/ps_1general.result

+6 −6
Original line number Diff line number Diff line
@@ -473,12 +473,12 @@ def id 8 3 1 N 32929 0 63 
def					select_type	253	19	6	N	1	31	8

def					table	253	64	2	Y	0	31	8

def					type	253	10	3	Y	0	31	8

def					possible_keys	253	4096	0	Y	0	31	8

def					possible_keys	252	4096	0	Y	0	31	8

def					key	253	64	0	Y	0	31	8

def					key_len	253	4096	0	Y	128	31	63

def					ref	253	1024	0	Y	0	31	8

def					ref	252	1024	0	Y	0	31	8

def					rows	8	10	1	Y	32928	0	63

def					Extra	253	255	14	N	1	31	8

def					Extra	252	255	14	N	1	31	8

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t1	ALL	NULL	NULL	NULL	NULL	4	Using filesort

SET @arg00=1 ;
@@ -489,12 +489,12 @@ def id 8 3 1 N 32929 0 63 
def					select_type	253	19	6	N	1	31	8

def					table	253	64	2	Y	0	31	8

def					type	253	10	5	Y	0	31	8

def					possible_keys	253	4096	7	Y	0	31	8

def					possible_keys	252	4096	7	Y	0	31	8

def					key	253	64	7	Y	0	31	8

def					key_len	253	4096	1	Y	128	31	63

def					ref	253	1024	0	Y	0	31	8

def					ref	252	1024	0	Y	0	31	8

def					rows	8	10	1	Y	32928	0	63

def					Extra	253	255	27	N	1	31	8

def					Extra	252	255	27	N	1	31	8

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t1	range	PRIMARY	PRIMARY	4	NULL	3	Using where; Using filesort

drop table if exists t2;

mysql-test/r/ps_2myisam.result

+3 −3
Original line number Diff line number Diff line
@@ -1154,12 +1154,12 @@ def id 8 3 1 N 32929 0 63 
def					select_type	253	19	6	N	1	31	8

def					table	253	64	2	Y	0	31	8

def					type	253	10	3	Y	0	31	8

def					possible_keys	253	4096	0	Y	0	31	8

def					possible_keys	252	4096	0	Y	0	31	8

def					key	253	64	0	Y	0	31	8

def					key_len	253	4096	0	Y	128	31	63

def					ref	253	1024	0	Y	0	31	8

def					ref	252	1024	0	Y	0	31	8

def					rows	8	10	1	Y	32928	0	63

def					Extra	253	255	0	N	1	31	8

def					Extra	252	255	0	N	1	31	8

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t9	ALL	NULL	NULL	NULL	NULL	2	

drop table if exists t2 ;

mysql-test/r/ps_3innodb.result

+3 −3
Original line number Diff line number Diff line
@@ -1154,12 +1154,12 @@ def id 8 3 1 N 32929 0 63 
def					select_type	253	19	6	N	1	31	8

def					table	253	64	2	Y	0	31	8

def					type	253	10	3	Y	0	31	8

def					possible_keys	253	4096	0	Y	0	31	8

def					possible_keys	252	4096	0	Y	0	31	8

def					key	253	64	0	Y	0	31	8

def					key_len	253	4096	0	Y	128	31	63

def					ref	253	1024	0	Y	0	31	8

def					ref	252	1024	0	Y	0	31	8

def					rows	8	10	1	Y	32928	0	63

def					Extra	253	255	0	N	1	31	8

def					Extra	252	255	0	N	1	31	8

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t9	ALL	NULL	NULL	NULL	NULL	2	

test_sequence