summaryrefslogtreecommitdiff
path: root/.bzrignore
diff options
context:
space:
mode:
authorSergei Golubchik <sergii@pisem.net>2012-10-01 13:15:29 +0200
committerSergei Golubchik <sergii@pisem.net>2012-10-01 13:15:29 +0200
commit416d0aebbfaaa00802d00105a0bd2faedb8b8f04 (patch)
tree5244b83a9f22d4d5899154c9a64a316111bbe6b6 /.bzrignore
parentadf6e145f77d2f7b049b977ee55ed12d05b96eac (diff)
downloadmariadb-git-416d0aebbfaaa00802d00105a0bd2faedb8b8f04.tar.gz
more fixes for test cases
mysql-test/suite/innodb/include/restart_and_reinit.inc: drop and recreate mysql.innodb* tables when deleting innodb table spaces mysql-test/t/ssl_8k_key-master.opt: with loose- prefix ssl errors are ignored sql-common/client.c: compiler warnings sql/field.cc: use the new function sql/item.cc: don't convert time to double or decimal via longlong, this loses sub-second part. Use dedicated functions. sql/item.h: incorrect cast_to_int type for params sql/item_strfunc.cc: use the new function sql/lex.h: unused sql/my_decimal.h: helper macro sql/sql_plugin.cc: workaround for a compiler warning sql/sql_yacc.yy: unused sql/transaction.cc: fix the merge for SERVER_STATUS_IN_TRANS_READONLY protocol flag storage/sphinx/CMakeLists.txt: compiler warnings
Diffstat (limited to '.bzrignore')
-rw-r--r--.bzrignore2
1 files changed, 1 insertions, 1 deletions
diff --git a/.bzrignore b/.bzrignore
index efb5febb210..c94b3202d91 100644
--- a/.bzrignore
+++ b/.bzrignore
@@ -498,7 +498,6 @@ mysql-test/r/*.err
mysql-test/r/*.log
mysql-test/r/*.out
mysql-test/r/*.reject
-mysql-test/std_data/*.pem
mysql-test/var
mysql.kdevprj
mysql.proj
@@ -1145,3 +1144,4 @@ sql/db.opt
./install_manifest_*.txt
typescript
storage/perfschema/gen_pfs_lex_token
+storage/perfschema/pfs_lex_token.h