2002-06-12 23:13:12 +02:00
|
|
|
/* 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
|
2003-03-25 13:46:10 +01:00
|
|
|
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
|
2002-06-12 23:13:12 +02:00
|
|
|
|
|
|
|
/**********************************************************************
|
|
|
|
This file contains the implementation of error and warnings related
|
|
|
|
|
2002-10-02 12:33:08 +02:00
|
|
|
- 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)
|
2002-06-12 23:13:12 +02:00
|
|
|
|
|
|
|
- When client requests the information using SHOW command, then
|
|
|
|
server processes from this list and returns back in the form of
|
|
|
|
resultset.
|
|
|
|
|
2002-10-02 12:33:08 +02:00
|
|
|
Supported syntaxes:
|
|
|
|
|
|
|
|
SHOW [COUNT(*)] ERRORS [LIMIT [offset,] rows]
|
|
|
|
SHOW [COUNT(*)] WARNINGS [LIMIT [offset,] rows]
|
|
|
|
SELECT @@warning_count, @@error_count;
|
2002-06-12 23:13:12 +02:00
|
|
|
|
|
|
|
***********************************************************************/
|
|
|
|
|
|
|
|
#include "mysql_priv.h"
|
2005-02-22 22:42:49 +01:00
|
|
|
#include "sp_rcontext.h"
|
2002-06-12 23:13:12 +02:00
|
|
|
|
2003-04-03 20:19:14 +02:00
|
|
|
/*
|
|
|
|
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);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2002-10-02 12:33:08 +02:00
|
|
|
/*
|
|
|
|
Reset all warnings for the thread
|
2002-06-12 23:13:12 +02:00
|
|
|
|
2002-10-02 12:33:08 +02:00
|
|
|
SYNOPSIS
|
|
|
|
mysql_reset_errors()
|
|
|
|
thd Thread handle
|
2005-03-09 14:29:22 +01:00
|
|
|
force Reset warnings even if it has been done before
|
2002-11-21 01:07:14 +01:00
|
|
|
|
|
|
|
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.
|
2002-10-02 12:33:08 +02:00
|
|
|
*/
|
2002-06-12 23:13:12 +02:00
|
|
|
|
2005-03-09 14:29:22 +01:00
|
|
|
void mysql_reset_errors(THD *thd, bool force)
|
2002-10-02 12:33:08 +02:00
|
|
|
{
|
2003-03-19 20:23:13 +01:00
|
|
|
DBUG_ENTER("mysql_reset_errors");
|
2005-03-09 14:29:22 +01:00
|
|
|
if (thd->query_id != thd->warn_id || force)
|
2002-11-21 01:07:14 +01:00
|
|
|
{
|
|
|
|
thd->warn_id= thd->query_id;
|
|
|
|
free_root(&thd->warn_root,MYF(0));
|
|
|
|
bzero((char*) thd->warn_count, sizeof(thd->warn_count));
|
2005-03-16 15:11:01 +01:00
|
|
|
if (force)
|
|
|
|
thd->total_warn_count= 0;
|
2002-11-21 01:07:14 +01:00
|
|
|
thd->warn_list.empty();
|
2003-04-30 09:02:28 +02:00
|
|
|
thd->row_count= 1; // by default point to row 1
|
2002-11-21 01:07:14 +01:00
|
|
|
}
|
2003-03-19 20:23:13 +01:00
|
|
|
DBUG_VOID_RETURN;
|
2002-06-12 23:13:12 +02:00
|
|
|
}
|
|
|
|
|
2002-10-02 12:33:08 +02:00
|
|
|
|
2002-06-12 23:13:12 +02:00
|
|
|
/*
|
2002-10-02 12:33:08 +02:00
|
|
|
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
|
2003-03-18 00:07:40 +01:00
|
|
|
|
|
|
|
RETURN
|
|
|
|
pointer on MYSQL_ERROR object
|
2002-06-12 23:13:12 +02:00
|
|
|
*/
|
|
|
|
|
2003-03-18 00:07:40 +01:00
|
|
|
MYSQL_ERROR *push_warning(THD *thd, MYSQL_ERROR::enum_warning_level level,
|
|
|
|
uint code, const char *msg)
|
2002-10-02 12:33:08 +02:00
|
|
|
{
|
2004-10-26 18:30:01 +02:00
|
|
|
MYSQL_ERROR *err= 0;
|
2003-11-28 11:18:13 +01:00
|
|
|
DBUG_ENTER("push_warning");
|
2005-02-21 18:40:28 +01:00
|
|
|
|
2005-02-24 22:33:42 +01:00
|
|
|
if (level == MYSQL_ERROR::WARN_LEVEL_NOTE &&
|
|
|
|
!(thd->options & OPTION_SQL_NOTES))
|
|
|
|
DBUG_RETURN(0);
|
2005-02-21 18:40:28 +01:00
|
|
|
|
2005-04-22 12:53:48 +02:00
|
|
|
if (thd->query_id != thd->warn_id && !thd->spcont)
|
2005-03-16 15:11:01 +01:00
|
|
|
mysql_reset_errors(thd, 0);
|
2005-02-22 22:42:49 +01:00
|
|
|
thd->got_warning= 1;
|
|
|
|
|
|
|
|
/* Abort if we are using strict mode and we are not using IGNORE */
|
|
|
|
if ((int) level >= (int) MYSQL_ERROR::WARN_LEVEL_WARN &&
|
|
|
|
thd->really_abort_on_warning())
|
|
|
|
{
|
2005-02-24 22:33:42 +01:00
|
|
|
/* Avoid my_message() calling push_warning */
|
|
|
|
bool no_warnings_for_error= thd->no_warnings_for_error;
|
2005-04-04 23:32:48 +02:00
|
|
|
sp_rcontext *spcont= thd->spcont;
|
|
|
|
|
2005-02-24 22:33:42 +01:00
|
|
|
thd->no_warnings_for_error= 1;
|
2005-04-04 23:32:48 +02:00
|
|
|
thd->spcont= 0;
|
|
|
|
|
2005-02-22 22:42:49 +01:00
|
|
|
thd->killed= THD::KILL_BAD_DATA;
|
|
|
|
my_message(code, msg, MYF(0));
|
2005-04-04 23:32:48 +02:00
|
|
|
|
|
|
|
thd->spcont= spcont;
|
2005-02-24 22:33:42 +01:00
|
|
|
thd->no_warnings_for_error= no_warnings_for_error;
|
2005-04-05 00:19:48 +02:00
|
|
|
/* Store error in error list (as my_message() didn't do it) */
|
2005-02-24 22:33:42 +01:00
|
|
|
level= MYSQL_ERROR::WARN_LEVEL_ERROR;
|
2005-02-22 22:42:49 +01:00
|
|
|
}
|
2002-11-21 01:07:14 +01:00
|
|
|
|
2005-04-04 23:32:48 +02:00
|
|
|
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);
|
|
|
|
}
|
2005-06-27 23:52:21 +02:00
|
|
|
query_cache_abort(&thd->net);
|
|
|
|
|
2005-04-04 23:32:48 +02:00
|
|
|
|
2002-10-02 12:33:08 +02:00
|
|
|
if (thd->warn_list.elements < thd->variables.max_error_count)
|
2002-06-12 23:13:12 +02:00
|
|
|
{
|
2002-10-02 12:33:08 +02:00
|
|
|
/*
|
|
|
|
The following code is here to change the allocation to not
|
|
|
|
use the thd->mem_root, which is freed after each query
|
2002-06-12 23:13:12 +02:00
|
|
|
*/
|
2004-11-08 00:13:54 +01:00
|
|
|
MEM_ROOT *old_root= thd->mem_root;
|
|
|
|
thd->mem_root= &thd->warn_root;
|
2005-02-22 22:42:49 +01:00
|
|
|
if ((err= new MYSQL_ERROR(thd, code, level, msg)))
|
2002-10-02 12:33:08 +02:00
|
|
|
thd->warn_list.push_back(err);
|
2004-11-08 00:13:54 +01:00
|
|
|
thd->mem_root= old_root;
|
2002-06-12 23:13:12 +02:00
|
|
|
}
|
2002-10-02 12:33:08 +02:00
|
|
|
thd->warn_count[(uint) level]++;
|
|
|
|
thd->total_warn_count++;
|
2003-11-28 11:18:13 +01:00
|
|
|
DBUG_RETURN(err);
|
2002-06-12 23:13:12 +02:00
|
|
|
}
|
|
|
|
|
2002-12-04 12:19:08 +01:00
|
|
|
/*
|
2003-01-06 00:48:59 +01:00
|
|
|
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
|
2002-12-04 12:19:08 +01:00
|
|
|
*/
|
|
|
|
|
2003-01-06 00:48:59 +01:00
|
|
|
void push_warning_printf(THD *thd, MYSQL_ERROR::enum_warning_level level,
|
|
|
|
uint code, const char *format, ...)
|
2002-12-04 12:19:08 +01:00
|
|
|
{
|
|
|
|
va_list args;
|
|
|
|
char warning[ERRMSGSIZE+20];
|
2003-01-06 00:48:59 +01:00
|
|
|
DBUG_ENTER("push_warning_printf");
|
|
|
|
DBUG_PRINT("enter",("warning: %u", code));
|
2002-12-04 12:19:08 +01:00
|
|
|
|
2003-01-06 00:48:59 +01:00
|
|
|
va_start(args,format);
|
|
|
|
my_vsnprintf(warning, sizeof(warning), format, args);
|
2002-12-04 12:19:08 +01:00
|
|
|
va_end(args);
|
2003-01-06 00:48:59 +01:00
|
|
|
push_warning(thd, level, code, warning);
|
2002-12-04 12:19:08 +01:00
|
|
|
DBUG_VOID_RETURN;
|
|
|
|
}
|
|
|
|
|
2002-06-12 23:13:12 +02:00
|
|
|
|
2002-10-02 12:33:08 +02:00
|
|
|
/*
|
|
|
|
Send all notes, errors or warnings to the client in a result set
|
2002-06-12 23:13:12 +02:00
|
|
|
|
2002-10-02 12:33:08 +02:00
|
|
|
SYNOPSIS
|
|
|
|
mysqld_show_warnings()
|
|
|
|
thd Thread handler
|
|
|
|
levels_to_show Bitmap for which levels to show
|
2002-06-12 23:13:12 +02:00
|
|
|
|
2002-10-02 12:33:08 +02:00
|
|
|
DESCRIPTION
|
|
|
|
Takes into account the current LIMIT
|
2002-06-12 23:13:12 +02:00
|
|
|
|
2002-10-02 12:33:08 +02:00
|
|
|
RETURN VALUES
|
2005-02-22 22:42:49 +01:00
|
|
|
FALSE ok
|
|
|
|
TRUE Error sending data to client
|
2002-10-02 12:33:08 +02:00
|
|
|
*/
|
2002-06-12 23:13:12 +02:00
|
|
|
|
2002-10-02 12:33:08 +02:00
|
|
|
static const char *warning_level_names[]= {"Note", "Warning", "Error", "?"};
|
2002-12-11 08:17:51 +01:00
|
|
|
static int warning_level_length[]= { 4, 7, 5, 1 };
|
2002-06-12 23:13:12 +02:00
|
|
|
|
2005-02-22 22:42:49 +01:00
|
|
|
bool mysqld_show_warnings(THD *thd, ulong levels_to_show)
|
2002-10-02 12:33:08 +02:00
|
|
|
{
|
2002-06-12 23:13:12 +02:00
|
|
|
List<Item> field_list;
|
2002-11-22 19:04:42 +01:00
|
|
|
DBUG_ENTER("mysqld_show_warnings");
|
2002-06-12 23:13:12 +02:00
|
|
|
|
2002-10-02 12:33:08 +02:00
|
|
|
field_list.push_back(new Item_empty_string("Level", 7));
|
2002-12-14 16:43:01 +01:00
|
|
|
field_list.push_back(new Item_return_int("Code",4, MYSQL_TYPE_LONG));
|
2002-10-02 12:33:08 +02:00
|
|
|
field_list.push_back(new Item_empty_string("Message",MYSQL_ERRMSG_SIZE));
|
2002-06-12 23:13:12 +02:00
|
|
|
|
2005-02-22 22:42:49 +01:00
|
|
|
if (thd->protocol->send_fields(&field_list,
|
|
|
|
Protocol::SEND_NUM_ROWS | Protocol::SEND_EOF))
|
|
|
|
DBUG_RETURN(TRUE);
|
2002-06-12 23:13:12 +02:00
|
|
|
|
2002-10-02 12:33:08 +02:00
|
|
|
MYSQL_ERROR *err;
|
2003-12-19 18:52:13 +01:00
|
|
|
SELECT_LEX *sel= &thd->lex->select_lex;
|
Patch two (the final one) for Bug#7306 "the server side preparedStatement
error for LIMIT placeholder".
The patch adds grammar support for LIMIT ?, ? and changes the
type of ST_SELECT_LEX::select_limit,offset_limit from ha_rows to Item*,
so that it can point to Item_param.
mysql-test/include/ps_modify.inc:
Fix existing tests: now LIMIT can contain placeholders.
mysql-test/include/ps_query.inc:
Fix existing tests: now LIMIT can contain placeholders.
mysql-test/r/ps.result:
Add basic test coverage for LIMIT ?, ? and fix test results.
mysql-test/r/ps_2myisam.result:
Fix test results: now LIMIT can contain placeholders.
mysql-test/r/ps_3innodb.result:
Fix test results: now LIMIT can contain placeholders.
mysql-test/r/ps_4heap.result:
Fix test results: now LIMIT can contain placeholders.
mysql-test/r/ps_5merge.result:
Fix test results: now LIMIT can contain placeholders.
mysql-test/r/ps_6bdb.result:
Fix test results: now LIMIT can contain placeholders.
mysql-test/r/ps_7ndb.result:
Fix test results: now LIMIT can contain placeholders.
mysql-test/t/ps.test:
Add basic test coverage for LIMIT ?, ?.
sql/item.h:
Add a short-cut for (ulonglong) val_int() to Item.
Add a constructor to Item_int() that accepts ulonglong.
Simplify Item_uint constructor by using the c-tor above.
sql/item_subselect.cc:
Now select_limit has type Item *.
We can safely create an Item in Item_exists_subselect::fix_length_and_dec():
it will be allocated in runtime memory root and freed in the end of
execution.
sql/sp_head.cc:
Add a special initalization state for stored procedures to
be able to easily distinguish the first execution of a stored procedure
from prepared statement prepare.
sql/sql_class.h:
Introduce new state 'INITIALIZED_FOR_SP' to be able to easily distinguish
the first execution of a stored procedure from prepared statement prepare.
sql/sql_derived.cc:
- use unit->set_limit() to set unit->select_limit_cnt, offset_limit_cnt
evreryplace. Add a warning about use of set_limit in
mysql_derived_filling.
sql/sql_error.cc:
- use unit->set_limit() to set unit->select_limit_cnt, offset_limit_cnt
evreryplace.
- this change is also aware of bug#11095 "show warnings limit 0 returns
all rows instead of zero rows", so the one who merges the bugfix from
4.1 can use local version of sql_error.cc.
sql/sql_handler.cc:
- use unit->set_limit() to initalize
unit->select_limit_cnt,offset_limit_cnt everyplace.
sql/sql_lex.cc:
Now ST_SELECT_LEX::select_limit, offset_limit have type Item *
sql/sql_lex.h:
Now ST_SELECT_LEX::select_limit, offset_limit have type Item *
sql/sql_parse.cc:
- use unit->set_limit() to initalize
unit->select_limit_cnt,offset_limit_cnt everyplace.
- we can create an Item_int to set global limit of a statement:
it will be created in the runtime mem root and freed in the end of
execution.
sql/sql_repl.cc:
Use unit->set_limit to initialize limits.
sql/sql_select.cc:
- select_limit is now Item* so the proper way to check for default value
is to compare it with NULL.
sql/sql_union.cc:
Evaluate offset_limit_cnt using the new type of ST_SELECT_LEX::offset_limit
sql/sql_view.cc:
Now ST_SELECT_LEX::select_limit, offset_limit have type Item *
sql/sql_yacc.yy:
Add grammar support for LIMIT ?, ? clause.
2005-06-07 12:11:36 +02:00
|
|
|
SELECT_LEX_UNIT *unit= &thd->lex->unit;
|
|
|
|
ha_rows idx= 0;
|
2002-12-11 08:17:51 +01:00
|
|
|
Protocol *protocol=thd->protocol;
|
Patch two (the final one) for Bug#7306 "the server side preparedStatement
error for LIMIT placeholder".
The patch adds grammar support for LIMIT ?, ? and changes the
type of ST_SELECT_LEX::select_limit,offset_limit from ha_rows to Item*,
so that it can point to Item_param.
mysql-test/include/ps_modify.inc:
Fix existing tests: now LIMIT can contain placeholders.
mysql-test/include/ps_query.inc:
Fix existing tests: now LIMIT can contain placeholders.
mysql-test/r/ps.result:
Add basic test coverage for LIMIT ?, ? and fix test results.
mysql-test/r/ps_2myisam.result:
Fix test results: now LIMIT can contain placeholders.
mysql-test/r/ps_3innodb.result:
Fix test results: now LIMIT can contain placeholders.
mysql-test/r/ps_4heap.result:
Fix test results: now LIMIT can contain placeholders.
mysql-test/r/ps_5merge.result:
Fix test results: now LIMIT can contain placeholders.
mysql-test/r/ps_6bdb.result:
Fix test results: now LIMIT can contain placeholders.
mysql-test/r/ps_7ndb.result:
Fix test results: now LIMIT can contain placeholders.
mysql-test/t/ps.test:
Add basic test coverage for LIMIT ?, ?.
sql/item.h:
Add a short-cut for (ulonglong) val_int() to Item.
Add a constructor to Item_int() that accepts ulonglong.
Simplify Item_uint constructor by using the c-tor above.
sql/item_subselect.cc:
Now select_limit has type Item *.
We can safely create an Item in Item_exists_subselect::fix_length_and_dec():
it will be allocated in runtime memory root and freed in the end of
execution.
sql/sp_head.cc:
Add a special initalization state for stored procedures to
be able to easily distinguish the first execution of a stored procedure
from prepared statement prepare.
sql/sql_class.h:
Introduce new state 'INITIALIZED_FOR_SP' to be able to easily distinguish
the first execution of a stored procedure from prepared statement prepare.
sql/sql_derived.cc:
- use unit->set_limit() to set unit->select_limit_cnt, offset_limit_cnt
evreryplace. Add a warning about use of set_limit in
mysql_derived_filling.
sql/sql_error.cc:
- use unit->set_limit() to set unit->select_limit_cnt, offset_limit_cnt
evreryplace.
- this change is also aware of bug#11095 "show warnings limit 0 returns
all rows instead of zero rows", so the one who merges the bugfix from
4.1 can use local version of sql_error.cc.
sql/sql_handler.cc:
- use unit->set_limit() to initalize
unit->select_limit_cnt,offset_limit_cnt everyplace.
sql/sql_lex.cc:
Now ST_SELECT_LEX::select_limit, offset_limit have type Item *
sql/sql_lex.h:
Now ST_SELECT_LEX::select_limit, offset_limit have type Item *
sql/sql_parse.cc:
- use unit->set_limit() to initalize
unit->select_limit_cnt,offset_limit_cnt everyplace.
- we can create an Item_int to set global limit of a statement:
it will be created in the runtime mem root and freed in the end of
execution.
sql/sql_repl.cc:
Use unit->set_limit to initialize limits.
sql/sql_select.cc:
- select_limit is now Item* so the proper way to check for default value
is to compare it with NULL.
sql/sql_union.cc:
Evaluate offset_limit_cnt using the new type of ST_SELECT_LEX::offset_limit
sql/sql_view.cc:
Now ST_SELECT_LEX::select_limit, offset_limit have type Item *
sql/sql_yacc.yy:
Add grammar support for LIMIT ?, ? clause.
2005-06-07 12:11:36 +02:00
|
|
|
|
|
|
|
unit->set_limit(sel);
|
|
|
|
|
2002-10-02 12:33:08 +02:00
|
|
|
List_iterator_fast<MYSQL_ERROR> it(thd->warn_list);
|
|
|
|
while ((err= it++))
|
2002-06-12 23:13:12 +02:00
|
|
|
{
|
2002-10-02 12:33:08 +02:00
|
|
|
/* Skip levels that the user is not interested in */
|
|
|
|
if (!(levels_to_show & ((ulong) 1 << err->level)))
|
|
|
|
continue;
|
Patch two (the final one) for Bug#7306 "the server side preparedStatement
error for LIMIT placeholder".
The patch adds grammar support for LIMIT ?, ? and changes the
type of ST_SELECT_LEX::select_limit,offset_limit from ha_rows to Item*,
so that it can point to Item_param.
mysql-test/include/ps_modify.inc:
Fix existing tests: now LIMIT can contain placeholders.
mysql-test/include/ps_query.inc:
Fix existing tests: now LIMIT can contain placeholders.
mysql-test/r/ps.result:
Add basic test coverage for LIMIT ?, ? and fix test results.
mysql-test/r/ps_2myisam.result:
Fix test results: now LIMIT can contain placeholders.
mysql-test/r/ps_3innodb.result:
Fix test results: now LIMIT can contain placeholders.
mysql-test/r/ps_4heap.result:
Fix test results: now LIMIT can contain placeholders.
mysql-test/r/ps_5merge.result:
Fix test results: now LIMIT can contain placeholders.
mysql-test/r/ps_6bdb.result:
Fix test results: now LIMIT can contain placeholders.
mysql-test/r/ps_7ndb.result:
Fix test results: now LIMIT can contain placeholders.
mysql-test/t/ps.test:
Add basic test coverage for LIMIT ?, ?.
sql/item.h:
Add a short-cut for (ulonglong) val_int() to Item.
Add a constructor to Item_int() that accepts ulonglong.
Simplify Item_uint constructor by using the c-tor above.
sql/item_subselect.cc:
Now select_limit has type Item *.
We can safely create an Item in Item_exists_subselect::fix_length_and_dec():
it will be allocated in runtime memory root and freed in the end of
execution.
sql/sp_head.cc:
Add a special initalization state for stored procedures to
be able to easily distinguish the first execution of a stored procedure
from prepared statement prepare.
sql/sql_class.h:
Introduce new state 'INITIALIZED_FOR_SP' to be able to easily distinguish
the first execution of a stored procedure from prepared statement prepare.
sql/sql_derived.cc:
- use unit->set_limit() to set unit->select_limit_cnt, offset_limit_cnt
evreryplace. Add a warning about use of set_limit in
mysql_derived_filling.
sql/sql_error.cc:
- use unit->set_limit() to set unit->select_limit_cnt, offset_limit_cnt
evreryplace.
- this change is also aware of bug#11095 "show warnings limit 0 returns
all rows instead of zero rows", so the one who merges the bugfix from
4.1 can use local version of sql_error.cc.
sql/sql_handler.cc:
- use unit->set_limit() to initalize
unit->select_limit_cnt,offset_limit_cnt everyplace.
sql/sql_lex.cc:
Now ST_SELECT_LEX::select_limit, offset_limit have type Item *
sql/sql_lex.h:
Now ST_SELECT_LEX::select_limit, offset_limit have type Item *
sql/sql_parse.cc:
- use unit->set_limit() to initalize
unit->select_limit_cnt,offset_limit_cnt everyplace.
- we can create an Item_int to set global limit of a statement:
it will be created in the runtime mem root and freed in the end of
execution.
sql/sql_repl.cc:
Use unit->set_limit to initialize limits.
sql/sql_select.cc:
- select_limit is now Item* so the proper way to check for default value
is to compare it with NULL.
sql/sql_union.cc:
Evaluate offset_limit_cnt using the new type of ST_SELECT_LEX::offset_limit
sql/sql_view.cc:
Now ST_SELECT_LEX::select_limit, offset_limit have type Item *
sql/sql_yacc.yy:
Add grammar support for LIMIT ?, ? clause.
2005-06-07 12:11:36 +02:00
|
|
|
if (++idx <= unit->offset_limit_cnt)
|
2002-10-02 12:33:08 +02:00
|
|
|
continue;
|
Patch two (the final one) for Bug#7306 "the server side preparedStatement
error for LIMIT placeholder".
The patch adds grammar support for LIMIT ?, ? and changes the
type of ST_SELECT_LEX::select_limit,offset_limit from ha_rows to Item*,
so that it can point to Item_param.
mysql-test/include/ps_modify.inc:
Fix existing tests: now LIMIT can contain placeholders.
mysql-test/include/ps_query.inc:
Fix existing tests: now LIMIT can contain placeholders.
mysql-test/r/ps.result:
Add basic test coverage for LIMIT ?, ? and fix test results.
mysql-test/r/ps_2myisam.result:
Fix test results: now LIMIT can contain placeholders.
mysql-test/r/ps_3innodb.result:
Fix test results: now LIMIT can contain placeholders.
mysql-test/r/ps_4heap.result:
Fix test results: now LIMIT can contain placeholders.
mysql-test/r/ps_5merge.result:
Fix test results: now LIMIT can contain placeholders.
mysql-test/r/ps_6bdb.result:
Fix test results: now LIMIT can contain placeholders.
mysql-test/r/ps_7ndb.result:
Fix test results: now LIMIT can contain placeholders.
mysql-test/t/ps.test:
Add basic test coverage for LIMIT ?, ?.
sql/item.h:
Add a short-cut for (ulonglong) val_int() to Item.
Add a constructor to Item_int() that accepts ulonglong.
Simplify Item_uint constructor by using the c-tor above.
sql/item_subselect.cc:
Now select_limit has type Item *.
We can safely create an Item in Item_exists_subselect::fix_length_and_dec():
it will be allocated in runtime memory root and freed in the end of
execution.
sql/sp_head.cc:
Add a special initalization state for stored procedures to
be able to easily distinguish the first execution of a stored procedure
from prepared statement prepare.
sql/sql_class.h:
Introduce new state 'INITIALIZED_FOR_SP' to be able to easily distinguish
the first execution of a stored procedure from prepared statement prepare.
sql/sql_derived.cc:
- use unit->set_limit() to set unit->select_limit_cnt, offset_limit_cnt
evreryplace. Add a warning about use of set_limit in
mysql_derived_filling.
sql/sql_error.cc:
- use unit->set_limit() to set unit->select_limit_cnt, offset_limit_cnt
evreryplace.
- this change is also aware of bug#11095 "show warnings limit 0 returns
all rows instead of zero rows", so the one who merges the bugfix from
4.1 can use local version of sql_error.cc.
sql/sql_handler.cc:
- use unit->set_limit() to initalize
unit->select_limit_cnt,offset_limit_cnt everyplace.
sql/sql_lex.cc:
Now ST_SELECT_LEX::select_limit, offset_limit have type Item *
sql/sql_lex.h:
Now ST_SELECT_LEX::select_limit, offset_limit have type Item *
sql/sql_parse.cc:
- use unit->set_limit() to initalize
unit->select_limit_cnt,offset_limit_cnt everyplace.
- we can create an Item_int to set global limit of a statement:
it will be created in the runtime mem root and freed in the end of
execution.
sql/sql_repl.cc:
Use unit->set_limit to initialize limits.
sql/sql_select.cc:
- select_limit is now Item* so the proper way to check for default value
is to compare it with NULL.
sql/sql_union.cc:
Evaluate offset_limit_cnt using the new type of ST_SELECT_LEX::offset_limit
sql/sql_view.cc:
Now ST_SELECT_LEX::select_limit, offset_limit have type Item *
sql/sql_yacc.yy:
Add grammar support for LIMIT ?, ? clause.
2005-06-07 12:11:36 +02:00
|
|
|
if (idx > unit->select_limit_cnt)
|
|
|
|
break;
|
2002-12-11 08:17:51 +01:00
|
|
|
protocol->prepare_for_resend();
|
|
|
|
protocol->store(warning_level_names[err->level],
|
2003-03-17 10:14:04 +01:00
|
|
|
warning_level_length[err->level], system_charset_info);
|
2002-12-11 08:17:51 +01:00
|
|
|
protocol->store((uint32) err->code);
|
2003-03-17 10:14:04 +01:00
|
|
|
protocol->store(err->msg, strlen(err->msg), system_charset_info);
|
2002-12-11 08:17:51 +01:00
|
|
|
if (protocol->write())
|
2005-02-22 22:42:49 +01:00
|
|
|
DBUG_RETURN(TRUE);
|
2002-06-12 23:13:12 +02:00
|
|
|
}
|
2005-02-22 22:42:49 +01:00
|
|
|
send_eof(thd);
|
|
|
|
DBUG_RETURN(FALSE);
|
2002-06-12 23:13:12 +02:00
|
|
|
}
|