diff options
| author | unknown <monty@narttu.mysql.fi> | 2003-06-05 00:12:45 +0300 |
|---|---|---|
| committer | unknown <monty@narttu.mysql.fi> | 2003-06-05 00:12:45 +0300 |
| commit | ad5e39bf12b7aeefbc313e464a1349541a7b15c5 (patch) | |
| tree | 824e127f68404d3fbe881d6619e34ad389d21202 /.bzrignore | |
| parent | 020baadcfebbd0f2248d9a3fa15f29d6e9d954b4 (diff) | |
| parent | c6c60f6ee819a238ab62e3f9608502c9a8f25b36 (diff) | |
| download | mariadb-git-ad5e39bf12b7aeefbc313e464a1349541a7b15c5.tar.gz | |
merge with public tree
BitKeeper/etc/ignore:
auto-union
BitKeeper/etc/logging_ok:
auto-union
client/mysql.cc:
Auto merged
configure.in:
Auto merged
include/config-win.h:
Auto merged
include/mysql.h:
Auto merged
include/mysql_version.h.in:
Auto merged
libmysqld/lib_sql.cc:
Auto merged
mysql-test/r/alter_table.result:
Auto merged
mysql-test/r/create.result:
Auto merged
mysql-test/r/ctype_collate.result:
Auto merged
mysql-test/r/innodb.result:
Auto merged
mysql-test/r/show_check.result:
Auto merged
mysql-test/r/subselect.result:
Auto merged
mysql-test/r/type_blob.result:
Auto merged
mysql-test/t/subselect.test:
Auto merged
mysys/default.c:
Auto merged
sql/Makefile.am:
Auto merged
sql/field.cc:
Auto merged
sql/item.cc:
Auto merged
sql/item.h:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/protocol.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/set_var.h:
Auto merged
sql/slave.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_show.cc:
Auto merged
sql/sql_string.cc:
Auto merged
sql/sql_string.h:
Auto merged
sql/sql_table.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
Diffstat (limited to '.bzrignore')
| -rw-r--r-- | .bzrignore | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/.bzrignore b/.bzrignore index dd77bcb1d12..4e9ce4e41ab 100644 --- a/.bzrignore +++ b/.bzrignore @@ -399,6 +399,7 @@ libmysqld/sql_rename.cc libmysqld/sql_repl.cc libmysqld/sql_select.cc libmysqld/sql_show.cc +libmysqld/sql_state.c libmysqld/sql_string.cc libmysqld/sql_table.cc libmysqld/sql_test.cc @@ -552,6 +553,7 @@ sql-bench/test-select sql-bench/test-transactions sql-bench/test-wisconsin sql/.gdbinit +sql/client.c sql/gen_lex_hash sql/gmon.out sql/lex_hash.h @@ -586,6 +588,7 @@ stamp-h4 strings/conf_to_src strings/ctype_autoconf.c strings/ctype_extra_sources.c +strings/str_test support-files/MacOSX/Description.plist support-files/MacOSX/Info.plist support-files/MacOSX/ReadMe.txt @@ -619,4 +622,3 @@ vio/test-ssl vio/test-sslclient vio/test-sslserver vio/viotest-ssl -sql/client.c |