summaryrefslogtreecommitdiff
path: root/sql/sql_update.cc
diff options
context:
space:
mode:
authorunknown <monty@mashka.mysql.fi>2003-10-11 23:26:39 +0300
committerunknown <monty@mashka.mysql.fi>2003-10-11 23:26:39 +0300
commit0cdddbf144de80d1c4da00ee681632bc0ac6c7c9 (patch)
treeef3d1cebc764d28840dd77ecb91ade0a6f1b593e /sql/sql_update.cc
parent617e09abcf4d0b41283bd423f32415d7f4459e9e (diff)
downloadmariadb-git-0cdddbf144de80d1c4da00ee681632bc0ac6c7c9.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)
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
Diffstat (limited to 'sql/sql_update.cc')
-rw-r--r--sql/sql_update.cc8
1 files changed, 4 insertions, 4 deletions
diff --git a/sql/sql_update.cc b/sql/sql_update.cc
index 2ecc526a612..f2185d265e1 100644
--- a/sql/sql_update.cc
+++ b/sql/sql_update.cc
@@ -295,7 +295,7 @@ int mysql_update(THD *thd,
init_read_record(&info,thd,table,select,0,1);
updated= found= 0;
- thd->count_cuted_fields=1; /* calc cuted fields */
+ thd->count_cuted_fields= CHECK_FIELD_WARN; /* calc cuted fields */
thd->cuted_fields=0L;
thd->proc_info="Updating";
query_id=thd->query_id;
@@ -386,7 +386,7 @@ int mysql_update(THD *thd,
thd->insert_id_used ? thd->insert_id() : 0L,buff);
DBUG_PRINT("info",("%d records updated",updated));
}
- thd->count_cuted_fields=0; /* calc cuted fields */
+ thd->count_cuted_fields= CHECK_FIELD_IGNORE; /* calc cuted fields */
free_io_cache(table);
DBUG_RETURN(0);
@@ -492,7 +492,7 @@ int multi_update::prepare(List<Item> &not_used_values, SELECT_LEX_UNIT *unit)
uint i, max_fields;
DBUG_ENTER("multi_update::prepare");
- thd->count_cuted_fields=1;
+ thd->count_cuted_fields= CHECK_FIELD_WARN;
thd->cuted_fields=0L;
thd->proc_info="updating main table";
@@ -733,7 +733,7 @@ multi_update::~multi_update()
}
if (copy_field)
delete [] copy_field;
- thd->count_cuted_fields=0; // Restore this setting
+ thd->count_cuted_fields= CHECK_FIELD_IGNORE; // Restore this setting
if (!trans_safe)
thd->options|=OPTION_STATUS_NO_TRANS_UPDATE;
}