Merge mysql-5.1-bugteam -> mysql-5.1-innodb

282eee88 · Vasil Dimov · eaaea8eb · 4a9b4ed0 · 282eee88 · 282eee88
Commit 282eee88 authored Oct 04, 2010 by Vasil Dimov
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
@@ -4640,7 +4640,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:
      max_length= DECIMAL_MAX_STR_LENGTH;