diff options
| author | unknown <pem@mysql.com> | 2003-04-04 13:45:35 +0200 |
|---|---|---|
| committer | unknown <pem@mysql.com> | 2003-04-04 13:45:35 +0200 |
| commit | b60e6bcf2d876b8f0591a40f93946dcf2fafe99f (patch) | |
| tree | f4f9ee455be6e05171fe74e04042708e983446b8 /scripts | |
| parent | 094d141b106bf0b2bdedc0494376528e6b8f0015 (diff) | |
| parent | fc448ccb7fba68f874edd8f33ec401873a1b4e1d (diff) | |
| download | mariadb-git-b60e6bcf2d876b8f0591a40f93946dcf2fafe99f.tar.gz | |
Merging 4.1 to 5.0.
BitKeeper/etc/gone:
auto-union
BitKeeper/etc/logging_ok:
auto-union
client/mysql.cc:
Auto merged
mysql-test/r/show_check.result:
Auto merged
mysql-test/r/subselect.result:
Auto merged
mysql-test/r/variables.result:
Auto merged
sql/item.cc:
Auto merged
sql/lex.h:
Auto merged
sql/log.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_delete.cc:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_load.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/share/swedish/errmsg.txt:
Auto merged
sql/sql_yacc.yy:
Auto merged
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/mysql_install_db.sh | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/scripts/mysql_install_db.sh b/scripts/mysql_install_db.sh index 1a969895f7f..0ce45c8d114 100644 --- a/scripts/mysql_install_db.sh +++ b/scripts/mysql_install_db.sh @@ -353,6 +353,19 @@ then c_c="$c_c comment='Column privileges';" fi +if test ! -f $mdata/proc.frm +then + echo "Preparing proc table" + + c_p="$c_p CREATE TABLE proc (" + c_p="$c_p name char(64) binary DEFAULT '' NOT NULL," + c_p="$c_p type enum('function','procedure') NOT NULL," + c_p="$c_p body blob DEFAULT '' NOT NULL," + c_p="$c_p PRIMARY KEY (name,type)" + c_p="$c_p )" + c_p="$c_p comment='Stored Procedures';" +fi + echo "Installing privilege tables" if ( cat << END_OF_DATA @@ -371,6 +384,7 @@ $i_f $c_t $c_c +$c_p END_OF_DATA if test -n "$fill_help_tables" then |