diff options
| author | unknown <jani@a88-113-38-195.elisa-laajakaista.fi> | 2008-03-28 12:14:27 +0200 |
|---|---|---|
| committer | unknown <jani@a88-113-38-195.elisa-laajakaista.fi> | 2008-03-28 12:14:27 +0200 |
| commit | 01a979e8b21b82d0e21292140852a1f6b99d2ac8 (patch) | |
| tree | 08ecfa85ad2a82409ad7feb221fbe2f63208803d /.bzrignore | |
| parent | 0cf83bbf56f13c4391e557cee5271259aff64d19 (diff) | |
| parent | 3a5a7ef44c600ab6265821945ce3ca53a5801270 (diff) | |
| download | mariadb-git-01a979e8b21b82d0e21292140852a1f6b99d2ac8.tar.gz | |
Merge a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-main
into a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-marvel
client/mysqldump.c:
Auto merged
client/mysqltest.c:
Auto merged
include/my_global.h:
Auto merged
mysql-test/lib/mtr_report.pl:
Auto merged
sql/ha_partition.cc:
Auto merged
sql/handler.h:
Auto merged
sql/item_func.cc:
Auto merged
sql/log.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_show.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/table.cc:
Auto merged
sql/unireg.cc:
Auto merged
storage/myisam/ha_myisam.cc:
Auto merged
storage/myisam/mi_dynrec.c:
Auto merged
storage/myisam/mi_open.c:
Auto merged
storage/myisammrg/ha_myisammrg.cc:
Auto merged
include/config-win.h:
Manual merge between main 5.1 and 5.1 marvel.
mysql-test/r/change_user.result:
Manual merge between main 5.1 and 5.1 marvel.
mysql-test/t/change_user.test:
Manual merge between main 5.1 and 5.1 marvel.
sql/sql_plugin.cc:
Manual merge between main 5.1 and 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 |