diff options
| -rw-r--r-- | mysql-test/r/sp.result | 1 | ||||
| -rw-r--r-- | mysql-test/t/sp.test | 2 | ||||
| -rw-r--r-- | sql/filesort.cc | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/mysql-test/r/sp.result b/mysql-test/r/sp.result index 832d8baee0e..50dd2ae7047 100644 --- a/mysql-test/r/sp.result +++ b/mysql-test/r/sp.result @@ -3064,7 +3064,6 @@ select @x| @x 3 # Restore the old query cache size -set global query_cache_size = @qcs1| delete from t1| drop function bug9902| drop function if exists bug9102| diff --git a/mysql-test/t/sp.test b/mysql-test/t/sp.test index c6d97df6449..b54845c307f 100644 --- a/mysql-test/t/sp.test +++ b/mysql-test/t/sp.test @@ -3762,9 +3762,11 @@ select bug9902() from t1| select @x| --echo # Restore the old query cache size +--disable_query_log if (`select @@have_query_cache='YES'`) { set global query_cache_size = @qcs1| } +--enable_query_log delete from t1| drop function bug9902| diff --git a/sql/filesort.cc b/sql/filesort.cc index 10991d1dcfb..559f4f1dcf6 100644 --- a/sql/filesort.cc +++ b/sql/filesort.cc @@ -875,7 +875,7 @@ static void make_sortkey(register SORTPARAM *param, case INT_RESULT: case TIME_RESULT: { - longlong value; + longlong UNINIT_VAR(value); if (sort_field->result_type == INT_RESULT) value= item->val_int_result(); else |