innodb_bug47167_test_fix.patch

   1 --- a/mysql-test/suite/innodb_plugin/r/innodb_bug47167.result
   2 +++ b/mysql-test/suite/innodb_plugin/r/innodb_bug47167.result
   3 @@ -1,7 +1,4 @@
   4  set @old_innodb_file_format_check=@@innodb_file_format_check;
   5 -select @old_innodb_file_format_check;
   6 -@old_innodb_file_format_check
   7 -Antelope
   8  set global innodb_file_format_check = Barracuda;
   9  select @@innodb_file_format_check;
  10  @@innodb_file_format_check
  11 @@ -11,9 +8,9 @@
  12  @@innodb_file_format_check
  13  Barracuda
  14  set global innodb_file_format_check = @old_innodb_file_format_check;
  15 -select @@innodb_file_format_check;
  16 -@@innodb_file_format_check
  17 -Antelope
  18 +select @@innodb_file_format_check = @old_innodb_file_format_check;
  19 +@@innodb_file_format_check = @old_innodb_file_format_check
  20 +1
  21  set global innodb_file_format_check = cheetah;
  22  ERROR HY000: Incorrect arguments to SET
  23  set global innodb_file_format_check = Bear;
  24 --- a/mysql-test/suite/innodb_plugin/t/innodb_bug47167.test
  25 +++ b/mysql-test/suite/innodb_plugin/t/innodb_bug47167.test
  26 @@ -9,9 +9,6 @@
  27  # 'old_innodb_file_format_check'
  28  set @old_innodb_file_format_check=@@innodb_file_format_check;
  29
  30 -# @old_innodb_file_format_check shall have the value of 'Antelope'
  31 -select @old_innodb_file_format_check;
  32 -
  33  # Reset the value in 'innodb_file_format_check' to 'Barracuda'
  34  set global innodb_file_format_check = Barracuda;
  35
  36 @@ -27,7 +24,7 @@
  37  set global innodb_file_format_check = @old_innodb_file_format_check;
  38
  39  # Check whether 'innodb_file_format_check' get its original value.
  40 -select @@innodb_file_format_check;
  41 +select @@innodb_file_format_check = @old_innodb_file_format_check;
  42
  43  # Following are negative tests, all should fail.
  44  --disable_warnings