mirror of
https://github.com/MariaDB/server.git
synced 2025-01-19 21:42:35 +01:00
266fde77b2
Allow one to run bootstrap even if --skip-maria is used (needed for bootstrap.test) Fixed lots of compiler warnings NOTE: maria-big and maria-recover tests failes becasue of bugs in transaction log handling. Sanja knows about this and is working on it! mysql-test/mysql-test-run.pl: Added --loose-skip-maria to MYSQLD_BOOTSTRAP_CMD to get bootstrap.test to work mysql-test/r/maria-recovery.result: Updated results mysql-test/t/bootstrap.test: Removed not needed empty line mysql-test/t/change_user.test: Fixed results for 32 bit systems mysql-test/t/maria-big.test: Only run this when you use --big mysql-test/t/maria-recovery.test: Added test case for recovery with big blobs mysys/my_uuid.c: Fixed compiler warning sql/mysqld.cc: Allow one to run bootstrap even if --skip-maria is used (needed for bootstrap.test) sql/set_var.cc: Compare max_join_size with ULONG_MAX instead of HA_POS_ERROR as we set max_join_size to ULONG_MAX by default storage/maria/ma_bitmap.c: Added __attribute((unused)) to fix compiler warning storage/maria/ma_blockrec.c: Added casts to remove compiler warnings Change variable types to avoid compiler warnings storage/maria/ma_check.c: Added casts to remove compiler warnings storage/maria/ma_checkpoint.c: Change variable types to avoid compiler warnings storage/maria/ma_create.c: Change variable types to avoid compiler warnings storage/maria/ma_delete.c: Added casts to remove compiler warnings storage/maria/ma_key_recover.c: Added casts to remove compiler warnings storage/maria/ma_loghandler.c: Moved initiazation of prev_buffer first as this could otherwise not be set in case of errors storage/maria/ma_page.c: Added casts to remove compiler warnings storage/maria/ma_pagecache.c: Added __attribute((unused)) to fix compiler warning storage/maria/ma_pagecrc.c: Added #ifndef DBUG_OFF to remove compiler warning storage/maria/ma_recovery.c: Added casts to remove compiler warnings storage/maria/ma_write.c: Added casts to remove compiler warnings storage/maria/maria_chk.c: Split long string into two to avoid compiler warnings storage/myisam/ft_boolean_search.c: Added LINT_INIT() to remove compiler warning support-files/compiler_warnings.supp: Suppress wrong compiler warning unittest/mytap/tap.c: Fixed declaration to match prototypes to remove compiler warnings
48 lines
1.4 KiB
Text
48 lines
1.4 KiB
Text
#
|
|
# test mysqld in bootstrap mode
|
|
#
|
|
--disable_warnings
|
|
drop table if exists t1;
|
|
--enable_warnings
|
|
|
|
#
|
|
# Check that --bootstrap reads from stdin
|
|
#
|
|
--write_file $MYSQLTEST_VARDIR/tmp/bootstrap_test.sql
|
|
use test;
|
|
CREATE TABLE t1(a int);
|
|
EOF
|
|
--exec $MYSQLD_BOOTSTRAP_CMD < $MYSQLTEST_VARDIR/tmp/bootstrap_test.sql >> $MYSQLTEST_VARDIR/tmp/bootstrap.log 2>&1
|
|
drop table t1;
|
|
remove_file $MYSQLTEST_VARDIR/tmp/bootstrap_test.sql;
|
|
|
|
#
|
|
# Check that --bootstrap of file with SQL error returns error
|
|
#
|
|
--write_file $MYSQLTEST_VARDIR/tmp/bootstrap_error.sql
|
|
use test;
|
|
CREATE TABLE t1;
|
|
EOF
|
|
--error 1
|
|
--exec $MYSQLD_BOOTSTRAP_CMD < $MYSQLTEST_VARDIR/tmp/bootstrap_error.sql >> $MYSQLTEST_VARDIR/tmp/bootstrap.log 2>&1
|
|
# Table t1 should not exists
|
|
--error 1051
|
|
drop table t1;
|
|
remove_file $MYSQLTEST_VARDIR/tmp/bootstrap_error.sql;
|
|
|
|
#
|
|
# Bootstrap with a query larger than 2*thd->net.max_packet
|
|
#
|
|
set @my_max_allowed_packet= @@max_allowed_packet;
|
|
set global max_allowed_packet=100*@@max_allowed_packet;
|
|
--disable_query_log
|
|
create table t1 select 2 as a, concat(repeat('MySQL', @@max_allowed_packet/10), ';') as b;
|
|
eval select * into outfile '$MYSQLTEST_VARDIR/tmp/long_query.sql' from t1;
|
|
--enable_query_log
|
|
--error 1
|
|
--exec $MYSQLD_BOOTSTRAP_CMD < $MYSQLTEST_VARDIR/tmp/long_query.sql >> $MYSQLTEST_VARDIR/tmp/bootstrap.log 2>&1
|
|
remove_file $MYSQLTEST_VARDIR/tmp/long_query.sql;
|
|
|
|
set global max_allowed_packet=@my_max_allowed_packet;
|
|
drop table t1;
|
|
|