diff options
| author | unknown <serg@serg.mylan> | 2004-02-17 17:07:14 +0100 |
|---|---|---|
| committer | unknown <serg@serg.mylan> | 2004-02-17 17:07:14 +0100 |
| commit | 017efd2124a70d0cad3b100e72eb975d46aa9ad1 (patch) | |
| tree | 6ebf0969524ee8c2567a33c286ae057b66a556ae /.bzrignore | |
| parent | 18d1234ada5b66836e8f5f2f4d49e85b9cc87e09 (diff) | |
| parent | a0040b0bdabae307e19fa5bd46fc13968db17135 (diff) | |
| download | mariadb-git-017efd2124a70d0cad3b100e72eb975d46aa9ad1.tar.gz | |
Merge bk-internal:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
BitKeeper/etc/ignore:
auto-union
include/my_global.h:
Auto merged
mysql-test/r/ctype_utf8.result:
Auto merged
mysql-test/r/myisam.result:
Auto merged
mysql-test/r/type_blob.result:
Auto merged
mysql-test/t/type_blob.test:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/share/english/errmsg.txt:
Auto merged
sql/share/russian/errmsg.txt:
Auto merged
sql/share/ukrainian/errmsg.txt:
Auto merged
Diffstat (limited to '.bzrignore')
| -rw-r--r-- | .bzrignore | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/.bzrignore b/.bzrignore index b8fac778709..0b5bb0bc33e 100644 --- a/.bzrignore +++ b/.bzrignore @@ -361,6 +361,7 @@ libmysqld/item_func.cc libmysqld/item_geofunc.cc libmysqld/item_row.cc libmysqld/item_strfunc.cc +libmysqld/item_subselect.cc libmysqld/item_sum.cc libmysqld/item_timefunc.cc libmysqld/item_uniq.cc @@ -396,6 +397,7 @@ libmysqld/sql_command libmysqld/sql_crypt.cc libmysqld/sql_db.cc libmysqld/sql_delete.cc +libmysqld/sql_derived.cc libmysqld/sql_do.cc libmysqld/sql_handler.cc libmysqld/sql_help.cc |