Merge connect/10.0 into 10.0

Squash all connect/10.0's commits into one and keep only
changes from storage/connect directory.

1 files changed, 2 insertions, 2 deletions

diff --git a/storage/connect/value.h b/storage/connect/value.h
index 2754c761815..f771d33dc52 100644
--- a/storage/connect/value.h
+++ b/storage/connect/value.h
@@ -90,8 +90,8 @@ class DllExport VALUE : public BLOCK {
   virtual double GetFloatValue(void) = 0;
   virtual void  *GetTo_Val(void) = 0;
   virtual void   SetPrec(int prec) {Prec = prec;}
-          bool   IsNull(void) {return Null;}
-          void   SetNull(bool b) {Null = b;}
+          bool   IsNull(void) {return (Nullable && Null);}
+          void   SetNull(bool b) {Null = (Nullable ? b : false);}
           bool   GetNullable(void) {return Nullable;}
           void   SetNullable(bool b) {Nullable = b;}
           int    GetType(void) {return Type;}