Skip to content

Commit a04e4f5

Browse files
vuvovavuvova
committed
Merge branch '10.0' into 10.1
2 parents 504beb1 + b728641 commit a04e4f5

File tree

19 files changed

+51
-245
lines changed

19 files changed

+51
-245
lines changed

‎include/heap.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -144,6 +144,7 @@ typedef struct st_heap_share
144144
uint key_version; /* Updated on key change */
145145
uint file_version; /* Update on clear */
146146
uint reclength;/* Length of one record */
147+
uint visible; /* Offset to the visible/deleted mark */
147148
uint changed;
148149
uint keys,max_key_length;
149150
uint currently_disabled_keys; /* saved value from "keys" when disabled */

‎mysql-test/r/view.result‎

Lines changed: 0 additions & 108 deletions
Original file line numberDiff line numberDiff line change
@@ -5268,114 +5268,6 @@ execute stmt1;
52685268
deallocate prepare stmt1;
52695269
drop view v1,v2;
52705270
drop table t1,t2;
5271-
#
5272-
# MDEV-6251: SIGSEGV in query optimizer (in set_check_materialized
5273-
# with MERGE view)
5274-
#
5275-
CREATE TABLE t1 (a1 INT(11) NOT NULL DEFAULT NULL AUTO_INCREMENT PRIMARY KEY);
5276-
CREATE TABLE t2 (b1 INT(11) NOT NULL DEFAULT NULL AUTO_INCREMENT PRIMARY KEY);
5277-
CREATE TABLE t3 (c1 INT(11) NOT NULL DEFAULT NULL AUTO_INCREMENT PRIMARY KEY);
5278-
CREATE TABLE t4 (d1 INT(11) NOT NULL DEFAULT NULL AUTO_INCREMENT PRIMARY KEY);
5279-
CREATE TABLE t5 (e1 INT(11) NOT NULL DEFAULT NULL AUTO_INCREMENT PRIMARY KEY);
5280-
CREATE TABLE t6 (f1 INT(11) NOT NULL DEFAULT NULL AUTO_INCREMENT PRIMARY KEY);
5281-
CREATE OR REPLACE view v1 AS
5282-
SELECT 1
5283-
FROM t1 a_alias_1
5284-
LEFT JOIN (t2 b_alias_1 JOIN t1 a_alias_2) ON b_alias_1.b1 = a_alias_1.a1 AND a_alias_2.a1 = a_alias_1.a1
5285-
LEFT JOIN t3 c_alias_1 ON c_alias_1.c1 = a_alias_1.a1
5286-
LEFT JOIN t4 d_alias_1 ON d_alias_1.d1 = a_alias_1.a1
5287-
LEFT JOIN t3 c_alias_2 ON c_alias_2.c1 = a_alias_1.a1
5288-
LEFT JOIN t5 e_alias_1 ON e_alias_1.e1 = a_alias_1.a1
5289-
LEFT JOIN t6 f_alias_1 ON f_alias_1.f1 = a_alias_1.a1
5290-
;
5291-
SELECT 1
5292-
FROM (( SELECT 1
5293-
FROM t1 a_alias_1
5294-
LEFT JOIN (t2 b_alias_1 JOIN t1 a_alias_2) ON b_alias_1.b1 = a_alias_1.a1 AND a_alias_2.a1 = a_alias_1.a1
5295-
LEFT JOIN t3 c_alias_1 ON c_alias_1.c1 = a_alias_1.a1
5296-
LEFT JOIN t4 d_alias_1 ON d_alias_1.d1 = a_alias_1.a1
5297-
LEFT JOIN t3 c_alias_2 ON c_alias_2.c1 = a_alias_1.a1
5298-
LEFT JOIN t5 e_alias_1 ON e_alias_1.e1 = a_alias_1.a1
5299-
LEFT JOIN t6 f_alias_1 ON f_alias_1.f1 = a_alias_1.a1
5300-
) t1)
5301-
LEFT OUTER JOIN (( SELECT 1
5302-
FROM t1 a_alias_1
5303-
LEFT JOIN (t2 b_alias_1 JOIN t1 a_alias_2) ON b_alias_1.b1 = a_alias_1.a1 AND a_alias_2.a1 = a_alias_1.a1
5304-
LEFT JOIN t3 c_alias_1 ON c_alias_1.c1 = a_alias_1.a1
5305-
LEFT JOIN t4 d_alias_1 ON d_alias_1.d1 = a_alias_1.a1
5306-
LEFT JOIN t3 c_alias_2 ON c_alias_2.c1 = a_alias_1.a1
5307-
LEFT JOIN t5 e_alias_1 ON e_alias_1.e1 = a_alias_1.a1
5308-
LEFT JOIN t6 f_alias_1 ON f_alias_1.f1 = a_alias_1.a1
5309-
) t2) ON 1=1
5310-
LEFT OUTER JOIN (( SELECT 1
5311-
FROM t1 a_alias_1
5312-
LEFT JOIN (t2 b_alias_1 JOIN t1 a_alias_2) ON b_alias_1.b1 = a_alias_1.a1 AND a_alias_2.a1 = a_alias_1.a1
5313-
LEFT JOIN t3 c_alias_1 ON c_alias_1.c1 = a_alias_1.a1
5314-
LEFT JOIN t4 d_alias_1 ON d_alias_1.d1 = a_alias_1.a1
5315-
LEFT JOIN t3 c_alias_2 ON c_alias_2.c1 = a_alias_1.a1
5316-
LEFT JOIN t5 e_alias_1 ON e_alias_1.e1 = a_alias_1.a1
5317-
LEFT JOIN t6 f_alias_1 ON f_alias_1.f1 = a_alias_1.a1
5318-
) t3) ON 1=1
5319-
LEFT OUTER JOIN (( SELECT 1
5320-
FROM t1 a_alias_1
5321-
LEFT JOIN (t2 b_alias_1 JOIN t1 a_alias_2) ON b_alias_1.b1 = a_alias_1.a1 AND a_alias_2.a1 = a_alias_1.a1
5322-
LEFT JOIN t3 c_alias_1 ON c_alias_1.c1 = a_alias_1.a1
5323-
LEFT JOIN t4 d_alias_1 ON d_alias_1.d1 = a_alias_1.a1
5324-
LEFT JOIN t3 c_alias_2 ON c_alias_2.c1 = a_alias_1.a1
5325-
LEFT JOIN t5 e_alias_1 ON e_alias_1.e1 = a_alias_1.a1
5326-
LEFT JOIN t6 f_alias_1 ON f_alias_1.f1 = a_alias_1.a1
5327-
) t4) ON 1=1
5328-
LEFT OUTER JOIN (( SELECT 1
5329-
FROM t1 a_alias_1
5330-
LEFT JOIN (t2 b_alias_1 JOIN t1 a_alias_2) ON b_alias_1.b1 = a_alias_1.a1 AND a_alias_2.a1 = a_alias_1.a1
5331-
LEFT JOIN t3 c_alias_1 ON c_alias_1.c1 = a_alias_1.a1
5332-
LEFT JOIN t4 d_alias_1 ON d_alias_1.d1 = a_alias_1.a1
5333-
LEFT JOIN t3 c_alias_2 ON c_alias_2.c1 = a_alias_1.a1
5334-
LEFT JOIN t5 e_alias_1 ON e_alias_1.e1 = a_alias_1.a1
5335-
LEFT JOIN t6 f_alias_1 ON f_alias_1.f1 = a_alias_1.a1
5336-
) t5) ON 1=1
5337-
LEFT OUTER JOIN (( SELECT 1
5338-
FROM t1 a_alias_1
5339-
LEFT JOIN (t2 b_alias_1 JOIN t1 a_alias_2) ON b_alias_1.b1 = a_alias_1.a1 AND a_alias_2.a1 = a_alias_1.a1
5340-
LEFT JOIN t3 c_alias_1 ON c_alias_1.c1 = a_alias_1.a1
5341-
LEFT JOIN t4 d_alias_1 ON d_alias_1.d1 = a_alias_1.a1
5342-
LEFT JOIN t3 c_alias_2 ON c_alias_2.c1 = a_alias_1.a1
5343-
LEFT JOIN t5 e_alias_1 ON e_alias_1.e1 = a_alias_1.a1
5344-
LEFT JOIN t6 f_alias_1 ON f_alias_1.f1 = a_alias_1.a1
5345-
) t6) ON 1=1
5346-
LEFT OUTER JOIN (( SELECT 1
5347-
FROM t1 a_alias_1
5348-
LEFT JOIN (t2 b_alias_1 JOIN t1 a_alias_2) ON b_alias_1.b1 = a_alias_1.a1 AND a_alias_2.a1 = a_alias_1.a1
5349-
LEFT JOIN t3 c_alias_1 ON c_alias_1.c1 = a_alias_1.a1
5350-
LEFT JOIN t4 d_alias_1 ON d_alias_1.d1 = a_alias_1.a1
5351-
LEFT JOIN t3 c_alias_2 ON c_alias_2.c1 = a_alias_1.a1
5352-
LEFT JOIN t5 e_alias_1 ON e_alias_1.e1 = a_alias_1.a1
5353-
LEFT JOIN t6 f_alias_1 ON f_alias_1.f1 = a_alias_1.a1
5354-
) t7) ON 1=1
5355-
LEFT OUTER JOIN (( SELECT 1
5356-
FROM t1 a_alias_1
5357-
LEFT JOIN (t2 b_alias_1 JOIN t1 a_alias_2) ON b_alias_1.b1 = a_alias_1.a1 AND a_alias_2.a1 = a_alias_1.a1
5358-
LEFT JOIN t3 c_alias_1 ON c_alias_1.c1 = a_alias_1.a1
5359-
LEFT JOIN t4 d_alias_1 ON d_alias_1.d1 = a_alias_1.a1
5360-
LEFT JOIN t3 c_alias_2 ON c_alias_2.c1 = a_alias_1.a1
5361-
LEFT JOIN t5 e_alias_1 ON e_alias_1.e1 = a_alias_1.a1
5362-
LEFT JOIN t6 f_alias_1 ON f_alias_1.f1 = a_alias_1.a1
5363-
) t8) ON 1=1
5364-
;
5365-
1
5366-
SELECT 1
5367-
FROM (v1 t1)
5368-
LEFT OUTER JOIN (v1 t2) ON 1=1
5369-
LEFT OUTER JOIN (v1 t3) ON 1=1
5370-
LEFT OUTER JOIN (v1 t4) ON 1=1
5371-
LEFT OUTER JOIN (v1 t5) ON 1=1
5372-
LEFT OUTER JOIN (v1 t6) ON 1=1
5373-
LEFT OUTER JOIN (v1 t7) ON 1=1
5374-
LEFT OUTER JOIN (v1 t8) ON 1=1
5375-
;
5376-
1
5377-
drop view v1;
5378-
drop table t1,t2,t3,t4,t5,t6;
53795271
# -----------------------------------------------------------------
53805272
# -- End of 5.3 tests.
53815273
# -----------------------------------------------------------------

