[Pkg-mysql-commits] r922 - branches/sid-5.1/debian
Christian Hammers
ch at alioth.debian.org
Tue Aug 28 23:09:42 UTC 2007
Author: ch
Date: 2007-08-28 23:09:42 +0000 (Tue, 28 Aug 2007)
New Revision: 922
Modified:
branches/sid-5.1/debian/changelog
branches/sid-5.1/debian/libmysqlclient-dev.files
branches/sid-5.1/debian/mysql-server-5.1.files
branches/sid-5.1/debian/mysql-server-5.1.postinst
Log:
switched to plugin based engines
Modified: branches/sid-5.1/debian/changelog
===================================================================
--- branches/sid-5.1/debian/changelog 2007-08-28 22:50:25 UTC (rev 921)
+++ branches/sid-5.1/debian/changelog 2007-08-28 23:09:42 UTC (rev 922)
@@ -11,6 +11,7 @@
* Commented out most of the compile conditionals in the hope that
all architectures can be build the same way.
* Added a lot of new binaries and manpages.
+ * Switched to plugin based engines.
-- Christian Hammers <ch at debian.org> Sat, 25 Aug 2007 14:24:40 +0200
Modified: branches/sid-5.1/debian/libmysqlclient-dev.files
===================================================================
--- branches/sid-5.1/debian/libmysqlclient-dev.files 2007-08-28 22:50:25 UTC (rev 921)
+++ branches/sid-5.1/debian/libmysqlclient-dev.files 2007-08-28 23:09:42 UTC (rev 922)
@@ -2,6 +2,7 @@
usr/include/*
usr/lib/*.a
usr/lib/*.la
-usr/lib/mysql
+usr/lib/mysql/*.a
+usr/lib/mysql/*.la
usr/share/man/man1/mysql_config.1
usr/share/lintian/overrides/libmysqlclient-dev
Modified: branches/sid-5.1/debian/mysql-server-5.1.files
===================================================================
--- branches/sid-5.1/debian/mysql-server-5.1.files 2007-08-28 22:50:25 UTC (rev 921)
+++ branches/sid-5.1/debian/mysql-server-5.1.files 2007-08-28 23:09:42 UTC (rev 922)
@@ -1,103 +1,63 @@
+usr/lib/mysql/*so*
etc/mysql/debian-start
-usr/bin/innochecksum
usr/bin/msql2mysql
+usr/bin/my_print_defaults
usr/bin/myisamchk
usr/bin/myisamlog
usr/bin/myisampack
-usr/bin/my_print_defaults
-usr/bin/mysqlbinlog
usr/bin/mysql_convert_table_format
-usr/bin/mysqld_multi
-usr/bin/mysqld_safe
usr/bin/mysql_fix_privilege_tables
-usr/bin/mysqlhotcopy
usr/bin/mysql_install_db
usr/bin/mysql_secure_installation
usr/bin/mysql_setpermission
-usr/bin/mysqlslap
-usr/bin/mysqltest
usr/bin/mysql_tzinfo_to_sql
usr/bin/mysql_upgrade
usr/bin/mysql_zap
-usr/bin/ndb_config
+usr/bin/mysqlbinlog
+usr/bin/mysqld_multi
+usr/bin/mysqld_safe
+usr/bin/mysqlhotcopy
+usr/bin/mysqltest
usr/bin/ndb_delete_all
usr/bin/ndb_desc
usr/bin/ndb_drop_index
usr/bin/ndb_drop_table
-usr/bin/ndb_error_reporter
usr/bin/ndb_mgm
-usr/bin/ndb_print_backup_file
-usr/bin/ndb_print_schema_file
-usr/bin/ndb_print_sys_file
usr/bin/ndb_restore
usr/bin/ndb_select_all
usr/bin/ndb_select_count
usr/bin/ndb_show_tables
-usr/bin/ndb_size.pl
-usr/bin/ndb_test_platform
usr/bin/ndb_waiter
usr/bin/perror
usr/bin/replace
-usr/bin/resolveip
usr/bin/resolve_stack_dump
-usr/lib/mysql/ha_*
+usr/bin/resolveip
usr/sbin/mysqld
usr/sbin/ndb_cpcd
usr/sbin/ndbd
usr/sbin/ndb_mgmd
usr/share/doc/mysql-server-5.1/
usr/share/lintian/overrides/mysql-server-5.1
-usr/share/man/man1/comp_err.1
-usr/share/man/man1/innochecksum.1
usr/share/man/man1/msql2mysql.1
usr/share/man/man1/myisamchk.1
usr/share/man/man1/myisamlog.1
usr/share/man/man1/myisampack.1
usr/share/man/man1/my_print_defaults.1
usr/share/man/man1/mysqlbinlog.1
-usr/share/man/man1/mysql_client_test.1
-usr/share/man/man1/mysql_client_test_embedded.1
usr/share/man/man1/mysql_convert_table_format.1
usr/share/man/man1/mysqld_multi.1
usr/share/man/man1/mysqld_safe.1
-usr/share/man/man1/mysql_explain_log.1
usr/share/man/man1/mysql_fix_privilege_tables.1
usr/share/man/man1/mysqlhotcopy.1
usr/share/man/man1/mysql_install_db.1
-usr/share/man/man1/mysqlman.1
usr/share/man/man1/mysql_secure_installation.1
usr/share/man/man1/mysql_setpermission.1
-usr/share/man/man1/mysqlslap.1
-usr/share/man/man1/mysql-stress-test.pl.1
-usr/share/man/man1/mysqltest.1
-usr/share/man/man1/mysqltest_embedded.1
-usr/share/man/man1/mysql_tzinfo_to_sql.1
usr/share/man/man1/mysql_upgrade.1
+usr/share/man/man1/mysqltest.1
usr/share/man/man1/mysql_zap.1
-usr/share/man/man1/ndb_config.1
-usr/share/man/man1/ndb_cpcd.1
-usr/share/man/man1/ndbd.1
-usr/share/man/man1/ndb_delete_all.1
-usr/share/man/man1/ndb_desc.1
-usr/share/man/man1/ndbd_redo_log_reader.1
-usr/share/man/man1/ndb_drop_index.1
-usr/share/man/man1/ndb_drop_table.1
-usr/share/man/man1/ndb_error_reporter.1
-usr/share/man/man1/ndb_mgm.1
-usr/share/man/man1/ndb_mgmd.1
-usr/share/man/man1/ndb_print_backup_file.1
-usr/share/man/man1/ndb_print_schema_file.1
-usr/share/man/man1/ndb_print_sys_file.1
-usr/share/man/man1/ndb_restore.1
-usr/share/man/man1/ndb_select_all.1
-usr/share/man/man1/ndb_select_count.1
-usr/share/man/man1/ndb_show_tables.1
-usr/share/man/man1/ndb_size.pl.1
-usr/share/man/man1/ndb_waiter.1
usr/share/man/man1/perror.1
usr/share/man/man1/replace.1
usr/share/man/man1/resolveip.1
usr/share/man/man1/resolve_stack_dump.1
usr/share/man/man8/mysqld.8
-usr/share/man/man8/mysqlmanager.8
usr/share/mysql/
Modified: branches/sid-5.1/debian/mysql-server-5.1.postinst
===================================================================
--- branches/sid-5.1/debian/mysql-server-5.1.postinst 2007-08-28 22:50:25 UTC (rev 921)
+++ branches/sid-5.1/debian/mysql-server-5.1.postinst 2007-08-28 23:09:42 UTC (rev 922)
@@ -151,7 +151,7 @@
chmod 0600 $dc
# update privilege tables
- MYSQL_BOOTSTRAP="/usr/sbin/mysqld --bootstrap --user=mysql --skip-grant-tables --skip-innodb "
+ MYSQL_BOOTSTRAP="/usr/sbin/mysqld --bootstrap --user=mysql --skip-grant-tables "
password_column_fix_query=`/bin/echo -e \
"USE mysql\n" \
"ALTER TABLE user CHANGE Password Password char(41) character set latin1 collate latin1_bin DEFAULT '' NOT NULL"`;
@@ -178,7 +178,7 @@
", Create_user_priv='Y' " \
", Event_priv='Y' " \
", Trigger_priv='Y' " `;
- fix_privs=`/bin/echo -e \
+ fix_privs=`/bin/echo -e \
"USE mysql;\n" \
"ALTER TABLE user ADD column Create_view_priv enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N'; " \
"ALTER TABLE user ADD column Show_view_priv enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N'; " \
@@ -187,12 +187,25 @@
"ALTER TABLE user ADD column Create_user_priv enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N'; " \
"ALTER TABLE user ADD column Event_priv enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N'; " \
"ALTER TABLE user ADD column Trigger_priv enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N'; " `
+ # Engines supported by etch should be installed per default. The query sequence is supposed
+ # to be aborted if the CREATE TABLE fails due to an already existent table in which case the
+ # admin might already have chosen to remove one or more plugins.
+ install_plugins=`/bin/echo -e \
+ "USE mysql;\n" \
+ "CREATE TABLE 'plugin' ('name' char(64) COLLATE utf8_bin NOT NULL DEFAULT '', " \
+ " 'dl' char(128) COLLATE utf8_bin NOT NULL DEFAULT '', " \
+ " PRIMARY KEY ('name')) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='MySQL plugins'; " \
+ "INSERT INTO plugin VALUES ('innodb', 'ha_innodb.so'); " \
+ "INSERT INTO plugin VALUES ('federated', 'ha_federated.so'); " \
+ "INSERT INTO plugin VALUES ('blackhole', 'ha_blackhole.so'); " \
+ "INSERT INTO plugin VALUES ('archive', 'ha_archive.so'); " `
echo "$password_column_fix_query" | $MYSQL_BOOTSTRAP 2>&1 | $ERR_LOGGER
echo "$fix_privs" | $MYSQL_BOOTSTRAP 2>&1 | $ERR_LOGGER
echo "$replace_query" | sed "s/__EXTRA_PRIVS__//" | $MYSQL_BOOTSTRAP 2>&1 | $ERR_LOGGER
set +e
echo "$replace_query" | sed "s/__EXTRA_PRIVS__/$extra_privs/" | $MYSQL_BOOTSTRAP 2>&1 | $ERR_LOGGER
+ echo "$install_plugins" | $MYSQL_BOOTSTRAP 2>&1 | $ERR_LOGGER
set -e
;;
More information about the Pkg-mysql-commits
mailing list