diff options
author | Michael Widenius <monty@askmonty.org> | 2012-06-05 14:09:18 +0300 |
---|---|---|
committer | Michael Widenius <monty@askmonty.org> | 2012-06-05 14:09:18 +0300 |
commit | 56ea8e9c0539a4dc95659ab4ba4b94956c7119e7 (patch) | |
tree | f1064496ed78c4ee1c4270ede3dcba94cf1a02ec /mysql-test/t/mysql_upgrade.test | |
parent | b889f6999367c9415f5806d2ea6ec104387ba1ff (diff) | |
download | mariadb-git-56ea8e9c0539a4dc95659ab4ba4b94956c7119e7.tar.gz |
Fixed build failures found by buildbot
- Added suppression of warnings
- Fixed some test cases
BUILD/FINISH.sh:
Added AM_EXTRA_MAKEFLAGS
BUILD/SETUP.sh:
Added option --extra-makeflags
client/mysqldump.c:
Added suppression
mysql-test/r/mysql.result:
Updated results
mysql-test/r/mysql_upgrade.result:
Updated results
mysql-test/r/partition_innodb_plugin.result:
Updated results
mysql-test/r/partition_open_files_limit.result:
Updated results
mysql-test/r/symlink.result:
Updated results
mysql-test/suite/innodb/r/innodb-create-options.result:
Updated results
mysql-test/suite/innodb/t/innodb-create-options.test:
Don't print error message (as it's varies on different system)
mysql-test/t/mysql.test:
Don't print error message (as it's varies on different system)
mysql-test/t/mysql_upgrade.test:
Fixed checking of error number
mysql-test/t/partition_innodb_plugin.test:
Don't print error message (as it's varies on different system)
plugin/semisync/semisync_master.cc:
Added suppression
sql/ha_partition.cc:
Added suppression
sql/item_subselect.cc:
Added suppression
sql/multi_range_read.cc:
Added suppression
sql/sql_parse.cc:
Added suppression
sql/sql_select.cc:
Added suppression
storage/innobase/handler/ha_innodb.cc:
Removed not used variable
storage/maria/ma_delete.c:
Added suppression
storage/maria/ma_key_recover.c:
Added suppression
storage/maria/ma_write.c:
Added suppression
strings/ctype-ucs2.c:
Added suppression
support-files/compiler_warnings.supp:
Added suppressions
unittest/mysys/my_vsnprintf-t.c:
Fixed test case with %M to also work on Solaris
Diffstat (limited to 'mysql-test/t/mysql_upgrade.test')
-rw-r--r-- | mysql-test/t/mysql_upgrade.test | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/t/mysql_upgrade.test b/mysql-test/t/mysql_upgrade.test index f200bce551f..78d439d5d52 100644 --- a/mysql-test/t/mysql_upgrade.test +++ b/mysql-test/t/mysql_upgrade.test @@ -47,7 +47,7 @@ DROP USER mysqltest1@'%'; --echo Run mysql_upgrade with a non existing server socket --replace_result $MYSQLTEST_VARDIR var ---replace_regex /.*mysqlcheck.*: Got/mysqlcheck: Got/ /\([0-9]*\)/(errno)/ +--replace_regex /.*mysqlcheck.*: Got/mysqlcheck: Got/ /\([0-9|-]*\)/(errno)/ --error 1 --exec $MYSQL_UPGRADE --force --host=not_existing_host 2>&1 |