diff --git a/.bzrignore b/.bzrignore index b0e4d3ef18b..4477d4f1243 100644 --- a/.bzrignore +++ b/.bzrignore @@ -3013,3 +3013,5 @@ ylwrap zlib/*.ds? zlib/*.vcproj mysql-test/funcs_1.log +mysql-test/funcs_1.tar +mysql-test/suite/funcs_1.tar.gz diff --git a/mysql-test/suite/funcs_1/t/disabled.def b/mysql-test/suite/funcs_1/t/disabled.def index 1d08d3506bc..7eab49dfd62 100644 --- a/mysql-test/suite/funcs_1/t/disabled.def +++ b/mysql-test/suite/funcs_1/t/disabled.def @@ -10,4 +10,8 @@ # ############################################################################## +innodb_storedproc_06 : bug#33464 DROP FUNCTION let server hang +myisam_storedproc_06 : bug#33464 DROP FUNCTION let server hang +memory_storedproc_06 : bug#33464 DROP FUNCTION let server hang +ndb_storedproc_06 : bug#33464 DROP FUNCTION let server hang ndb__datadict: 2007-10-08 mleich Bug#31421 funcs_1: ndb__datadict fails, discrepancy between scripts and expected results