Initial merge result with mariaDB 10: lp:maria

1 files changed, 0 insertions, 98 deletions

diff --git a/debian/mariadb-test-10.0.dirs b/debian/mariadb-test-10.0.dirs
deleted file mode 100644
index 2c10b45efba..00000000000
--- a/debian/mariadb-test-10.0.dirs
+++ /dev/null
@@ -1,98 +0,0 @@
-usr/bin
-usr/share/man/man1
-usr/share/mysql/mysql-test
-usr/share/mysql/mysql-test/extra
-usr/share/mysql/mysql-test/extra/binlog_tests
-usr/share/mysql/mysql-test/extra/rpl_tests
-usr/share/mysql/mysql-test/lib
-usr/share/mysql/mysql-test/lib/My
-usr/share/mysql/mysql-test/lib/My/SafeProcess
-usr/share/mysql/mysql-test/lib/My/File
-usr/share/mysql/mysql-test/lib/v1
-usr/share/mysql/mysql-test/lib/v1/My
-usr/share/mysql/mysql-test/collections
-usr/share/mysql/mysql-test/t
-usr/share/mysql/mysql-test/r
-usr/share/mysql/mysql-test/include
-usr/share/mysql/mysql-test/suite
-usr/share/mysql/mysql-test/suite/parts
-usr/share/mysql/mysql-test/suite/parts/inc
-usr/share/mysql/mysql-test/suite/parts/t
-usr/share/mysql/mysql-test/suite/parts/r
-usr/share/mysql/mysql-test/suite/rpl_ndb
-usr/share/mysql/mysql-test/suite/rpl_ndb/t
-usr/share/mysql/mysql-test/suite/rpl_ndb/r
-usr/share/mysql/mysql-test/suite/bugs
-usr/share/mysql/mysql-test/suite/bugs/t
-usr/share/mysql/mysql-test/suite/bugs/r
-usr/share/mysql/mysql-test/suite/bugs/data
-usr/share/mysql/mysql-test/suite/rpl
-usr/share/mysql/mysql-test/suite/rpl/t
-usr/share/mysql/mysql-test/suite/rpl/r
-usr/share/mysql/mysql-test/suite/rpl/include
-usr/share/mysql/mysql-test/suite/innodb
-usr/share/mysql/mysql-test/suite/innodb/t
-usr/share/mysql/mysql-test/suite/innodb/r
-usr/share/mysql/mysql-test/suite/innodb/include
-usr/share/mysql/mysql-test/suite/manual
-usr/share/mysql/mysql-test/suite/manual/t
-usr/share/mysql/mysql-test/suite/manual/r
-usr/share/mysql/mysql-test/suite/stress
-usr/share/mysql/mysql-test/suite/stress/t
-usr/share/mysql/mysql-test/suite/stress/r
-usr/share/mysql/mysql-test/suite/stress/include
-usr/share/mysql/mysql-test/suite/jp
-usr/share/mysql/mysql-test/suite/jp/t
-usr/share/mysql/mysql-test/suite/jp/r
-usr/share/mysql/mysql-test/suite/jp/include
-usr/share/mysql/mysql-test/suite/jp/std_data
-usr/share/mysql/mysql-test/suite/ndb
-usr/share/mysql/mysql-test/suite/ndb/t
-usr/share/mysql/mysql-test/suite/ndb/r
-usr/share/mysql/mysql-test/suite/maria
-usr/share/mysql/mysql-test/suite/maria/t
-usr/share/mysql/mysql-test/suite/maria/r
-usr/share/mysql/mysql-test/suite/funcs_2
-usr/share/mysql/mysql-test/suite/funcs_2/lib
-usr/share/mysql/mysql-test/suite/funcs_2/t
-usr/share/mysql/mysql-test/suite/funcs_2/charset
-usr/share/mysql/mysql-test/suite/funcs_2/r
-usr/share/mysql/mysql-test/suite/funcs_2/include
-usr/share/mysql/mysql-test/suite/funcs_2/data
-usr/share/mysql/mysql-test/suite/binlog
-usr/share/mysql/mysql-test/suite/binlog/t
-usr/share/mysql/mysql-test/suite/binlog/r
-usr/share/mysql/mysql-test/suite/binlog/std_data
-usr/share/mysql/mysql-test/suite/ndb_team
-usr/share/mysql/mysql-test/suite/ndb_team/t
-usr/share/mysql/mysql-test/suite/ndb_team/r
-usr/share/mysql/mysql-test/suite/federated
-usr/share/mysql/mysql-test/suite/pbxt
-usr/share/mysql/mysql-test/suite/pbxt/t
-usr/share/mysql/mysql-test/suite/pbxt/r
-usr/share/mysql/mysql-test/suite/funcs_1
-usr/share/mysql/mysql-test/suite/funcs_1/cursors
-usr/share/mysql/mysql-test/suite/funcs_1/bitdata
-usr/share/mysql/mysql-test/suite/funcs_1/views
-usr/share/mysql/mysql-test/suite/funcs_1/storedproc
-usr/share/mysql/mysql-test/suite/funcs_1/triggers
-usr/share/mysql/mysql-test/suite/funcs_1/lib
-usr/share/mysql/mysql-test/suite/funcs_1/t
-usr/share/mysql/mysql-test/suite/funcs_1/r
-usr/share/mysql/mysql-test/suite/funcs_1/include
-usr/share/mysql/mysql-test/suite/funcs_1/datadict
-usr/share/mysql/mysql-test/suite/vcol
-usr/share/mysql/mysql-test/suite/vcol/inc
-usr/share/mysql/mysql-test/suite/vcol/t
-usr/share/mysql/mysql-test/suite/vcol/r
-usr/share/mysql/mysql-test/suite/oqgraph
-usr/share/mysql/mysql-test/suite/oqgraph/t
-usr/share/mysql/mysql-test/suite/oqgraph/r
-usr/share/mysql/mysql-test/suite/oqgraph/include
-usr/share/mysql/mysql-test/std_data
-usr/share/mysql/mysql-test/std_data/ndb_backup50
-usr/share/mysql/mysql-test/std_data/parts
-usr/share/mysql/mysql-test/std_data/ndb_backup51_data_le
-usr/share/mysql/mysql-test/std_data/ndb_backup51_data_be
-usr/share/mysql/mysql-test/std_data/ndb_backup51
-usr/share/mysql/mysql-test/std_data/funcs_1