diff options
| author | unknown <kostja@oak.local> | 2003-09-03 14:12:10 +0400 |
|---|---|---|
| committer | unknown <kostja@oak.local> | 2003-09-03 14:12:10 +0400 |
| commit | 49b0312dd7afe5a60a9d6aa22daff79bf50f0a84 (patch) | |
| tree | 4aa3e74d29fde5abc55c20c2c14e6c286e467c6e /scripts | |
| parent | 651898adfce345138363961769c6fdfd6da95532 (diff) | |
| parent | 0188e158c1d29057cb8a449891894c69dd2f5f2b (diff) | |
| download | mariadb-git-49b0312dd7afe5a60a9d6aa22daff79bf50f0a84.tar.gz | |
merge commit, hope that none of bar and dlenev changes were
lost.
BitKeeper/etc/logging_ok:
auto-union
include/mysql.h:
Auto merged
include/mysql_com.h:
Auto merged
libmysql/libmysql.c:
Auto merged
scripts/mysql_fix_privilege_tables.sql:
Auto merged
sql/item_create.cc:
Auto merged
sql/item_create.h:
Auto merged
sql/item_strfunc.cc:
Auto merged
sql/item_strfunc.h:
Auto merged
sql/lex.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/protocol.h:
Auto merged
sql/set_var.cc:
Auto merged
sql/sql_acl.h:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_yacc.yy:
Auto merged
include/mysqld_error.h:
merge commit: new error message added
sql-common/client.c:
merge commit
sql/mysql_priv.h:
merge commit: autoremerge
sql/set_var.h:
merge commit
sql/share/czech/errmsg.txt:
merge commit
sql/share/danish/errmsg.txt:
merge commit
sql/share/dutch/errmsg.txt:
merge commit
sql/share/english/errmsg.txt:
merge commit
sql/share/estonian/errmsg.txt:
merge commit
sql/share/french/errmsg.txt:
merge commit
sql/share/german/errmsg.txt:
merge commit
sql/share/greek/errmsg.txt:
merge commit
sql/share/hungarian/errmsg.txt:
merge commit
sql/share/italian/errmsg.txt:
merge commit
sql/share/japanese/errmsg.txt:
merge commit
sql/share/korean/errmsg.txt:
merge commit
sql/share/norwegian-ny/errmsg.txt:
merge commit
sql/share/norwegian/errmsg.txt:
merge commit
sql/share/polish/errmsg.txt:
merge commit
sql/share/portuguese/errmsg.txt:
merge commit
sql/share/romanian/errmsg.txt:
merge commit
sql/share/russian/errmsg.txt:
merge commit
sql/share/serbian/errmsg.txt:
merge commit
sql/share/slovak/errmsg.txt:
merge commit
sql/share/spanish/errmsg.txt:
merge commit
sql/share/swedish/errmsg.txt:
merge commit
sql/share/ukrainian/errmsg.txt:
merge commit
sql/slave.cc:
merge commit
sql/slave.h:
merge commit
sql/sql_acl.cc:
merge commit
sql/sql_parse.cc:
merge commit
sql/sql_repl.h:
merge commit
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/mysql_create_system_tables.sh | 2 | ||||
| -rw-r--r-- | scripts/mysql_fix_privilege_tables.sql | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/scripts/mysql_create_system_tables.sh b/scripts/mysql_create_system_tables.sh index 2739c45e750..c4cdc7b52d7 100644 --- a/scripts/mysql_create_system_tables.sh +++ b/scripts/mysql_create_system_tables.sh @@ -108,7 +108,7 @@ 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(45) binary DEFAULT '' NOT NULL," + c_u="$c_u Password char(41) binary DEFAULT '' NOT NULL," c_u="$c_u Select_priv enum('N','Y') DEFAULT 'N' NOT NULL," c_u="$c_u Insert_priv enum('N','Y') DEFAULT 'N' NOT NULL," c_u="$c_u Update_priv enum('N','Y') DEFAULT 'N' NOT NULL," diff --git a/scripts/mysql_fix_privilege_tables.sql b/scripts/mysql_fix_privilege_tables.sql index 7af97b9fad5..220bf4036db 100644 --- a/scripts/mysql_fix_privilege_tables.sql +++ b/scripts/mysql_fix_privilege_tables.sql @@ -16,7 +16,7 @@ ALTER TABLE host type=MyISAM; ALTER TABLE func type=MyISAM; ALTER TABLE columns_priv type=MyISAM; ALTER TABLE tables_priv type=MyISAM; -ALTER TABLE user change Password Password char(45) not null; +ALTER TABLE user change Password Password char(41) not null; ALTER TABLE user add File_priv enum('N','Y') NOT NULL; CREATE TABLE IF NOT EXISTS func ( name char(64) DEFAULT '' NOT NULL, |