‎mysql-test/suite/maria/dynamic.result‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
create table t1 (a blob, b varchar(20000)) engine=aria row_format=dynamic;
2+
insert t1 (b) values (repeat('a', 20000));
3+
update t1 set b='b';
4+
drop table t1;

‎mysql-test/suite/maria/dynamic.test‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
#
2+
# MDEV-13748 Assertion `status_var.local_memory_used == 0 || !debug_assert_on_not_freed_memory' failed in virtual THD::~THD after query with INTERSECT
3+
#
4+
create table t1 (a blob, b varchar(20000)) engine=aria row_format=dynamic;
5+
insert t1 (b) values (repeat('a', 20000));
6+
update t1 set b='b';
7+
drop table t1;

‎mysql-test/suite/parts/r/partition_alter_maria.result‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,15 @@ select * from t1;
1616
pk dt
1717
1 2017-09-28 15:12:00
1818
drop table t1;
19+
create table t1 (a int) engine=Aria transactional=1 partition by hash(a) partitions 2;
20+
show create table t1;
21+
Table Create Table
22+
t1 CREATE TABLE `t1` (
23+
`a` int(11) DEFAULT NULL
24+
) ENGINE=Aria DEFAULT CHARSET=latin1 TRANSACTIONAL=1
25+
/*!50100 PARTITION BY HASH (a)
26+
PARTITIONS 2 */
27+
drop table t1;
1928
#
2029
# MDEV-14641 Incompatible key or row definition between the MariaDB .frm file and the information in the storage engine
2130
#

