diff options
author | unknown <tulin@dl145c.mysql.com> | 2005-05-17 23:25:13 +0200 |
---|---|---|
committer | unknown <tulin@dl145c.mysql.com> | 2005-05-17 23:25:13 +0200 |
commit | 2fe8cc51aad5fb7958a90ea8be3667f1e23b0ea5 (patch) | |
tree | 2884a280bfd49ec5194214f1f3708dcc5b7cd2aa /install-sh | |
parent | db4a3d9a703f89e0fbd2a8a8a426e6bc8f4b6571 (diff) | |
parent | cdba1d562d40ca20c70377a8ed40d2dfb72b6058 (diff) | |
download | mariadb-git-2fe8cc51aad5fb7958a90ea8be3667f1e23b0ea5.tar.gz |
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
into dl145c.mysql.com:/home/ndbdev/tomas/mysql-5.1
scripts/mysql_create_system_tables.sh:
Auto merged
scripts/mysql_fix_privilege_tables.sql:
Auto merged
sql/ha_innodb.cc:
Auto merged
sql/ha_innodb.h:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_acl.h:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
Diffstat (limited to 'install-sh')
0 files changed, 0 insertions, 0 deletions