Author: glen Date: Mon Jul 2 20:57:29 2007 GMT
Module: SOURCES Tag: MYSQL_5_0
---- Log message:
- revert BASE_TABLETYPE
---- Files affected:
SOURCES:
mysql.init (1.105.4.1.2.3 -> 1.105.4.1.2.4)
---- Diffs:
================================================================
Index: SOURCES/mysql.init
diff -u SOURCES/mysql.init:1.105.4.1.2.3 SOURCES/mysql.init:1.105.4.1.2.4
--- SOURCES/mysql.init:1.105.4.1.2.3 Fri Jun 8 13:11:28 2007
+++ SOURCES/mysql.init Mon Jul 2 22:57:24 2007
@@ -21,8 +21,6 @@
exit 1
fi
-[ -z "$BASE_TABLETYPE" ] && BASE_TABLETYPE="InnoDB"
-
if [ -n "$MYSQL_DB_CLUSTERS" ]; then
nls "Warning: MYSQL_DB_CLUSTERS is set. It's obsolete. Use %s instead."
/etc/mysql/clusters.conf
fi
@@ -505,11 +503,11 @@
i_u="INSERT INTO user VALUES
('localhost','mysql','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','','','','',0,0,0,0);
INSERT INTO user (host,user) values ('localhost','');
INSERT INTO user VALUES
('localhost','mysql_logrotate','','N','N','N','N','N','N','Y','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','','','','',0,0,0,0);"
- if [ ! "x$hostname" -eq "xlocahost" ]; then
+ if [ "$hostname" != "locahost" ]; then
i_u="
INSERT INTO user VALUES ('$hostname',
'mysql','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','','','','',0,0,0,0);
INSERT INTO user (host,user) values ('$hostname','');";
- fi;
+ fi
fi
if test ! -f $MYSQL_DATA_DIR/mysqldb/mysql/func.frm
@@ -520,7 +518,7 @@
c_f="$c_f dl char(128) DEFAULT '' NOT NULL,"
c_f="$c_f type enum ('function','aggregate') COLLATE
utf8_general_ci NOT NULL,"
c_f="$c_f PRIMARY KEY (name)"
- c_f="$c_f ) engine=${BASE_TABLETYPE} "
+ c_f="$c_f )"
c_f="$c_f CHARACTER SET utf8 COLLATE utf8_bin"
c_f="$c_f comment='User defined functions';"
fi
@@ -538,7 +536,7 @@
c_t="$c_t Column_priv set('Select','Insert','Update','References')
COLLATE utf8_general_ci DEFAULT '' NOT NULL,"
c_t="$c_t PRIMARY KEY (Host,Db,User,Table_name),"
c_t="$c_t KEY Grantor (Grantor)"
- c_t="$c_t ) engine=${BASE_TABLETYPE} "
+ c_t="$c_t )"
c_t="$c_t CHARACTER SET utf8 COLLATE utf8_bin"
c_t="$c_t comment='Table privileges';"
fi
@@ -554,7 +552,7 @@
c_c="$c_c Timestamp timestamp(14),"
c_c="$c_c Column_priv set('Select','Insert','Update','References')
COLLATE utf8_general_ci DEFAULT '' NOT NULL,"
c_c="$c_c PRIMARY KEY (Host,Db,User,Table_name,Column_name)"
- c_c="$c_c ) engine=${BASE_TABLETYPE} "
+ c_c="$c_c )"
c_c="$c_c CHARACTER SET utf8 COLLATE utf8_bin"
c_c="$c_c comment='Column privileges';"
fi
@@ -572,7 +570,7 @@
c_pp="$c_pp Timestamp timestamp(14),"
c_pp="$c_pp PRIMARY KEY (Host,Db,User,Routine_name,Routine_type),"
c_pp="$c_pp KEY Grantor (Grantor)"
- c_pp="$c_pp ) engine=${BASE_TABLETYPE} "
+ c_pp="$c_pp )"
c_pp="$c_pp CHARACTER SET utf8 COLLATE utf8_bin"
c_pp="$c_pp comment='Procedure privileges';"
fi
@@ -589,7 +587,7 @@
c_ht="$c_ht url varchar(128) not null,"
c_ht="$c_ht primary key (help_topic_id),"
c_ht="$c_ht unique index (name)"
- c_ht="$c_ht ) engine=${BASE_TABLETYPE} "
+ c_ht="$c_ht )"
c_ht="$c_ht CHARACTER SET utf8"
c_ht="$c_ht comment='help topics';"
fi
@@ -603,7 +601,7 @@
c_hc="$c_hc url varchar(128) not null,"
c_hc="$c_hc primary key (help_category_id),"
c_hc="$c_hc unique index (name)"
- c_hc="$c_hc ) engine=${BASE_TABLETYPE} "
+ c_hc="$c_hc )"
c_hc="$c_hc CHARACTER SET utf8"
c_hc="$c_hc comment='help categories';"
fi
@@ -615,7 +613,7 @@
c_hk="$c_hk name varchar(64) not null,"
c_hk="$c_hk primary key (help_keyword_id),"
c_hk="$c_hk unique index (name)"
- c_hk="$c_hk ) engine=${BASE_TABLETYPE} "
+ c_hk="$c_hk )"
c_hk="$c_hk CHARACTER SET utf8"
c_hk="$c_hk comment='help keywords';"
fi
@@ -626,7 +624,7 @@
c_hr="$c_hr help_topic_id int unsigned not null references
help_topic,"
c_hr="$c_hr help_keyword_id int unsigned not null references
help_keyword,"
c_hr="$c_hr primary key (help_keyword_id, help_topic_id)"
- c_hr="$c_hr ) engine=${BASE_TABLETYPE} "
+ c_hr="$c_hr )"
c_hr="$c_hr CHARACTER SET utf8"
c_hr="$c_hr comment='keyword-topic relation';"
fi
@@ -637,7 +635,7 @@
c_tzn="$c_tzn Name char(64) NOT NULL,"
c_tzn="$c_tzn Time_zone_id int unsigned NOT NULL,"
c_tzn="$c_tzn PRIMARY KEY Name (Name)"
- c_tzn="$c_tzn ) engine=${BASE_TABLETYPE} "
+ c_tzn="$c_tzn )"
c_tzn="$c_tzn CHARACTER SET utf8"
c_tzn="$c_tzn comment='Time zone names';"
fi
@@ -648,7 +646,7 @@
c_tz="$c_tz Time_zone_id int unsigned NOT NULL auto_increment,"
c_tz="$c_tz Use_leap_seconds enum('Y','N') DEFAULT 'N' NOT NULL,"
c_tz="$c_tz PRIMARY KEY TzId (Time_zone_id)"
- c_tz="$c_tz ) engine=${BASE_TABLETYPE} "
+ c_tz="$c_tz )"
c_tz="$c_tz CHARACTER SET utf8"
c_tz="$c_tz comment='Time zones';"
fi
@@ -660,7 +658,7 @@
c_tzt="$c_tzt Transition_time bigint signed NOT NULL,"
c_tzt="$c_tzt Transition_type_id int unsigned NOT NULL,"
c_tzt="$c_tzt PRIMARY KEY TzIdTranTime (Time_zone_id,
Transition_time)"
- c_tzt="$c_tzt ) engine=${BASE_TABLETYPE} "
+ c_tzt="$c_tzt )"
c_tzt="$c_tzt CHARACTER SET utf8"
c_tzt="$c_tzt comment='Time zone transitions';"
fi
@@ -674,7 +672,7 @@
c_tztt="$c_tztt Is_DST tinyint unsigned DEFAULT 0 NOT NULL,"
c_tztt="$c_tztt Abbreviation char(8) DEFAULT '' NOT NULL,"
c_tztt="$c_tztt PRIMARY KEY TzIdTrTId (Time_zone_id,
Transition_type_id)"
- c_tztt="$c_tztt ) engine=${BASE_TABLETYPE} "
+ c_tztt="$c_tztt )"
c_tztt="$c_tztt CHARACTER SET utf8"
c_tztt="$c_tztt comment='Time zone transition types';"
fi
@@ -685,7 +683,7 @@
c_tzls="$c_tzls Transition_time bigint signed NOT NULL,"
c_tzls="$c_tzls Correction int signed NOT NULL,"
c_tzls="$c_tzls PRIMARY KEY TranTime (Transition_time)"
- c_tzls="$c_tzls ) engine=${BASE_TABLETYPE} "
+ c_tzls="$c_tzls )"
c_tzls="$c_tzls CHARACTER SET utf8"
c_tzls="$c_tzls comment='Leap seconds information for time zones';"
fi
@@ -745,7 +743,7 @@
c_p="$c_p ) DEFAULT '' NOT NULL,"
c_p="$c_p comment char(64) collate utf8_bin DEFAULT ''
NOT NULL,"
c_p="$c_p PRIMARY KEY (db,name,type)"
- c_p="$c_p ) engine=${BASE_TABLETYPE} "
+ c_p="$c_p )"
c_p="$c_p character set utf8"
c_p="$c_p comment='Stored Procedures';"
fi
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SOURCES/mysql.init?r1=1.105.4.1.2.3&r2=1.105.4.1.2.4&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
