summaryrefslogtreecommitdiff
path: root/mysql-test/suite/archive
diff options
context:
space:
mode:
authorSergei Golubchik <sergii@pisem.net>2013-04-09 15:56:28 +0200
committerSergei Golubchik <sergii@pisem.net>2013-04-09 15:56:28 +0200
commit9ec326a8b1fd0d83d9baaaf64f021be10564409d (patch)
tree2d75f40a13edf1484d2a1555ef0f055d1d760b43 /mysql-test/suite/archive
parent84b882172d6ff772148da808531f67baa4e89283 (diff)
downloadmariadb-git-9ec326a8b1fd0d83d9baaaf64f021be10564409d.tar.gz
cleanup frm creation:
* comments * cosmetic changes, *(ptr+5) -> ptr[5] * a couple of trivial functions -> inline * remove unused argument from pack_header() * create_frm() no longer creates frm file (the function used to prepare and fill a memory buffer and call my_create at the end. Now it only prepares a memory buffer). Renamed accordingly. * don't call pack_screen twice, go for a smaller screen area in the first attempt * remove useless calls to check_duplicate_warning() * don't write unireg screens to .frm files * remove make_new_entry(), it's basically dead code, always calculating and writing into frm the same string value. replace the function call with the constant string.
Diffstat (limited to 'mysql-test/suite/archive')
-rw-r--r--mysql-test/suite/archive/archive.result4
-rw-r--r--mysql-test/suite/archive/partition_archive.result4
2 files changed, 4 insertions, 4 deletions
diff --git a/mysql-test/suite/archive/archive.result b/mysql-test/suite/archive/archive.result
index e914aeb89be..4babfdae220 100644
--- a/mysql-test/suite/archive/archive.result
+++ b/mysql-test/suite/archive/archive.result
@@ -12701,12 +12701,12 @@ CREATE TABLE t1(a INT, b BLOB) ENGINE=archive;
SELECT DATA_LENGTH, AVG_ROW_LENGTH FROM
INFORMATION_SCHEMA.TABLES WHERE TABLE_NAME='t1' AND TABLE_SCHEMA='test';
DATA_LENGTH AVG_ROW_LENGTH
-8666 15
+8608 15
INSERT INTO t1 VALUES(1, 'sampleblob1'),(2, 'sampleblob2');
SELECT DATA_LENGTH, AVG_ROW_LENGTH FROM
INFORMATION_SCHEMA.TABLES WHERE TABLE_NAME='t1' AND TABLE_SCHEMA='test';
DATA_LENGTH AVG_ROW_LENGTH
-8700 4350
+8642 4321
DROP TABLE t1;
SET @save_join_buffer_size= @@join_buffer_size;
SET @@join_buffer_size= 8192;
diff --git a/mysql-test/suite/archive/partition_archive.result b/mysql-test/suite/archive/partition_archive.result
index 186a7930251..9ea6f00015e 100644
--- a/mysql-test/suite/archive/partition_archive.result
+++ b/mysql-test/suite/archive/partition_archive.result
@@ -15,10 +15,10 @@ ENGINE = ARCHIVE;
INSERT INTO t1 VALUES(CURRENT_DATE);
SELECT DATA_LENGTH, INDEX_LENGTH FROM information_schema.TABLES WHERE TABLE_SCHEMA='test' AND TABLE_NAME='t1';
DATA_LENGTH INDEX_LENGTH
-8658 0
+8604 0
SELECT DATA_LENGTH, INDEX_LENGTH FROM information_schema.TABLES WHERE TABLE_SCHEMA='test' AND TABLE_NAME='t1';
DATA_LENGTH INDEX_LENGTH
-8658 0
+8604 0
DROP TABLE t1;
drop database if exists db99;
drop table if exists t1;