diff options
| author | unknown <andrey@lmy004.> | 2006-01-30 14:28:48 +0100 |
|---|---|---|
| committer | unknown <andrey@lmy004.> | 2006-01-30 14:28:48 +0100 |
| commit | 2272e140fd1490772fa9660ece4ea91eed26cee7 (patch) | |
| tree | 8ef0243df685fd27f6f69d8bcff5e5743c6a0648 /mysql-test/lib/init_db.sql | |
| parent | 799129e254fca5df0fddc910c371acce7fb666dc (diff) | |
| parent | c3542cebf9c775241652ef8f0a4ed7dd788683d7 (diff) | |
| download | mariadb-git-2272e140fd1490772fa9660ece4ea91eed26cee7.tar.gz | |
post-commit merge
mysql-test/lib/init_db.sql:
Auto merged
scripts/mysql_create_system_tables.sh:
Auto merged
scripts/mysql_fix_privilege_tables.sql:
Auto merged
sql/event.cc:
Auto merged
sql/event.h:
Auto merged
sql/event_executor.cc:
Auto merged
sql/event_priv.h:
Auto merged
sql/event_timed.cc:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
mysql-test/r/events.result:
manual merge
mysql-test/r/system_mysql_db.result:
manual merge
mysql-test/t/events.test:
manual merge
Diffstat (limited to 'mysql-test/lib/init_db.sql')
| -rw-r--r-- | mysql-test/lib/init_db.sql | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/lib/init_db.sql b/mysql-test/lib/init_db.sql index b07af136c23..0c287aa092a 100644 --- a/mysql-test/lib/init_db.sql +++ b/mysql-test/lib/init_db.sql @@ -596,7 +596,7 @@ CREATE TABLE event ( status ENUM('ENABLED','DISABLED') NOT NULL default 'ENABLED', on_completion ENUM('DROP','PRESERVE') NOT NULL default 'DROP', comment char(64) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL default '', - PRIMARY KEY (db,name) + PRIMARY KEY (definer, db, name) ) ENGINE=MyISAM DEFAULT CHARSET=utf8 COMMENT 'Events'; CREATE DATABASE IF NOT EXISTS cluster_replication; |