Commit df226305 authored by unknown's avatar unknown
Browse files

Merge mysql.com:/usr/local/bk/mysql-5.0 

into  mysql.com:/usr/home/pem/bug14233/mysql-5.0


sql/share/errmsg.txt:
  Auto merged
sql/sql_base.cc:
  Auto merged
parents fbb2fd3e 81142c86

mysql-test/r/sp-destruct.result

0 → 100644
+79 −0
Original line number Diff line number Diff line 
use test;

drop procedure if exists bug14233;

drop function if exists bug14233;

drop table if exists t1;

drop view if exists v1;

create procedure bug14233()

set @x = 42;

create function bug14233_f() returns int

return 42;

create table t1 (id int);

create trigger t1_ai after insert on t1 for each row call bug14233();

alter table mysql.proc drop type;

call bug14233();

ERROR HY000: The table mysql.proc is missing, corrupt, or contains bad data (internal code -5)

create view v1 as select bug14233_f();

ERROR HY000: The table mysql.proc is missing, corrupt, or contains bad data (internal code -5)

insert into t1 values (0);

ERROR HY000: The table mysql.proc is missing, corrupt, or contains bad data (internal code -5)

flush table mysql.proc;

call bug14233();

ERROR HY000: Incorrect information in file: './mysql/proc.frm'

create view v1 as select bug14233_f();

ERROR HY000: Incorrect information in file: './mysql/proc.frm'

insert into t1 values (0);

ERROR HY000: Incorrect information in file: './mysql/proc.frm'

flush table mysql.proc;

call bug14233();

ERROR 42S02: Table 'mysql.proc' doesn't exist

create view v1 as select bug14233_f();

ERROR 42S02: Table 'mysql.proc' doesn't exist

insert into t1 values (0);

ERROR 42S02: Table 'mysql.proc' doesn't exist

flush table mysql.proc;

flush privileges;

delete from mysql.proc where name like 'bug14233%';

insert into mysql.proc

(

db, name, type, specific_name, language, sql_data_access, is_deterministic,

security_type, param_list, returns, body, definer, created, modified,

sql_mode, comment

)

values

(

'test', 'bug14233_1', 'FUNCTION', 'bug14233_1', 'SQL', 'READS_SQL_DATA', 'NO',

'DEFINER', '', 'int(10)',

'select count(*) from mysql.user',

'root@localhost', NOW() , '0000-00-00 00:00:00', '', ''

),

(

'test', 'bug14233_2', 'FUNCTION', 'bug14233_2', 'SQL', 'READS_SQL_DATA', 'NO',

'DEFINER', '', 'int(10)',

'begin declare x int; select count(*) into x from mysql.user; end',

'root@localhost', NOW() , '0000-00-00 00:00:00', '', ''

),

(

'test', 'bug14233_3', 'PROCEDURE', 'bug14233_3', 'SQL', 'READS_SQL_DATA','NO',

'DEFINER', '', '',

'alksj wpsj sa ^#!@ ',

'root@localhost', NOW() , '0000-00-00 00:00:00', '', ''

);

select bug14233_1();

ERROR 0A000: Not allowed to return a result set from a function

create view v1 as select bug14233_1();

ERROR 0A000: Not allowed to return a result set from a function

select bug14233_2();

ERROR 2F005: FUNCTION bug14233_2 ended without RETURN

create view v1 as select bug14233_2();

select * from v1;

ERROR 2F005: FUNCTION bug14233_2 ended without RETURN

call bug14233_3();

ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'wpsj sa ^#!@ ' at line 3

drop trigger t1_ai;

create trigger t1_ai after insert on t1 for each row call bug14233_3();

insert into t1 values (0);

ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'wpsj sa ^#!@ ' at line 3

delete from mysql.proc where name like 'bug14233%';

drop trigger t1_ai;

drop table t1;

drop view v1;

mysql-test/t/sp-destruct.test

0 → 100644
+126 −0
Original line number Diff line number Diff line 
#

# Destructive stored procedure tests

#

# We do horrible things to the mysql.proc table here, so any unexpected

# failures here might leave it in an undetermined state.

#

# In the case of trouble you might want to skip this.

#



# We're using --system things that probably doesn't work on Windows.

--source include/not_windows.inc



# Backup proc table

--system rm -rf var/master-data/mysql/backup

--system mkdir var/master-data/mysql/backup

--system cp var/master-data/mysql/proc.* var/master-data/mysql/backup/



use test;



--disable_warnings

drop procedure if exists bug14233;

drop function if exists bug14233;

drop table if exists t1;

drop view if exists v1;

--enable_warnings



create procedure bug14233()

  set @x = 42;



create function bug14233_f() returns int

  return 42;



create table t1 (id int);

create trigger t1_ai after insert on t1 for each row call bug14233();



# Unsupported tampering with the mysql.proc definition

alter table mysql.proc drop type;

--error ER_SP_PROC_TABLE_CORRUPT

call bug14233();

