diff options
| author | jani@hynda.mysql.fi <> | 2008-02-27 16:46:32 +0200 |
|---|---|---|
| committer | jani@hynda.mysql.fi <> | 2008-02-27 16:46:32 +0200 |
| commit | b806eea262123165cd1209a58d8a9177d4bac3ed (patch) | |
| tree | 62bd6b18ff3b4c12d2ed3f7e4b77b8f6ee45be4f /.bzrignore | |
| parent | 45442d08d4df211a4f42b6f8437dba4014b39759 (diff) | |
| parent | b7bef32d2dc7e0f5c5fd7b6da424455b023d8b4d (diff) | |
| download | mariadb-git-b806eea262123165cd1209a58d8a9177d4bac3ed.tar.gz | |
Merge hynda.mysql.fi:/home/my/mysql-5.1-main
into hynda.mysql.fi:/home/my/mysql-5.1-marvel
Diffstat (limited to '.bzrignore')
| -rw-r--r-- | .bzrignore | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/.bzrignore b/.bzrignore index 507f04363f9..25af8360a83 100644 --- a/.bzrignore +++ b/.bzrignore @@ -58,6 +58,7 @@ ./mysql.sln ./mysql.suo ./prepare +.DS_Store .defs.mk .depend .depend.mk @@ -1178,6 +1179,7 @@ libmysqld/sql_parse.cc libmysqld/sql_partition.cc libmysqld/sql_plugin.cc libmysqld/sql_prepare.cc +libmysqld/sql_profile.cc libmysqld/sql_rename.cc libmysqld/sql_repl.cc libmysqld/sql_select.cc @@ -1279,6 +1281,9 @@ mysql-5.0.2-alpha.tar.gz mysql-max-4.0.2-alpha-pc-linux-gnu-i686.tar.gz mysql-test/*.ds? mysql-test/*.vcproj +mysql-test/.DS_Store +mysql-test/funcs_1.log +mysql-test/funcs_1.tar mysql-test/gmon.out mysql-test/install_test_db mysql-test/lib/init_db.sql @@ -1367,9 +1372,12 @@ mysql-test/r/symlink.log mysql-test/r/system_mysql_db.log mysql-test/r/tmp.result mysql-test/r/udf.log +mysql-test/reg.log mysql-test/rpl.log mysql-test/share/mysql mysql-test/std_data/*.pem +mysql-test/suite/funcs_1.tar.gz +mysql-test/suite/funcs_1.tar.zip mysql-test/suite/funcs_1/r/innodb_trig_03e.warnings mysql-test/suite/funcs_1/r/innodb_views.warnings mysql-test/suite/funcs_1/r/memory_trig_03e.warnings @@ -3012,11 +3020,3 @@ win/vs8cache.txt ylwrap zlib/*.ds? zlib/*.vcproj -mysql-test/funcs_1.log -mysql-test/funcs_1.tar -mysql-test/suite/funcs_1.tar.gz -mysql-test/.DS_Store -.DS_Store -libmysqld/sql_profile.cc -mysql-test/suite/funcs_1.tar.zip -mysql-test/reg.log |