diff options
| author | unknown <jani@ua141d10.elisa.omakaista.fi> | 2006-05-31 14:55:28 +0300 |
|---|---|---|
| committer | unknown <jani@ua141d10.elisa.omakaista.fi> | 2006-05-31 14:55:28 +0300 |
| commit | 62ec077c28bbb5e83d5ba617f681dbf55edf35c1 (patch) | |
| tree | 1c557958ac2e6f1df533bb4e7e235e366ed68f81 /scripts | |
| parent | aca736a4db1c26c53b5482b38d7e6774147e3fbc (diff) | |
| download | mariadb-git-62ec077c28bbb5e83d5ba617f681dbf55edf35c1.tar.gz | |
Merge from 5.0 to 5.1. Third part with fixes.
mysql-test/r/mysqldump.result:
Change in output from low letter to capital letter.
Fixed test.
scripts/mysql_create_system_tables.sh:
definer was removed from part of the key.
vio/viosocket.c:
Fixed output from DBUG_PRINT() to match the style
in other parts of the code.
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/mysql_create_system_tables.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/mysql_create_system_tables.sh b/scripts/mysql_create_system_tables.sh index a401e1d0159..69ea8e3d004 100644 --- a/scripts/mysql_create_system_tables.sh +++ b/scripts/mysql_create_system_tables.sh @@ -827,7 +827,7 @@ then c_ev="$c_ev 'HIGH_NOT_PRECEDENCE'" c_ev="$c_ev ) DEFAULT '' NOT NULL," c_ev="$c_ev comment char(64) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL default ''," - c_ev="$c_ev PRIMARY KEY (definer, db, name)" + c_ev="$c_ev PRIMARY KEY (db, name)" c_ev="$c_ev ) ENGINE=MyISAM DEFAULT CHARSET=utf8 COMMENT 'Events';" fi |