note, this is not about blindly merging everything. see whether changes make sense, ask somebody in support or consulting, when in doubt, see blogs about these changes, etc.

Unexpectedly to the task attached following ones:

• added --autoset- prefix for start-up options
• added unit test for my_getopt
• added unit test for --autoset-
• Added ability to switch off QC without setting size to 0
• Fixed bug in query_cache_type checking procedure which expeted only numeric values when it is enum
• Fixed showing/setting functions which incorrectly detect type of the variable (no applied mask)

revision-id: 0f1cd7cfc871b458e2205a045ed602bdd2f77bea
parent(s): 302bf7c4664b904482ecc133476e822d497b114d
committer: Oleksandr Byelkin
branch nick: server
timestamp: 2015-07-03 18:17:15 +0200
message:

MDEV-6066: Merge new defaults from 5.6 and 5.7 (part 1 (no hash serch))

Oleksandr Byelkin, please document which changes you decided to merge and which not, and comment on those which you decided to skip to explain the decision.
Meanwhile, please check MDEV-8429 – whether you have already merged this one; if you decided before that it should be skipped, you might want to re-consider.

revision-id: 686761fbb0fc36e4fa781b68aba24af21599822d
parent(s): 302bf7c4664b904482ecc133476e822d497b114d
committer: Oleksandr Byelkin
branch nick: server
timestamp: 2015-07-14 00:11:25 +0200
message:

MDEV-6066: Merge new defaults from 5.6 and 5.7 (part 1 (no hash serch) v2)

postreview 2 patches:

revision-id: ba230c21adcfc6e6a6174ff25d8a8aebd1a70f0a (mariadb-10.1.6-12-gba230c2)
parent(s): 86a3613d4e981c341e38291c9eeec5dc9f836fae
committer: Oleksandr Byelkin
timestamp: 2015-08-10 21:45:11 +0200
message:

MDEV-6066: Merge new defaults from 5.6 and 5.7 (autoset)

-autoset command line prefix added

—

revision-id: 76d6ac448d18a9e97ce4be585d79607780e00a49 (mariadb-10.1.6-13-g76d6ac4)
parent(s): ba230c21adcfc6e6a6174ff25d8a8aebd1a70f0a
committer: Oleksandr Byelkin
timestamp: 2015-08-11 18:45:38 +0200
message:

MDEV-6066: Merge new defaults from 5.6 and 5.7 (defaults changed, QC can be stopped with no-zero size)

—