diff options
| author | Alexander Nozdrin <alik@sun.com> | 2010-04-14 20:40:04 +0400 |
|---|---|---|
| committer | Alexander Nozdrin <alik@sun.com> | 2010-04-14 20:40:04 +0400 |
| commit | f3635be0314e6a66ef5f9b51f9cdba761d6ed5ad (patch) | |
| tree | e55a71edba3e3ac37c1304f1bdeabd83f7730ef7 /scripts/mysql_system_tables.sql | |
| parent | b8d014b8f6671395b9965b5a9953f5b2efa0fd15 (diff) | |
| download | mariadb-git-f3635be0314e6a66ef5f9b51f9cdba761d6ed5ad.tar.gz | |
A patch for Bug#52444 (mysql_upgrade fails b/w 5.1 -> 5.5 (Celosia)).
The problem was that the code that works with stored routines was present
in mysql_system_tables.sql. This is wrong because until upgrade is finished,
stored routines may be (and were) not available.
The fix is to move that code to the end of mysql_system_tables_fix.sql.
Diffstat (limited to 'scripts/mysql_system_tables.sql')
| -rw-r--r-- | scripts/mysql_system_tables.sql | 22 |
1 files changed, 1 insertions, 21 deletions
diff --git a/scripts/mysql_system_tables.sql b/scripts/mysql_system_tables.sql index 69d6d6d7feb..b5ee4d6dd41 100644 --- a/scripts/mysql_system_tables.sql +++ b/scripts/mysql_system_tables.sql @@ -11,7 +11,7 @@ -- -- You should have received a copy of the GNU General Public License -- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +-- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -- -- The system tables of MySQL Server @@ -161,26 +161,6 @@ EXECUTE stmt; DROP PREPARE stmt; -- --- Unlike 'performance_schema', the 'mysql' database is reserved already, --- so no user procedure is supposed to be there --- -drop procedure if exists mysql.die; -create procedure mysql.die() signal sqlstate 'HY000' set message_text='Unexpected content found in the performance_schema database.'; - --- --- For broken upgrades, SIGNAL the error --- - -SET @cmd="call mysql.die()"; - -SET @str = IF(@broken_pfs > 0, @cmd, 'SET @dummy = 0'); -PREPARE stmt FROM @str; -EXECUTE stmt; -DROP PREPARE stmt; - -drop procedure mysql.die; - --- -- From this point, only create the performance schema tables -- if the server is build with performance schema -- |