database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-06-23 19:21:55 +03:00
Code Activity

Merging 4.1 into 5.0 (second pass; post-merge fixes).

Browse Source 
One test in subselect.test still wrong.
Had to reconstruct all errmsg.txt files completely, since auto-merge made
a mess of the lot. :-(
This commit is contained in:
pem@mysql.telia.com
2003-07-09 17:07:12 +02:00
parent 9c3a7a6ba3
commit a8a29a39d2
40 changed files with 836 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
scripts/mysql_create_system_tables.sh
View File

@ -39,6 +39,7 @@ c_hc=""
c_hr=""
c_hk=""
i_ht=""
c_p=""
# Check for old tables
if test ! -f $mdata/db.frm
@ -285,6 +286,22 @@ then
c_hr="$c_hr comment='keyword-topic relation';"
fi
if test ! -f $mdata/proc.frm
then
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 creator char(77) binary DEFAULT '' NOT NULL,"
c_p="$c_p modified timestamp,"
c_p="$c_p created timestamp,"
c_p="$c_p suid enum ('N', 'Y') DEFAULT 'Y' NOT NULL,"
c_p="$c_p comment char(64) binary DEFAULT '' NOT NULL,"
c_p="$c_p PRIMARY KEY (name,type)"
c_p="$c_p )"
c_p="$c_p comment='Stored Procedures';"
fi
cat << END_OF_DATA
use mysql;
$c_d
@ -306,5 +323,8 @@ $c_ht
$c_hc
$c_hr
$c_hk
$c_p
END_OF_DATA