merge

5069e39a · Georgi Kodinov · fcc76869 · 82aee0e4 · 5069e39a · 5069e39a
Commit 5069e39a authored Sep 30, 2010 by Georgi Kodinov
5 changed files
--- a/mysql-test/r/ps_2myisam.result
+++ b/mysql-test/r/ps_2myisam.result
--- a/mysql-test/r/ps_3innodb.result
+++ b/mysql-test/r/ps_3innodb.result
--- a/mysql-test/r/ps_4heap.result
+++ b/mysql-test/r/ps_4heap.result
--- a/mysql-test/r/ps_5merge.result
+++ b/mysql-test/r/ps_5merge.result
--- a/sql/item_func.cc
+++ b/sql/item_func.cc
@@ -5023,7 +5023,7 @@ void Item_func_get_user_var::fix_length_and_dec()
      decimals=0;
      break;
    case STRING_RESULT:
-      max_length= MAX_BLOB_WIDTH;
+      max_length= MAX_BLOB_WIDTH - 1;
      break;
    case DECIMAL_RESULT:
      fix_char_length(DECIMAL_MAX_STR_LENGTH);