Add warnings for single line inserts. To do this I had to convert count_cuted_fields to an enum (to be able to detect setting a NOT NULL field to NULL)

1 files changed, 5 insertions, 1 deletions

diff --git a/sql/sql_class.h b/sql/sql_class.h
index 5e5d0335e9d..5c84f39c91b 100644
--- a/sql/sql_class.h
+++ b/sql/sql_class.h
@@ -34,6 +34,9 @@ enum enum_log_type { LOG_CLOSED, LOG_TO_BE_OPENED, LOG_NORMAL, LOG_NEW, LOG_BIN}
 enum enum_delay_key_write { DELAY_KEY_WRITE_NONE, DELAY_KEY_WRITE_ON,
 			    DELAY_KEY_WRITE_ALL };
 
+enum enum_check_fields { CHECK_FIELD_IGNORE, CHECK_FIELD_WARN,
+			 CHECK_FIELD_ERROR_FOR_NULL };
+
 extern char internal_table_name[2];
 
 /* log info errors */
@@ -568,6 +571,7 @@ public:
   uint       select_number;             //number of select (used for EXPLAIN)
   /* variables.transaction_isolation is reset to this after each commit */
   enum_tx_isolation session_tx_isolation;
+  enum_check_fields count_cuted_fields;
   /* for user variables replication*/
   DYNAMIC_ARRAY user_var_events;
 
@@ -575,7 +579,7 @@ public:
   char	     scramble[SCRAMBLE_LENGTH+1];
 
   bool       slave_thread;
-  bool	     set_query_id,locked,count_cuted_fields,some_tables_deleted;
+  bool	     set_query_id,locked,some_tables_deleted;
   bool       last_cuted_field;
   bool	     no_errors, allow_sum_func, password, is_fatal_error;
   bool	     query_start_used,last_insert_id_used,insert_id_used,rand_used;