From: Tor Didriksen
Date: April 15 2011 12:59pm
Subject: bzr commit into mysql-trunk branch (tor.didriksen:3324)
List-Archive: http://lists.mysql.com/commits/135527
Message-Id: <20110415125933.A8A85376C@atum07.norway.sun.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============5733926083471311820=="

--===============5733926083471311820==
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

#At file:///export/home/didrik/repo/trunk-bug58705/ based on revid:alexander.nozdrin@stripped

 3324 Tor Didriksen	2011-04-15
      nullable or not nullable, that is the question

    modified:
      sql/event_db_repository.cc
      sql/field.h
      sql/sql_load.cc
      storage/innobase/handler/handler0alter.cc
      storage/perfschema/table_events_statements.cc
=== modified file 'sql/event_db_repository.cc'
--- a/sql/event_db_repository.cc	2011-03-21 16:24:30 +0000
+++ b/sql/event_db_repository.cc	2011-04-15 12:59:29 +0000
@@ -279,7 +279,7 @@ mysql_event_fill_row(THD *thd,
                                   interval_type_to_name[et->interval].length,
                                   scs);
 
-    fields[ET_FIELD_EXECUTE_AT]->set_null();
+    // not nullable!! fields[ET_FIELD_EXECUTE_AT]->set_null();
 
     if (!et->starts_null)
     {

=== modified file 'sql/field.h'
--- a/sql/field.h	2011-03-28 08:51:35 +0000
+++ b/sql/field.h	2011-04-15 12:59:29 +0000
@@ -281,7 +281,10 @@ public:
     return test(null_ptr[offset] & null_bit);
   }
   inline void set_null(my_ptrdiff_t row_offset= 0)
-    { if (null_ptr) null_ptr[row_offset]|= null_bit; }
+  {
+    DBUG_ASSERT(real_maybe_null());
+    if (null_ptr) null_ptr[row_offset]|= null_bit;
+  }
   inline void set_notnull(my_ptrdiff_t row_offset= 0)
     { if (null_ptr) null_ptr[row_offset]&= (uchar) ~null_bit; }
   inline bool maybe_null(void) { return null_ptr != 0 || table->maybe_null; }

=== modified file 'sql/sql_load.cc'
--- a/sql/sql_load.cc	2011-04-15 09:02:16 +0000
+++ b/sql/sql_load.cc	2011-04-15 12:59:29 +0000
@@ -965,7 +965,8 @@ read_sep_field(THD *thd, COPY_INFO &info
                      thd->warning_info->current_row_for_warning());
             DBUG_RETURN(1);
           }
-          field->set_null();
+          if (field->real_maybe_null())
+            field->set_null();
           if (!field->maybe_null())
           {
             if (field->type() == MYSQL_TYPE_TIMESTAMP)

=== modified file 'storage/innobase/handler/handler0alter.cc'
--- a/storage/innobase/handler/handler0alter.cc	2011-03-30 12:20:45 +0000
+++ b/storage/innobase/handler/handler0alter.cc	2011-04-15 12:59:29 +0000
@@ -157,7 +157,8 @@ innobase_rec_to_mysql(
 
 		if (UNIV_UNLIKELY(ipos == ULINT_UNDEFINED)) {
 null_field:
-			field->set_null();
+			if (field->real_maybe_null())
+				field->set_null();
 			continue;
 		}
 

=== modified file 'storage/perfschema/table_events_statements.cc'
--- a/storage/perfschema/table_events_statements.cc	2011-02-14 14:23:55 +0000
+++ b/storage/perfschema/table_events_statements.cc	2011-04-15 12:59:29 +0000
@@ -411,7 +411,7 @@ int table_events_statements_common::read
         if (m_row.m_lock_time != 0)
           set_field_ulonglong(f, m_row.m_lock_time);
         else
-          f->set_null();
+        {} // not nullable!! f->set_null();
         break;
       case 8: /* SQL_TEXT */
         if (m_row.m_sqltext_length)


--===============5733926083471311820==
MIME-Version: 1.0
Content-Type: text/bzr-bundle; charset="us-ascii";
	name="bzr/tor.didriksen@stripped"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: tor.didriksen@stripped\
#   8k9th78wszpj98z5
# target_branch: file:///export/home/didrik/repo/trunk-bug58705/
# testament_sha1: 2ecaac03b307697a5ec32c3d5891f3de8b3a787c
# timestamp: 2011-04-15 14:59:33 +0200
# base_revision_id: alexander.nozdrin@stripped\
#   22923jpricrots8n
# 
# Begin bundle
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
FMQ=


--===============5733926083471311820==--