--error ER_SP_PROC_TABLE_CORRUPT

create view v1 as select bug14233_f();

--error ER_SP_PROC_TABLE_CORRUPT

insert into t1 values (0);



flush table mysql.proc;



# Thrashing the .frm file

--system echo 'saljdlfa' > var/master-data/mysql/proc.frm

--error ER_NOT_FORM_FILE

call bug14233();

--error ER_NOT_FORM_FILE

create view v1 as select bug14233_f();

--error ER_NOT_FORM_FILE

insert into t1 values (0);





flush table mysql.proc;



# Drop the mysql.proc table

--system rm var/master-data/mysql/proc.*

--error ER_NO_SUCH_TABLE

call bug14233();

--error ER_NO_SUCH_TABLE

create view v1 as select bug14233_f();

--error ER_NO_SUCH_TABLE

insert into t1 values (0);



# Restore mysql.proc

--system mv var/master-data/mysql/backup/* var/master-data/mysql/

--system rmdir var/master-data/mysql/backup



flush table mysql.proc;

flush privileges;



delete from mysql.proc where name like 'bug14233%';



# Unsupported editing of mysql.proc, circumventing checks in "create ..."

insert into mysql.proc

(

  db, name, type, specific_name, language, sql_data_access, is_deterministic,

  security_type, param_list, returns, body, definer, created, modified,

  sql_mode, comment

)

values

(

  'test', 'bug14233_1', 'FUNCTION', 'bug14233_1', 'SQL', 'READS_SQL_DATA', 'NO',

  'DEFINER', '', 'int(10)',

  'select count(*) from mysql.user',

  'root@localhost', NOW() , '0000-00-00 00:00:00', '', ''

),

(

  'test', 'bug14233_2', 'FUNCTION', 'bug14233_2', 'SQL', 'READS_SQL_DATA', 'NO',

  'DEFINER', '', 'int(10)',

  'begin declare x int; select count(*) into x from mysql.user; end',

  'root@localhost', NOW() , '0000-00-00 00:00:00', '', ''

),

(

  'test', 'bug14233_3', 'PROCEDURE', 'bug14233_3', 'SQL', 'READS_SQL_DATA','NO',

  'DEFINER', '', '',

  'alksj wpsj sa ^#!@ ',

  'root@localhost', NOW() , '0000-00-00 00:00:00', '', ''

);



--error ER_SP_NO_RETSET

select bug14233_1();

--error ER_SP_NO_RETSET

create view v1 as select bug14233_1();



--error ER_SP_NORETURNEND

select bug14233_2();

create view v1 as select bug14233_2();

--error ER_SP_NORETURNEND

select * from v1;



--error ER_PARSE_ERROR

call bug14233_3();

drop trigger t1_ai;

create trigger t1_ai after insert on t1 for each row call bug14233_3();

--error ER_PARSE_ERROR

insert into t1 values (0);



# Clean-up

delete from mysql.proc where name like 'bug14233%';

drop trigger t1_ai;

drop table t1;

drop view v1;

mysql-test/t/sp.test

+2 −0
Original line number Diff line number Diff line
@@ -13,6 +13,8 @@ 
# Tests that require multiple connections, except security/privilege tests,

#   go to sp-thread.

# Tests that uses 'goto' to into sp-goto.test (currently disabled)

# Tests that destroys system tables (e.g. mysql.proc) for error testing

#   go to sp-destruct.



use test;

sql/share/errmsg.txt

+2 −0
Original line number Diff line number Diff line
@@ -5421,3 +5421,5 @@ ER_NO_REFERENCED_ROW_2 23000 
	eng "Cannot add or update a child row: a foreign key constraint fails (%.192s)"

ER_SP_BAD_VAR_SHADOW 42000

	eng "Variable '%-.64s' must be quoted with `...`, or renamed"

ER_SP_PROC_TABLE_CORRUPT

	eng "The table mysql.proc is missing, corrupt, or contains bad data (internal code %d)"

sql/sp.cc

+63 −22
Original line number Diff line number Diff line
@@ -1414,20 +1414,22 @@ static void sp_update_stmt_used_routines(THD *thd, LEX *lex, SQL_LIST *src) 
      first_no_prelock - If true, don't add tables or cache routines used by

                         the body of the first routine (i.e. *start)

                         will be executed in non-prelocked mode.

      tabs_changed     - Set to TRUE some tables were added, FALSE otherwise

  NOTE

    If some function is missing this won't be reported here.

    Instead this fact will be discovered during query execution.



  RETURN VALUE

    TRUE  - some tables were added

    FALSE - no tables were added.

     0 - success

    -x - failure (error code, like SP_PARSE_ERROR et al)

*/



static bool

static int

sp_cache_routines_and_add_tables_aux(THD *thd, LEX *lex,

                                     Sroutine_hash_entry *start, 

                                     bool first_no_prelock)

                                     bool first_no_prelock, bool *tabs_changed)

