summaryrefslogtreecommitdiff
path: root/sql/item_subselect.h
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2019-05-05 10:23:14 +0300
committerMarko Mäkelä <marko.makela@mariadb.com>2019-05-05 10:23:14 +0300
commitb132b8895e2e59df457e063451f186b53576b034 (patch)
tree565a5529facdca326b36d4418fae3522d8715e02 /sql/item_subselect.h
parent27980b0f83529725435dc8f37cb51878eb074d1d (diff)
parent4d59f45260547b3230f177498b6fa07a12647fdc (diff)
downloadmariadb-git-b132b8895e2e59df457e063451f186b53576b034.tar.gz
Merge 10.3 into 10.4
Diffstat (limited to 'sql/item_subselect.h')
-rw-r--r--sql/item_subselect.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/item_subselect.h b/sql/item_subselect.h
index bbc24d336f0..6b66ccc8fe7 100644
--- a/sql/item_subselect.h
+++ b/sql/item_subselect.h
@@ -1293,7 +1293,7 @@ public:
++cur_key_idx;
}
- void sort_keys();
+ bool sort_keys();
double null_selectivity();
/*