diff options
| author | unknown <hf@deer.(none)> | 2005-02-09 02:54:08 +0400 |
|---|---|---|
| committer | unknown <hf@deer.(none)> | 2005-02-09 02:54:08 +0400 |
| commit | f4eef98e6eea90e7f5b54a7dcca8778867ecdc8f (patch) | |
| tree | cbbd8c87bb306645df2da91891d307858dcc9a59 /.bzrignore | |
| parent | 3f24932124b99fb0186ce6442d0bd44a519cc072 (diff) | |
| parent | 91db48e35a57421c00f65d5ce82e84b843ceec22 (diff) | |
| download | mariadb-git-f4eef98e6eea90e7f5b54a7dcca8778867ecdc8f.tar.gz | |
Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0
into deer.(none):/home/hf/work/mysql-5.0.clean
mysql-test/r/view.result:
Auto merged
sql/item_func.cc:
Auto merged
sql/sp_head.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_prepare.cc:
Auto merged
sql/sql_show.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
Diffstat (limited to '.bzrignore')
| -rw-r--r-- | .bzrignore | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/.bzrignore b/.bzrignore index 74e098e888f..0d352209a08 100644 --- a/.bzrignore +++ b/.bzrignore @@ -1056,3 +1056,6 @@ include/mysqld_ername.h include/mysqld_error.h include/sql_state.h support-files/ndb-config-2-node.ini +client/decimal.c +client/my_decimal.cc +client/my_decimal.h |