The branch, master has been updated via 5cb5afedbb580fd5e13c018a63e71be076e5ca16 (commit) via f97fafea3dc55ba9a98a10fba1787c3cea4b953e (commit) from a9bfc2cd5b14561477689003c47d6972d4d49f4f (commit) - Log ----------------------------------------------------------------- commit 5cb5afedbb580fd5e13c018a63e71be076e5ca16 Merge: a9bfc2cd5b14561477689003c47d6972d4d49f4f f97fafea3dc55ba9a98a10fba1787c3cea4b953e Author: Michal Čihař <mcihar@novell.com> Date: Mon Apr 26 14:20:51 2010 +0200 Merge branch 'QA_3_3' ----------------------------------------------------------------------- Summary of changes: scripts/create_tables.sql | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/scripts/create_tables.sql b/scripts/create_tables.sql index 27c3e4d..bcb8b35 100644 --- a/scripts/create_tables.sql +++ b/scripts/create_tables.sql @@ -1,8 +1,8 @@ -- -------------------------------------------------------- -- SQL Commands to set up the pmadb as described in Documentation.html. --- +-- -- This file is meant for use with MySQL 5 and above! --- +-- -- This script expects the user pma to already be existing. If we would put a -- line here to create him too many users might just use this script and end -- up with having the same password for the controluser. @@ -173,9 +173,11 @@ CREATE TABLE IF NOT EXISTS `pma_designer_coords` ( ENGINE=MyISAM COMMENT='Table coordinates for Designer' DEFAULT CHARACTER SET utf8 COLLATE utf8_bin; --- +-- -------------------------------------------------------- + +-- -- Table structure for table `pma_tracking` --- +-- CREATE TABLE IF NOT EXISTS `pma_tracking` ( `db_name` varchar(64) collate utf8_bin NOT NULL, hooks/post-receive -- phpMyAdmin