1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

After-merge fixes (4.1 -> 5.0).

Browse Source
This commit is contained in:
konstantin@mysql.com 2005-07-16 16:10:42 +04:00
parent 8e72214d74
commit 8b0adacbc6
7 changed files with 34 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
mysql-test/r/sp.result
View File

@ -2657,16 +2657,22 @@ end|
call avg ()| call avg ()|
drop procedure avg| drop procedure avg|
drop procedure if exists bug6129| drop procedure if exists bug6129|
set @@sql_mode = 'traditional'| set @old_mode= @@sql_mode;
create procedure bug6129(mode text) set @@sql_mode= "";
select @@sql_mode = mode| create procedure bug6129()
call bug6129(@@sql_mode)| select @@sql_mode|
@@sql_mode = mode call bug6129()|
1 @@sql_mode
set @@sql_mode = ''|
call bug6129(@@sql_mode)| set @@sql_mode= "NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO"|
@@sql_mode = mode call bug6129()|
0 @@sql_mode
NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO
set @@sql_mode= "NO_ZERO_IN_DATE"|
call bug6129()|
@@sql_mode
NO_ZERO_IN_DATE
set @@sql_mode=@old_mode;
drop procedure bug6129| drop procedure bug6129|
drop procedure if exists bug9856| drop procedure if exists bug9856|
create procedure bug9856() create procedure bug9856()

2
mysql-test/r/view.result
View File

@ -1836,7 +1836,7 @@ create table t2 (b timestamp default now());
create view v1 as select a,b,t1.a < now() from t1,t2 where t1.a < now(); create view v1 as select a,b,t1.a < now() from t1,t2 where t1.a < now();
SHOW CREATE VIEW v1; SHOW CREATE VIEW v1;
View Create View View Create View
v1 CREATE ALGORITHM=UNDEFINED VIEW `test`.`v1` AS select sql_no_cache `test`.`t1`.`a` AS `a`,`test`.`t2`.`b` AS `b`,(`test`.`t1`.`a` < now()) AS `t1.a < now()` from `test`.`t1` join `test`.`t2` where (`test`.`t1`.`a` < now()) v1 CREATE ALGORITHM=UNDEFINED VIEW `test`.`v1` AS select sql_no_cache `test`.`t1`.`a` AS `a`,`test`.`t2`.`b` AS `b`,(`test`.`t1`.`a` < now()) AS `t1.a < now()` from (`test`.`t1` join `test`.`t2`) where (`test`.`t1`.`a` < now())
drop view v1; drop view v1;
drop table t1, t2; drop table t1, t2;
CREATE TABLE t1 ( a varchar(50) ); CREATE TABLE t1 ( a varchar(50) );

19
mysql-test/t/sp.test
View File

@ -3377,15 +3377,16 @@ drop procedure avg|
--disable_warnings --disable_warnings
drop procedure if exists bug6129| drop procedure if exists bug6129|
--enable_warnings --enable_warnings
set @@sql_mode = 'traditional'| set @old_mode= @@sql_mode;
create procedure bug6129(mode text) set @@sql_mode= "";
select @@sql_mode = mode| create procedure bug6129()
select @@sql_mode|
# 1 call bug6129()|
call bug6129(@@sql_mode)| set @@sql_mode= "NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO"|
set @@sql_mode = ''| call bug6129()|
# 0 set @@sql_mode= "NO_ZERO_IN_DATE"|
call bug6129(@@sql_mode)| call bug6129()|
set @@sql_mode=@old_mode;
drop procedure bug6129| drop procedure bug6129|

2
sql/item_func.cc
View File

@ -4229,7 +4229,7 @@ Item_func_get_system_var(sys_var *var_arg, enum_var_type var_type_arg,
bool bool
Item_func_get_system_var::fix_fields(THD *thd, TABLE_LIST *tables, Item **ref) Item_func_get_system_var::fix_fields(THD *thd, Item **ref)
{ {
Item *item= var->item(thd, var_type, &component); Item *item= var->item(thd, var_type, &component);
DBUG_ENTER("Item_func_get_system_var::fix_fields"); DBUG_ENTER("Item_func_get_system_var::fix_fields");

6
sql/item_func.h
View File

@ -1210,15 +1210,17 @@ public:
Item_func_get_system_var(sys_var *var_arg, enum_var_type var_type_arg, Item_func_get_system_var(sys_var *var_arg, enum_var_type var_type_arg,
LEX_STRING *component_arg, const char *name_arg, LEX_STRING *component_arg, const char *name_arg,
size_t name_len_arg); size_t name_len_arg);
bool fix_fields(THD *thd, TABLE_LIST *tables, Item **ref); bool fix_fields(THD *thd, Item **ref);
/* /*
Stubs for pure virtual methods. Should never be called: this Stubs for pure virtual methods. Should never be called: this
item is always substituted with a constant in fix_fields(). item is always substituted with a constant in fix_fields().
*/ */
double val() { DBUG_ASSERT(0); return 0.0; } double val_real() { DBUG_ASSERT(0); return 0.0; }
longlong val_int() { DBUG_ASSERT(0); return 0; } longlong val_int() { DBUG_ASSERT(0); return 0; }
String* val_str(String*) { DBUG_ASSERT(0); return 0; } String* val_str(String*) { DBUG_ASSERT(0); return 0; }
void fix_length_and_dec() { DBUG_ASSERT(0); } void fix_length_and_dec() { DBUG_ASSERT(0); }
/* TODO: fix to support views */
const char *func_name() const { return "get_system_var"; }
}; };

2
sql/mysql_priv.h
View File

@ -477,7 +477,7 @@ typedef my_bool (*qc_engine_callback)(THD *thd, char *table_key,
class user_var_entry; class user_var_entry;
enum enum_var_type enum enum_var_type
{ {
OPT_DEFAULT, OPT_SESSION, OPT_GLOBAL OPT_DEFAULT= 0, OPT_SESSION, OPT_GLOBAL
}; };
class sys_var; class sys_var;
#include "item.h" #include "item.h"

8
sql/mysqld.cc
View File

@ -685,13 +685,7 @@ static void close_connections(void)
{ {
DBUG_PRINT("quit",("Informing thread %ld that it's time to die", DBUG_PRINT("quit",("Informing thread %ld that it's time to die",
tmp->thread_id)); tmp->thread_id));
/* tmp->killed= THD::KILL_CONNECTION;
Re: bug 7403 - close_connection will be called mulitple times
bug a wholesale clean up of our network code is a very large
project. This will wake up the socket on Windows and prevent the
printing of the error message that we are force closing a connection.
*/
close_connection(tmp, 0, 1);
if (tmp->mysys_var) if (tmp->mysys_var)
{ {
tmp->mysys_var->abort=1; tmp->mysys_var->abort=1;