From a746411816606aa156a4307ec6950b28ae9a13f6 Mon Sep 17 00:00:00 2001
From: "kostja@bodhi.(none)" <>
Date: Tue, 20 May 2008 21:07:11 +0400
Subject: [PATCH] Bug#27430 "Crash in subquery code when in PS and table DDL
 changed after PREPARE" Update test results after a merge with the main tree:
 the new minimum for the table definition cache is 256.

---
 .../r/table_definition_cache_basic.result     | 30 ++++++++++++-------
 1 file changed, 20 insertions(+), 10 deletions(-)

diff --git a/mysql-test/r/table_definition_cache_basic.result b/mysql-test/r/table_definition_cache_basic.result
index 56bfb40b2f8..5f0e1960358 100644
--- a/mysql-test/r/table_definition_cache_basic.result
+++ b/mysql-test/r/table_definition_cache_basic.result
@@ -1,27 +1,33 @@
 SET @start_value = @@global.table_definition_cache;
 SELECT @start_value;
 @start_value
-128
+256
 '#--------------------FN_DYNVARS_019_01------------------------#'
 SET @@global.table_definition_cache = 100;
+Warnings:
+Warning	1292	Truncated incorrect table_definition_cache value: '100'
 SET @@global.table_definition_cache = DEFAULT;
 SELECT @@global.table_definition_cache;
 @@global.table_definition_cache
-128
+256
 '#---------------------FN_DYNVARS_019_02-------------------------#'
 SET @@global.table_definition_cache = DEFAULT;
 SELECT @@global.table_definition_cache = 128;
 @@global.table_definition_cache = 128
-1
+0
 '#--------------------FN_DYNVARS_019_03------------------------#'
 SET @@global.table_definition_cache = 1;
+Warnings:
+Warning	1292	Truncated incorrect table_definition_cache value: '1'
 SELECT @@global.table_definition_cache;
 @@global.table_definition_cache
-1
+256
 SET @@global.table_definition_cache = 2;
+Warnings:
+Warning	1292	Truncated incorrect table_definition_cache value: '2'
 SELECT @@global.table_definition_cache;
 @@global.table_definition_cache
-2
+256
 SET @@global.table_definition_cache = 524287;
 SELECT @@global.table_definition_cache;
 @@global.table_definition_cache
@@ -36,13 +42,13 @@ Warnings:
 Warning	1292	Truncated incorrect table_definition_cache value: '0'
 SELECT @@global.table_definition_cache;
 @@global.table_definition_cache
-1
+256
 SET @@global.table_definition_cache = -1024;
 Warnings:
 Warning	1292	Truncated incorrect table_definition_cache value: '0'
 SELECT @@global.table_definition_cache;
 @@global.table_definition_cache
-1
+256
 SET @@global.table_definition_cache = 524289;
 Warnings:
 Warning	1292	Truncated incorrect table_definition_cache value: '524289'
@@ -73,17 +79,21 @@ WHERE VARIABLE_NAME='table_definition_cache';
 1
 '#---------------------FN_DYNVARS_019_07----------------------#'
 SET @@global.table_definition_cache = TRUE;
+Warnings:
+Warning	1292	Truncated incorrect table_definition_cache value: '1'
 SELECT @@global.table_definition_cache;
 @@global.table_definition_cache
-1
+256
 SET @@global.table_definition_cache = FALSE;
 Warnings:
 Warning	1292	Truncated incorrect table_definition_cache value: '0'
 SELECT @@global.table_definition_cache;
 @@global.table_definition_cache
-1
+256
 '#---------------------FN_DYNVARS_019_08----------------------#'
 SET @@global.table_definition_cache = 5;
+Warnings:
+Warning	1292	Truncated incorrect table_definition_cache value: '5'
 SELECT @@table_definition_cache = @@global.table_definition_cache;
 @@table_definition_cache = @@global.table_definition_cache
 1
@@ -99,4 +109,4 @@ ERROR 42S22: Unknown column 'table_definition_cache' in 'field list'
 SET @@global.table_definition_cache = @start_value;
 SELECT @@global.table_definition_cache;
 @@global.table_definition_cache
-128
+256