diff options
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/r/binary.result | 4 | ||||
| -rw-r--r-- | mysql-test/r/ctype_cp1251.result | 4 | ||||
| -rw-r--r-- | mysql-test/r/endspace.result | 2 | ||||
| -rw-r--r-- | mysql-test/r/func_if.result | 2 | ||||
| -rw-r--r-- | mysql-test/r/func_str.result | 2 | ||||
| -rw-r--r-- | mysql-test/r/gis.result | 19 | ||||
| -rw-r--r-- | mysql-test/r/myisam.result | 1 | ||||
| -rw-r--r-- | mysql-test/r/ndb_basic.result | 1005 | ||||
| -rw-r--r-- | mysql-test/r/type_ranges.result | 2 | ||||
| -rw-r--r-- | mysql-test/t/gis.test | 18 | ||||
| -rw-r--r-- | mysql-test/t/ndb_basic.test | 4 |
11 files changed, 1054 insertions, 9 deletions
diff --git a/mysql-test/r/binary.result b/mysql-test/r/binary.result index 68b507d1089..405de1158d6 100644 --- a/mysql-test/r/binary.result +++ b/mysql-test/r/binary.result @@ -111,10 +111,10 @@ a b aaa bbb select charset(a), charset(b), charset(binary 'ccc') from t1 limit 1; charset(a) charset(b) charset(binary 'ccc') -latin1 binary latin1 +latin1 binary binary select collation(a), collation(b), collation(binary 'ccc') from t1 limit 1; collation(a) collation(b) collation(binary 'ccc') -latin1_bin binary latin1_bin +latin1_bin binary binary drop table t1; create table t1( firstname char(20), lastname char(20)); insert into t1 values ("john","doe"),("John","Doe"); diff --git a/mysql-test/r/ctype_cp1251.result b/mysql-test/r/ctype_cp1251.result index 2a59f976156..3793e962d40 100644 --- a/mysql-test/r/ctype_cp1251.result +++ b/mysql-test/r/ctype_cp1251.result @@ -49,8 +49,8 @@ a b aaa bbb select charset(a), charset(b), charset(binary 'ccc') from t1 limit 1; charset(a) charset(b) charset(binary 'ccc') -cp1251 binary cp1251 +cp1251 binary binary select collation(a), collation(b), collation(binary 'ccc') from t1 limit 1; collation(a) collation(b) collation(binary 'ccc') -cp1251_bin binary cp1251_bin +cp1251_bin binary binary drop table t1; diff --git a/mysql-test/r/endspace.result b/mysql-test/r/endspace.result index bca1717eeba..96210a0e16d 100644 --- a/mysql-test/r/endspace.result +++ b/mysql-test/r/endspace.result @@ -19,7 +19,7 @@ select 'a a' > 'a', 'a \0' < 'a'; 1 1 select binary 'a a' > 'a', binary 'a \0' > 'a', binary 'a\0' > 'a'; binary 'a a' > 'a' binary 'a \0' > 'a' binary 'a\0' > 'a' -1 0 0 +1 1 1 create table t1 (text1 varchar(32) not NULL, KEY key1 (text1)); insert into t1 values ('teststring'), ('nothing'), ('teststring\t'); check table t1; diff --git a/mysql-test/r/func_if.result b/mysql-test/r/func_if.result index 4c8a0561b0a..dd916d06372 100644 --- a/mysql-test/r/func_if.result +++ b/mysql-test/r/func_if.result @@ -43,7 +43,7 @@ explain extended select if(u=1,st,binary st) s from t1 where st like "%a%" order id select_type table type possible_keys key key_len ref rows Extra 1 SIMPLE t1 ALL NULL NULL NULL NULL 7 Using where; Using filesort Warnings: -Note 1003 select if((test.t1.u = 1),test.t1.st,(test.t1.st collate _latin1'BINARY')) AS `s` from test.t1 where (test.t1.st like _latin1'%a%') order by if((test.t1.u = 1),test.t1.st,(test.t1.st collate _latin1'BINARY')) +Note 1003 select if((test.t1.u = 1),test.t1.st,cast(test.t1.st as char charset binary)) AS `s` from test.t1 where (test.t1.st like _latin1'%a%') order by if((test.t1.u = 1),test.t1.st,cast(test.t1.st as char charset binary)) select nullif(u=0, 'test') from t1; nullif(u=0, 'test') NULL diff --git a/mysql-test/r/func_str.result b/mysql-test/r/func_str.result index 345832387bd..7b2fc4b21a5 100644 --- a/mysql-test/r/func_str.result +++ b/mysql-test/r/func_str.result @@ -638,7 +638,7 @@ explain extended select md5('hello'), sha('abc'), sha1('abc'), soundex(''), 'moo id select_type table type possible_keys key key_len ref rows Extra 1 SIMPLE NULL NULL NULL NULL NULL NULL NULL No tables used Warnings: -Note 1003 select md5(_latin1'hello') AS `md5('hello')`,sha(_latin1'abc') AS `sha('abc')`,sha(_latin1'abc') AS `sha1('abc')`,soundex(_latin1'') AS `soundex('')`,(soundex(_latin1'mood') = soundex(_latin1'mud')) AS `'mood' sounds like 'mud'`,aes_decrypt(aes_encrypt(_latin1'abc',_latin1'1'),_latin1'1') AS `aes_decrypt(aes_encrypt('abc','1'),'1')`,concat(_latin1'*',repeat(_latin1' ',5),_latin1'*') AS `concat('*',space(5),'*')`,reverse(_latin1'abc') AS `reverse('abc')`,rpad(_latin1'a',4,_latin1'1') AS `rpad('a',4,'1')`,lpad(_latin1'a',4,_latin1'1') AS `lpad('a',4,'1')`,concat_ws(_latin1',',_latin1'',NULL,_latin1'a') AS `concat_ws(',','',NULL,'a')`,make_set(255,_latin2'a',_latin2'b',_latin2'c') AS `make_set(255,_latin2'a',_latin2'b',_latin2'c')`,elt(2,1) AS `elt(2,1)`,locate(_latin1'a',_latin1'b',2) AS `locate("a","b",2)`,format(130,10) AS `format(130,10)`,char(0) AS `char(0)`,conv(130,16,10) AS `conv(130,16,10)`,hex(130) AS `hex(130)`,(_latin1'HE' collate _latin1'BINARY') AS `binary 'HE'`,export_set(255,_latin2'y',_latin2'n',_latin2' ') AS `export_set(255,_latin2'y',_latin2'n',_latin2' ')`,field((_latin1'b' collate _latin1'latin1_bin'),_latin1'A',_latin1'B') AS `FIELD('b' COLLATE latin1_bin,'A','B')`,find_in_set(_latin1'B',_latin1'a,b,c,d') AS `FIND_IN_SET(_latin1'B',_latin1'a,b,c,d')`,collation(conv(130,16,10)) AS `collation(conv(130,16,10))`,coercibility(conv(130,16,10)) AS `coercibility(conv(130,16,10))`,length(_latin1'\n \r\0\\_\\%\\') AS `length('\n\t\r\b\0\_\%\\')`,bit_length(_latin1'\n \r\0\\_\\%\\') AS `bit_length('\n\t\r\b\0\_\%\\')`,bit_length(_latin1'\n \r\0\\_\\%\\') AS `bit_length('\n\t\r\b\0\_\%\\')`,concat(_latin1'monty',_latin1' was here ',_latin1'again') AS `concat('monty',' was here ','again')`,length(_latin1'hello') AS `length('hello')`,char(ascii(_latin1'h')) AS `char(ascii('h'))`,ord(_latin1'h') AS `ord('h')`,quote((1 / 0)) AS `quote(1/0)`,crc32(_latin1'123') AS `crc32("123")`,replace(_latin1'aaaa',_latin1'a',_latin1'b') AS `replace('aaaa','a','b')`,insert(_latin1'txs',2,1,_latin1'hi') AS `insert('txs',2,1,'hi')`,left(_latin2'a',1) AS `left(_latin2'a',1)`,right(_latin2'a',1) AS `right(_latin2'a',1)`,lcase(_latin2'a') AS `lcase(_latin2'a')`,ucase(_latin2'a') AS `ucase(_latin2'a')`,substr(_latin1'abcdefg',3,2) AS `SUBSTR('abcdefg',3,2)`,substr_index(_latin1'1abcd;2abcd;3abcd;4abcd',_latin1';',2) AS `substring_index("1abcd;2abcd;3abcd;4abcd", ';', 2)`,trim(_latin2' a ') AS `trim(_latin2' a ')`,ltrim(_latin2' a ') AS `ltrim(_latin2' a ')`,rtrim(_latin2' a ') AS `rtrim(_latin2' a ')`,decode(encode(repeat(_latin1'a',100000))) AS `decode(encode(repeat("a",100000),"monty"),"monty")` +Note 1003 select md5(_latin1'hello') AS `md5('hello')`,sha(_latin1'abc') AS `sha('abc')`,sha(_latin1'abc') AS `sha1('abc')`,soundex(_latin1'') AS `soundex('')`,(soundex(_latin1'mood') = soundex(_latin1'mud')) AS `'mood' sounds like 'mud'`,aes_decrypt(aes_encrypt(_latin1'abc',_latin1'1'),_latin1'1') AS `aes_decrypt(aes_encrypt('abc','1'),'1')`,concat(_latin1'*',repeat(_latin1' ',5),_latin1'*') AS `concat('*',space(5),'*')`,reverse(_latin1'abc') AS `reverse('abc')`,rpad(_latin1'a',4,_latin1'1') AS `rpad('a',4,'1')`,lpad(_latin1'a',4,_latin1'1') AS `lpad('a',4,'1')`,concat_ws(_latin1',',_latin1'',NULL,_latin1'a') AS `concat_ws(',','',NULL,'a')`,make_set(255,_latin2'a',_latin2'b',_latin2'c') AS `make_set(255,_latin2'a',_latin2'b',_latin2'c')`,elt(2,1) AS `elt(2,1)`,locate(_latin1'a',_latin1'b',2) AS `locate("a","b",2)`,format(130,10) AS `format(130,10)`,char(0) AS `char(0)`,conv(130,16,10) AS `conv(130,16,10)`,hex(130) AS `hex(130)`,cast(_latin1'HE' as char charset binary) AS `binary 'HE'`,export_set(255,_latin2'y',_latin2'n',_latin2' ') AS `export_set(255,_latin2'y',_latin2'n',_latin2' ')`,field((_latin1'b' collate _latin1'latin1_bin'),_latin1'A',_latin1'B') AS `FIELD('b' COLLATE latin1_bin,'A','B')`,find_in_set(_latin1'B',_latin1'a,b,c,d') AS `FIND_IN_SET(_latin1'B',_latin1'a,b,c,d')`,collation(conv(130,16,10)) AS `collation(conv(130,16,10))`,coercibility(conv(130,16,10)) AS `coercibility(conv(130,16,10))`,length(_latin1'\n \r\0\\_\\%\\') AS `length('\n\t\r\b\0\_\%\\')`,bit_length(_latin1'\n \r\0\\_\\%\\') AS `bit_length('\n\t\r\b\0\_\%\\')`,bit_length(_latin1'\n \r\0\\_\\%\\') AS `bit_length('\n\t\r\b\0\_\%\\')`,concat(_latin1'monty',_latin1' was here ',_latin1'again') AS `concat('monty',' was here ','again')`,length(_latin1'hello') AS `length('hello')`,char(ascii(_latin1'h')) AS `char(ascii('h'))`,ord(_latin1'h') AS `ord('h')`,quote((1 / 0)) AS `quote(1/0)`,crc32(_latin1'123') AS `crc32("123")`,replace(_latin1'aaaa',_latin1'a',_latin1'b') AS `replace('aaaa','a','b')`,insert(_latin1'txs',2,1,_latin1'hi') AS `insert('txs',2,1,'hi')`,left(_latin2'a',1) AS `left(_latin2'a',1)`,right(_latin2'a',1) AS `right(_latin2'a',1)`,lcase(_latin2'a') AS `lcase(_latin2'a')`,ucase(_latin2'a') AS `ucase(_latin2'a')`,substr(_latin1'abcdefg',3,2) AS `SUBSTR('abcdefg',3,2)`,substr_index(_latin1'1abcd;2abcd;3abcd;4abcd',_latin1';',2) AS `substring_index("1abcd;2abcd;3abcd;4abcd", ';', 2)`,trim(_latin2' a ') AS `trim(_latin2' a ')`,ltrim(_latin2' a ') AS `ltrim(_latin2' a ')`,rtrim(_latin2' a ') AS `rtrim(_latin2' a ')`,decode(encode(repeat(_latin1'a',100000))) AS `decode(encode(repeat("a",100000),"monty"),"monty")` SELECT lpad(12345, 5, "#"); lpad(12345, 5, "#") 12345 diff --git a/mysql-test/r/gis.result b/mysql-test/r/gis.result index c2fd7855c85..9f5dd286cf9 100644 --- a/mysql-test/r/gis.result +++ b/mysql-test/r/gis.result @@ -466,3 +466,22 @@ insert IGNORE into t1 values ('Garbage'); ERROR HY000: Unknown error alter table t1 add spatial index(a); drop table t1; +create table t1(a geometry not null, spatial index(a)); +insert into t1 values +(GeomFromText('POINT(1 1)')), (GeomFromText('POINT(3 3)')), +(GeomFromText('POINT(4 4)')), (GeomFromText('POINT(6 6)')); +select AsText(a) from t1 where +MBRContains(GeomFromText('Polygon((0 0, 0 2, 2 2, 2 0, 0 0))'), a) +or +MBRContains(GeomFromText('Polygon((2 2, 2 5, 5 5, 5 2, 2 2))'), a); +AsText(a) +POINT(1 1) +POINT(3 3) +POINT(4 4) +select AsText(a) from t1 where +MBRContains(GeomFromText('Polygon((0 0, 0 2, 2 2, 2 0, 0 0))'), a) +and +MBRContains(GeomFromText('Polygon((0 0, 0 7, 7 7, 7 0, 0 0))'), a); +AsText(a) +POINT(1 1) +drop table t1; diff --git a/mysql-test/r/myisam.result b/mysql-test/r/myisam.result index 0109097d3a1..354675cd4d4 100644 --- a/mysql-test/r/myisam.result +++ b/mysql-test/r/myisam.result @@ -412,7 +412,6 @@ aaa. aaa . select concat(a,'.') from t1 where binary a='aaa'; concat(a,'.') -aaa . aaa. update t1 set a='bbb' where a='aaa'; select concat(a,'.') from t1; diff --git a/mysql-test/r/ndb_basic.result b/mysql-test/r/ndb_basic.result index f2727c91628..e42485a1548 100644 --- a/mysql-test/r/ndb_basic.result +++ b/mysql-test/r/ndb_basic.result @@ -234,6 +234,1011 @@ select * from t4 where a = 7 and b = 17 order by a; a b c d select * from t4 where a = 7 and b != 16 order by b; a b c d +select x1.a, x1.b from t2 x1, t2 x2 where x1.b = x2.b order by x1.a; +a b +1 10 +3 12 +5 14 +7 16 +9 18 +11 20 +13 22 +15 24 +17 26 +19 28 +21 30 +23 32 +25 34 +27 36 +29 38 +31 40 +33 42 +35 44 +37 46 +39 48 +41 50 +43 52 +45 54 +47 56 +49 58 +51 60 +53 62 +55 64 +57 66 +59 68 +61 70 +63 72 +65 74 +67 76 +69 78 +71 80 +73 82 +75 84 +77 86 +79 88 +81 90 +83 92 +85 94 +87 96 +89 98 +91 100 +93 102 +95 104 +97 106 +99 108 +101 110 +103 112 +105 114 +107 116 +109 118 +111 120 +113 122 +115 124 +117 126 +119 128 +121 130 +123 132 +125 134 +127 136 +129 138 +131 140 +133 142 +135 144 +137 146 +139 148 +141 150 +143 152 +145 154 +147 156 +149 158 +151 160 +153 162 +155 164 +157 166 +159 168 +161 170 +163 172 +165 174 +167 176 +169 178 +171 180 +173 182 +175 184 +177 186 +179 188 +181 190 +183 192 +185 194 +187 196 +189 198 +191 200 +193 202 +195 204 +197 206 +199 208 +201 210 +203 212 +205 214 +207 216 +209 218 +211 220 +213 222 +215 224 +217 226 +219 228 +221 230 +223 232 +225 234 +227 236 +229 238 +231 240 +233 242 +235 244 +237 246 +239 248 +241 250 +243 252 +245 254 +247 256 +249 258 +251 260 +253 262 +255 264 +257 266 +259 268 +261 270 +263 272 +265 274 +267 276 +269 278 +271 280 +273 282 +275 284 +277 286 +279 288 +281 290 +283 292 +285 294 +287 296 +289 298 +291 300 +293 302 +295 304 +297 306 +299 308 +301 310 +303 312 +305 314 +307 316 +309 318 +311 320 +313 322 +315 324 +317 326 +319 328 +321 330 +323 332 +325 334 +327 336 +329 338 +331 340 +333 342 +335 344 +337 346 +339 348 +341 350 +343 352 +345 354 +347 356 +349 358 +351 360 +353 362 +355 364 +357 366 +359 368 +361 370 +363 372 +365 374 +367 376 +369 378 +371 380 +373 382 +375 384 +377 386 +379 388 +381 390 +383 392 +385 394 +387 396 +389 398 +391 400 +393 402 +395 404 +397 406 +399 408 +401 410 +403 412 +405 414 +407 416 +409 418 +411 420 +413 422 +415 424 +417 426 +419 428 +421 430 +423 432 +425 434 +427 436 +429 438 +431 440 +433 442 +435 444 +437 446 +439 448 +441 450 +443 452 +445 454 +447 456 +449 458 +451 460 +453 462 +455 464 +457 466 +459 468 +461 470 +463 472 +465 474 +467 476 +469 478 +471 480 +473 482 +475 484 +477 486 +479 488 +481 490 +483 492 +485 494 +487 496 +489 498 +491 500 +493 502 +495 504 +497 506 +499 508 +501 510 +503 512 +505 514 +507 516 +509 518 +511 520 +513 522 +515 524 +517 526 +519 528 +521 530 +523 532 +525 534 +527 536 +529 538 +531 540 +533 542 +535 544 +537 546 +539 548 +541 550 +543 552 +545 554 +547 556 +549 558 +551 560 +553 562 +555 564 +557 566 +559 568 +561 570 +563 572 +565 574 +567 576 +569 578 +571 580 +573 582 +575 584 +577 586 +579 588 +581 590 +583 592 +585 594 +587 596 +589 598 +591 600 +593 602 +595 604 +597 606 +599 608 +601 610 +603 612 +605 614 +607 616 +609 618 +611 620 +613 622 +615 624 +617 626 +619 628 +621 630 +623 632 +625 634 +627 636 +629 638 +631 640 +633 642 +635 644 +637 646 +639 648 +641 650 +643 652 +645 654 +647 656 +649 658 +651 660 +653 662 +655 664 +657 666 +659 668 +661 670 +663 672 +665 674 +667 676 +669 678 +671 680 +673 682 +675 684 +677 686 +679 688 +681 690 +683 692 +685 694 +687 696 +689 698 +691 700 +693 702 +695 704 +697 706 +699 708 +701 710 +703 712 +705 714 +707 716 +709 718 +711 720 +713 722 +715 724 +717 726 +719 728 +721 730 +723 732 +725 734 +727 736 +729 738 +731 740 +733 742 +735 744 +737 746 +739 748 +741 750 +743 752 +745 754 +747 756 +749 758 +751 760 +753 762 +755 764 +757 766 +759 768 +761 770 +763 772 +765 774 +767 776 +769 778 +771 780 +773 782 +775 784 +777 786 +779 788 +781 790 +783 792 +785 794 +787 796 +789 798 +791 800 +793 802 +795 804 +797 806 +799 808 +801 810 +803 812 +805 814 +807 816 +809 818 +811 820 +813 822 +815 824 +817 826 +819 828 +821 830 +823 832 +825 834 +827 836 +829 838 +831 840 +833 842 +835 844 +837 846 +839 848 +841 850 +843 852 +845 854 +847 856 +849 858 +851 860 +853 862 +855 864 +857 866 +859 868 +861 870 +863 872 +865 874 +867 876 +869 878 +871 880 +873 882 +875 884 +877 886 +879 888 +881 890 +883 892 +885 894 +887 896 +889 898 +891 900 +893 902 +895 904 +897 906 +899 908 +901 910 +903 912 +905 914 +907 916 +909 918 +911 920 +913 922 +915 924 +917 926 +919 928 +921 930 +923 932 +925 934 +927 936 +929 938 +931 940 +933 942 +935 944 +937 946 +939 948 +941 950 +943 952 +945 954 +947 956 +949 958 +951 960 +953 962 +955 964 +957 966 +959 968 +961 970 +963 972 +965 974 +967 976 +969 978 +971 980 +973 982 +975 984 +977 986 +979 988 +981 990 +983 992 +985 994 +987 996 +989 998 +991 1000 +993 1002 +995 1004 +997 1006 +999 1008 +select a, b FROM t2 outer_table where +a = (select a from t2 where b = outer_table.b ) order by a; +a b +1 10 +3 12 +5 14 +7 16 +9 18 +11 20 +13 22 +15 24 +17 26 +19 28 +21 30 +23 32 +25 34 +27 36 +29 38 +31 40 +33 42 +35 44 +37 46 +39 48 +41 50 +43 52 +45 54 +47 56 +49 58 +51 60 +53 62 +55 64 +57 66 +59 68 +61 70 +63 72 +65 74 +67 76 +69 78 +71 80 +73 82 +75 84 +77 86 +79 88 +81 90 +83 92 +85 94 +87 96 +89 98 +91 100 +93 102 +95 104 +97 106 +99 108 +101 110 +103 112 +105 114 +107 116 +109 118 +111 120 +113 122 +115 124 +117 126 +119 128 +121 130 +123 132 +125 134 +127 136 +129 138 +131 140 +133 142 +135 144 +137 146 +139 148 +141 150 +143 152 +145 154 +147 156 +149 158 +151 160 +153 162 +155 164 +157 166 +159 168 +161 170 +163 172 +165 174 +167 176 +169 178 +171 180 +173 182 +175 184 +177 186 +179 188 +181 190 +183 192 +185 194 +187 196 +189 198 +191 200 +193 202 +195 204 +197 206 +199 208 +201 210 +203 212 +205 214 +207 216 +209 218 +211 220 +213 222 +215 224 +217 226 +219 228 +221 230 +223 232 +225 234 +227 236 +229 238 +231 240 +233 242 +235 244 +237 246 +239 248 +241 250 +243 252 +245 254 +247 256 +249 258 +251 260 +253 262 +255 264 +257 266 +259 268 +261 270 +263 272 +265 274 +267 276 +269 278 +271 280 +273 282 +275 284 +277 286 +279 288 +281 290 +283 292 +285 294 +287 296 +289 298 +291 300 +293 302 +295 304 +297 306 +299 308 +301 310 +303 312 +305 314 +307 316 +309 318 +311 320 +313 322 +315 324 +317 326 +319 328 +321 330 +323 332 +325 334 +327 336 +329 338 +331 340 +333 342 +335 344 +337 346 +339 348 +341 350 +343 352 +345 354 +347 356 +349 358 +351 360 +353 362 +355 364 +357 366 +359 368 +361 370 +363 372 +365 374 +367 376 +369 378 +371 380 +373 382 +375 384 +377 386 +379 388 +381 390 +383 392 +385 394 +387 396 +389 398 +391 400 +393 402 +395 404 +397 406 +399 408 +401 410 +403 412 +405 414 +407 416 +409 418 +411 420 +413 422 +415 424 +417 426 +419 428 +421 430 +423 432 +425 434 +427 436 +429 438 +431 440 +433 442 +435 444 +437 446 +439 448 +441 450 +443 452 +445 454 +447 456 +449 458 +451 460 +453 462 +455 464 +457 466 +459 468 +461 470 +463 472 +465 474 +467 476 +469 478 +471 480 +473 482 +475 484 +477 486 +479 488 +481 490 +483 492 +485 494 +487 496 +489 498 +491 500 +493 502 +495 504 +497 506 +499 508 +501 510 +503 512 +505 514 +507 516 +509 518 +511 520 +513 522 +515 524 +517 526 +519 528 +521 530 +523 532 +525 534 +527 536 +529 538 +531 540 +533 542 +535 544 +537 546 +539 548 +541 550 +543 552 +545 554 +547 556 +549 558 +551 560 +553 562 +555 564 +557 566 +559 568 +561 570 +563 572 +565 574 +567 576 +569 578 +571 580 +573 582 +575 584 +577 586 +579 588 +581 590 +583 592 +585 594 +587 596 +589 598 +591 600 +593 602 +595 604 +597 606 +599 608 +601 610 +603 612 +605 614 +607 616 +609 618 +611 620 +613 622 +615 624 +617 626 +619 628 +621 630 +623 632 +625 634 +627 636 +629 638 +631 640 +633 642 +635 644 +637 646 +639 648 +641 650 +643 652 +645 654 +647 656 +649 658 +651 660 +653 662 +655 664 +657 666 +659 668 +661 670 +663 672 +665 674 +667 676 +669 678 +671 680 +673 682 +675 684 +677 686 +679 688 +681 690 +683 692 +685 694 +687 696 +689 698 +691 700 +693 702 +695 704 +697 706 +699 708 +701 710 +703 712 +705 714 +707 716 +709 718 +711 720 +713 722 +715 724 +717 726 +719 728 +721 730 +723 732 +725 734 +727 736 +729 738 +731 740 +733 742 +735 744 +737 746 +739 748 +741 750 +743 752 +745 754 +747 756 +749 758 +751 760 +753 762 +755 764 +757 766 +759 768 +761 770 +763 772 +765 774 +767 776 +769 778 +771 780 +773 782 +775 784 +777 786 +779 788 +781 790 +783 792 +785 794 +787 796 +789 798 +791 800 +793 802 +795 804 +797 806 +799 808 +801 810 +803 812 +805 814 +807 816 +809 818 +811 820 +813 822 +815 824 +817 826 +819 828 +821 830 +823 832 +825 834 +827 836 +829 838 +831 840 +833 842 +835 844 +837 846 +839 848 +841 850 +843 852 +845 854 +847 856 +849 858 +851 860 +853 862 +855 864 +857 866 +859 868 +861 870 +863 872 +865 874 +867 876 +869 878 +871 880 +873 882 +875 884 +877 886 +879 888 +881 890 +883 892 +885 894 +887 896 +889 898 +891 900 +893 902 +895 904 +897 906 +899 908 +901 910 +903 912 +905 914 +907 916 +909 918 +911 920 +913 922 +915 924 +917 926 +919 928 +921 930 +923 932 +925 934 +927 936 +929 938 +931 940 +933 942 +935 944 +937 946 +939 948 +941 950 +943 952 +945 954 +947 956 +949 958 +951 960 +953 962 +955 964 +957 966 +959 968 +961 970 +963 972 +965 974 +967 976 +969 978 +971 980 +973 982 +975 984 +977 986 +979 988 +981 990 +983 992 +985 994 +987 996 +989 998 +991 1000 +993 1002 +995 1004 +997 1006 +999 1008 delete from t2; delete from t3; delete from t4; diff --git a/mysql-test/r/type_ranges.result b/mysql-test/r/type_ranges.result index e803fde14a6..5a65c90c5c7 100644 --- a/mysql-test/r/type_ranges.result +++ b/mysql-test/r/type_ranges.result @@ -272,7 +272,7 @@ auto bigint(17) unsigned NULL PRI 0 select,insert,update,references t1 bigint(1) NULL 0 select,insert,update,references t2 char(1) latin1_swedish_ci select,insert,update,references t3 longtext latin1_swedish_ci select,insert,update,references -t4 longtext latin1_bin select,insert,update,references +t4 longblob NULL select,insert,update,references select * from t2; auto t1 t2 t3 t4 11 1 a aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb diff --git a/mysql-test/t/gis.test b/mysql-test/t/gis.test index 590007caba1..e35b9996a44 100644 --- a/mysql-test/t/gis.test +++ b/mysql-test/t/gis.test @@ -172,3 +172,21 @@ insert IGNORE into t1 values ('Garbage'); alter table t1 add spatial index(a); drop table t1; + +# +# Bug #5219: problem with range optimizer +# + +create table t1(a geometry not null, spatial index(a)); +insert into t1 values +(GeomFromText('POINT(1 1)')), (GeomFromText('POINT(3 3)')), +(GeomFromText('POINT(4 4)')), (GeomFromText('POINT(6 6)')); +select AsText(a) from t1 where + MBRContains(GeomFromText('Polygon((0 0, 0 2, 2 2, 2 0, 0 0))'), a) + or + MBRContains(GeomFromText('Polygon((2 2, 2 5, 5 5, 5 2, 2 2))'), a); +select AsText(a) from t1 where + MBRContains(GeomFromText('Polygon((0 0, 0 2, 2 2, 2 0, 0 0))'), a) + and + MBRContains(GeomFromText('Polygon((0 0, 0 7, 7 7, 7 0, 0 0))'), a); +drop table t1; diff --git a/mysql-test/t/ndb_basic.test b/mysql-test/t/ndb_basic.test index ea2a70e1837..a24891ab814 100644 --- a/mysql-test/t/ndb_basic.test +++ b/mysql-test/t/ndb_basic.test @@ -206,6 +206,10 @@ select * from t4 where a = 7 and b = 16 order by a; select * from t4 where a = 7 and b = 17 order by a; select * from t4 where a = 7 and b != 16 order by b; +select x1.a, x1.b from t2 x1, t2 x2 where x1.b = x2.b order by x1.a; +select a, b FROM t2 outer_table where +a = (select a from t2 where b = outer_table.b ) order by a; + # # update records # |