Skip to content

Commit

Permalink
Fixed simple failures:
Browse files Browse the repository at this point in the history
- openssl_1 errors where system dependent
- Used not portable UINT32_MAX instead of UINT_MAX32
  • Loading branch information
montywi committed Jan 2, 2018
1 parent fbab79c commit 14e01bd
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 2 deletions.
2 changes: 1 addition & 1 deletion mysql-test/r/openssl_1.result
Original file line number Diff line number Diff line change
Expand Up @@ -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
1 change: 1 addition & 0 deletions mysql-test/t/openssl_1.test
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion sql/mysqld.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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
},
Expand Down

0 comments on commit 14e01bd

Please sign in to comment.