Skip to content

M
mariadb
Commit 1be0a0c8 authored by monty@mysql.com's avatar monty@mysql.com
Browse files
Options

Now one gets an error if one tries to insert an invalid value via a stored... 

Now one gets an error if one tries to insert an invalid value via a stored procedure in STRICT mode. (Bug #5907)
parent 04f8e164
Show whitespace changes
Inline Side-by-side
Showing with 105 additions and 66 deletions
client/mysqldump.c
View file @ 1be0a0c8
...@@ -37,7 +37,7 @@ ...@@ -37,7 +37,7 @@
** 10 Jun 2003: SET NAMES and --no-set-names by Alexander Barkov ** 10 Jun 2003: SET NAMES and --no-set-names by Alexander Barkov
*/ */
#define DUMP_VERSION "10.9" #define DUMP_VERSION "10.10"
#include <my_global.h> #include <my_global.h>
#include <my_sys.h> #include <my_sys.h>
...@@ -396,7 +396,7 @@ static int dump_all_databases(); ...@@ -396,7 +396,7 @@ static int dump_all_databases();
static char *quote_name(const char *name, char *buff, my_bool force); static char *quote_name(const char *name, char *buff, my_bool force);
static const char *check_if_ignore_table(const char *table_name); static const char *check_if_ignore_table(const char *table_name);
static char *primary_key_fields(const char *table_name); static char *primary_key_fields(const char *table_name);
static my_bool getViewStructure(char *table, char* db); static my_bool get_view_structure(char *table, char* db);
static my_bool dump_all_views_in_db(char *database); static my_bool dump_all_views_in_db(char *database);
#include <help_start.h> #include <help_start.h>
...@@ -777,16 +777,16 @@ static int get_options(int *argc, char ***argv) ...@@ -777,16 +777,16 @@ static int get_options(int *argc, char ***argv)
/* /*
** DBerror -- prints mysql error message and exits the program. ** DB_error -- prints mysql error message and exits the program.
*/ */
static void DBerror(MYSQL *mysql, const char *when) static void DB_error(MYSQL *mysql, const char *when)
{ {
DBUG_ENTER("DBerror"); DBUG_ENTER("DB_error");
my_printf_error(0,"Got error: %d: %s %s", MYF(0), my_printf_error(0,"Got error: %d: %s %s", MYF(0),
mysql_errno(mysql), mysql_error(mysql), when); mysql_errno(mysql), mysql_error(mysql), when);
safe_exit(EX_MYSQLERR); safe_exit(EX_MYSQLERR);
DBUG_VOID_RETURN; DBUG_VOID_RETURN;
} /* DBerror */ } /* DB_error */
/* /*
...@@ -862,7 +862,7 @@ static int dbConnect(char *host, char *user,char *passwd) ...@@ -862,7 +862,7 @@ static int dbConnect(char *host, char *user,char *passwd)
NULL,opt_mysql_port,opt_mysql_unix_port, NULL,opt_mysql_port,opt_mysql_unix_port,
0))) 0)))
{ {
DBerror(&mysql_connection, "when trying to connect"); DB_error(&mysql_connection, "when trying to connect");
return 1; return 1;
} }
/* /*
...@@ -1093,7 +1093,7 @@ static void print_xml_row(FILE *xml_file, const char *row_name, ...@@ -1093,7 +1093,7 @@ static void print_xml_row(FILE *xml_file, const char *row_name,
number of fields in table, 0 if error number of fields in table, 0 if error
*/ */
static uint getTableStructure(char *table, char *db) static uint get_table_structure(char *table, char *db)
{ {
MYSQL_RES *tableRes; MYSQL_RES *tableRes;
MYSQL_ROW row; MYSQL_ROW row;
...@@ -1104,7 +1104,7 @@ static uint getTableStructure(char *table, char *db) ...@@ -1104,7 +1104,7 @@ static uint getTableStructure(char *table, char *db)
char name_buff[NAME_LEN+3],table_buff[NAME_LEN*2+3]; char name_buff[NAME_LEN+3],table_buff[NAME_LEN*2+3];
char table_buff2[NAME_LEN*2+3]; char table_buff2[NAME_LEN*2+3];
FILE *sql_file = md_result_file; FILE *sql_file = md_result_file;
DBUG_ENTER("getTableStructure"); DBUG_ENTER("get_table_structure");
delayed= opt_delayed ? " DELAYED " : ""; delayed= opt_delayed ? " DELAYED " : "";
...@@ -1457,7 +1457,7 @@ continue_xml: ...@@ -1457,7 +1457,7 @@ continue_xml:
my_fclose(sql_file, MYF(MY_WME)); my_fclose(sql_file, MYF(MY_WME));
} }
DBUG_RETURN(numFields); DBUG_RETURN(numFields);
} /* getTableStructure */ } /* get_table_structure */
static char *add_load_option(char *ptr,const char *object, static char *add_load_option(char *ptr,const char *object,
...@@ -1523,10 +1523,12 @@ static char *alloc_query_str(ulong size) ...@@ -1523,10 +1523,12 @@ static char *alloc_query_str(ulong size)
return query; return query;
} }
/* /*
** dumpTable saves database contents as a series of INSERT statements. ** dump_table saves database contents as a series of INSERT statements.
*/ */
static void dumpTable(uint numFields, char *table)
static void dump_table(uint numFields, char *table)
{ {
char query_buf[QUERY_LENGTH], *end, buff[256],table_buff[NAME_LEN+3]; char query_buf[QUERY_LENGTH], *end, buff[256],table_buff[NAME_LEN+3];
char *result_table, table_buff2[NAME_LEN*2+3], *opt_quoted_table; char *result_table, table_buff2[NAME_LEN*2+3], *opt_quoted_table;
...@@ -1592,7 +1594,7 @@ static void dumpTable(uint numFields, char *table) ...@@ -1592,7 +1594,7 @@ static void dumpTable(uint numFields, char *table)
} }
if (mysql_real_query(sock, query, (uint) (end - query))) if (mysql_real_query(sock, query, (uint) (end - query)))
{ {
DBerror(sock, "when executing 'SELECT INTO OUTFILE'"); DB_error(sock, "when executing 'SELECT INTO OUTFILE'");
return; return;
} }
} }
...@@ -1639,13 +1641,13 @@ static void dumpTable(uint numFields, char *table) ...@@ -1639,13 +1641,13 @@ static void dumpTable(uint numFields, char *table)
check_io(md_result_file); check_io(md_result_file);
} }
if (mysql_query_with_error_report(sock, 0, query)) if (mysql_query_with_error_report(sock, 0, query))
DBerror(sock, "when retrieving data from server"); DB_error(sock, "when retrieving data from server");
if (quick) if (quick)
res=mysql_use_result(sock); res=mysql_use_result(sock);
else else
res=mysql_store_result(sock); res=mysql_store_result(sock);
if (!res) if (!res)
DBerror(sock, "when retrieving data from server"); DB_error(sock, "when retrieving data from server");
if (verbose) if (verbose)
fprintf(stderr, "-- Retrieving rows...\n"); fprintf(stderr, "-- Retrieving rows...\n");
if (mysql_num_fields(res) != numFields) if (mysql_num_fields(res) != numFields)
...@@ -1946,7 +1948,7 @@ err: ...@@ -1946,7 +1948,7 @@ err:
my_free(query, MYF(MY_ALLOW_ZERO_PTR)); my_free(query, MYF(MY_ALLOW_ZERO_PTR));
safe_exit(error); safe_exit(error);
return; return;
} /* dumpTable */ } /* dump_table */
static char *getTableName(int reset) static char *getTableName(int reset)
...@@ -2035,7 +2037,7 @@ static int init_dumping(char *database) ...@@ -2035,7 +2037,7 @@ static int init_dumping(char *database)
if (mysql_select_db(sock, database)) if (mysql_select_db(sock, database))
{ {
DBerror(sock, "when selecting the database"); DB_error(sock, "when selecting the database");
return 1; /* If --force */ return 1; /* If --force */
} }
if (!path && !opt_xml) if (!path && !opt_xml)
...@@ -2123,14 +2125,14 @@ static int dump_all_tables_in_db(char *database) ...@@ -2123,14 +2125,14 @@ static int dump_all_tables_in_db(char *database)
dynstr_append(&query, " READ /*!32311 LOCAL */,"); dynstr_append(&query, " READ /*!32311 LOCAL */,");
} }
if (numrows && mysql_real_query(sock, query.str, query.length-1)) if (numrows && mysql_real_query(sock, query.str, query.length-1))
DBerror(sock, "when using LOCK TABLES"); DB_error(sock, "when using LOCK TABLES");
/* We shall continue here, if --force was given */ /* We shall continue here, if --force was given */
dynstr_free(&query); dynstr_free(&query);
} }
if (flush_logs) if (flush_logs)
{ {
if (mysql_refresh(sock, REFRESH_LOG)) if (mysql_refresh(sock, REFRESH_LOG))
DBerror(sock, "when doing refresh"); DB_error(sock, "when doing refresh");
/* We shall continue here, if --force was given */ /* We shall continue here, if --force was given */
} }
while ((table= getTableName(0))) while ((table= getTableName(0)))
...@@ -2138,9 +2140,9 @@ static int dump_all_tables_in_db(char *database) ...@@ -2138,9 +2140,9 @@ static int dump_all_tables_in_db(char *database)
char *end= strmov(afterdot, table); char *end= strmov(afterdot, table);
if (include_table(hash_key, end - hash_key)) if (include_table(hash_key, end - hash_key))
{ {
numrows = getTableStructure(table, database); numrows = get_table_structure(table, database);
if (!dFlag && numrows > 0) if (!dFlag && numrows > 0)
dumpTable(numrows,table); dump_table(numrows,table);
my_free(order_by, MYF(MY_ALLOW_ZERO_PTR)); my_free(order_by, MYF(MY_ALLOW_ZERO_PTR));
order_by= 0; order_by= 0;
} }
...@@ -2188,18 +2190,18 @@ static my_bool dump_all_views_in_db(char *database) ...@@ -2188,18 +2190,18 @@ static my_bool dump_all_views_in_db(char *database)
dynstr_append(&query, " READ /*!32311 LOCAL */,"); dynstr_append(&query, " READ /*!32311 LOCAL */,");
} }
if (numrows && mysql_real_query(sock, query.str, query.length-1)) if (numrows && mysql_real_query(sock, query.str, query.length-1))
DBerror(sock, "when using LOCK TABLES"); DB_error(sock, "when using LOCK TABLES");
/* We shall continue here, if --force was given */ /* We shall continue here, if --force was given */
dynstr_free(&query); dynstr_free(&query);
} }
if (flush_logs) if (flush_logs)
{ {
if (mysql_refresh(sock, REFRESH_LOG)) if (mysql_refresh(sock, REFRESH_LOG))
DBerror(sock, "when doing refresh"); DB_error(sock, "when doing refresh");
/* We shall continue here, if --force was given */ /* We shall continue here, if --force was given */
} }
while ((table= getTableName(0))) while ((table= getTableName(0)))
getViewStructure(table, database); get_view_structure(table, database);
if (opt_xml) if (opt_xml)
{ {
fputs("</database>\n", md_result_file); fputs("</database>\n", md_result_file);
...@@ -2226,7 +2228,7 @@ static int get_actual_table_name(const char *old_table_name, ...@@ -2226,7 +2228,7 @@ static int get_actual_table_name(const char *old_table_name,
int buf_size) int buf_size)
{ {
int retval; int retval;
MYSQL_RES *tableRes; MYSQL_RES *table_res;
MYSQL_ROW row; MYSQL_ROW row;
char query[50 + 2*NAME_LEN]; char query[50 + 2*NAME_LEN];
char show_name_buff[FN_REFLEN]; char show_name_buff[FN_REFLEN];
...@@ -2242,18 +2244,22 @@ static int get_actual_table_name(const char *old_table_name, ...@@ -2242,18 +2244,22 @@ static int get_actual_table_name(const char *old_table_name,
safe_exit(EX_MYSQLERR); safe_exit(EX_MYSQLERR);
} }
tableRes= mysql_store_result( sock );
retval = 1; retval = 1;
if (tableRes != NULL)
if ((table_res= mysql_store_result(sock)))
{ {
my_ulonglong numRows = mysql_num_rows(tableRes); my_ulonglong num_rows= mysql_num_rows(table_res);
if (numRows > 0) if (num_rows > 0)
{ {
row= mysql_fetch_row( tableRes ); /*
Return first row
TODO: Return all matching rows
*/
row= mysql_fetch_row(table_res);
strmake(new_table_name, row[0], buf_size-1); strmake(new_table_name, row[0], buf_size-1);
retval = 0; retval= 0;
} }
mysql_free_result(tableRes); mysql_free_result(table_res);
} }
return retval; return retval;
} }
...@@ -2278,14 +2284,14 @@ static int dump_selected_tables(char *db, char **table_names, int tables) ...@@ -2278,14 +2284,14 @@ static int dump_selected_tables(char *db, char **table_names, int tables)
dynstr_append(&query, " READ /*!32311 LOCAL */,"); dynstr_append(&query, " READ /*!32311 LOCAL */,");
} }
if (mysql_real_query(sock, query.str, query.length-1)) if (mysql_real_query(sock, query.str, query.length-1))
DBerror(sock, "when doing LOCK TABLES"); DB_error(sock, "when doing LOCK TABLES");
/* We shall countinue here, if --force was given */ /* We shall countinue here, if --force was given */
dynstr_free(&query); dynstr_free(&query);
} }
if (flush_logs) if (flush_logs)
{ {
if (mysql_refresh(sock, REFRESH_LOG)) if (mysql_refresh(sock, REFRESH_LOG))
DBerror(sock, "when doing refresh"); DB_error(sock, "when doing refresh");
/* We shall countinue here, if --force was given */ /* We shall countinue here, if --force was given */
} }
if (opt_xml) if (opt_xml)
...@@ -2295,12 +2301,11 @@ static int dump_selected_tables(char *db, char **table_names, int tables) ...@@ -2295,12 +2301,11 @@ static int dump_selected_tables(char *db, char **table_names, int tables)
char new_table_name[NAME_LEN]; char new_table_name[NAME_LEN];
/* the table name passed on commandline may be wrong case */ /* the table name passed on commandline may be wrong case */
if (!get_actual_table_name( table_names[i], new_table_name, sizeof(new_table_name) )) if (!get_actual_table_name( table_names[i], new_table_name,
sizeof(new_table_name)))
{ {
numrows= get_table_structure(new_table_name, db);
numrows = getTableStructure(new_table_name, db); dump_table(numrows, new_table_name);
dumpTable(numrows, new_table_name);
} }
my_free(order_by, MYF(MY_ALLOW_ZERO_PTR)); my_free(order_by, MYF(MY_ALLOW_ZERO_PTR));
order_by= 0; order_by= 0;
...@@ -2308,7 +2313,7 @@ static int dump_selected_tables(char *db, char **table_names, int tables) ...@@ -2308,7 +2313,7 @@ static int dump_selected_tables(char *db, char **table_names, int tables)
if (was_views) if (was_views)
{ {
for (i=0 ; i < tables ; i++) for (i=0 ; i < tables ; i++)
getViewStructure(table_names[i], db); get_view_structure(table_names[i], db);
} }
if (opt_xml) if (opt_xml)
{ {
...@@ -2613,7 +2618,7 @@ cleanup: ...@@ -2613,7 +2618,7 @@ cleanup:
Getting VIEW structure Getting VIEW structure
SYNOPSIS SYNOPSIS
getViewStructure() get_view_structure()
table view name table view name
db db name db db name
...@@ -2622,9 +2627,9 @@ cleanup: ...@@ -2622,9 +2627,9 @@ cleanup:
1 ERROR 1 ERROR
*/ */
static my_bool getViewStructure(char *table, char* db) static my_bool get_view_structure(char *table, char* db)
{ {
MYSQL_RES *tableRes; MYSQL_RES *table_res;
MYSQL_ROW row; MYSQL_ROW row;
MYSQL_FIELD *field; MYSQL_FIELD *field;
char *result_table, *opt_quoted_table; char *result_table, *opt_quoted_table;
...@@ -2632,7 +2637,7 @@ static my_bool getViewStructure(char *table, char* db) ...@@ -2632,7 +2637,7 @@ static my_bool getViewStructure(char *table, char* db)
char table_buff2[NAME_LEN*2+3]; char table_buff2[NAME_LEN*2+3];
char buff[20+FN_REFLEN]; char buff[20+FN_REFLEN];
FILE *sql_file = md_result_file; FILE *sql_file = md_result_file;
DBUG_ENTER("getViewStructure"); DBUG_ENTER("get_view_structure");
if (tFlag) if (tFlag)
DBUG_RETURN(0); DBUG_RETURN(0);
...@@ -2667,8 +2672,8 @@ static my_bool getViewStructure(char *table, char* db) ...@@ -2667,8 +2672,8 @@ static my_bool getViewStructure(char *table, char* db)
} }
write_header(sql_file, db); write_header(sql_file, db);
} }
tableRes= mysql_store_result(sock); table_res= mysql_store_result(sock);
field= mysql_fetch_field_direct(tableRes, 0); field= mysql_fetch_field_direct(table_res, 0);
if (strcmp(field->name, "View") != 0) if (strcmp(field->name, "View") != 0)
{ {
if (verbose) if (verbose)
...@@ -2688,10 +2693,10 @@ static my_bool getViewStructure(char *table, char* db) ...@@ -2688,10 +2693,10 @@ static my_bool getViewStructure(char *table, char* db)
check_io(sql_file); check_io(sql_file);
} }
row= mysql_fetch_row(tableRes); row= mysql_fetch_row(table_res);
fprintf(sql_file, "%s;\n", row[1]); fprintf(sql_file, "%s;\n", row[1]);
check_io(sql_file); check_io(sql_file);
mysql_free_result(tableRes); mysql_free_result(table_res);
if (sql_file != md_result_file) if (sql_file != md_result_file)
{ {
......
mysql-test/r/strict.result
View file @ 1be0a0c8
...@@ -1173,4 +1173,16 @@ col1 ...@@ -1173,4 +1173,16 @@ col1
0000-00-00 00:00:00 0000-00-00 00:00:00
NULL NULL
drop table t1; drop table t1;
create table t1 (col1 tinyint);
drop procedure if exists t1;
Warnings:
Note 1305 PROCEDURE t1 does not exist
create procedure t1 () begin declare exit handler for sqlexception
select'a'; insert into t1 values (200); end;|
call t1();
ERROR 22003: Out of range value adjusted for column 'col1' at row 1
select * from t1;
col1
drop procedure t1;
drop table t1;
set sql_mode=@org_mode; set sql_mode=@org_mode;
mysql-test/t/strict.test
View file @ 1be0a0c8
...@@ -1031,6 +1031,21 @@ insert into t1 select * from t1; ...@@ -1031,6 +1031,21 @@ insert into t1 select * from t1;
select * from t1; select * from t1;
drop table t1; drop table t1;
#
# Test of inserting an invalid value via a stored procedure (Bug #5907)
#
create table t1 (col1 tinyint);
drop procedure if exists t1;
delimiter |;
create procedure t1 () begin declare exit handler for sqlexception
select'a'; insert into t1 values (200); end;|
delimiter ;|
--error 1264
call t1();
select * from t1;
drop procedure t1;
drop table t1;
# #
# Restore mode # Restore mode
# #
......
sql/sql_base.cc
View file @ 1be0a0c8
...@@ -692,11 +692,11 @@ TABLE_LIST *find_table_in_list(TABLE_LIST *table, ...@@ -692,11 +692,11 @@ TABLE_LIST *find_table_in_list(TABLE_LIST *table,
/* /*
Test that table is unique Test that table is unique (It's only exists once in the table list)
SYNOPSIS SYNOPSIS
unique_table() unique_table()
table table which should be chaked table table which should be checked
table_list list of tables table_list list of tables
NOTE: to exclude derived tables from check we use following mechanism: NOTE: to exclude derived tables from check we use following mechanism:
......
sql/sql_error.cc
View file @ 1be0a0c8
...@@ -116,15 +116,6 @@ MYSQL_ERROR *push_warning(THD *thd, MYSQL_ERROR::enum_warning_level level, ...@@ -116,15 +116,6 @@ MYSQL_ERROR *push_warning(THD *thd, MYSQL_ERROR::enum_warning_level level,
if (thd->query_id != thd->warn_id) if (thd->query_id != thd->warn_id)
mysql_reset_errors(thd, 0); mysql_reset_errors(thd, 0);
thd->got_warning= 1; thd->got_warning= 1;
if (thd->spcont &&
thd->spcont->find_handler(code,
((int) level >=
(int) MYSQL_ERROR::WARN_LEVEL_WARN &&
thd->really_abort_on_warning()) ?
MYSQL_ERROR::WARN_LEVEL_ERROR : level))
{
DBUG_RETURN(NULL);
}
/* Abort if we are using strict mode and we are not using IGNORE */ /* Abort if we are using strict mode and we are not using IGNORE */
if ((int) level >= (int) MYSQL_ERROR::WARN_LEVEL_WARN && if ((int) level >= (int) MYSQL_ERROR::WARN_LEVEL_WARN &&
...@@ -132,14 +123,30 @@ MYSQL_ERROR *push_warning(THD *thd, MYSQL_ERROR::enum_warning_level level, ...@@ -132,14 +123,30 @@ MYSQL_ERROR *push_warning(THD *thd, MYSQL_ERROR::enum_warning_level level,
{ {
/* Avoid my_message() calling push_warning */ /* Avoid my_message() calling push_warning */
bool no_warnings_for_error= thd->no_warnings_for_error; bool no_warnings_for_error= thd->no_warnings_for_error;
sp_rcontext *spcont= thd->spcont;
thd->no_warnings_for_error= 1; thd->no_warnings_for_error= 1;
thd->spcont= 0;
thd->killed= THD::KILL_BAD_DATA; thd->killed= THD::KILL_BAD_DATA;
my_message(code, msg, MYF(0)); my_message(code, msg, MYF(0));
thd->spcont= spcont;
thd->no_warnings_for_error= no_warnings_for_error; thd->no_warnings_for_error= no_warnings_for_error;
/* Store error in error list (as my_message() didn't do it in this case */ /* Store error in error list (as my_message() didn't do it in this case */
level= MYSQL_ERROR::WARN_LEVEL_ERROR; level= MYSQL_ERROR::WARN_LEVEL_ERROR;
} }
if (thd->spcont &&
thd->spcont->find_handler(code,
((int) level >=
(int) MYSQL_ERROR::WARN_LEVEL_WARN &&
thd->really_abort_on_warning()) ?
MYSQL_ERROR::WARN_LEVEL_ERROR : level))
{
DBUG_RETURN(NULL);
}
if (thd->warn_list.elements < thd->variables.max_error_count) if (thd->warn_list.elements < thd->variables.max_error_count)
{ {
/* /*
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7