{

  int ret= 0;

  bool result= FALSE;

  bool first= TRUE;

  DBUG_ENTER("sp_cache_routines_and_add_tables_aux");
@@ -1453,13 +1455,36 @@ sp_cache_routines_and_add_tables_aux(THD *thd, LEX *lex, 
      name.m_name.str+= 1;

      name.m_name.length= name.m_qname.length - name.m_db.length - 1;



      if (db_find_routine(thd, type, &name, &sp) == SP_OK)

      switch ((ret= db_find_routine(thd, type, &name, &sp)))

      {

      case SP_OK:

        {

          if (type == TYPE_ENUM_FUNCTION)

            sp_cache_insert(&thd->sp_func_cache, sp);

          else

            sp_cache_insert(&thd->sp_proc_cache, sp);

        }

        break;

      case SP_KEY_NOT_FOUND:

        ret= SP_OK;

        break;

      case SP_OPEN_TABLE_FAILED:

        /*

          Force it to attempt opening it again on subsequent calls;

          otherwise we will get one error message the first time, and

          then ER_SP_PROC_TABLE_CORRUPT (below) on subsequent tries.

        */

        mysql_proc_table_exists= 1;

        /* Fall through */

      default:

        /*

          In some cases no error has been set (e.g. get field failed,

          when the proc table has been tampered with).

         */

        if (! thd->net.report_error)

          my_error(ER_SP_PROC_TABLE_CORRUPT, MYF(0), ret);

        break;

      }

      delete newlex;

      thd->lex= oldlex;

    }
@@ -1473,7 +1498,9 @@ sp_cache_routines_and_add_tables_aux(THD *thd, LEX *lex, 
    }

    first= FALSE;

  }

  DBUG_RETURN(result);

  if (tabs_changed)

    *tabs_changed= result;

  DBUG_RETURN(ret);

}
@@ -1488,18 +1515,20 @@ sp_cache_routines_and_add_tables_aux(THD *thd, LEX *lex, 
      lex              - LEX representing statement

      first_no_prelock - If true, don't add tables or cache routines used by

                         the body of the first routine (i.e. *start)

      tabs_changed     - Set to TRUE some tables were added, FALSE otherwise

                         

  RETURN VALUE

    TRUE  - some tables were added

    FALSE - no tables were added.

     0 - success

    -x - failure (error code, like SP_PARSE_ERROR et al)

*/



bool

sp_cache_routines_and_add_tables(THD *thd, LEX *lex, bool first_no_prelock)

int

sp_cache_routines_and_add_tables(THD *thd, LEX *lex, bool first_no_prelock,

                                 bool *tabs_changed)

{

  return sp_cache_routines_and_add_tables_aux(thd, lex,

           (Sroutine_hash_entry *)lex->sroutines_list.first,

           first_no_prelock);

           first_no_prelock, tabs_changed);

}
@@ -1513,16 +1542,21 @@ sp_cache_routines_and_add_tables(THD *thd, LEX *lex, bool first_no_prelock) 
      thd     - thread context

      lex     - LEX representing statement

      aux_lex - LEX representing view

                         

  RETURN VALUE

     0 - success

    -x - failure (error code, like SP_PARSE_ERROR et al)

*/



void

int

sp_cache_routines_and_add_tables_for_view(THD *thd, LEX *lex, LEX *aux_lex)

{

  Sroutine_hash_entry **last_cached_routine_ptr=

                          (Sroutine_hash_entry **)lex->sroutines_list.next;

  sp_update_stmt_used_routines(thd, lex, &aux_lex->sroutines_list);

  (void)sp_cache_routines_and_add_tables_aux(thd, lex, 

                                             *last_cached_routine_ptr, FALSE);

  return sp_cache_routines_and_add_tables_aux(thd, lex, 

                                              *last_cached_routine_ptr, FALSE,

                                              NULL);

}
@@ -1536,12 +1570,18 @@ sp_cache_routines_and_add_tables_for_view(THD *thd, LEX *lex, LEX *aux_lex) 
      thd      - thread context

      lex      - LEX respresenting statement

      triggers - triggers of the table



  RETURN VALUE

     0 - success

    -x - failure (error code, like SP_PARSE_ERROR et al)

*/



void

int

sp_cache_routines_and_add_tables_for_triggers(THD *thd, LEX *lex,

                                              Table_triggers_list *triggers)

{

  int ret= 0;



  if (add_used_routine(lex, thd->stmt_arena, &triggers->sroutines_key))

  {

    Sroutine_hash_entry **last_cached_routine_ptr=
@@ -1559,10 +1599,11 @@ sp_cache_routines_and_add_tables_for_triggers(THD *thd, LEX *lex, 
        }

      }

    }

    (void)sp_cache_routines_and_add_tables_aux(thd, lex,

    ret= sp_cache_routines_and_add_tables_aux(thd, lex,

                                              *last_cached_routine_ptr, 

                                               FALSE);

                                              FALSE, NULL);

  }

  return ret;

}