mirror of
https://github.com/MariaDB/server.git
synced 2025-08-01 03:47:19 +03:00
Things missing in last changset
After merge fixes Don't give duplicate warnings for some ::store() functions mysql-test/mysql-test-run.sh: Added back missing line mysql-test/r/ps_2myisam.result: Update results after removing duplicate warnings from ::store() mysql-test/r/ps_3innodb.result: Update results after removing duplicate warnings from ::store() mysql-test/r/ps_4heap.result: Update results after removing duplicate warnings from ::store() mysql-test/r/ps_5merge.result: Update results after removing duplicate warnings from ::store() sql/field.cc: Don't give duplicate warnings for some ::store() functions Before we could get different number of warnings in the test suite for different platforms sql/field.h: Update results after removing duplicate warnings from ::store() sql/sql_class.h: Update results after removing duplicate warnings from ::store() sql/sql_error.cc: Update results after removing duplicate warnings from ::store() sql/sql_list.h: After merge fix
This commit is contained in:
@ -692,6 +692,7 @@ then
|
||||
fi
|
||||
|
||||
MYSQL_CLIENT_TEST="$MYSQL_CLIENT_TEST --no-defaults --testcase --user=root --socket=$MASTER_MYSOCK --port=$MYSQL_TCP_PORT --silent"
|
||||
MYSQL_DUMP="$MYSQL_DUMP --no-defaults -uroot --socket=$MASTER_MYSOCK --password=$DBPASSWD $EXTRA_MYSQLDUMP_OPT"
|
||||
MYSQL_BINLOG="$MYSQL_BINLOG --no-defaults --local-load=$MYSQL_TMP_DIR --character-sets-dir=$CHARSETSDIR $EXTRA_MYSQLBINLOG_OPT"
|
||||
MYSQL_FIX_SYSTEM_TABLES="$MYSQL_FIX_SYSTEM_TABLES --no-defaults --host=localhost --port=$MASTER_MYPORT --socket=$MASTER_MYSOCK --user=root --password=$DBPASSWD --basedir=$BASEDIR --bindir=$CLIENT_BINDIR --verbose"
|
||||
MYSQL="$MYSQL --host=localhost --port=$MASTER_MYPORT --socket=$MASTER_MYSOCK --user=root --password=$DBPASSWD"
|
||||
|
Reference in New Issue
Block a user