diff options
| author | unknown <jimw@mysql.com> | 2005-08-02 16:50:12 -0700 |
|---|---|---|
| committer | unknown <jimw@mysql.com> | 2005-08-02 16:50:12 -0700 |
| commit | 1ea0632e6c425e8b2094b551439dca0df439e864 (patch) | |
| tree | 8f42f5271e4c2ede105a05c9472da1d158f05ee0 /scripts | |
| parent | 6ea67532cc7c76d2b82c1ccb1e36a651a8d2722f (diff) | |
| parent | eb25e83ee4a2b960a387778a19440b6db4a01fd7 (diff) | |
| download | mariadb-git-1ea0632e6c425e8b2094b551439dca0df439e864.tar.gz | |
Merge mysql.com:/home/jimw/my/mysql-5.0-11602
into mysql.com:/home/jimw/my/mysql-5.0-clean
client/mysqltest.c:
Auto merged
sql/sp.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/share/errmsg.txt:
Resolve conflict
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/mysql_create_system_tables.sh | 2 | ||||
| -rw-r--r-- | scripts/mysql_fix_privilege_tables.sql | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/scripts/mysql_create_system_tables.sh b/scripts/mysql_create_system_tables.sh index a3036b5c10b..383f8b80dc8 100644 --- a/scripts/mysql_create_system_tables.sh +++ b/scripts/mysql_create_system_tables.sh @@ -683,7 +683,7 @@ then c_p="$c_p security_type enum('INVOKER','DEFINER') DEFAULT 'DEFINER' NOT NULL," c_p="$c_p param_list blob DEFAULT '' NOT NULL," c_p="$c_p returns char(64) DEFAULT '' NOT NULL," - c_p="$c_p body blob DEFAULT '' NOT NULL," + c_p="$c_p body longblob DEFAULT '' NOT NULL," c_p="$c_p definer char(77) collate utf8_bin DEFAULT '' NOT NULL," c_p="$c_p created timestamp," c_p="$c_p modified timestamp," diff --git a/scripts/mysql_fix_privilege_tables.sql b/scripts/mysql_fix_privilege_tables.sql index b93e0a47b1b..f67bab44514 100644 --- a/scripts/mysql_fix_privilege_tables.sql +++ b/scripts/mysql_fix_privilege_tables.sql @@ -426,7 +426,7 @@ CREATE TABLE IF NOT EXISTS proc ( security_type enum('INVOKER','DEFINER') DEFAULT 'DEFINER' NOT NULL, param_list blob DEFAULT '' NOT NULL, returns char(64) DEFAULT '' NOT NULL, - body blob DEFAULT '' NOT NULL, + body longblob DEFAULT '' NOT NULL, definer char(77) collate utf8_bin DEFAULT '' NOT NULL, created timestamp, modified timestamp, @@ -477,6 +477,7 @@ ALTER TABLE proc MODIFY name char(64) DEFAULT '' NOT NULL, 'READS_SQL_DATA', 'MODIFIES_SQL_DATA' ) DEFAULT 'CONTAINS_SQL' NOT NULL, + MODIFY body longblob DEFAULT '' NOT NULL, MODIFY sql_mode set('REAL_AS_FLOAT', 'PIPES_AS_CONCAT', |