mirror of
https://github.com/MariaDB/server.git
synced 2025-01-17 04:22:27 +01:00
f935c6a286
Changed timestamp to return string in YYYY-MM-DD HH:MM:SS format. DATE_ADD() and related functions now returns correct DATE/DATETIME type depending on argument types. Now all tests passes, still some work left to remove warnings in log files from mysql-test-run mysql-test/r/cast.result: New result for time mysql-test/r/delayed.result: Timestamp update mysql-test/r/derived.result: Fix after bulk insert change mysql-test/r/explain.result: Fix after bulk insert change mysql-test/r/func_date_add.result: Timestamp change mysql-test/r/func_str.result: Timestamp change mysql-test/r/func_time.result: Timestamp change mysql-test/r/innodb.result: Timestamp change mysql-test/r/join_outer.result: Fix after bulk insert change mysql-test/r/key_primary.result: Fix after bulk insert change mysql-test/r/keywords.result: Timestamp change mysql-test/r/merge.result: Removed warning mysql-test/r/odbc.result: Fix after bulk insert change mysql-test/r/range.result: Fix after bulk insert change mysql-test/r/select.result: Fix after bulk insert change mysql-test/r/subselect.result: Fixed EXPLAIN output mysql-test/r/type_datetime.result: Timestamp update mysql-test/r/type_ranges.result: Timestamp update mysql-test/r/type_timestamp.result: Timestamp update mysql-test/r/union.result: EXPLAIN UPDATE mysql-test/t/func_str.test: Timestamp update mysql-test/t/func_time.test: New test for interval type result mysql-test/t/merge.test: Remove warnings of wrong drop table mysql-test/t/type_datetime.test: Timestamp change mysql-test/t/type_timestamp.test: Timestamp change sql/field.cc: Changed timestamp to return string in YYYY-MM-DD HH:MM:SS format sql/field.h: Changed timestamp to return string in YYYY-MM-DD HH:MM:SS format sql/item.cc: Binary protocol update sql/item.h: Binary protocol update sql/item_func.cc: Added comment sql/item_func.h: @variables are always returned to the client as strings sql/item_timefunc.cc: Changed INTERVAL to return correct type sql/item_timefunc.h: Changed INTERVAL to return correct type sql/mysqld.cc: Changed default pthread_attr_setstacksize to 129K sql/protocol.cc: More type checking sql/set_var.cc: Fixed that @convert works ok with new protocol sql/sql_analyse.cc: Fixed bug in analyze sql/sql_class.cc: Fixed bug from last push in LIMIT sql/sql_error.cc: More optimal types sql/sql_repl.cc: Binary protocol changes sql/sql_select.cc: Fixed bug in multi-table-update Changed EXPLAIN to return NULL instead of empty strings sql/sql_show.cc: Binary protocol
195 lines
5.5 KiB
C++
195 lines
5.5 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"
|
|
|
|
/*
|
|
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)
|
|
{
|
|
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();
|
|
}
|
|
}
|
|
|
|
|
|
/*
|
|
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
|
|
*/
|
|
|
|
void push_warning(THD *thd, MYSQL_ERROR::enum_warning_level level, uint code,
|
|
const char *msg)
|
|
{
|
|
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);
|
|
MYSQL_ERROR *err= new MYSQL_ERROR(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++;
|
|
}
|
|
|
|
/*
|
|
Store warning to the list
|
|
*/
|
|
|
|
void store_warning(THD *thd, uint errcode, ...)
|
|
{
|
|
#if TESTS_TO_BE_FIXED
|
|
va_list args;
|
|
const char *format;
|
|
char warning[ERRMSGSIZE+20];
|
|
DBUG_ENTER("store_warning");
|
|
DBUG_PRINT("enter",("warning: %u",errcode));
|
|
|
|
va_start(args,errcode);
|
|
if (errcode)
|
|
format= ER(errcode);
|
|
else
|
|
{
|
|
format=va_arg(args,char*);
|
|
errcode= ER_UNKNOWN_ERROR;
|
|
}
|
|
(void) vsprintf (warning,format,args);
|
|
va_end(args);
|
|
push_warning(thd, MYSQL_ERROR::WARN_LEVEL_WARN, errcode, warning);
|
|
DBUG_VOID_RETURN;
|
|
#endif
|
|
}
|
|
|
|
|
|
/*
|
|
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]);
|
|
protocol->store((uint32) err->code);
|
|
protocol->store(err->msg, strlen(err->msg));
|
|
if (protocol->write())
|
|
DBUG_RETURN(1);
|
|
if (!--limit)
|
|
break;
|
|
}
|
|
send_eof(thd);
|
|
DBUG_RETURN(0);
|
|
}
|