SOURCES: mysql.init - merge from DEVEL
arekm
arekm at pld-linux.org
Sat Dec 16 21:30:24 CET 2006
Author: arekm Date: Sat Dec 16 20:30:24 2006 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- merge from DEVEL
---- Files affected:
SOURCES:
mysql.init (1.106 -> 1.107)
---- Diffs:
================================================================
Index: SOURCES/mysql.init
diff -u SOURCES/mysql.init:1.106 SOURCES/mysql.init:1.107
--- SOURCES/mysql.init:1.106 Wed Dec 13 15:07:48 2006
+++ SOURCES/mysql.init Sat Dec 16 21:30:19 2006
@@ -368,370 +368,7 @@
exit 1
fi
- # Initialize variables
- c_d="" i_d="" c_ht="" c_tz=""
- c_h="" i_h="" c_hc="" c_tzt=""
- c_u="" i_u="" c_hk="" c_tztt=""
- c_f="" i_f="" c_hr="" c_tzls=""
- c_t="" c_c="" c_tzn="" c_p=""
- c_pp=""
-
- # Check for old tables
- if test ! -f $MYSQL_DATA_DIR/mysqldb/mysql/db.frm
- then
- # mysqld --bootstrap wants one command/line
- c_d="$c_d CREATE TABLE db ("
- c_d="$c_d Host char(60) DEFAULT '' NOT NULL,"
- c_d="$c_d Db char(64) DEFAULT '' NOT NULL,"
- c_d="$c_d User char(16) DEFAULT '' NOT NULL,"
- c_d="$c_d Select_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL,"
- c_d="$c_d Insert_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL,"
- c_d="$c_d Update_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL,"
- c_d="$c_d Delete_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL,"
- c_d="$c_d Create_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL,"
- c_d="$c_d Drop_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL,"
- c_d="$c_d Grant_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL,"
- c_d="$c_d References_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL,"
- c_d="$c_d Index_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL,"
- c_d="$c_d Alter_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL,"
- c_d="$c_d Create_tmp_table_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL,"
- c_d="$c_d Lock_tables_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL,"
- c_d="$c_d Create_view_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL,"
- c_d="$c_d Show_view_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL,"
- c_d="$c_d Create_routine_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL,"
- c_d="$c_d Alter_routine_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL,"
- c_d="$c_d Execute_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL,"
- c_d="$c_d PRIMARY KEY Host (Host,Db,User),"
- c_d="$c_d KEY User (User)"
- c_d="$c_d ) engine=MyISAM "
- c_d="$c_d CHARACTER SET utf8 COLLATE utf8_bin"
- c_d="$c_d comment='Database privileges';"
-
- i_d="INSERT INTO db VALUES ('%','test','','Y','Y','Y','Y','Y','Y','N','Y','Y','Y','Y','Y','Y','Y','Y','N','N');
- INSERT INTO db VALUES ('%','test\_%','','Y','Y','Y','Y','Y','Y','N','Y','Y','Y','Y','Y','Y','Y','Y','N','N');"
-
- fi
-
- if test ! -f $MYSQL_DATA_DIR/mysqldb/mysql/host.frm
- then
- c_h="$c_h CREATE TABLE host ("
- c_h="$c_h Host char(60) DEFAULT '' NOT NULL,"
- c_h="$c_h Db char(64) DEFAULT '' NOT NULL,"
- c_h="$c_h Select_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL,"
- c_h="$c_h Insert_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL,"
- c_h="$c_h Update_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL,"
- c_h="$c_h Delete_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL,"
- c_h="$c_h Create_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL,"
- c_h="$c_h Drop_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL,"
- c_h="$c_h Grant_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL,"
- c_h="$c_h References_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL,"
- c_h="$c_h Index_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL,"
- c_h="$c_h Alter_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL,"
- c_h="$c_h Create_tmp_table_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL,"
- c_h="$c_h Lock_tables_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL,"
- c_h="$c_h Create_view_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL,"
- c_h="$c_h Show_view_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL,"
- c_h="$c_h Create_routine_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL,"
- c_h="$c_h Alter_routine_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL,"
- c_h="$c_h Execute_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL,"
- c_h="$c_h PRIMARY KEY Host (Host,Db)"
- c_h="$c_h ) engine=MyISAM "
- c_h="$c_h CHARACTER SET utf8 COLLATE utf8_bin"
- c_h="$c_h comment='Host privileges; Merged with database privileges';"
- fi
-
- if test ! -f $MYSQL_DATA_DIR/mysqldb/mysql/user.frm
- then
- c_u="$c_u CREATE TABLE user ("
- c_u="$c_u Host char(60) binary DEFAULT '' NOT NULL,"
- c_u="$c_u User char(16) binary DEFAULT '' NOT NULL,"
- c_u="$c_u Password char(41) character set latin1 collate latin1_bin DEFAULT '' NOT NULL,"
- c_u="$c_u Select_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL,"
- c_u="$c_u Insert_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL,"
- c_u="$c_u Update_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL,"
- c_u="$c_u Delete_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL,"
- c_u="$c_u Create_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL,"
- c_u="$c_u Drop_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL,"
- c_u="$c_u Reload_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL,"
- c_u="$c_u Shutdown_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL,"
- c_u="$c_u Process_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL,"
- c_u="$c_u File_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL,"
- c_u="$c_u Grant_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL,"
- c_u="$c_u References_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL,"
- c_u="$c_u Index_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL,"
- c_u="$c_u Alter_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL,"
- c_u="$c_u Show_db_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL,"
- c_u="$c_u Super_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL,"
- c_u="$c_u Create_tmp_table_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL,"
- c_u="$c_u Lock_tables_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL,"
- c_u="$c_u Execute_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL,"
- c_u="$c_u Repl_slave_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL,"
- c_u="$c_u Repl_client_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL,"
- c_u="$c_u Create_view_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL,"
- c_u="$c_u Show_view_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL,"
- c_u="$c_u Create_routine_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL,"
- c_u="$c_u Alter_routine_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL,"
- c_u="$c_u Create_user_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL,"
- c_u="$c_u ssl_type enum('','ANY','X509', 'SPECIFIED') COLLATE utf8_general_ci DEFAULT '' NOT NULL,"
- c_u="$c_u ssl_cipher BLOB NOT NULL,"
- c_u="$c_u x509_issuer BLOB NOT NULL,"
- c_u="$c_u x509_subject BLOB NOT NULL,"
- c_u="$c_u max_questions int(11) unsigned DEFAULT 0 NOT NULL,"
- c_u="$c_u max_updates int(11) unsigned DEFAULT 0 NOT NULL,"
- c_u="$c_u max_connections int(11) unsigned DEFAULT 0 NOT NULL,"
- c_u="$c_u max_user_connections int(11) unsigned DEFAULT 0 NOT NULL,"
- c_u="$c_u PRIMARY KEY Host (Host,User)"
- c_u="$c_u ) engine=MyISAM "
- c_u="$c_u CHARACTER SET utf8 COLLATE utf8_bin"
- c_u="$c_u comment='Users and global privileges';"
-
-
- 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 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 ('localhost','');
- INSERT INTO user (host,user) values ('$hostname','');
- 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);"
- fi
-
- if test ! -f $MYSQL_DATA_DIR/mysqldb/mysql/func.frm
- then
- c_f="$c_f CREATE TABLE func ("
- c_f="$c_f name char(64) DEFAULT '' NOT NULL,"
- c_f="$c_f ret tinyint(1) DEFAULT '0' NOT NULL,"
- 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 CHARACTER SET utf8 COLLATE utf8_bin"
- c_f="$c_f comment='User defined functions';"
- fi
-
- if test ! -f $MYSQL_DATA_DIR/mysqldb/mysql/tables_priv.frm
- then
- c_t="$c_t CREATE TABLE tables_priv ("
- c_t="$c_t Host char(60) DEFAULT '' NOT NULL,"
- c_t="$c_t Db char(64) DEFAULT '' NOT NULL,"
- c_t="$c_t User char(16) DEFAULT '' NOT NULL,"
- c_t="$c_t Table_name char(60) DEFAULT '' NOT NULL,"
- c_t="$c_t Grantor char(77) DEFAULT '' NOT NULL,"
- c_t="$c_t Timestamp timestamp(14),"
- c_t="$c_t Table_priv set('Select','Insert','Update','Delete','Create','Drop','Grant','References','Index', 'Alter','Create View','Show view') COLLATE utf8_general_ci DEFAULT '' NOT NULL,"
- 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 CHARACTER SET utf8 COLLATE utf8_bin"
- c_t="$c_t comment='Table privileges';"
- fi
-
- if test ! -f $MYSQL_DATA_DIR/mysqldb/mysql/columns_priv.frm
- then
- c_c="$c_c CREATE TABLE columns_priv ("
- c_c="$c_c Host char(60) DEFAULT '' NOT NULL,"
- c_c="$c_c Db char(64) DEFAULT '' NOT NULL,"
- c_c="$c_c User char(16) DEFAULT '' NOT NULL,"
- c_c="$c_c Table_name char(64) DEFAULT '' NOT NULL,"
- c_c="$c_c Column_name char(64) DEFAULT '' NOT NULL,"
- 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 CHARACTER SET utf8 COLLATE utf8_bin"
- c_c="$c_c comment='Column privileges';"
- fi
-
- if test ! -f $MYSQL_DATA_DIR/mysqldb/mysql/procs_priv.frm
- then
- c_pp="$c_pp CREATE TABLE procs_priv ("
- c_pp="$c_pp Host char(60) binary DEFAULT '' NOT NULL,"
- c_pp="$c_pp Db char(64) binary DEFAULT '' NOT NULL,"
- c_pp="$c_pp User char(16) binary DEFAULT '' NOT NULL,"
- c_pp="$c_pp Routine_name char(64) binary DEFAULT '' NOT NULL,"
- c_pp="$c_pp Routine_type enum('FUNCTION','PROCEDURE') NOT NULL,"
- c_pp="$c_pp Grantor char(77) DEFAULT '' NOT NULL,"
- c_pp="$c_pp Proc_priv set('Execute','Alter Routine','Grant') COLLATE utf8_general_ci DEFAULT '' NOT NULL,"
- 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 CHARACTER SET utf8 COLLATE utf8_bin"
- c_pp="$c_pp comment='Procedure privileges';"
- fi
-
-
- if test ! -f $MYSQL_DATA_DIR/mysqldb/mysql/help_topic.frm
- then
- c_ht="$c_ht CREATE TABLE help_topic ("
- c_ht="$c_ht help_topic_id int unsigned not null,"
- c_ht="$c_ht name varchar(64) not null,"
- c_ht="$c_ht help_category_id smallint unsigned not null,"
- c_ht="$c_ht description text not null,"
- c_ht="$c_ht example text not null,"
- 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 CHARACTER SET utf8"
- c_ht="$c_ht comment='help topics';"
- fi
-
- if test ! -f $MYSQL_DATA_DIR/mysqldb/mysql/help_category.frm
- then
- c_hc="$c_hc CREATE TABLE help_category ("
- c_hc="$c_hc help_category_id smallint unsigned not null,"
- c_hc="$c_hc name varchar(64) not null,"
- c_hc="$c_hc parent_category_id smallint unsigned null,"
- 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 CHARACTER SET utf8"
- c_hc="$c_hc comment='help categories';"
- fi
-
- if test ! -f $MYSQL_DATA_DIR/mysqldb/mysql/help_keyword.frm
- then
- c_hk="$c_hk CREATE TABLE help_keyword ("
- c_hk="$c_hk help_keyword_id int unsigned not null,"
- 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 CHARACTER SET utf8"
- c_hk="$c_hk comment='help keywords';"
- fi
-
- if test ! -f $MYSQL_DATA_DIR/mysqldb/mysql/help_relation.frm
- then
- c_hr="$c_hr CREATE TABLE help_relation ("
- 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 CHARACTER SET utf8"
- c_hr="$c_hr comment='keyword-topic relation';"
- fi
-
- if test ! -f $MYSQL_DATA_DIR/mysqldb/mysql/time_zone_name.frm
- then
- c_tzn="$c_tzn CREATE TABLE time_zone_name ("
- 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 CHARACTER SET utf8"
- c_tzn="$c_tzn comment='Time zone names';"
- fi
-
- if test ! -f $MYSQL_DATA_DIR/mysqldb/mysql/time_zone.frm
- then
- c_tz="$c_tz CREATE TABLE time_zone ("
- 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 CHARACTER SET utf8"
- c_tz="$c_tz comment='Time zones';"
- fi
-
- if test ! -f $MYSQL_DATA_DIR/mysqldb/mysql/time_zone_transition.frm
- then
- c_tzt="$c_tzt CREATE TABLE time_zone_transition ("
- c_tzt="$c_tzt Time_zone_id int unsigned NOT NULL,"
- 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 CHARACTER SET utf8"
- c_tzt="$c_tzt comment='Time zone transitions';"
- fi
-
- if test ! -f $MYSQL_DATA_DIR/mysqldb/mysql/time_zone_transition_type.frm
- then
- c_tztt="$c_tztt CREATE TABLE time_zone_transition_type ("
- c_tztt="$c_tztt Time_zone_id int unsigned NOT NULL,"
- c_tztt="$c_tztt Transition_type_id int unsigned NOT NULL,"
- c_tztt="$c_tztt Offset int signed DEFAULT 0 NOT NULL,"
- 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 CHARACTER SET utf8"
- c_tztt="$c_tztt comment='Time zone transition types';"
- fi
-
- if test ! -f $MYSQL_DATA_DIR/mysqldb/mysql/time_zone_leap_second.frm
- then
- c_tzls="$c_tzls CREATE TABLE time_zone_leap_second ("
- 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 CHARACTER SET utf8"
- c_tzls="$c_tzls comment='Leap seconds information for time zones';"
- fi
-
- if test ! -f $MYSQL_DATA_DIR/mysqldb/mysql/proc.frm
- then
- c_p="$c_p CREATE TABLE proc ("
- c_p="$c_p db char(64) collate utf8_bin DEFAULT '' NOT NULL,"
- c_p="$c_p name char(64) DEFAULT '' NOT NULL,"
- c_p="$c_p type enum('FUNCTION','PROCEDURE') NOT NULL,"
- c_p="$c_p specific_name char(64) DEFAULT '' NOT NULL,"
- c_p="$c_p language enum('SQL') DEFAULT 'SQL' NOT NULL,"
- c_p="$c_p sql_data_access enum('CONTAINS_SQL',"
- c_p="$c_p 'NO_SQL',"
- c_p="$c_p 'READS_SQL_DATA',"
- c_p="$c_p 'MODIFIES_SQL_DATA'"
- c_p="$c_p ) DEFAULT 'CONTAINS_SQL' NOT NULL,"
- c_p="$c_p is_deterministic enum('YES','NO') DEFAULT 'NO' NOT NULL,"
- 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 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,"
- c_p="$c_p sql_mode set("
- c_p="$c_p 'REAL_AS_FLOAT',"
- c_p="$c_p 'PIPES_AS_CONCAT',"
- c_p="$c_p 'ANSI_QUOTES',"
- c_p="$c_p 'IGNORE_SPACE',"
- c_p="$c_p 'NOT_USED',"
- c_p="$c_p 'ONLY_FULL_GROUP_BY',"
- c_p="$c_p 'NO_UNSIGNED_SUBTRACTION',"
- c_p="$c_p 'NO_DIR_IN_CREATE',"
- c_p="$c_p 'POSTGRESQL',"
- c_p="$c_p 'ORACLE',"
- c_p="$c_p 'MSSQL',"
- c_p="$c_p 'DB2',"
- c_p="$c_p 'MAXDB',"
- c_p="$c_p 'NO_KEY_OPTIONS',"
- c_p="$c_p 'NO_TABLE_OPTIONS',"
- c_p="$c_p 'NO_FIELD_OPTIONS',"
- c_p="$c_p 'MYSQL323',"
- c_p="$c_p 'MYSQL40',"
- c_p="$c_p 'ANSI',"
- c_p="$c_p 'NO_AUTO_VALUE_ON_ZERO',"
- c_p="$c_p 'NO_BACKSLASH_ESCAPES',"
- c_p="$c_p 'STRICT_TRANS_TABLES',"
- c_p="$c_p 'STRICT_ALL_TABLES',"
- c_p="$c_p 'NO_ZERO_IN_DATE',"
- c_p="$c_p 'NO_ZERO_DATE',"
- c_p="$c_p 'INVALID_DATES',"
- c_p="$c_p 'ERROR_FOR_DIVISION_BY_ZERO',"
- c_p="$c_p 'TRADITIONAL',"
- c_p="$c_p 'NO_AUTO_CREATE_USER',"
- c_p="$c_p 'HIGH_NOT_PRECEDENCE'"
- 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 character set utf8"
- c_p="$c_p comment='Stored Procedures';"
- fi
-
- mkdir -p "$MYSQL_DATA_DIR" > /dev/null 2>&1
+ mkdir -p "$MYSQL_DATA_DIR"
# Using mysql:mysql for MYSQL_CLUSTER_DIR is creating SECURITY hole, root:root is proper
chown root:root "$MYSQL_CLUSTER_DIR"
chown mysql:mysql "$MYSQL_CLUSTER_DIR/mysqldb" "$MYSQL_DATA_DIR" > /dev/null 2>&1
@@ -755,37 +392,13 @@
if /usr/sbin/mysqld --bootstrap --skip-grant-tables \
--datadir=$MYSQL_DATA_DIR --user=$MYSQL_USER << END_OF_DATA
-CREATE DATABASE mysql;
-use mysql;
-$c_d
-$i_d
-
-$c_h
-$i_h
-
-$c_u
-$i_u
-$c_f
-$i_f
-
-$c_t
-$c_c
-
-$c_ht
-$c_hc
-$c_hk
-$c_hr
-
-$c_tzn
-$c_tz
-$c_tzt
-$c_tztt
-$c_tzls
-
-$c_p
-$c_pp
+ CREATE DATABASE mysql;
+ use mysql;
+ $(sed -e "s, at ENGINE@,$BASE_TABLETYPE," /usr/share/mysql/init_db.sql)
+ $(sed -e "s,\$hostname,$hostname,g" /usr/share/mysql/init_db-data.sql)
END_OF_DATA
+
then
ok
cat << END_OF_MSG
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SOURCES/mysql.init?r1=1.106&r2=1.107&f=u
More information about the pld-cvs-commit
mailing list