patches/webscalesql-skip-session-tracking-types.patch

   1 From b4ae418dbbd4913cbf0d523569a3d4ec9ba85343 Mon Sep 17 00:00:00 2001
   2 From: Manuel Ung <mung@fb.com>
   3 Date: Thu, 1 Feb 2018 11:26:32 -0800
   4 Subject: [PATCH] Safely skip over unsupported session tracking types
   5
   6 Summary:
   7 When we backported session tracking from 5.7, we did not backport all types, which is fine. However, we weren't skipping over them properly, since we just break out prematurely.
   8
   9 The fix is to move the cases down with the default cases where they will safely get skipped. Note that the assert won't fire because we still have all the enums defined properly.
  10
  11 Closes https://github.com/facebook/mysql-5.6/pull/781
  12 Closes https://github.com/facebook/mysql-5.6/issues/766
  13
  14 Reviewed By: jkedgar
  15
  16 Differential Revision: D6874150
  17 ---
  18  sql-common/client.c | 11 +++++------
  19  1 file changed, 5 insertions(+), 6 deletions(-)
  20
  21 diff --git a/third-party/webscalesqlclient/src/sql-common/client.c b/third-party/webscalesqlclient/src/sql-common/client.c
  22 index 3cfe0d8ddb..e10f15d89b 100644
  23 --- a/third-party/webscalesqlclient/src/sql-common/client.c
  24 +++ b/third-party/webscalesqlclient/src/sql-common/client.c
  25 @@ -780,12 +780,6 @@ void read_ok_ex(MYSQL *mysql, ulong length)
  26
  27            switch (type)
  28            {
  29 -          case SESSION_TRACK_SYSTEM_VARIABLES:
  30 -          case SESSION_TRACK_SCHEMA:
  31 -          case SESSION_TRACK_TRANSACTION_CHARACTERISTICS:
  32 -          case SESSION_TRACK_TRANSACTION_STATE:
  33 -            /* not backported */
  34 -           break;
  35            case SESSION_TRACK_GTIDS:
  36              if (!my_multi_malloc(MYF(0),
  37                &element, sizeof(LIST),
  38 @@ -858,6 +852,11 @@ void read_ok_ex(MYSQL *mysql, ulong length)
  39              }
  40
  41              break;
  42 +          case SESSION_TRACK_SYSTEM_VARIABLES:
  43 +          case SESSION_TRACK_SCHEMA:
  44 +          case SESSION_TRACK_TRANSACTION_CHARACTERISTICS:
  45 +          case SESSION_TRACK_TRANSACTION_STATE:
  46 +            /* not backported */
  47            default:
  48              DBUG_ASSERT(type <= SESSION_TRACK_END);
  49              /*
  50 --
  51 2.13.5
  52