Commit a005dfb6 authored by unknown's avatar unknown
Browse files

Merge vajra.(none):/opt/local/work/mysql-5.0-runtime 

into  vajra.(none):/opt/local/work/mysql-5.1-runtime


sql/parse_file.cc:
  Auto merged
sql/sp_head.cc:
  Auto merged
parents c557623a 52b86a6e

sql/parse_file.cc

+13 −2
Original line number Diff line number Diff line
@@ -740,7 +740,11 @@ bool get_file_options_ulllist(char *&ptr, char *end, char *line, 
                        TABLE)

    mem_root            MEM_ROOT for parameters allocation

    parameters          parameters description

    required            number of required parameters in above list

    required            number of parameters in the above list. If the file

                        contains more parameters than "required", they will

                        be ignored. If the file contains less parameters

                        then "required", non-existing parameters will

                        remain their values.

    hook                hook called for unknown keys

    hook_data           some data specific for the hook
@@ -923,6 +927,13 @@ File_parser::parse(gptr base, MEM_ROOT *mem_root, 
      }

    }

  }



  /*

    NOTE: if we read less than "required" parameters, it is still Ok.

    Probably, we've just read the file of the previous version, which

    contains less parameters.

  */



  DBUG_RETURN(FALSE);

}

sql/sp_head.cc

+6 −0
Original line number Diff line number Diff line
@@ -992,6 +992,12 @@ sp_head::execute(THD *thd) 
               m_first_instance->m_last_cached_sp == this) ||

              (m_recursion_level + 1 == m_next_cached_sp->m_recursion_level));



  /*

    NOTE: The SQL Standard does not specify the context that should be

    preserved for stored routines. However, at SAP/Walldorf meeting it was

    decided that current database should be preserved.

  */



  if (m_db.length &&

      (err_status= sp_use_new_db(thd, m_db, &old_db, 0, &dbchanged)))

    goto done;