Skip to content

Commit 80c1c6b

Browse files
author
[email protected]
committed
Merge mysql.com:/home/jimw/my/mysql-4.1-clean
into mysql.com:/home/jimw/my/mysql-5.0-clean
2 parents f40ac0b + bb6918e commit 80c1c6b

27 files changed

Lines changed: 329 additions & 266 deletions

‎extra/perror.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ static struct my_option my_long_options[] =
4141
{"info", 'I', "Synonym for --help.", 0, 0, 0, GET_NO_ARG,
4242
NO_ARG, 0, 0, 0, 0, 0, 0},
4343
#ifdef HAVE_NDBCLUSTER_DB
44-
{"ndb", 0, "Ndbcluster storage engine specific error codes.", (gptr*) &ndb_code,
44+
{"ndb", 257, "Ndbcluster storage engine specific error codes.", (gptr*) &ndb_code,
4545
(gptr*) &ndb_code, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
4646
#endif
4747
#ifdef HAVE_SYS_ERRLIST

‎include/my_global.h‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1005,7 +1005,8 @@ do { doubleget_union _tmp; \
10051005
#define float4get(V,M) do { *((long *) &(V)) = *((long*) (M)); } while(0)
10061006
#define float8get(V,M) doubleget((V),(M))
10071007
#define float4store(V,M) memcpy((byte*) V,(byte*) (&M),sizeof(float))
1008-
#define floatstore(T,V) memcpy((byte*)(T), (byte*)(&V), sizeof(float))
1008+
#define floatstore(T,V) memcpy((byte*)(T), (byte*)(&V),sizeof(float))
1009+
#define floatget(V,M) memcpy((byte*) &V,(byte*) (M),sizeof(float))
10091010
#define float8store(V,M) doublestore((V),(M))
10101011
#endif /* __i386__ */
10111012

@@ -1176,7 +1177,8 @@ do { doubleget_union _tmp; \
11761177
*(((char*)T)+1)=(((A) >> 16));\
11771178
*(((char*)T)+0)=(((A) >> 24)); } while(0)
11781179

1179-
#define floatstore(T,V) memcpy_fixed((byte*)(T), (byte*)(&V), sizeof(float))
1180+
#define floatget(V,M) memcpy_fixed((byte*) &V,(byte*) (M),sizeof(float))
1181+
#define floatstore(T,V) memcpy_fixed((byte*) (T),(byte*)(&V),sizeof(float))
11801182
#define doubleget(V,M) memcpy_fixed((byte*) &V,(byte*) (M),sizeof(double))
11811183
#define doublestore(T,V) memcpy_fixed((byte*) (T),(byte*) &V,sizeof(double))
11821184
#define longlongget(V,M) memcpy_fixed((byte*) &V,(byte*) (M),sizeof(ulonglong))
@@ -1191,7 +1193,8 @@ do { doubleget_union _tmp; \
11911193
#define shortstore(T,V) int2store(T,V)
11921194
#define longstore(T,V) int4store(T,V)
11931195
#ifndef floatstore
1194-
#define floatstore(T,V) memcpy_fixed((byte*)(T), (byte*)(&V), sizeof(float))
1196+
#define floatstore(T,V) memcpy_fixed((byte*) (T),(byte*) (&V),sizeof(float))
1197+
#define floatget(V,M) memcpy_fixed((byte*) &V, (byte*) (M), sizeof(float))
11951198
#endif
11961199
#ifndef doubleget
11971200
#define doubleget(V,M) memcpy_fixed((byte*) &V,(byte*) (M),sizeof(double))

‎mysql-test/r/ps_1general.result‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -473,12 +473,12 @@ def id 8 3 1 N 32929 0 63
473473
def select_type 253 19 6 N 1 31 8
474474
def table 253 64 2 Y 0 31 8
475475
def type 253 10 3 Y 0 31 8
476-
def possible_keys 253 4096 0 Y 0 31 8
476+
def possible_keys 252 4096 0 Y 0 31 8
477477
def key 253 64 0 Y 0 31 8
478478
def key_len 253 4096 0 Y 128 31 63
479-
def ref 253 1024 0 Y 0 31 8
479+
def ref 252 1024 0 Y 0 31 8
480480
def rows 8 10 1 Y 32928 0 63
481-
def Extra 253 255 14 N 1 31 8
481+
def Extra 252 255 14 N 1 31 8
482482
id select_type table type possible_keys key key_len ref rows Extra
483483
1 SIMPLE t1 ALL NULL NULL NULL NULL 4 Using filesort
484484
SET @arg00=1 ;
@@ -489,12 +489,12 @@ def id 8 3 1 N 32929 0 63
489489
def select_type 253 19 6 N 1 31 8
490490
def table 253 64 2 Y 0 31 8
491491
def type 253 10 5 Y 0 31 8
492-
def possible_keys 253 4096 7 Y 0 31 8
492+
def possible_keys 252 4096 7 Y 0 31 8
493493
def key 253 64 7 Y 0 31 8
494494
def key_len 253 4096 1 Y 128 31 63
495-
def ref 253 1024 0 Y 0 31 8
495+
def ref 252 1024 0 Y 0 31 8
496496
def rows 8 10 1 Y 32928 0 63
497-
def Extra 253 255 27 N 1 31 8
497+
def Extra 252 255 27 N 1 31 8
498498
id select_type table type possible_keys key key_len ref rows Extra
499499
1 SIMPLE t1 range PRIMARY PRIMARY 4 NULL 3 Using where; Using filesort
500500
drop table if exists t2;

‎mysql-test/r/ps_2myisam.result‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1154,12 +1154,12 @@ def id 8 3 1 N 32929 0 63
11541154
def select_type 253 19 6 N 1 31 8
11551155
def table 253 64 2 Y 0 31 8
11561156
def type 253 10 3 Y 0 31 8
1157-
def possible_keys 253 4096 0 Y 0 31 8
1157+
def possible_keys 252 4096 0 Y 0 31 8
11581158
def key 253 64 0 Y 0 31 8
11591159
def key_len 253 4096 0 Y 128 31 63
1160-
def ref 253 1024 0 Y 0 31 8
1160+
def ref 252 1024 0 Y 0 31 8
11611161
def rows 8 10 1 Y 32928 0 63
1162-
def Extra 253 255 0 N 1 31 8
1162+
def Extra 252 255 0 N 1 31 8
11631163
id select_type table type possible_keys key key_len ref rows Extra
11641164
1 SIMPLE t9 ALL NULL NULL NULL NULL 2
11651165
drop table if exists t2 ;

‎mysql-test/r/ps_3innodb.result‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1154,12 +1154,12 @@ def id 8 3 1 N 32929 0 63
11541154
def select_type 253 19 6 N 1 31 8
11551155
def table 253 64 2 Y 0 31 8
11561156
def type 253 10 3 Y 0 31 8
1157-
def possible_keys 253 4096 0 Y 0 31 8
1157+
def possible_keys 252 4096 0 Y 0 31 8
11581158
def key 253 64 0 Y 0 31 8
11591159
def key_len 253 4096 0 Y 128 31 63
1160-
def ref 253 1024 0 Y 0 31 8
1160+
def ref 252 1024 0 Y 0 31 8
11611161
def rows 8 10 1 Y 32928 0 63
1162-
def Extra 253 255 0 N 1 31 8
1162+
def Extra 252 255 0 N 1 31 8
11631163
id select_type table type possible_keys key key_len ref rows Extra
11641164
1 SIMPLE t9 ALL NULL NULL NULL NULL 2
11651165
test_sequence

‎mysql-test/r/ps_4heap.result‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1155,12 +1155,12 @@ def id 8 3 1 N 32929 0 63
11551155
def select_type 253 19 6 N 1 31 8
11561156
def table 253 64 2 Y 0 31 8
11571157
def type 253 10 3 Y 0 31 8
1158-
def possible_keys 253 4096 0 Y 0 31 8
1158+
def possible_keys 252 4096 0 Y 0 31 8
11591159
def key 253 64 0 Y 0 31 8
11601160
def key_len 253 4096 0 Y 128 31 63
1161-
def ref 253 1024 0 Y 0 31 8
1161+
def ref 252 1024 0 Y 0 31 8
11621162
def rows 8 10 1 Y 32928 0 63
1163-
def Extra 253 255 0 N 1 31 8
1163+
def Extra 252 255 0 N 1 31 8
11641164
id select_type table type possible_keys key key_len ref rows Extra
11651165
1 SIMPLE t9 ALL NULL NULL NULL NULL 2
11661166
test_sequence

‎mysql-test/r/ps_5merge.result‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1197,12 +1197,12 @@ def id 8 3 1 N 32929 0 63
11971197
def select_type 253 19 6 N 1 31 8
11981198
def table 253 64 2 Y 0 31 8
11991199
def type 253 10 3 Y 0 31 8
1200-
def possible_keys 253 4096 0 Y 0 31 8
1200+
def possible_keys 252 4096 0 Y 0 31 8
12011201
def key 253 64 0 Y 0 31 8
12021202
def key_len 253 4096 0 Y 128 31 63
1203-
def ref 253 1024 0 Y 0 31 8
1203+
def ref 252 1024 0 Y 0 31 8
12041204
def rows 8 10 1 Y 32928 0 63
1205-
def Extra 253 255 0 N 1 31 8
1205+
def Extra 252 255 0 N 1 31 8
12061206
id select_type table type possible_keys key key_len ref rows Extra
12071207
1 SIMPLE t9 ALL NULL NULL NULL NULL 2
12081208
test_sequence
@@ -4209,12 +4209,12 @@ def id 8 3 1 N 32929 0 63
42094209
def select_type 253 19 6 N 1 31 8
42104210
def table 253 64 2 Y 0 31 8
42114211
def type 253 10 3 Y 0 31 8
4212-
def possible_keys 253 4096 0 Y 0 31 8
4212+
def possible_keys 252 4096 0 Y 0 31 8
42134213
def key 253 64 0 Y 0 31 8
42144214
def key_len 253 4096 0 Y 128 31 63
4215-
def ref 253 1024 0 Y 0 31 8
4215+
def ref 252 1024 0 Y 0 31 8
42164216
def rows 8 10 1 Y 32928 0 63
4217-
def Extra 253 255 0 N 1 31 8
4217+
def Extra 252 255 0 N 1 31 8
42184218
id select_type table type possible_keys key key_len ref rows Extra
42194219
1 SIMPLE t9 ALL NULL NULL NULL NULL 2
42204220
test_sequence

‎mysql-test/r/ps_6bdb.result‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1154,12 +1154,12 @@ def id 8 3 1 N 32929 0 63
11541154
def select_type 253 19 6 N 1 31 8
11551155
def table 253 64 2 Y 0 31 8
11561156
def type 253 10 3 Y 0 31 8
1157-
def possible_keys 253 4096 0 Y 0 31 8
1157+
def possible_keys 252 4096 0 Y 0 31 8
11581158
def key 253 64 0 Y 0 31 8
11591159
def key_len 253 4096 0 Y 128 31 63
1160-
def ref 253 1024 0 Y 0 31 8
1160+
def ref 252 1024 0 Y 0 31 8
11611161
def rows 8 10 1 Y 32928 0 63
1162-
def Extra 253 255 0 N 1 31 8
1162+
def Extra 252 255 0 N 1 31 8
11631163
id select_type table type possible_keys key key_len ref rows Extra
11641164
1 SIMPLE t9 ALL NULL NULL NULL NULL 3
11651165
test_sequence

‎mysql-test/r/ps_7ndb.result‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1154,12 +1154,12 @@ def id 8 3 1 N 32929 0 63
11541154
def select_type 253 19 6 N 1 31 8
11551155
def table 253 64 2 Y 0 31 8
11561156
def type 253 10 3 Y 0 31 8
1157-
def possible_keys 253 4096 0 Y 0 31 8
1157+
def possible_keys 252 4096 0 Y 0 31 8
11581158
def key 253 64 0 Y 0 31 8
11591159
def key_len 253 4096 0 Y 128 31 63
1160-
def ref 253 1024 0 Y 0 31 8
1160+
def ref 252 1024 0 Y 0 31 8
11611161
def rows 8 10 1 Y 32928 0 63
1162-
def Extra 253 255 0 N 1 31 8
1162+
def Extra 252 255 0 N 1 31 8
11631163
id select_type table type possible_keys key key_len ref rows Extra
11641164
1 SIMPLE t9 ALL NULL NULL NULL NULL 2
11651165
test_sequence

‎mysql-test/r/select.result‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2781,7 +2781,26 @@ INSERT INTO t1
27812781
SELECT 50, 3, 3 FROM DUAL
27822782
WHERE NOT EXISTS
27832783
(SELECT * FROM t1 WHERE a = 50 AND b = 3);
2784+
select found_rows();
2785+
found_rows()
2786+
0
27842787
SELECT * FROM t1;
27852788
a b c
27862789
50 3 3
2790+
select count(*) from t1;
2791+
count(*)
2792+
1
2793+
select found_rows();
2794+
found_rows()
2795+
1
2796+
select count(*) from t1 limit 2,3;
2797+
count(*)
2798+
select found_rows();
2799+
found_rows()
2800+
0
2801+
select SQL_CALC_FOUND_ROWS count(*) from t1 limit 2,3;
2802+
count(*)
2803+
select found_rows();
2804+
found_rows()
2805+
1
27872806
DROP TABLE t1;

0 commit comments

Comments
 (0)