diff options
| author | unknown <holyfoot/hf@hfmain.(none)> | 2007-11-12 13:07:30 +0400 |
|---|---|---|
| committer | unknown <holyfoot/hf@hfmain.(none)> | 2007-11-12 13:07:30 +0400 |
| commit | 572cdc80d0385db879fa1ded9a131bb66ff4a7a1 (patch) | |
| tree | df82262f59b9dab7d9f3ad0f863b13662f83d132 /.bzrignore | |
| parent | f78be6c8e997a2e5c5e971749d35ef4e44e425e2 (diff) | |
| parent | 04e51e2447cc827955f284d39fce5d420a028ee8 (diff) | |
| download | mariadb-git-572cdc80d0385db879fa1ded9a131bb66ff4a7a1.tar.gz | |
Merge mysql.com:/home/hf/work/31305/my50-31305
into mysql.com:/home/hf/work/31305/my51-31305
BitKeeper/etc/ignore:
auto-union
storage/myisam/mi_dynrec.c:
Auto merged
Diffstat (limited to '.bzrignore')
| -rw-r--r-- | .bzrignore | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/.bzrignore b/.bzrignore index e1ad5a89015..7a8066fdba1 100644 --- a/.bzrignore +++ b/.bzrignore @@ -900,6 +900,7 @@ libmysql_r/.libs/libmysqlclient_r.lai libmysql_r/.libs/libmysqlclient_r.so.15 libmysql_r/.libs/libmysqlclient_r.so.15.0.0 libmysql_r/acconfig.h +libmysql_r/client_settings.h libmysql_r/conf_to_src libmysql_r/my_static.h libmysql_r/mysys_priv.h |