diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-08-23 16:51:16 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-08-23 16:51:16 +0300 |
| commit | 687417e5c57aa4c40573b16da0e40e3be8ba7dae (patch) | |
| tree | 992b8c678f63bae97639198cddadce42fe09a2da | |
| parent | cfbdb5d21072b16ae94c04b6b46db42f500be4c8 (diff) | |
| parent | 1f1d5606e08c928e3da98bfeb13a7cccc307105d (diff) | |
| download | mariadb-git-687417e5c57aa4c40573b16da0e40e3be8ba7dae.tar.gz | |
Merge 10.2 into 10.3
| -rw-r--r-- | mysql-test/suite/innodb_gis/disabled.def | 2 | ||||
| -rw-r--r-- | storage/maria/ma_rt_test.c | 3 | ||||
| -rw-r--r-- | storage/myisam/rt_test.c | 3 |
3 files changed, 2 insertions, 6 deletions
diff --git a/mysql-test/suite/innodb_gis/disabled.def b/mysql-test/suite/innodb_gis/disabled.def index 8cae44a3607..bf500c1cb93 100644 --- a/mysql-test/suite/innodb_gis/disabled.def +++ b/mysql-test/suite/innodb_gis/disabled.def @@ -10,3 +10,5 @@ # ############################################################################## +rtree_concurrent_srch : MDEV-15284 COUNT(*) mismatch +rtree_recovery : MDEV-15284 COUNT(*) mismatch diff --git a/storage/maria/ma_rt_test.c b/storage/maria/ma_rt_test.c index 5af941b78c8..f7e38af3dce 100644 --- a/storage/maria/ma_rt_test.c +++ b/storage/maria/ma_rt_test.c @@ -133,7 +133,6 @@ static int run_test(const char *filename) int key_length=8; int null_fields=0; int nrecords=sizeof(rt_data)/(sizeof(double)*4);/* 40 */ - int rec_length=0; int uniques=0; int i, max_i; int error; @@ -153,7 +152,6 @@ static int run_test(const char *filename) recinfo[0].type=FIELD_NORMAL; recinfo[0].length=1; /* For NULL bits */ - rec_length=1; /* Define 2*ndims columns for coordinates*/ @@ -161,7 +159,6 @@ static int run_test(const char *filename) { recinfo[i].type=FIELD_NORMAL; recinfo[i].length=key_length; - rec_length+=key_length; } /* Define a key with 2*ndims segments */ diff --git a/storage/myisam/rt_test.c b/storage/myisam/rt_test.c index 353e20951cd..62c9539eb66 100644 --- a/storage/myisam/rt_test.c +++ b/storage/myisam/rt_test.c @@ -104,7 +104,6 @@ static int run_test(const char *filename) int key_length=8; int null_fields=0; int nrecords=sizeof(rt_data)/(sizeof(double)*4);/* 3000;*/ - int rec_length=0; int uniques=0; int i, max_i; int error; @@ -124,14 +123,12 @@ static int run_test(const char *filename) recinfo[0].type=FIELD_NORMAL; recinfo[0].length=1; /* For NULL bits */ - rec_length=1; /* Define 2*ndims columns for coordinates*/ for (i=1; i<=2*ndims ;i++){ recinfo[i].type=FIELD_NORMAL; recinfo[i].length=key_length; - rec_length+=key_length; } /* Define a key with 2*ndims segments */ |