diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2018-01-03 11:46:31 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2018-01-03 11:56:24 +0200 |
| commit | d361401bc26f49480daec8b0307afff6edae2ecc (patch) | |
| tree | 32fe757102f56b144401a4576956477370978bea /mysql-test/include | |
| parent | 7a9fee9853c19c1d6d547cd17f87e9bd8f4ebbaa (diff) | |
| parent | 016caa3d202ee1f020ff84613b345c8f3bacdce3 (diff) | |
| download | mariadb-git-mariadb-10.2.12.tar.gz | |
Merge 10.1 into 10.2, with some MDEV-14799 fixupsmariadb-10.2.12
trx_undo_page_report_modify(): For SPATIAL INDEX, keep logging
updated off-page columns twice, so that
the minimum bounding rectangle (MBR) will be logged.
Avoiding the redundant logging would require larger changes
to the undo log format.
row_build_index_entry_low(): Handle SPATIAL_UNKNOWN more robustly,
by refusing to purge the record from the spatial index.
We can get this code when processing old undo log from 10.2.10 or
10.2.11 (the releases affected by MDEV-14799, which was a regression
from MDEV-14051).
Diffstat (limited to 'mysql-test/include')
| -rw-r--r-- | mysql-test/include/truncate_file.inc | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/mysql-test/include/truncate_file.inc b/mysql-test/include/truncate_file.inc index 2326d6c0b94..fe88cb05bd9 100644 --- a/mysql-test/include/truncate_file.inc +++ b/mysql-test/include/truncate_file.inc @@ -1,16 +1,11 @@ # truncate a giving file, all contents of the file are be cleared -if (!$file) +if (!$TRUNCATE_FILE) { - --echo Please assign a file name to $file!! - exit; + die TRUNCATE_FILE is not set; } -let TRUNCATE_FILE= $file; - perl; -use Env; -Env::import('TRUNCATE_FILE'); -open FILE, '>', $TRUNCATE_FILE || die "Can not open file $file"; +open FILE, '>', $ENV{TRUNCATE_FILE} or die "open(>$ENV{TRUNCATE_FILE}): $!"; close FILE; EOF |