Adding upstream version 1:10.11.6.upstream/1%10.11.6upstream

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 76 insertions, 0 deletions

diff --git a/mysql-test/suite/vcol/r/vcol_handler_innodb.result b/mysql-test/suite/vcol/r/vcol_handler_innodb.result
new file mode 100644
index 00000000..c3358acd
--- /dev/null
+++ b/mysql-test/suite/vcol/r/vcol_handler_innodb.result
@@ -0,0 +1,76 @@
+SET @@session.default_storage_engine = 'InnoDB';
+create table t1 (a int, 
+b int as (-a),
+c int as (-a) persistent,
+d char(1),
+index (a),
+index (c));
+insert into t1 (a,d) values (4,'a'), (2,'b'), (1,'c'), (3,'d');
+select * from t1;
+a	b	c	d
+4	-4	-4	a
+2	-2	-2	b
+1	-1	-1	c
+3	-3	-3	d
+# HANDLER tbl_name OPEN
+handler t1 open;
+# HANDLER tbl_name READ non-vcol_index_name > (value1,value2,...)
+handler t1 read a > (2);
+a	b	c	d
+3	-3	-3	d
+# HANDLER tbl_name READ non-vcol_index_name > (value1,value2,...) WHERE non-vcol_field=expr
+handler t1 read a > (2) where d='c';
+a	b	c	d
+# HANDLER tbl_name READ vcol_index_name = (value1,value2,...)
+handler t1 read c = (-2);
+a	b	c	d
+2	-2	-2	b
+# HANDLER tbl_name READ vcol_index_name = (value1,value2,...) WHERE non-vcol_field=expr
+handler t1 read c = (-2) where d='c';
+a	b	c	d
+# HANDLER tbl_name READ non-vcol_index_name > (value1,value2,...) WHERE vcol_field=expr
+handler t1 read a > (2) where b=-3 && c=-3;
+a	b	c	d
+3	-3	-3	d
+# HANDLER tbl_name READ vcol_index_name <= (value1,value2,...)
+handler t1 read c <= (-2);
+a	b	c	d
+2	-2	-2	b
+# HANDLER tbl_name READ vcol_index_name > (value1,value2,...) WHERE vcol_field=expr
+handler t1 read c <= (-2) where b=-3;
+a	b	c	d
+3	-3	-3	d
+# HANDLER tbl_name READ vcol_index_name FIRST
+handler t1 read c first;
+a	b	c	d
+4	-4	-4	a
+# HANDLER tbl_name READ vcol_index_name NEXT
+handler t1 read c next;
+a	b	c	d
+3	-3	-3	d
+# HANDLER tbl_name READ vcol_index_name PREV
+handler t1 read c prev;
+a	b	c	d
+4	-4	-4	a
+# HANDLER tbl_name READ vcol_index_name LAST
+handler t1 read c last;
+a	b	c	d
+1	-1	-1	c
+# HANDLER tbl_name READ FIRST where non-vcol=expr
+handler t1 read FIRST where a >= 2;
+a	b	c	d
+4	-4	-4	a
+# HANDLER tbl_name READ FIRST where vcol=expr
+handler t1 read FIRST where b >= -2;
+a	b	c	d
+2	-2	-2	b
+# HANDLER tbl_name READ NEXT where non-vcol=expr
+handler t1 read NEXT where d='c';
+a	b	c	d
+1	-1	-1	c
+# HANDLER tbl_name READ NEXT where vcol=expr
+handler t1 read NEXT where b<=-4;
+a	b	c	d
+# HANDLER tbl_name CLOSE
+handler t1 close;
+drop table t1;