1
0
mirror of https://github.com/MariaDB/server.git synced 2025-12-24 11:21:21 +03:00

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)

mysql-test/r/ctype_mb.result:
  update results after adding more warnings
mysql-test/r/null.result:
  update results after adding more warnings
mysql-test/r/select_found.result:
  update results after adding more warnings
mysql-test/r/warnings.result:
  update results after adding more warnings
mysql-test/t/ctype_mb.test:
  Add missing drop table
mysql-test/t/myisam.test:
  Disable some warnings
mysql-test/t/select_found.test:
  update results after adding more warnings
sql/field_conv.cc:
  Add warnings for single line inserts
sql/item_func.cc:
  Remove compile warnings
sql/sql_class.cc:
  Add warnings for single line inserts
sql/sql_class.h:
  Add warnings for single line inserts
sql/sql_insert.cc:
  Add warnings for single line inserts
sql/sql_load.cc:
  Add warnings for single line inserts
sql/sql_select.cc:
  Add warnings for single line inserts
sql/sql_table.cc:
  Add warnings for single line inserts
sql/sql_update.cc:
  Add warnings for single line inserts
This commit is contained in:
unknown
2003-10-11 23:26:39 +03:00
parent 617e09abcf
commit 0cdddbf144
16 changed files with 60 additions and 23 deletions

View File

@@ -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;