diff options
| author | Georgi Kodinov <Georgi.Kodinov@Oracle.com> | 2010-09-20 17:17:32 +0300 |
|---|---|---|
| committer | Georgi Kodinov <Georgi.Kodinov@Oracle.com> | 2010-09-20 17:17:32 +0300 |
| commit | dc0b8f7ada9df6ea4b40d28766a672581526d9d8 (patch) | |
| tree | 4b2b7364d1e622b3b02db3fb9d0c898fb9293a87 /.bzrignore | |
| parent | 702d559fd5e19e9d0ef462c50c2da97360fc9def (diff) | |
| parent | 9141bb587892f3bfb59f0aad5eb8ef38e4310199 (diff) | |
| download | mariadb-git-dc0b8f7ada9df6ea4b40d28766a672581526d9d8.tar.gz | |
merge of mysql-5.5 into mysql-5.5-wl1054
Diffstat (limited to '.bzrignore')
| -rw-r--r-- | .bzrignore | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/.bzrignore b/.bzrignore index a17b1dec6cb..4c437cdd36c 100644 --- a/.bzrignore +++ b/.bzrignore @@ -997,6 +997,7 @@ libmysqld/.deps/sql_cursor.Po libmysqld/.deps/sql_db.Po libmysqld/.deps/sql_delete.Po libmysqld/.deps/sql_truncate.Po +libmysqld/.deps/sql_reload.Po libmysqld/.deps/datadict.Po libmysqld/.deps/sql_derived.Po libmysqld/.deps/sql_do.Po @@ -1175,6 +1176,7 @@ libmysqld/sql_cursor.h libmysqld/sql_db.cc libmysqld/sql_delete.cc libmysqld/sql_truncate.cc +libmysqld/sql_reload.cc libmysqld/datadict.cc libmysqld/sql_derived.cc libmysqld/sql_do.cc @@ -2067,6 +2069,7 @@ sql/.deps/sql_cursor.Po sql/.deps/sql_db.Po sql/.deps/sql_delete.Po sql/.deps/sql_truncate.Po +sql/.deps/sql_reload.Po sql/.deps/datadict.Po sql/.deps/sql_derived.Po sql/.deps/sql_do.Po |