Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
This commit is contained in:
commit
d6a78be9f2
@ -719,14 +719,18 @@ nlist_err:
|
|||||||
|
|
||||||
/*
|
/*
|
||||||
parse parameters
|
parse parameters
|
||||||
|
|
||||||
SYNOPSIS
|
SYNOPSIS
|
||||||
File_parser::parse()
|
File_parser::parse()
|
||||||
base base address for parameter writing (structure like
|
base base address for parameter writing (structure like
|
||||||
TABLE)
|
TABLE)
|
||||||
mem_root MEM_ROOT for parameters allocation
|
mem_root MEM_ROOT for parameters allocation
|
||||||
parameters parameters description
|
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 hook called for unknown keys
|
||||||
hook_data some data specific for the hook
|
hook_data some data specific for the hook
|
||||||
|
|
||||||
@ -909,6 +913,13 @@ list_err:
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
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);
|
DBUG_RETURN(FALSE);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -954,6 +954,12 @@ sp_head::execute(THD *thd)
|
|||||||
m_first_instance->m_last_cached_sp == this) ||
|
m_first_instance->m_last_cached_sp == this) ||
|
||||||
(m_recursion_level + 1 == m_next_cached_sp->m_recursion_level));
|
(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 &&
|
if (m_db.length &&
|
||||||
(err_status= sp_use_new_db(thd, m_db, &old_db, 0, &dbchanged)))
|
(err_status= sp_use_new_db(thd, m_db, &old_db, 0, &dbchanged)))
|
||||||
goto done;
|
goto done;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user