diff options
| author | Igor Babaev <igor@askmonty.org> | 2017-11-01 21:42:26 -0700 |
|---|---|---|
| committer | Igor Babaev <igor@askmonty.org> | 2017-11-01 21:42:26 -0700 |
| commit | 6f1b6061d8e7aa867970c6827e6737c35ee8a254 (patch) | |
| tree | 412e4263ad9a6f3d06736f59187fd8759c266f88 /mysql-test/r/mysqld--help.result | |
| parent | 613dd62a76b51df38b96e36bce5bd8b7be2ca73a (diff) | |
| parent | 34737e0cee5cd101a23c19d1f30b872a45393382 (diff) | |
| download | mariadb-git-6f1b6061d8e7aa867970c6827e6737c35ee8a254.tar.gz | |
Merge remote-tracking branch 'shagalla/10.3-mdev12172' into 10.3
As a result of this merge the code for the following tasks appears in 10.3:
- MDEV-12172 Implement tables specified by table value constructors
- MDEV-12176 Transform [NOT] IN predicate with long list of values INTO
[NOT] IN subquery.
Diffstat (limited to 'mysql-test/r/mysqld--help.result')
| -rw-r--r-- | mysql-test/r/mysqld--help.result | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/mysql-test/r/mysqld--help.result b/mysql-test/r/mysqld--help.result index 0037511b741..f5ef190b501 100644 --- a/mysql-test/r/mysqld--help.result +++ b/mysql-test/r/mysqld--help.result @@ -334,6 +334,10 @@ The following options may be given as the first argument: Specifies a directory to add to the ignore list when collecting database names from the datadir. Put a blank argument to reset the list accumulated so far. + --in-subquery-conversion-threshold[=#] + The minimum number of scalar elements in the value list + of IN predicate that triggers its conversion to IN + subquery --init-connect=name Command(s) that are executed for each new connection (unless the user has SUPER privilege) --init-file=name Read SQL commands from this file at startup @@ -1354,6 +1358,7 @@ idle-transaction-timeout 0 idle-write-transaction-timeout 0 ignore-builtin-innodb FALSE ignore-db-dirs +in-subquery-conversion-threshold 10000 init-connect init-file (No default value) init-rpl-role MASTER |