diff options
| author | unknown <jani@hynda.mysql.fi> | 2008-02-27 16:46:32 +0200 |
|---|---|---|
| committer | unknown <jani@hynda.mysql.fi> | 2008-02-27 16:46:32 +0200 |
| commit | bfbea4f4b40948621213aad712781b64cc80186f (patch) | |
| tree | 62bd6b18ff3b4c12d2ed3f7e4b77b8f6ee45be4f /.bzrignore | |
| parent | 977edd0c8424dd2ee3ab743ef5b6ef16b770bb49 (diff) | |
| parent | e265b62b52c4fc4c1fbc0724bf4538ddaaf59a35 (diff) | |
| download | mariadb-git-bfbea4f4b40948621213aad712781b64cc80186f.tar.gz | |
Merge hynda.mysql.fi:/home/my/mysql-5.1-main
into hynda.mysql.fi:/home/my/mysql-5.1-marvel
BitKeeper/etc/ignore:
auto-union
client/mysqldump.c:
Auto merged
client/mysqltest.c:
Auto merged
include/my_global.h:
Auto merged
include/my_sys.h:
Auto merged
sql/handler.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/set_var.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_plugin.cc:
Auto merged
storage/myisam/mi_check.c:
Auto merged
storage/myisam/mi_dynrec.c:
Auto merged
storage/myisam/mi_write.c:
Auto merged
storage/myisam/myisamdef.h:
Auto merged
storage/myisam/myisampack.c:
Auto merged
sql/mysqld.cc:
Manual merge with main 5.1 tree.
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 |