summaryrefslogtreecommitdiff
path: root/netware
diff options
context:
space:
mode:
authorgreg@mysql.com <>2004-01-13 01:10:21 -0100
committergreg@mysql.com <>2004-01-13 01:10:21 -0100
commit0c91129a38a549e0a5140033271e1a4da504a047 (patch)
tree7636898f62fa252776f480102424bb9a5f9a6dba /netware
parentc6c2478f8c97b7e2a3c3c1cc055799dc0be1ed1c (diff)
downloadmariadb-git-0c91129a38a549e0a5140033271e1a4da504a047.tar.gz
Minor Novell supplied changes for 4.1 (inside netware directory)
Diffstat (limited to 'netware')
-rw-r--r--netware/init_db.sql4
-rw-r--r--netware/libmysql.imp2
2 files changed, 5 insertions, 1 deletions
diff --git a/netware/init_db.sql b/netware/init_db.sql
index 4613e5c0274..063c1815eb1 100644
--- a/netware/init_db.sql
+++ b/netware/init_db.sql
@@ -24,3 +24,7 @@ CREATE TABLE tables_priv (Host char(60) binary DEFAULT '' NOT NULL, Db char(64)
CREATE TABLE columns_priv (Host char(60) binary DEFAULT '' NOT NULL, Db char(64) binary DEFAULT '' NOT NULL, User char(16) binary DEFAULT '' NOT NULL, Table_name char(64) binary DEFAULT '' NOT NULL, Column_name char(64) binary DEFAULT '' NOT NULL, Timestamp timestamp(14), Column_priv set('Select','Insert','Update','References') DEFAULT '' NOT NULL, PRIMARY KEY (Host,Db,User,Table_name,Column_name)) comment='Column privileges';
+CREATE TABLE help_topic (help_topic_id int unsigned NOT NULL, name varchar(64) NOT NULL, help_category_id smallint unsigned NOT NULL, description text NOT NULL, example text NOT NULL, url varchar(128) NOT NULL, primary key (help_topic_id), unique index (name))comment='help topics';
+CREATE TABLE help_category (help_category_id smallint unsigned NOT NULL, name varchar(64) NOT NULL, parent_category_id smallint unsigned null, url varchar(128) NOT NULL, primary key (help_category_id), unique index (name)) comment='help categories';
+CREATE TABLE help_keyword (help_keyword_id int unsigned NOT NULL, name varchar(64) NOT NULL, primary key (help_keyword_id), unique index (name)) comment='help keywords';
+CREATE TABLE help_relation (help_topic_id int unsigned NOT NULL references help_topic, help_keyword_id int unsigned NOT NULL references help_keyword, primary key (help_keyword_id, help_topic_id)) comment='keyword-topic relation';
diff --git a/netware/libmysql.imp b/netware/libmysql.imp
index 75fcc8d1a99..977fb1b0b1f 100644
--- a/netware/libmysql.imp
+++ b/netware/libmysql.imp
@@ -77,7 +77,7 @@ mysql_thread_init,
mysql_thread_safe,
mysql_use_result,
net_safe_read,
-simple_command,
+#simple_command,
mysql_connect,
mysql_create_db,
mysql_drop_db,