mirror of
https://github.com/MariaDB/server.git
synced 2025-07-27 18:02:13 +03:00
Added 'const' to arguments in get_one_option and find_typeset()
One should not change the program arguments! This change also reduces warnings from the icc compiler. Almost all changes are just syntax changes (adding const to 'get_one_option function' declarations). Other changes: - Added a few cast of 'argument' from 'const char*' to 'char *'. This was mainly in calls to 'external' functions we don't have control of. - Ensure that all reset of 'password command line argument' are similar. (In almost all cases it was just adding a comment and a cast) - In mysqlbinlog.cc and mysqld.cc there was a few cases that changed the command line argument. These places where changed to instead allocate the option in a MEM_ROOT to avoid changing the argument. Some of this code was changed to ensure that different programs did parsing the same way. Added a test case for the changes in mysqlbinlog.cc - Changed a few variables that took their value from command line options from 'char *' to 'const char *'.
This commit is contained in:
@ -130,6 +130,7 @@ select "--- reading stdin --" as "";
|
||||
# postion is constant to correspond to an event in pre-recorded binlog
|
||||
--let $binlog_start_pos=79
|
||||
--exec $MYSQL_BINLOG --short-form --start-position=$binlog_start_pos - < $MYSQL_TEST_DIR/std_data/trunc_binlog.000001
|
||||
|
||||
drop table t1,t2;
|
||||
|
||||
#
|
||||
@ -595,3 +596,30 @@ eval SET GLOBAL SERVER_ID = $old_server_id;
|
||||
#
|
||||
replace_regex /.*mysqlbinlog(\.exe)? Ver .* for .* at [-_a-zA-Z0-9]+/mysqlbinlog Ver VER for OS at ARCH/;
|
||||
exec $MYSQL_BINLOG --version;
|
||||
|
||||
--echo #
|
||||
--echo # Test --rewrite-db
|
||||
--echo #
|
||||
|
||||
RESET MASTER;
|
||||
CREATE TABLE t1 (a int);
|
||||
INSERT INTO t1 values(1);
|
||||
DROP TABLE t1;
|
||||
FLUSH LOGS;
|
||||
|
||||
--error 1
|
||||
--exec $MYSQL_BINLOG --rewrite-db=a --short-form $MYSQLD_DATADIR/master-bin.000001 2>&1
|
||||
|
||||
--error 1
|
||||
--exec $MYSQL_BINLOG --rewrite-db="a->" --short-form $MYSQLD_DATADIR/master-bin.000001 2>&1
|
||||
|
||||
--error 1
|
||||
--exec $MYSQL_BINLOG --rewrite-db="a-> " --short-form $MYSQLD_DATADIR/master-bin.000001 2>&1
|
||||
|
||||
--error 1
|
||||
--exec $MYSQL_BINLOG --rewrite-db="->b" --short-form $MYSQLD_DATADIR/master-bin.000001 2>&1
|
||||
|
||||
--error 1
|
||||
--exec $MYSQL_BINLOG --rewrite-db=" ->" --short-form $MYSQLD_DATADIR/master-bin.000001 2>&1
|
||||
|
||||
--exec $MYSQL_BINLOG --rewrite-db=" test -> foo " --short-form $MYSQLD_DATADIR/master-bin.000001 > /dev/null 2> $MYSQLTEST_VARDIR/tmp/mysqlbinlog.warn
|
||||
|
Reference in New Issue
Block a user