diff options
author | unknown <monty@mysql.com> | 2004-11-03 13:01:38 +0200 |
---|---|---|
committer | unknown <monty@mysql.com> | 2004-11-03 13:01:38 +0200 |
commit | 614cda698a2c07ae158cbaf9a0a102a04866e28c (patch) | |
tree | 39f6697332c041cfd44f3c685d341ba5024ca0f5 /Docs/Flags/portugal.gif | |
parent | 09e0503538cbf882cdb1c215a45becfd3826d67a (diff) | |
parent | f5a47f156b6778a0f6751556e56a0afe25d6be13 (diff) | |
download | mariadb-git-614cda698a2c07ae158cbaf9a0a102a04866e28c.tar.gz |
Merge on pull
BitKeeper/etc/ignore:
auto-union
mysql-test/r/grant2.result:
Auto merged
mysql-test/r/sql_mode.result:
Auto merged
mysql-test/t/grant2.test:
Auto merged
sql/handler.cc:
Auto merged
sql/handler.h:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/opt_range.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
Diffstat (limited to 'Docs/Flags/portugal.gif')
-rw-r--r-- | Docs/Flags/portugal.gif | bin | 628 -> 0 bytes |
1 files changed, 0 insertions, 0 deletions
diff --git a/Docs/Flags/portugal.gif b/Docs/Flags/portugal.gif Binary files differdeleted file mode 100644 index add53255d60..00000000000 --- a/Docs/Flags/portugal.gif +++ /dev/null |