summaryrefslogtreecommitdiff
path: root/sql/sql_show.cc
diff options
context:
space:
mode:
authorunknown <monty@mysql.com>2005-03-30 16:00:31 +0300
committerunknown <monty@mysql.com>2005-03-30 16:00:31 +0300
commita5b1b9d92474e4e1e30e7b1a3570cf4531533b03 (patch)
tree805fffb7b7262d7e59f1fd8969a0c1670de80a88 /sql/sql_show.cc
parenta391ef8dda3326a421f804bb34b4be48782a2848 (diff)
downloadmariadb-git-a5b1b9d92474e4e1e30e7b1a3570cf4531533b03.tar.gz
Give warnings if wrong date/time/datetime argument for STR_TO_DATE
Small fixes while doing review of new pushed code More test cases for decimal mysql-test/r/date_formats.result: Warnings added for STR_TO_DATE() mysql-test/r/ps_1general.result: Better description for BLACKHOLE mysql-test/r/strict.result: Added tests for STR_TO_DATE mysql-test/r/type_decimal.result: Test to test ranges of DECIMAL mysql-test/t/date_formats.test: More tests mysql-test/t/strict.test: Added tests for STR_TO_DATE mysql-test/t/type_decimal.test: Test to test ranges of DECIMAL sql/field.cc: Simple optimization sql/handler.cc: Better description for BLACKHOLE sql/item_timefunc.cc: Give warnings if wrong date/time/datetime argument for STR_TO_DATE sql/log_event.cc: Indentation fixes sql/log_event.h: #ifdef-ed not used code sql/share/errmsg.txt: New error message sql/sql_show.cc: Ensure that we do a proper restore in case of error
Diffstat (limited to 'sql/sql_show.cc')
-rw-r--r--sql/sql_show.cc7
1 files changed, 4 insertions, 3 deletions
diff --git a/sql/sql_show.cc b/sql/sql_show.cc
index bd0b8926c6a..263f907f277 100644
--- a/sql/sql_show.cc
+++ b/sql/sql_show.cc
@@ -1615,10 +1615,11 @@ typedef struct st_index_field_values
SYNOPSIS
schema_table_store_record()
thd thread handler
- table I_S table
+ table Information schema table to be updated
+
RETURN
- 1 error
0 success
+ 1 error
*/
static bool schema_table_store_record(THD *thd, TABLE *table)
@@ -1959,7 +1960,7 @@ int get_all_tables(THD *thd, TABLE_LIST *tables, COND *cond)
}
}
if (schema_table_store_record(thd, table))
- DBUG_RETURN(error);
+ goto err;
}
else
{