diff options
| author | unknown <msvensson@pilot.blaudden> | 2007-04-23 17:01:02 +0200 |
|---|---|---|
| committer | unknown <msvensson@pilot.blaudden> | 2007-04-23 17:01:02 +0200 |
| commit | 0d5a18b53bd30af029b27e39579b52f05b8f7115 (patch) | |
| tree | 8cc026fffb64b3233d53f89373b5f930e8ed9a49 /.bzrignore | |
| parent | 2c4ad7372c0737d49812f1e22a108dc841b4ba74 (diff) | |
| parent | e4a8fd700ef4078cdd7ea11cd57e7d2bc9c11253 (diff) | |
| download | mariadb-git-0d5a18b53bd30af029b27e39579b52f05b8f7115.tar.gz | |
Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.1
into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
BitKeeper/etc/ignore:
auto-union
client/Makefile.am:
Auto merged
client/mysql.cc:
Auto merged
configure.in:
Auto merged
client/mysqltest.c:
Auto merged
libmysqld/Makefile.am:
Auto merged
sql/Makefile.am:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/item.cc:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/item_func.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_delete.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_table.cc:
Auto merged
Diffstat (limited to '.bzrignore')
| -rw-r--r-- | .bzrignore | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/.bzrignore b/.bzrignore index 45cd1bdf674..2e6193b6368 100644 --- a/.bzrignore +++ b/.bzrignore @@ -352,6 +352,7 @@ client/.libs/mysqltest client/completion_hash.cpp client/decimal.c client/insert_test +client/link_sources client/log_event.cc client/log_event.h client/log_event_old.cc @@ -579,6 +580,7 @@ help help.c help.h include/check_abi +include/link_sources include/my_config.h include/my_global.h include/mysql_h.ic @@ -754,6 +756,7 @@ libmysql/.libs/libmysqlclient.so.15.0.0 libmysql/conf_to_src libmysql/debug/libmysql.exp libmysql/libmysql.ver +libmysql/link_sources libmysql/my_static.h libmysql/my_time.c libmysql/mysys_priv.h @@ -1089,6 +1092,7 @@ libmysqld/item_uniq.cc libmysqld/key.cc libmysqld/lib_sql.cpp libmysqld/libmysql.c +libmysqld/link_sources libmysqld/lock.cc libmysqld/log.cc libmysqld/log_event.cc @@ -1813,6 +1817,7 @@ repl-tests/test-repl/sum-wlen-slave.master.re repl-tests/test-repl/sum-wlen-slave.master.reje replace/*.ds? replace/*.vcproj +scripts/comp_sql scripts/fill_func_tables scripts/fill_func_tables.sql scripts/fill_help_tables @@ -1830,6 +1835,7 @@ scripts/mysql_find_rows scripts/mysql_fix_extensions scripts/mysql_fix_privilege_tables scripts/mysql_fix_privilege_tables.sql +scripts/mysql_fix_privilege_tables_sql.c scripts/mysql_install_db scripts/mysql_secure_installation scripts/mysql_setpermission |