diff options
| author | Monty <monty@mariadb.org> | 2018-01-02 02:03:12 +0200 |
|---|---|---|
| committer | Monty <monty@mariadb.org> | 2018-01-02 02:03:12 +0200 |
| commit | 14e01bd86813b692cc69f38879f3ac3105ea9cf3 (patch) | |
| tree | 2d21c8ab264a76e8c30ab3955dff11bac2f471d7 | |
| parent | fbab79c9b8a58b90292e900cf46ab6d6632ebb68 (diff) | |
| download | mariadb-git-14e01bd86813b692cc69f38879f3ac3105ea9cf3.tar.gz | |
Fixed simple failures:
- openssl_1 errors where system dependent
- Used not portable UINT32_MAX instead of UINT_MAX32
| -rw-r--r-- | mysql-test/r/openssl_1.result | 2 | ||||
| -rw-r--r-- | mysql-test/t/openssl_1.test | 1 | ||||
| -rw-r--r-- | sql/mysqld.cc | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/mysql-test/r/openssl_1.result b/mysql-test/r/openssl_1.result index 40455f04c8c..ca8d71895e2 100644 --- a/mysql-test/r/openssl_1.result +++ b/mysql-test/r/openssl_1.result @@ -228,4 +228,4 @@ End of 5.1 tests /*!40019 SET @@session.max_insert_delayed_threads=0*/; /*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/; DELIMITER /*!*/; -ERROR: Failed on connect: SSL connection error: No such file or directory +ERROR: Failed on connect: SSL connection error
\ No newline at end of file diff --git a/mysql-test/t/openssl_1.test b/mysql-test/t/openssl_1.test index 55f60880fbc..a3db700f787 100644 --- a/mysql-test/t/openssl_1.test +++ b/mysql-test/t/openssl_1.test @@ -260,6 +260,7 @@ set global sql_mode=default; # MDEV-9605 mysqlbinlog does not accept ssl-ca option as expected. # +--replace_regex /SSL connection error:.*/SSL connection error/ --error 1 --exec $MYSQL_BINLOG --read-from-remote-server --ssl-ca --user=root --host=localhost nobinlog.111111 2>&1 diff --git a/sql/mysqld.cc b/sql/mysqld.cc index 5f10d980910..82ca7860195 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -7240,7 +7240,7 @@ struct my_option my_long_options[]= "The value has to be a multiple of 256.", &opt_binlog_rows_event_max_size, &opt_binlog_rows_event_max_size, 0, GET_ULONG, REQUIRED_ARG, - /* def_value */ 8192, /* min_value */ 256, /* max_value */ UINT32_MAX-1, + /* def_value */ 8192, /* min_value */ 256, /* max_value */ UINT_MAX32-1, /* sub_size */ 0, /* block_size */ 256, /* app_type */ 0 }, |