‎mysql-test/suite/parts/t/partition_alter_maria.test‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,5 +17,12 @@ alter table t1 drop partition p20181231;
1717
select * from t1;
1818
drop table t1;
1919

20+
#
21+
# MDEV-13982 Server crashes in in ha_partition::engine_name
22+
#
23+
create table t1 (a int) engine=Aria transactional=1 partition by hash(a) partitions 2;
24+
show create table t1;
25+
drop table t1;
26+
2027
--let $engine=Aria
2128
--source inc/part_alter_values.inc

‎mysql-test/suite/plugins/t/server_audit.test‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,10 @@ select 1,
4242
3;
4343
insert into t2 values (1), (2);
4444
select * from t2;
45+
--disable_ps_protocol
4546
--error ER_NO_SUCH_TABLE
4647
select * from t_doesnt_exist;
48+
--enable_ps_protocol
4749
--error 1064
4850
syntax_error_query;
4951
drop table renamed_t1, t2;

‎mysql-test/t/view.test‎

Lines changed: 0 additions & 112 deletions
Original file line numberDiff line numberDiff line change
@@ -5182,118 +5182,6 @@ deallocate prepare stmt1;
51825182
drop view v1,v2;
51835183
drop table t1,t2;
51845184

5185-
--echo #
5186-
--echo # MDEV-6251: SIGSEGV in query optimizer (in set_check_materialized
5187-
--echo # with MERGE view)
5188-
--echo #
5189-
5190-
CREATE TABLE t1 (a1 INT(11) NOT NULL DEFAULT NULL AUTO_INCREMENT PRIMARY KEY);
5191-
CREATE TABLE t2 (b1 INT(11) NOT NULL DEFAULT NULL AUTO_INCREMENT PRIMARY KEY);
5192-
CREATE TABLE t3 (c1 INT(11) NOT NULL DEFAULT NULL AUTO_INCREMENT PRIMARY KEY);
5193-
CREATE TABLE t4 (d1 INT(11) NOT NULL DEFAULT NULL AUTO_INCREMENT PRIMARY KEY);
5194-
CREATE TABLE t5 (e1 INT(11) NOT NULL DEFAULT NULL AUTO_INCREMENT PRIMARY KEY);
5195-
CREATE TABLE t6 (f1 INT(11) NOT NULL DEFAULT NULL AUTO_INCREMENT PRIMARY KEY);
5196-
5197-
CREATE OR REPLACE view v1 AS
5198-
SELECT 1
5199-
FROM t1 a_alias_1
5200-
LEFT JOIN (t2 b_alias_1 JOIN t1 a_alias_2) ON b_alias_1.b1 = a_alias_1.a1 AND a_alias_2.a1 = a_alias_1.a1
5201-
LEFT JOIN t3 c_alias_1 ON c_alias_1.c1 = a_alias_1.a1
5202-
LEFT JOIN t4 d_alias_1 ON d_alias_1.d1 = a_alias_1.a1
5203-
LEFT JOIN t3 c_alias_2 ON c_alias_2.c1 = a_alias_1.a1
5204-
LEFT JOIN t5 e_alias_1 ON e_alias_1.e1 = a_alias_1.a1
5205-
LEFT JOIN t6 f_alias_1 ON f_alias_1.f1 = a_alias_1.a1
5206-
;
5207-
5208-
SELECT 1
5209-
FROM (( SELECT 1
5210-
FROM t1 a_alias_1
5211-
LEFT JOIN (t2 b_alias_1 JOIN t1 a_alias_2) ON b_alias_1.b1 = a_alias_1.a1 AND a_alias_2.a1 = a_alias_1.a1
5212-
LEFT JOIN t3 c_alias_1 ON c_alias_1.c1 = a_alias_1.a1
5213-
LEFT JOIN t4 d_alias_1 ON d_alias_1.d1 = a_alias_1.a1
5214-
LEFT JOIN t3 c_alias_2 ON c_alias_2.c1 = a_alias_1.a1
5215-
LEFT JOIN t5 e_alias_1 ON e_alias_1.e1 = a_alias_1.a1
5216-
LEFT JOIN t6 f_alias_1 ON f_alias_1.f1 = a_alias_1.a1
5217-
) t1)
5218-
LEFT OUTER JOIN (( SELECT 1
5219-
FROM t1 a_alias_1
5220-
LEFT JOIN (t2 b_alias_1 JOIN t1 a_alias_2) ON b_alias_1.b1 = a_alias_1.a1 AND a_alias_2.a1 = a_alias_1.a1
5221-
LEFT JOIN t3 c_alias_1 ON c_alias_1.c1 = a_alias_1.a1
5222-
LEFT JOIN t4 d_alias_1 ON d_alias_1.d1 = a_alias_1.a1
5223-
LEFT JOIN t3 c_alias_2 ON c_alias_2.c1 = a_alias_1.a1
5224-
LEFT JOIN t5 e_alias_1 ON e_alias_1.e1 = a_alias_1.a1
5225-
LEFT JOIN t6 f_alias_1 ON f_alias_1.f1 = a_alias_1.a1
5226-
) t2) ON 1=1
5227-
LEFT OUTER JOIN (( SELECT 1
5228-
FROM t1 a_alias_1
5229-
LEFT JOIN (t2 b_alias_1 JOIN t1 a_alias_2) ON b_alias_1.b1 = a_alias_1.a1 AND a_alias_2.a1 = a_alias_1.a1
5230-
LEFT JOIN t3 c_alias_1 ON c_alias_1.c1 = a_alias_1.a1
5231-
LEFT JOIN t4 d_alias_1 ON d_alias_1.d1 = a_alias_1.a1
5232-
LEFT JOIN t3 c_alias_2 ON c_alias_2.c1 = a_alias_1.a1
5233-
LEFT JOIN t5 e_alias_1 ON e_alias_1.e1 = a_alias_1.a1
5234-
LEFT JOIN t6 f_alias_1 ON f_alias_1.f1 = a_alias_1.a1
5235-
) t3) ON 1=1
5236-
LEFT OUTER JOIN (( SELECT 1
5237-
FROM t1 a_alias_1
5238-
LEFT JOIN (t2 b_alias_1 JOIN t1 a_alias_2) ON b_alias_1.b1 = a_alias_1.a1 AND a_alias_2.a1 = a_alias_1.a1
5239-
LEFT JOIN t3 c_alias_1 ON c_alias_1.c1 = a_alias_1.a1
5240-
LEFT JOIN t4 d_alias_1 ON d_alias_1.d1 = a_alias_1.a1
5241-
LEFT JOIN t3 c_alias_2 ON c_alias_2.c1 = a_alias_1.a1
5242-
LEFT JOIN t5 e_alias_1 ON e_alias_1.e1 = a_alias_1.a1
5243-
LEFT JOIN t6 f_alias_1 ON f_alias_1.f1 = a_alias_1.a1
5244-
) t4) ON 1=1
5245-
LEFT OUTER JOIN (( SELECT 1
5246-
FROM t1 a_alias_1
5247-
LEFT JOIN (t2 b_alias_1 JOIN t1 a_alias_2) ON b_alias_1.b1 = a_alias_1.a1 AND a_alias_2.a1 = a_alias_1.a1
5248-
LEFT JOIN t3 c_alias_1 ON c_alias_1.c1 = a_alias_1.a1
5249-
LEFT JOIN t4 d_alias_1 ON d_alias_1.d1 = a_alias_1.a1
5250-
LEFT JOIN t3 c_alias_2 ON c_alias_2.c1 = a_alias_1.a1
5251-
LEFT JOIN t5 e_alias_1 ON e_alias_1.e1 = a_alias_1.a1
5252-
LEFT JOIN t6 f_alias_1 ON f_alias_1.f1 = a_alias_1.a1
5253-
) t5) ON 1=1
5254-
LEFT OUTER JOIN (( SELECT 1
5255-
FROM t1 a_alias_1
5256-
LEFT JOIN (t2 b_alias_1 JOIN t1 a_alias_2) ON b_alias_1.b1 = a_alias_1.a1 AND a_alias_2.a1 = a_alias_1.a1
5257-
LEFT JOIN t3 c_alias_1 ON c_alias_1.c1 = a_alias_1.a1
5258-
LEFT JOIN t4 d_alias_1 ON d_alias_1.d1 = a_alias_1.a1
5259-
LEFT JOIN t3 c_alias_2 ON c_alias_2.c1 = a_alias_1.a1
5260-
LEFT JOIN t5 e_alias_1 ON e_alias_1.e1 = a_alias_1.a1
5261-
LEFT JOIN t6 f_alias_1 ON f_alias_1.f1 = a_alias_1.a1
5262-
) t6) ON 1=1
5263-
LEFT OUTER JOIN (( SELECT 1
5264-
FROM t1 a_alias_1
5265-
LEFT JOIN (t2 b_alias_1 JOIN t1 a_alias_2) ON b_alias_1.b1 = a_alias_1.a1 AND a_alias_2.a1 = a_alias_1.a1
5266-
LEFT JOIN t3 c_alias_1 ON c_alias_1.c1 = a_alias_1.a1
5267-
LEFT JOIN t4 d_alias_1 ON d_alias_1.d1 = a_alias_1.a1
5268-
LEFT JOIN t3 c_alias_2 ON c_alias_2.c1 = a_alias_1.a1
5269-
LEFT JOIN t5 e_alias_1 ON e_alias_1.e1 = a_alias_1.a1
5270-
LEFT JOIN t6 f_alias_1 ON f_alias_1.f1 = a_alias_1.a1
5271-
) t7) ON 1=1
5272-
LEFT OUTER JOIN (( SELECT 1
5273-
FROM t1 a_alias_1
5274-
LEFT JOIN (t2 b_alias_1 JOIN t1 a_alias_2) ON b_alias_1.b1 = a_alias_1.a1 AND a_alias_2.a1 = a_alias_1.a1
5275-
LEFT JOIN t3 c_alias_1 ON c_alias_1.c1 = a_alias_1.a1
5276-
LEFT JOIN t4 d_alias_1 ON d_alias_1.d1 = a_alias_1.a1
5277-
LEFT JOIN t3 c_alias_2 ON c_alias_2.c1 = a_alias_1.a1
5278-
LEFT JOIN t5 e_alias_1 ON e_alias_1.e1 = a_alias_1.a1
5279-
LEFT JOIN t6 f_alias_1 ON f_alias_1.f1 = a_alias_1.a1
5280-
) t8) ON 1=1
5281-
;
5282-
5283-
SELECT 1
5284-
FROM (v1 t1)
5285-
LEFT OUTER JOIN (v1 t2) ON 1=1
5286-
LEFT OUTER JOIN (v1 t3) ON 1=1
5287-
LEFT OUTER JOIN (v1 t4) ON 1=1
5288-
LEFT OUTER JOIN (v1 t5) ON 1=1
5289-
LEFT OUTER JOIN (v1 t6) ON 1=1
5290-
LEFT OUTER JOIN (v1 t7) ON 1=1
5291-
LEFT OUTER JOIN (v1 t8) ON 1=1
5292-
;
5293-
5294-
drop view v1;
5295-
drop table t1,t2,t3,t4,t5,t6;
5296-
52975185
--echo # -----------------------------------------------------------------
52985186
--echo # -- End of 5.3 tests.
52995187
--echo # -----------------------------------------------------------------

‎sql/sql_table.cc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4198,7 +4198,7 @@ mysql_prepare_create_table(THD *thd, HA_CREATE_INFO *create_info,
41984198
/* Give warnings for not supported table options */
41994199
#if defined(WITH_ARIA_STORAGE_ENGINE)
42004200
extern handlerton *maria_hton;
4201-
if (file->ht != maria_hton)
4201+
if (file->partition_ht() != maria_hton)
42024202
#endif
42034203
if (create_info->transactional)
42044204
push_warning_printf(thd, Sql_condition::WARN_LEVEL_WARN,

‎storage/heap/_check.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ int heap_check_heap(HP_INFO *info, my_bool print_status)
7979
}
8080
hp_find_record(info,pos);
8181

82-
if (!info->current_ptr[share->reclength])
82+
if (!info->current_ptr[share->visible])
8383
deleted++;
8484
else
8585
records++;

0 commit comments

Comments
 (0)