diff options
| author | unknown <holyfoot/hf@hfmain.(none)> | 2007-11-20 14:35:49 +0400 |
|---|---|---|
| committer | unknown <holyfoot/hf@hfmain.(none)> | 2007-11-20 14:35:49 +0400 |
| commit | 3ae44c907ebc76b780557177fc637b37d92662d4 (patch) | |
| tree | fba8a7e0fedb621fad497f7bf24ba21553d01dbc /.bzrignore | |
| parent | 83e7133071b00cb3fe77346fc7c302d7549bbfe0 (diff) | |
| parent | b88cfbad684ed57b058a3e6b63d458516b41db85 (diff) | |
| download | mariadb-git-3ae44c907ebc76b780557177fc637b37d92662d4.tar.gz | |
Merge bk@192.168.21.1:mysql-5.1-opt
into mysql.com:/home/hf/work/31868/my51-31868
BitKeeper/etc/ignore:
auto-union
libmysqld/lib_sql.cc:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_table.cc:
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 7a8066fdba1..d30466a0a36 100644 --- a/.bzrignore +++ b/.bzrignore @@ -1137,6 +1137,7 @@ libmysqld/rpl_filter.cc libmysqld/rpl_injector.cc libmysqld/rpl_record.cc libmysqld/rpl_record_old.cc +libmysqld/scheduler.cc libmysqld/set_var.cc libmysqld/simple-test libmysqld/slave.cc @@ -1153,6 +1154,7 @@ libmysqld/sql_builtin.cc libmysqld/sql_cache.cc libmysqld/sql_class.cc libmysqld/sql_command +libmysqld/sql_connect.cc libmysqld/sql_crypt.cc libmysqld/sql_cursor.cc libmysqld/sql_cursor.h @@ -1183,6 +1185,7 @@ libmysqld/sql_show.cc libmysqld/sql_state.c libmysqld/sql_string.cc libmysqld/sql_table.cc +libmysqld/sql_tablespace.cc libmysqld/sql_test.cc libmysqld/sql_trigger.cc libmysqld/sql_udf.cc |