Commit a1820ab1 authored by unknown's avatar unknown
Browse files

Merge mishka.local:/tmp/skr99/mysql-5.0 

into  mishka.local:/home/my/mysql-5.0


sql/item_strfunc.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
parents 141a36c3 3eda70b2

mysql-test/r/information_schema.result

+4 −0
Original line number Diff line number Diff line
@@ -966,4 +966,8 @@ column_name column_default 
a	NULL

b	NULL

use test;

show columns from t1;

Field	Type	Null	Key	Default	Extra

a	int(11)	NO			

b	int(11)	YES		NULL	

drop table t1;

mysql-test/r/sp-security.result

+2 −0
Original line number Diff line number Diff line
@@ -245,6 +245,8 @@ end// 
grant usage on *.* to mysqltest_1@localhost;

call mysqltest_1.p1();

ERROR 42000: execute command denied to user 'mysqltest_1'@'localhost' for routine 'mysqltest_1.p1'

call mysqltest_1.p1();

ERROR 42000: execute command denied to user 'mysqltest_1'@'localhost' for routine 'mysqltest_1.p1'

drop procedure mysqltest_1.p1;

drop database mysqltest_1;

revoke usage on *.* from mysqltest_1@localhost;

mysql-test/t/information_schema.test

+1 −0
Original line number Diff line number Diff line
@@ -649,4 +649,5 @@ use information_schema; 
select column_name, column_default from columns

  where table_schema='test' and table_name='t1';

use test;

show columns from t1;

drop table t1;

mysql-test/t/sp-security.test

+6 −0
Original line number Diff line number Diff line
@@ -397,6 +397,12 @@ connection n1; 
--error 1370

call mysqltest_1.p1();

disconnect n1;

# Test also without a current database

connect (n2,localhost,mysqltest_1,,*NO-ONE*,$MASTER_MYPORT,$MASTER_MYSOCK);

connection n2;

--error 1370

call mysqltest_1.p1();

disconnect n2;



connection default;

sql/mysqld.cc

+2 −1
Original line number Diff line number Diff line
@@ -730,7 +730,8 @@ static void close_connections(void) 
    DBUG_PRINT("quit",("Informing thread %ld that it's time to die",

		       tmp->thread_id));

    /* We skip slave threads on this first loop through. */

    if (tmp->slave_thread) continue;

    if (tmp->slave_thread)

      continue;



    tmp->killed= THD::KILL_CONNECTION;

    if (tmp->mysys_var)