maria-developers team mailing list archive

[<sanja@xxxxxxxxxxxx>]

At file:///home/bell/maria/bzr/work-maria-5.3-scache/

------------------------------------------------------------
revno: 2792
revision-id: sanja@xxxxxxxxxxxx-20100525182914-z3zeviggq9026x1n
parent: sanja@xxxxxxxxxxxx-20100525125457-5rwbiihh0vtghdrj
committer: sanja@xxxxxxxxxxxx
branch nick: work-maria-5.3-scache
timestamp: Tue 2010-05-25 21:29:14 +0300
message:
  fixed problem with subselect_debug.test

=== modified file 'sql/item_subselect.cc'
--- a/sql/item_subselect.cc	2010-05-25 12:54:57 +0000
+++ b/sql/item_subselect.cc	2010-05-25 18:29:14 +0000
@@ -1201,7 +1201,8 @@
   if (exec())
   {
     reset();
-    DBUG_RETURN(NULL);
+    str->set((ulonglong)0,&my_charset_bin);
+    DBUG_RETURN(str);
   }
 
   if (scache)
@@ -1244,7 +1245,8 @@
   if (exec())
   {
     reset();
-    DBUG_RETURN(0);
+    int2my_decimal(E_DEC_FATAL_ERROR, 0, 0, decimal_value);
+    DBUG_RETURN(decimal_value);
   }
 
   if (scache)