diff options
| author | monty@mashka.mysql.fi <> | 2003-10-11 23:26:39 +0300 |
|---|---|---|
| committer | monty@mashka.mysql.fi <> | 2003-10-11 23:26:39 +0300 |
| commit | c60a75e9ba08cd1937e73a42ca065b992a4f47d2 (patch) | |
| tree | ef3d1cebc764d28840dd77ecb91ade0a6f1b593e /sql/sql_load.cc | |
| parent | a533d88693f43cd92e1f42ea03fcfc2316a289a6 (diff) | |
| download | mariadb-git-c60a75e9ba08cd1937e73a42ca065b992a4f47d2.tar.gz | |
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)
Diffstat (limited to 'sql/sql_load.cc')
| -rw-r--r-- | sql/sql_load.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_load.cc b/sql/sql_load.cc index 0a5c544c2e7..0e7895689b5 100644 --- a/sql/sql_load.cc +++ b/sql/sql_load.cc @@ -252,7 +252,7 @@ int mysql_load(THD *thd,sql_exchange *ex,TABLE_LIST *table_list, restore_record(table,default_values); - thd->count_cuted_fields=1; /* calc cuted fields */ + thd->count_cuted_fields= CHECK_FIELD_WARN; /* calc cuted fields */ thd->cuted_fields=0L; if (ex->line_term->length() && field_term->length()) { @@ -293,7 +293,7 @@ int mysql_load(THD *thd,sql_exchange *ex,TABLE_LIST *table_list, if (file >= 0) my_close(file,MYF(0)); free_blobs(table); /* if pack_blob was used */ table->copy_blobs=0; - thd->count_cuted_fields=0; /* Don`t calc cuted fields */ + thd->count_cuted_fields= CHECK_FIELD_IGNORE; /* We must invalidate the table in query cache before binlog writing and |