mirror of
https://github.com/MariaDB/server.git
synced 2025-01-30 10:31:54 +01:00
853c2c788c
New mysqltest that can run mysqltest with PS Added support for ZEROFILL in PS Fixed crash when one called mysql_stmt_store_result() without a preceding mysql_stmt_bind_result() Updated test cases to support --ps-protocol (Some tests are still run using old protocol) Fixed crash in PS when using SELECT * FROM t1 NATURAL JOIN t2... Fixed crash in PS when using sub queries Create table didn't signal when table was created. This could cause a "DROP TABLE created_table" in another thread to wait "forever" Fixed wrong permissions check in PS and multi-table updates (one could get permission denied for legal quries) Fix for PS and SELECT ... PROCEDURE Reset all warnings when executing a new PS query group_concat(...ORDER BY) didn't work with PS Fixed problem with test suite when not using innodb BitKeeper/deleted/.del-innodb-lock-master.opt~f76a4a1999728f87: Delete: mysql-test/t/innodb-lock-master.opt client/Makefile.am: mysqltest now uses regex client/mysqltest.c: Added support for testing of prepared statements (with --ps-protocol) Main code was done by Kent, I did mainly some cleanups and minor bug fixes New test commands: --disable_ps_protocol --enable_ps_protocol NOTE: new code still has some things that needs to be cleaned up. For example run_query_stmt_handle_error() should be made more general so that same code can be used also by 'normal' queries configure.in: mysqltest now uses regex libmysql/libmysql.c: Reset warning_count after prepare (safety). In the future we should also provide warnings on prepare integer -> string conversion now handles ZEROFILL double -> string conversion is now closer to the one in the server Fixed crash when one called mysql_stmt_store_result() without preceding mysql_stmt_bind_result() libmysqld/examples/Makefile.am: mysqltest now uses regex mysql-test/include/have_query_cache.inc: Fixes for --ps-protocol mysql-test/include/ps_conv.inc: Fixes for --ps-protocol mysql-test/mysql-test-run.sh: Added options --ps-protocol mysql-test/r/ctype_utf8.result: Fixed test case mysql-test/r/fulltext_cache.result: Changed output of MATCH to use round() to get same numbers with --ps-protocol mysql-test/r/fulltext_left_join.result: Changed output of MATCH to use round() to get same numbers with --ps-protocol mysql-test/r/fulltext_multi.result: Changed output of MATCH to use round() to get same numbers with --ps-protocol mysql-test/r/innodb-lock.result: Fixed test to work even if Innodb is not compiled in. mysql-test/t/create.test: Fixes for --ps-protocol mysql-test/t/ctype_utf8.test: Remove warnings mysql-test/t/date_formats.test: Fixes for --ps-protocol mysql-test/t/fulltext_cache.test: Changed output of MATCH to use round() to get same numbers with --ps-protocol mysql-test/t/fulltext_left_join.test: Changed output of MATCH to use round() to get same numbers with --ps-protocol mysql-test/t/fulltext_multi.test: Changed output of MATCH to use round() to get same numbers with --ps-protocol mysql-test/t/func_group.test: Fixes for --ps-protocol mysql-test/t/func_sapdb.test: Fixes for --ps-protocol mysql-test/t/innodb-lock.test: Fixed test to work even if Innodb is not compiled in. mysql-test/t/insert.test: Fixes for --ps-protocol mysql-test/t/insert_select.test: Fixes for --ps-protocol mysql-test/t/insert_update.test: Fixes for --ps-protocol mysql-test/t/metadata.test: Fixes for --ps-protocol mysql-test/t/multi_statement.test: Fixes for --ps-protocol mysql-test/t/ps_1general.test: Fixes for --ps-protocol mysql-test/t/rollback.test: Fixes for --ps-protocol mysql-test/t/rpl_redirect.test: Fixes for --ps-protocol mysql-test/t/rpl_user_variables.test: Fixes for --ps-protocol mysql-test/t/select.test: Fixes for --ps-protocol mysql-test/t/status.test: Fixes for --ps-protocol mysql-test/t/type_blob.test: Fixes for --ps-protocol mysql-test/t/type_float.test: Fixes for --ps-protocol mysql-test/t/union.test: Fixes for --ps-protocol mysql-test/t/warnings.test: Fixes for --ps-protocol mysys/my_alloc.c: More debugging information sql-common/client.c: More debugging information sql-common/my_time.c: TIME didn't support full range with PS sql/field.cc: TIME didn't support full range with PS sql/item_cmpfunc.cc: IN(constants,...) didn't work with PS sql/item_subselect.cc: Some subqueries didn't work with PS sql/item_sum.cc: group_concat(...ORDER BY) didn't work with PS Removed variable warning_available as 'warning' can be used for this. sql/item_sum.h: Removed not needed variable sql/protocol.cc: TIME didn't support full range with PS sql/set_var.cc: Style fix sql/sql_base.cc: setup_wild() didn't properly restore old arena, which caused core dump in PS when using SELECT * FROM t1 NATURAL JOIN t2... sql/sql_class.cc: Style fix sql/sql_error.cc: Style fix sql/sql_insert.cc: Create table didn't signal when table was created. This could cause a "DROP TABLE created_table" in another thread to wait "forever" sql/sql_lex.h: Fix for PS and procedures sql/sql_parse.cc: More debugging information Make a copy of 'db' in PS as this may change Fixed wrong permissions check in PS and multi-table updates sql/sql_prepare.cc: Fix for PS and SELECT ... PROCEDURE Reset all warnings when executing a new query sql/sql_union.cc: Fixes for PS and SELECT ... PROCEDURE Reset 'with_wild' as 'wild' is resolved on prepare
214 lines
6.1 KiB
C++
214 lines
6.1 KiB
C++
/* Copyright (C) 1995-2002 MySQL AB
|
|
|
|
This program is free software; you can redistribute it and/or modify
|
|
it under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation; either version 2 of the License, or
|
|
(at your option) any later version.
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
GNU General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with this program; if not, write to the Free Software
|
|
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
|
|
|
|
/**********************************************************************
|
|
This file contains the implementation of error and warnings related
|
|
|
|
- Whenever an error or warning occurred, it pushes it to a warning list
|
|
that the user can retrieve with SHOW WARNINGS or SHOW ERRORS.
|
|
|
|
- For each statement, we return the number of warnings generated from this
|
|
command. Note that this can be different from @@warning_count as
|
|
we reset the warning list only for questions that uses a table.
|
|
This is done to allow on to do:
|
|
INSERT ...;
|
|
SELECT @@warning_count;
|
|
SHOW WARNINGS;
|
|
(If we would reset after each command, we could not retrieve the number
|
|
of warnings)
|
|
|
|
- When client requests the information using SHOW command, then
|
|
server processes from this list and returns back in the form of
|
|
resultset.
|
|
|
|
Supported syntaxes:
|
|
|
|
SHOW [COUNT(*)] ERRORS [LIMIT [offset,] rows]
|
|
SHOW [COUNT(*)] WARNINGS [LIMIT [offset,] rows]
|
|
SELECT @@warning_count, @@error_count;
|
|
|
|
***********************************************************************/
|
|
|
|
#include "mysql_priv.h"
|
|
|
|
/*
|
|
Store a new message in an error object
|
|
|
|
This is used to in group_concat() to register how many warnings we actually
|
|
got after the query has been executed.
|
|
*/
|
|
|
|
void MYSQL_ERROR::set_msg(THD *thd, const char *msg_arg)
|
|
{
|
|
msg= strdup_root(&thd->warn_root, msg_arg);
|
|
}
|
|
|
|
|
|
/*
|
|
Reset all warnings for the thread
|
|
|
|
SYNOPSIS
|
|
mysql_reset_errors()
|
|
thd Thread handle
|
|
|
|
IMPLEMENTATION
|
|
Don't reset warnings if this has already been called for this query.
|
|
This may happen if one gets a warning during the parsing stage,
|
|
in which case push_warnings() has already called this function.
|
|
*/
|
|
|
|
void mysql_reset_errors(THD *thd)
|
|
{
|
|
DBUG_ENTER("mysql_reset_errors");
|
|
if (thd->query_id != thd->warn_id)
|
|
{
|
|
thd->warn_id= thd->query_id;
|
|
free_root(&thd->warn_root,MYF(0));
|
|
bzero((char*) thd->warn_count, sizeof(thd->warn_count));
|
|
thd->warn_list.empty();
|
|
thd->row_count= 1; // by default point to row 1
|
|
}
|
|
DBUG_VOID_RETURN;
|
|
}
|
|
|
|
|
|
/*
|
|
Push the warning/error to error list if there is still room in the list
|
|
|
|
SYNOPSIS
|
|
push_warning()
|
|
thd Thread handle
|
|
level Severity of warning (note, warning, error ...)
|
|
code Error number
|
|
msg Clear error message
|
|
|
|
RETURN
|
|
pointer on MYSQL_ERROR object
|
|
*/
|
|
|
|
MYSQL_ERROR *push_warning(THD *thd, MYSQL_ERROR::enum_warning_level level,
|
|
uint code, const char *msg)
|
|
{
|
|
MYSQL_ERROR *err= 0;
|
|
DBUG_ENTER("push_warning");
|
|
if (thd->query_id != thd->warn_id)
|
|
mysql_reset_errors(thd);
|
|
|
|
if (thd->warn_list.elements < thd->variables.max_error_count)
|
|
{
|
|
/*
|
|
The following code is here to change the allocation to not
|
|
use the thd->mem_root, which is freed after each query
|
|
*/
|
|
MEM_ROOT *old_root=my_pthread_getspecific_ptr(MEM_ROOT*,THR_MALLOC);
|
|
my_pthread_setspecific_ptr(THR_MALLOC, &thd->warn_root);
|
|
err= new MYSQL_ERROR(thd, code, level, msg);
|
|
if (err)
|
|
thd->warn_list.push_back(err);
|
|
my_pthread_setspecific_ptr(THR_MALLOC, old_root);
|
|
}
|
|
thd->warn_count[(uint) level]++;
|
|
thd->total_warn_count++;
|
|
DBUG_RETURN(err);
|
|
}
|
|
|
|
/*
|
|
Push the warning/error to error list if there is still room in the list
|
|
|
|
SYNOPSIS
|
|
push_warning_printf()
|
|
thd Thread handle
|
|
level Severity of warning (note, warning, error ...)
|
|
code Error number
|
|
msg Clear error message
|
|
*/
|
|
|
|
void push_warning_printf(THD *thd, MYSQL_ERROR::enum_warning_level level,
|
|
uint code, const char *format, ...)
|
|
{
|
|
va_list args;
|
|
char warning[ERRMSGSIZE+20];
|
|
DBUG_ENTER("push_warning_printf");
|
|
DBUG_PRINT("enter",("warning: %u", code));
|
|
|
|
va_start(args,format);
|
|
my_vsnprintf(warning, sizeof(warning), format, args);
|
|
va_end(args);
|
|
push_warning(thd, level, code, warning);
|
|
DBUG_VOID_RETURN;
|
|
}
|
|
|
|
|
|
/*
|
|
Send all notes, errors or warnings to the client in a result set
|
|
|
|
SYNOPSIS
|
|
mysqld_show_warnings()
|
|
thd Thread handler
|
|
levels_to_show Bitmap for which levels to show
|
|
|
|
DESCRIPTION
|
|
Takes into account the current LIMIT
|
|
|
|
RETURN VALUES
|
|
0 ok
|
|
1 Error sending data to client
|
|
*/
|
|
|
|
static const char *warning_level_names[]= {"Note", "Warning", "Error", "?"};
|
|
static int warning_level_length[]= { 4, 7, 5, 1 };
|
|
|
|
my_bool mysqld_show_warnings(THD *thd, ulong levels_to_show)
|
|
{
|
|
List<Item> field_list;
|
|
DBUG_ENTER("mysqld_show_warnings");
|
|
|
|
field_list.push_back(new Item_empty_string("Level", 7));
|
|
field_list.push_back(new Item_return_int("Code",4, MYSQL_TYPE_LONG));
|
|
field_list.push_back(new Item_empty_string("Message",MYSQL_ERRMSG_SIZE));
|
|
|
|
if (thd->protocol->send_fields(&field_list,1))
|
|
DBUG_RETURN(1);
|
|
|
|
MYSQL_ERROR *err;
|
|
SELECT_LEX *sel= &thd->lex->select_lex;
|
|
ha_rows offset= sel->offset_limit, limit= sel->select_limit;
|
|
Protocol *protocol=thd->protocol;
|
|
|
|
List_iterator_fast<MYSQL_ERROR> it(thd->warn_list);
|
|
while ((err= it++))
|
|
{
|
|
/* Skip levels that the user is not interested in */
|
|
if (!(levels_to_show & ((ulong) 1 << err->level)))
|
|
continue;
|
|
if (offset)
|
|
{
|
|
offset--;
|
|
continue;
|
|
}
|
|
protocol->prepare_for_resend();
|
|
protocol->store(warning_level_names[err->level],
|
|
warning_level_length[err->level], system_charset_info);
|
|
protocol->store((uint32) err->code);
|
|
protocol->store(err->msg, strlen(err->msg), system_charset_info);
|
|
if (protocol->write())
|
|
DBUG_RETURN(1);
|
|
if (!--limit)
|
|
break;
|
|
}
|
|
send_eof(thd);
|
|
DBUG_RETURN(0);
|
|
}
|