From ee74f24f38d3ab260632231c81af4abd5507e263 Mon Sep 17 00:00:00 2001 From: Alexey Kopytov Date: Sat, 18 Apr 2020 08:56:08 +0300 Subject: [PATCH 1/4] build/CI/packaging: remove Ubuntu Disco (EOL) --- .travis.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index e5b9109..867125a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -37,7 +37,6 @@ env: - OS=fedora DIST=rawhide - OS=ubuntu DIST=xenial - OS=ubuntu DIST=bionic - - OS=ubuntu DIST=disco - OS=ubuntu DIST=eoan - OS=debian DIST=jessie - OS=debian DIST=stretch @@ -45,7 +44,6 @@ env: - OS=debian DIST=sid - OS=ubuntu DIST=xenial ARCH=i386 - OS=ubuntu DIST=bionic ARCH=i386 - - OS=ubuntu DIST=disco ARCH=i386 - OS=ubuntu DIST=eoan ARCH=i386 - OS=debian DIST=jessie ARCH=i386 - OS=debian DIST=stretch ARCH=i386 From 0a1734346c3ec3fb2f20377d91a4bc161cf23e02 Mon Sep 17 00:00:00 2001 From: Alexey Kopytov Date: Sat, 18 Apr 2020 09:54:18 +0300 Subject: [PATCH 2/4] build/CI/packaging: fix macOS builds in Travis --- .travis.yml | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 867125a..fa93c65 100644 --- a/.travis.yml +++ b/.travis.yml @@ -164,15 +164,13 @@ before_install: case "${TRAVIS_OS_NAME:-linux}" in osx) brew update - brew install mysql + brew install mysql postgresql # OS X requires servers to be started explicitly brew services start mysql - # Avoid PostgreSQL upgrade woes, just reinstall the database - brew uninstall --ignore-dependencies postgresql - rm -rf /usr/local/var/postgres - brew install postgresql + brew postgresql-upgrade-database + brew services start postgresql echo "Starting PostgreSQL" pg_ctl -wD /usr/local/var/postgres start From 849ddc59e8c60f6864d3f8e7a8c7c2dfee0f11e8 Mon Sep 17 00:00:00 2001 From: Alexey Kopytov Date: Mon, 10 Feb 2020 09:38:39 +0300 Subject: [PATCH 3/4] build/CI/packaging: fix regression tests to work with MySQL 8.0.19+ --- tests/t/api_legacy_sql.t | 74 ++++++------ tests/t/script_bulk_insert_mysql.t | 8 +- tests/t/script_oltp_delete_mysql.t | 68 ++++++------ tests/t/script_oltp_insert_mysql.t | 68 ++++++------ tests/t/script_oltp_point_select_mysql.t | 68 ++++++------ tests/t/script_oltp_read_write_mysql.t | 136 +++++++++++------------ tests/t/script_select_random_mysql.t | 8 +- 7 files changed, 215 insertions(+), 215 deletions(-) diff --git a/tests/t/api_legacy_sql.t b/tests/t/api_legacy_sql.t index a568017..d785f59 100644 --- a/tests/t/api_legacy_sql.t +++ b/tests/t/api_legacy_sql.t @@ -50,7 +50,7 @@ Legacy SQL Lua API tests *************************** 1. row *************************** t CREATE TABLE `t` ( - `a` int(11) DEFAULT NULL + `a` int* DEFAULT NULL (glob) ) * (glob) $ mysql -uroot sbtest -Nse "SELECT COUNT(DISTINCT a) FROM t" @@ -99,8 +99,8 @@ Legacy SQL Lua API tests *************************** 1. row *************************** sbtest1 CREATE TABLE `sbtest1` ( - `id` int(10) unsigned NOT NULL AUTO_INCREMENT, - `k` int(10) unsigned NOT NULL DEFAULT '0', + `id` int* unsigned NOT NULL AUTO_INCREMENT, (glob) + `k` int* unsigned NOT NULL DEFAULT '0', (glob) `c` char(120)* NOT NULL DEFAULT '', (glob) `pad` char(60)* NOT NULL DEFAULT '', (glob) PRIMARY KEY (`id`), @@ -109,8 +109,8 @@ Legacy SQL Lua API tests *************************** 1. row *************************** sbtest2 CREATE TABLE `sbtest2` ( - `id` int(10) unsigned NOT NULL AUTO_INCREMENT, - `k` int(10) unsigned NOT NULL DEFAULT '0', + `id` int* unsigned NOT NULL AUTO_INCREMENT, (glob) + `k` int* unsigned NOT NULL DEFAULT '0', (glob) `c` char(120)* NOT NULL DEFAULT '', (glob) `pad` char(60)* NOT NULL DEFAULT '', (glob) PRIMARY KEY (`id`), @@ -119,8 +119,8 @@ Legacy SQL Lua API tests *************************** 1. row *************************** sbtest3 CREATE TABLE `sbtest3` ( - `id` int(10) unsigned NOT NULL AUTO_INCREMENT, - `k` int(10) unsigned NOT NULL DEFAULT '0', + `id` int* unsigned NOT NULL AUTO_INCREMENT, (glob) + `k` int* unsigned NOT NULL DEFAULT '0', (glob) `c` char(120)* NOT NULL DEFAULT '', (glob) `pad` char(60)* NOT NULL DEFAULT '', (glob) PRIMARY KEY (`id`), @@ -129,8 +129,8 @@ Legacy SQL Lua API tests *************************** 1. row *************************** sbtest4 CREATE TABLE `sbtest4` ( - `id` int(10) unsigned NOT NULL AUTO_INCREMENT, - `k` int(10) unsigned NOT NULL DEFAULT '0', + `id` int* unsigned NOT NULL AUTO_INCREMENT, (glob) + `k` int* unsigned NOT NULL DEFAULT '0', (glob) `c` char(120)* NOT NULL DEFAULT '', (glob) `pad` char(60)* NOT NULL DEFAULT '', (glob) PRIMARY KEY (`id`), @@ -139,8 +139,8 @@ Legacy SQL Lua API tests *************************** 1. row *************************** sbtest5 CREATE TABLE `sbtest5` ( - `id` int(10) unsigned NOT NULL AUTO_INCREMENT, - `k` int(10) unsigned NOT NULL DEFAULT '0', + `id` int* unsigned NOT NULL AUTO_INCREMENT, (glob) + `k` int* unsigned NOT NULL DEFAULT '0', (glob) `c` char(120)* NOT NULL DEFAULT '', (glob) `pad` char(60)* NOT NULL DEFAULT '', (glob) PRIMARY KEY (`id`), @@ -149,8 +149,8 @@ Legacy SQL Lua API tests *************************** 1. row *************************** sbtest6 CREATE TABLE `sbtest6` ( - `id` int(10) unsigned NOT NULL AUTO_INCREMENT, - `k` int(10) unsigned NOT NULL DEFAULT '0', + `id` int* unsigned NOT NULL AUTO_INCREMENT, (glob) + `k` int* unsigned NOT NULL DEFAULT '0', (glob) `c` char(120)* NOT NULL DEFAULT '', (glob) `pad` char(60)* NOT NULL DEFAULT '', (glob) PRIMARY KEY (`id`), @@ -159,8 +159,8 @@ Legacy SQL Lua API tests *************************** 1. row *************************** sbtest7 CREATE TABLE `sbtest7` ( - `id` int(10) unsigned NOT NULL AUTO_INCREMENT, - `k` int(10) unsigned NOT NULL DEFAULT '0', + `id` int* unsigned NOT NULL AUTO_INCREMENT, (glob) + `k` int* unsigned NOT NULL DEFAULT '0', (glob) `c` char(120)* NOT NULL DEFAULT '', (glob) `pad` char(60)* NOT NULL DEFAULT '', (glob) PRIMARY KEY (`id`), @@ -169,8 +169,8 @@ Legacy SQL Lua API tests *************************** 1. row *************************** sbtest8 CREATE TABLE `sbtest8` ( - `id` int(10) unsigned NOT NULL AUTO_INCREMENT, - `k` int(10) unsigned NOT NULL DEFAULT '0', + `id` int* unsigned NOT NULL AUTO_INCREMENT, (glob) + `k` int* unsigned NOT NULL DEFAULT '0', (glob) `c` char(120)* NOT NULL DEFAULT '', (glob) `pad` char(60)* NOT NULL DEFAULT '', (glob) PRIMARY KEY (`id`), @@ -244,8 +244,8 @@ Legacy SQL Lua API tests *************************** 1. row *************************** sbtest1 CREATE TABLE `sbtest1` ( - `id` int(10) unsigned NOT NULL AUTO_INCREMENT, - `k` int(10) unsigned NOT NULL DEFAULT '0', + `id` int* unsigned NOT NULL AUTO_INCREMENT, (glob) + `k` int* unsigned NOT NULL DEFAULT '0', (glob) `c` char(120)* NOT NULL DEFAULT '', (glob) `pad` char(60)* NOT NULL DEFAULT '', (glob) PRIMARY KEY (`id`) @@ -287,8 +287,8 @@ Legacy SQL Lua API tests *************************** 1. row *************************** sbtest1 CREATE TABLE `sbtest1` ( - `id` int(10) unsigned NOT NULL AUTO_INCREMENT, - `k` int(10) unsigned NOT NULL DEFAULT '0', + `id` int* unsigned NOT NULL AUTO_INCREMENT, (glob) + `k` int* unsigned NOT NULL DEFAULT '0', (glob) `c` char(120)* NOT NULL DEFAULT '', (glob) `pad` char(60)* NOT NULL DEFAULT '', (glob) PRIMARY KEY (`id`), @@ -297,8 +297,8 @@ Legacy SQL Lua API tests *************************** 1. row *************************** sbtest2 CREATE TABLE `sbtest2` ( - `id` int(10) unsigned NOT NULL AUTO_INCREMENT, - `k` int(10) unsigned NOT NULL DEFAULT '0', + `id` int* unsigned NOT NULL AUTO_INCREMENT, (glob) + `k` int* unsigned NOT NULL DEFAULT '0', (glob) `c` char(120)* NOT NULL DEFAULT '', (glob) `pad` char(60)* NOT NULL DEFAULT '', (glob) PRIMARY KEY (`id`), @@ -307,8 +307,8 @@ Legacy SQL Lua API tests *************************** 1. row *************************** sbtest3 CREATE TABLE `sbtest3` ( - `id` int(10) unsigned NOT NULL AUTO_INCREMENT, - `k` int(10) unsigned NOT NULL DEFAULT '0', + `id` int* unsigned NOT NULL AUTO_INCREMENT, (glob) + `k` int* unsigned NOT NULL DEFAULT '0', (glob) `c` char(120)* NOT NULL DEFAULT '', (glob) `pad` char(60)* NOT NULL DEFAULT '', (glob) PRIMARY KEY (`id`), @@ -317,8 +317,8 @@ Legacy SQL Lua API tests *************************** 1. row *************************** sbtest4 CREATE TABLE `sbtest4` ( - `id` int(10) unsigned NOT NULL AUTO_INCREMENT, - `k` int(10) unsigned NOT NULL DEFAULT '0', + `id` int* unsigned NOT NULL AUTO_INCREMENT, (glob) + `k` int* unsigned NOT NULL DEFAULT '0', (glob) `c` char(120)* NOT NULL DEFAULT '', (glob) `pad` char(60)* NOT NULL DEFAULT '', (glob) PRIMARY KEY (`id`), @@ -327,8 +327,8 @@ Legacy SQL Lua API tests *************************** 1. row *************************** sbtest5 CREATE TABLE `sbtest5` ( - `id` int(10) unsigned NOT NULL AUTO_INCREMENT, - `k` int(10) unsigned NOT NULL DEFAULT '0', + `id` int* unsigned NOT NULL AUTO_INCREMENT, (glob) + `k` int* unsigned NOT NULL DEFAULT '0', (glob) `c` char(120)* NOT NULL DEFAULT '', (glob) `pad` char(60)* NOT NULL DEFAULT '', (glob) PRIMARY KEY (`id`), @@ -337,8 +337,8 @@ Legacy SQL Lua API tests *************************** 1. row *************************** sbtest6 CREATE TABLE `sbtest6` ( - `id` int(10) unsigned NOT NULL AUTO_INCREMENT, - `k` int(10) unsigned NOT NULL DEFAULT '0', + `id` int* unsigned NOT NULL AUTO_INCREMENT, (glob) + `k` int* unsigned NOT NULL DEFAULT '0', (glob) `c` char(120)* NOT NULL DEFAULT '', (glob) `pad` char(60)* NOT NULL DEFAULT '', (glob) PRIMARY KEY (`id`), @@ -347,8 +347,8 @@ Legacy SQL Lua API tests *************************** 1. row *************************** sbtest7 CREATE TABLE `sbtest7` ( - `id` int(10) unsigned NOT NULL AUTO_INCREMENT, - `k` int(10) unsigned NOT NULL DEFAULT '0', + `id` int* unsigned NOT NULL AUTO_INCREMENT, (glob) + `k` int* unsigned NOT NULL DEFAULT '0', (glob) `c` char(120)* NOT NULL DEFAULT '', (glob) `pad` char(60)* NOT NULL DEFAULT '', (glob) PRIMARY KEY (`id`), @@ -357,8 +357,8 @@ Legacy SQL Lua API tests *************************** 1. row *************************** sbtest8 CREATE TABLE `sbtest8` ( - `id` int(10) unsigned NOT NULL AUTO_INCREMENT, - `k` int(10) unsigned NOT NULL DEFAULT '0', + `id` int* unsigned NOT NULL AUTO_INCREMENT, (glob) + `k` int* unsigned NOT NULL DEFAULT '0', (glob) `c` char(120)* NOT NULL DEFAULT '', (glob) `pad` char(60)* NOT NULL DEFAULT '', (glob) PRIMARY KEY (`id`), @@ -432,8 +432,8 @@ Legacy SQL Lua API tests *************************** 1. row *************************** sbtest1 CREATE TABLE `sbtest1` ( - `id` int(10) unsigned NOT NULL AUTO_INCREMENT, - `k` int(10) unsigned NOT NULL DEFAULT '0', + `id` int* unsigned NOT NULL AUTO_INCREMENT, (glob) + `k` int* unsigned NOT NULL DEFAULT '0', (glob) `c` char(120)* NOT NULL DEFAULT '', (glob) `pad` char(60)* NOT NULL DEFAULT '', (glob) PRIMARY KEY (`id`) diff --git a/tests/t/script_bulk_insert_mysql.t b/tests/t/script_bulk_insert_mysql.t index bc2a34d..411c7b2 100644 --- a/tests/t/script_bulk_insert_mysql.t +++ b/tests/t/script_bulk_insert_mysql.t @@ -9,15 +9,15 @@ bulk_insert.lua + MySQL tests *************************** 1. row *************************** sbtest1 CREATE TABLE `sbtest1` ( - `id` int(11) NOT NULL, - `k` int(11) NOT NULL DEFAULT '0', + `id` int* NOT NULL, (glob) + `k` int* NOT NULL DEFAULT '0', (glob) PRIMARY KEY (`id`) ) ENGINE=InnoDB * (glob) *************************** 1. row *************************** sbtest2 CREATE TABLE `sbtest2` ( - `id` int(11) NOT NULL, - `k` int(11) NOT NULL DEFAULT '0', + `id` int* NOT NULL, (glob) + `k` int* NOT NULL DEFAULT '0', (glob) PRIMARY KEY (`id`) ) ENGINE=InnoDB * (glob) ERROR 1146 (42S02) at line 1: Table 'sbtest.sbtest3' doesn't exist diff --git a/tests/t/script_oltp_delete_mysql.t b/tests/t/script_oltp_delete_mysql.t index 2762619..929b49b 100644 --- a/tests/t/script_oltp_delete_mysql.t +++ b/tests/t/script_oltp_delete_mysql.t @@ -34,8 +34,8 @@ oltp_delete.lua + MySQL tests *************************** 1. row *************************** sbtest1 CREATE TABLE `sbtest1` ( - `id` int(11) NOT NULL AUTO_INCREMENT, - `k` int(11) NOT NULL DEFAULT '0', + `id` int* NOT NULL AUTO_INCREMENT, (glob) + `k` int* NOT NULL DEFAULT '0', (glob) `c` char(120)* NOT NULL DEFAULT '', (glob) `pad` char(60)* NOT NULL DEFAULT '', (glob) PRIMARY KEY (`id`), @@ -44,8 +44,8 @@ oltp_delete.lua + MySQL tests *************************** 1. row *************************** sbtest2 CREATE TABLE `sbtest2` ( - `id` int(11) NOT NULL AUTO_INCREMENT, - `k` int(11) NOT NULL DEFAULT '0', + `id` int* NOT NULL AUTO_INCREMENT, (glob) + `k` int* NOT NULL DEFAULT '0', (glob) `c` char(120)* NOT NULL DEFAULT '', (glob) `pad` char(60)* NOT NULL DEFAULT '', (glob) PRIMARY KEY (`id`), @@ -54,8 +54,8 @@ oltp_delete.lua + MySQL tests *************************** 1. row *************************** sbtest3 CREATE TABLE `sbtest3` ( - `id` int(11) NOT NULL AUTO_INCREMENT, - `k` int(11) NOT NULL DEFAULT '0', + `id` int* NOT NULL AUTO_INCREMENT, (glob) + `k` int* NOT NULL DEFAULT '0', (glob) `c` char(120)* NOT NULL DEFAULT '', (glob) `pad` char(60)* NOT NULL DEFAULT '', (glob) PRIMARY KEY (`id`), @@ -64,8 +64,8 @@ oltp_delete.lua + MySQL tests *************************** 1. row *************************** sbtest4 CREATE TABLE `sbtest4` ( - `id` int(11) NOT NULL AUTO_INCREMENT, - `k` int(11) NOT NULL DEFAULT '0', + `id` int* NOT NULL AUTO_INCREMENT, (glob) + `k` int* NOT NULL DEFAULT '0', (glob) `c` char(120)* NOT NULL DEFAULT '', (glob) `pad` char(60)* NOT NULL DEFAULT '', (glob) PRIMARY KEY (`id`), @@ -74,8 +74,8 @@ oltp_delete.lua + MySQL tests *************************** 1. row *************************** sbtest5 CREATE TABLE `sbtest5` ( - `id` int(11) NOT NULL AUTO_INCREMENT, - `k` int(11) NOT NULL DEFAULT '0', + `id` int* NOT NULL AUTO_INCREMENT, (glob) + `k` int* NOT NULL DEFAULT '0', (glob) `c` char(120)* NOT NULL DEFAULT '', (glob) `pad` char(60)* NOT NULL DEFAULT '', (glob) PRIMARY KEY (`id`), @@ -84,8 +84,8 @@ oltp_delete.lua + MySQL tests *************************** 1. row *************************** sbtest6 CREATE TABLE `sbtest6` ( - `id` int(11) NOT NULL AUTO_INCREMENT, - `k` int(11) NOT NULL DEFAULT '0', + `id` int* NOT NULL AUTO_INCREMENT, (glob) + `k` int* NOT NULL DEFAULT '0', (glob) `c` char(120)* NOT NULL DEFAULT '', (glob) `pad` char(60)* NOT NULL DEFAULT '', (glob) PRIMARY KEY (`id`), @@ -94,8 +94,8 @@ oltp_delete.lua + MySQL tests *************************** 1. row *************************** sbtest7 CREATE TABLE `sbtest7` ( - `id` int(11) NOT NULL AUTO_INCREMENT, - `k` int(11) NOT NULL DEFAULT '0', + `id` int* NOT NULL AUTO_INCREMENT, (glob) + `k` int* NOT NULL DEFAULT '0', (glob) `c` char(120)* NOT NULL DEFAULT '', (glob) `pad` char(60)* NOT NULL DEFAULT '', (glob) PRIMARY KEY (`id`), @@ -104,8 +104,8 @@ oltp_delete.lua + MySQL tests *************************** 1. row *************************** sbtest8 CREATE TABLE `sbtest8` ( - `id` int(11) NOT NULL AUTO_INCREMENT, - `k` int(11) NOT NULL DEFAULT '0', + `id` int* NOT NULL AUTO_INCREMENT, (glob) + `k` int* NOT NULL DEFAULT '0', (glob) `c` char(120)* NOT NULL DEFAULT '', (glob) `pad` char(60)* NOT NULL DEFAULT '', (glob) PRIMARY KEY (`id`), @@ -135,8 +135,8 @@ oltp_delete.lua + MySQL tests *************************** 1. row *************************** sbtest1 CREATE TABLE `sbtest1` ( - `id` int(11) NOT NULL AUTO_INCREMENT, - `k` int(11) NOT NULL DEFAULT '0', + `id` int* NOT NULL AUTO_INCREMENT, (glob) + `k` int* NOT NULL DEFAULT '0', (glob) `c` char(120)* NOT NULL DEFAULT '', (glob) `pad` char(60)* NOT NULL DEFAULT '', (glob) PRIMARY KEY (`id`), @@ -145,8 +145,8 @@ oltp_delete.lua + MySQL tests *************************** 1. row *************************** sbtest2 CREATE TABLE `sbtest2` ( - `id` int(11) NOT NULL AUTO_INCREMENT, - `k` int(11) NOT NULL DEFAULT '0', + `id` int* NOT NULL AUTO_INCREMENT, (glob) + `k` int* NOT NULL DEFAULT '0', (glob) `c` char(120)* NOT NULL DEFAULT '', (glob) `pad` char(60)* NOT NULL DEFAULT '', (glob) PRIMARY KEY (`id`), @@ -155,8 +155,8 @@ oltp_delete.lua + MySQL tests *************************** 1. row *************************** sbtest3 CREATE TABLE `sbtest3` ( - `id` int(11) NOT NULL AUTO_INCREMENT, - `k` int(11) NOT NULL DEFAULT '0', + `id` int* NOT NULL AUTO_INCREMENT, (glob) + `k` int* NOT NULL DEFAULT '0', (glob) `c` char(120)* NOT NULL DEFAULT '', (glob) `pad` char(60)* NOT NULL DEFAULT '', (glob) PRIMARY KEY (`id`), @@ -165,8 +165,8 @@ oltp_delete.lua + MySQL tests *************************** 1. row *************************** sbtest4 CREATE TABLE `sbtest4` ( - `id` int(11) NOT NULL AUTO_INCREMENT, - `k` int(11) NOT NULL DEFAULT '0', + `id` int* NOT NULL AUTO_INCREMENT, (glob) + `k` int* NOT NULL DEFAULT '0', (glob) `c` char(120)* NOT NULL DEFAULT '', (glob) `pad` char(60)* NOT NULL DEFAULT '', (glob) PRIMARY KEY (`id`), @@ -175,8 +175,8 @@ oltp_delete.lua + MySQL tests *************************** 1. row *************************** sbtest5 CREATE TABLE `sbtest5` ( - `id` int(11) NOT NULL AUTO_INCREMENT, - `k` int(11) NOT NULL DEFAULT '0', + `id` int* NOT NULL AUTO_INCREMENT, (glob) + `k` int* NOT NULL DEFAULT '0', (glob) `c` char(120)* NOT NULL DEFAULT '', (glob) `pad` char(60)* NOT NULL DEFAULT '', (glob) PRIMARY KEY (`id`), @@ -185,8 +185,8 @@ oltp_delete.lua + MySQL tests *************************** 1. row *************************** sbtest6 CREATE TABLE `sbtest6` ( - `id` int(11) NOT NULL AUTO_INCREMENT, - `k` int(11) NOT NULL DEFAULT '0', + `id` int* NOT NULL AUTO_INCREMENT, (glob) + `k` int* NOT NULL DEFAULT '0', (glob) `c` char(120)* NOT NULL DEFAULT '', (glob) `pad` char(60)* NOT NULL DEFAULT '', (glob) PRIMARY KEY (`id`), @@ -195,8 +195,8 @@ oltp_delete.lua + MySQL tests *************************** 1. row *************************** sbtest7 CREATE TABLE `sbtest7` ( - `id` int(11) NOT NULL AUTO_INCREMENT, - `k` int(11) NOT NULL DEFAULT '0', + `id` int* NOT NULL AUTO_INCREMENT, (glob) + `k` int* NOT NULL DEFAULT '0', (glob) `c` char(120)* NOT NULL DEFAULT '', (glob) `pad` char(60)* NOT NULL DEFAULT '', (glob) PRIMARY KEY (`id`), @@ -205,8 +205,8 @@ oltp_delete.lua + MySQL tests *************************** 1. row *************************** sbtest8 CREATE TABLE `sbtest8` ( - `id` int(11) NOT NULL AUTO_INCREMENT, - `k` int(11) NOT NULL DEFAULT '0', + `id` int* NOT NULL AUTO_INCREMENT, (glob) + `k` int* NOT NULL DEFAULT '0', (glob) `c` char(120)* NOT NULL DEFAULT '', (glob) `pad` char(60)* NOT NULL DEFAULT '', (glob) PRIMARY KEY (`id`), @@ -266,8 +266,8 @@ oltp_delete.lua + MySQL tests *************************** 1. row *************************** sbtest1 CREATE TABLE `sbtest1` ( - `id` int(11) NOT NULL AUTO_INCREMENT, - `k` int(11) NOT NULL DEFAULT '0', + `id` int* NOT NULL AUTO_INCREMENT, (glob) + `k` int* NOT NULL DEFAULT '0', (glob) `c` char(120)* NOT NULL DEFAULT '', (glob) `pad` char(60)* NOT NULL DEFAULT '', (glob) PRIMARY KEY (`id`) diff --git a/tests/t/script_oltp_insert_mysql.t b/tests/t/script_oltp_insert_mysql.t index 3758c68..ee7f41f 100644 --- a/tests/t/script_oltp_insert_mysql.t +++ b/tests/t/script_oltp_insert_mysql.t @@ -34,8 +34,8 @@ oltp_insert.lua + MySQL tests *************************** 1. row *************************** sbtest1 CREATE TABLE `sbtest1` ( - `id` int(11) NOT NULL AUTO_INCREMENT, - `k` int(11) NOT NULL DEFAULT '0', + `id` int* NOT NULL AUTO_INCREMENT, (glob) + `k` int* NOT NULL DEFAULT '0', (glob) `c` char(120)* NOT NULL DEFAULT '', (glob) `pad` char(60)* NOT NULL DEFAULT '', (glob) PRIMARY KEY (`id`), @@ -44,8 +44,8 @@ oltp_insert.lua + MySQL tests *************************** 1. row *************************** sbtest2 CREATE TABLE `sbtest2` ( - `id` int(11) NOT NULL AUTO_INCREMENT, - `k` int(11) NOT NULL DEFAULT '0', + `id` int* NOT NULL AUTO_INCREMENT, (glob) + `k` int* NOT NULL DEFAULT '0', (glob) `c` char(120)* NOT NULL DEFAULT '', (glob) `pad` char(60)* NOT NULL DEFAULT '', (glob) PRIMARY KEY (`id`), @@ -54,8 +54,8 @@ oltp_insert.lua + MySQL tests *************************** 1. row *************************** sbtest3 CREATE TABLE `sbtest3` ( - `id` int(11) NOT NULL AUTO_INCREMENT, - `k` int(11) NOT NULL DEFAULT '0', + `id` int* NOT NULL AUTO_INCREMENT, (glob) + `k` int* NOT NULL DEFAULT '0', (glob) `c` char(120)* NOT NULL DEFAULT '', (glob) `pad` char(60)* NOT NULL DEFAULT '', (glob) PRIMARY KEY (`id`), @@ -64,8 +64,8 @@ oltp_insert.lua + MySQL tests *************************** 1. row *************************** sbtest4 CREATE TABLE `sbtest4` ( - `id` int(11) NOT NULL AUTO_INCREMENT, - `k` int(11) NOT NULL DEFAULT '0', + `id` int* NOT NULL AUTO_INCREMENT, (glob) + `k` int* NOT NULL DEFAULT '0', (glob) `c` char(120)* NOT NULL DEFAULT '', (glob) `pad` char(60)* NOT NULL DEFAULT '', (glob) PRIMARY KEY (`id`), @@ -74,8 +74,8 @@ oltp_insert.lua + MySQL tests *************************** 1. row *************************** sbtest5 CREATE TABLE `sbtest5` ( - `id` int(11) NOT NULL AUTO_INCREMENT, - `k` int(11) NOT NULL DEFAULT '0', + `id` int* NOT NULL AUTO_INCREMENT, (glob) + `k` int* NOT NULL DEFAULT '0', (glob) `c` char(120)* NOT NULL DEFAULT '', (glob) `pad` char(60)* NOT NULL DEFAULT '', (glob) PRIMARY KEY (`id`), @@ -84,8 +84,8 @@ oltp_insert.lua + MySQL tests *************************** 1. row *************************** sbtest6 CREATE TABLE `sbtest6` ( - `id` int(11) NOT NULL AUTO_INCREMENT, - `k` int(11) NOT NULL DEFAULT '0', + `id` int* NOT NULL AUTO_INCREMENT, (glob) + `k` int* NOT NULL DEFAULT '0', (glob) `c` char(120)* NOT NULL DEFAULT '', (glob) `pad` char(60)* NOT NULL DEFAULT '', (glob) PRIMARY KEY (`id`), @@ -94,8 +94,8 @@ oltp_insert.lua + MySQL tests *************************** 1. row *************************** sbtest7 CREATE TABLE `sbtest7` ( - `id` int(11) NOT NULL AUTO_INCREMENT, - `k` int(11) NOT NULL DEFAULT '0', + `id` int* NOT NULL AUTO_INCREMENT, (glob) + `k` int* NOT NULL DEFAULT '0', (glob) `c` char(120)* NOT NULL DEFAULT '', (glob) `pad` char(60)* NOT NULL DEFAULT '', (glob) PRIMARY KEY (`id`), @@ -104,8 +104,8 @@ oltp_insert.lua + MySQL tests *************************** 1. row *************************** sbtest8 CREATE TABLE `sbtest8` ( - `id` int(11) NOT NULL AUTO_INCREMENT, - `k` int(11) NOT NULL DEFAULT '0', + `id` int* NOT NULL AUTO_INCREMENT, (glob) + `k` int* NOT NULL DEFAULT '0', (glob) `c` char(120)* NOT NULL DEFAULT '', (glob) `pad` char(60)* NOT NULL DEFAULT '', (glob) PRIMARY KEY (`id`), @@ -135,8 +135,8 @@ oltp_insert.lua + MySQL tests *************************** 1. row *************************** sbtest1 CREATE TABLE `sbtest1` ( - `id` int(11) NOT NULL AUTO_INCREMENT, - `k` int(11) NOT NULL DEFAULT '0', + `id` int* NOT NULL AUTO_INCREMENT, (glob) + `k` int* NOT NULL DEFAULT '0', (glob) `c` char(120)* NOT NULL DEFAULT '', (glob) `pad` char(60)* NOT NULL DEFAULT '', (glob) PRIMARY KEY (`id`), @@ -145,8 +145,8 @@ oltp_insert.lua + MySQL tests *************************** 1. row *************************** sbtest2 CREATE TABLE `sbtest2` ( - `id` int(11) NOT NULL AUTO_INCREMENT, - `k` int(11) NOT NULL DEFAULT '0', + `id` int* NOT NULL AUTO_INCREMENT, (glob) + `k` int* NOT NULL DEFAULT '0', (glob) `c` char(120)* NOT NULL DEFAULT '', (glob) `pad` char(60)* NOT NULL DEFAULT '', (glob) PRIMARY KEY (`id`), @@ -155,8 +155,8 @@ oltp_insert.lua + MySQL tests *************************** 1. row *************************** sbtest3 CREATE TABLE `sbtest3` ( - `id` int(11) NOT NULL AUTO_INCREMENT, - `k` int(11) NOT NULL DEFAULT '0', + `id` int* NOT NULL AUTO_INCREMENT, (glob) + `k` int* NOT NULL DEFAULT '0', (glob) `c` char(120)* NOT NULL DEFAULT '', (glob) `pad` char(60)* NOT NULL DEFAULT '', (glob) PRIMARY KEY (`id`), @@ -165,8 +165,8 @@ oltp_insert.lua + MySQL tests *************************** 1. row *************************** sbtest4 CREATE TABLE `sbtest4` ( - `id` int(11) NOT NULL AUTO_INCREMENT, - `k` int(11) NOT NULL DEFAULT '0', + `id` int* NOT NULL AUTO_INCREMENT, (glob) + `k` int* NOT NULL DEFAULT '0', (glob) `c` char(120)* NOT NULL DEFAULT '', (glob) `pad` char(60)* NOT NULL DEFAULT '', (glob) PRIMARY KEY (`id`), @@ -175,8 +175,8 @@ oltp_insert.lua + MySQL tests *************************** 1. row *************************** sbtest5 CREATE TABLE `sbtest5` ( - `id` int(11) NOT NULL AUTO_INCREMENT, - `k` int(11) NOT NULL DEFAULT '0', + `id` int* NOT NULL AUTO_INCREMENT, (glob) + `k` int* NOT NULL DEFAULT '0', (glob) `c` char(120)* NOT NULL DEFAULT '', (glob) `pad` char(60)* NOT NULL DEFAULT '', (glob) PRIMARY KEY (`id`), @@ -185,8 +185,8 @@ oltp_insert.lua + MySQL tests *************************** 1. row *************************** sbtest6 CREATE TABLE `sbtest6` ( - `id` int(11) NOT NULL AUTO_INCREMENT, - `k` int(11) NOT NULL DEFAULT '0', + `id` int* NOT NULL AUTO_INCREMENT, (glob) + `k` int* NOT NULL DEFAULT '0', (glob) `c` char(120)* NOT NULL DEFAULT '', (glob) `pad` char(60)* NOT NULL DEFAULT '', (glob) PRIMARY KEY (`id`), @@ -195,8 +195,8 @@ oltp_insert.lua + MySQL tests *************************** 1. row *************************** sbtest7 CREATE TABLE `sbtest7` ( - `id` int(11) NOT NULL AUTO_INCREMENT, - `k` int(11) NOT NULL DEFAULT '0', + `id` int* NOT NULL AUTO_INCREMENT, (glob) + `k` int* NOT NULL DEFAULT '0', (glob) `c` char(120)* NOT NULL DEFAULT '', (glob) `pad` char(60)* NOT NULL DEFAULT '', (glob) PRIMARY KEY (`id`), @@ -205,8 +205,8 @@ oltp_insert.lua + MySQL tests *************************** 1. row *************************** sbtest8 CREATE TABLE `sbtest8` ( - `id` int(11) NOT NULL AUTO_INCREMENT, - `k` int(11) NOT NULL DEFAULT '0', + `id` int* NOT NULL AUTO_INCREMENT, (glob) + `k` int* NOT NULL DEFAULT '0', (glob) `c` char(120)* NOT NULL DEFAULT '', (glob) `pad` char(60)* NOT NULL DEFAULT '', (glob) PRIMARY KEY (`id`), @@ -266,8 +266,8 @@ oltp_insert.lua + MySQL tests *************************** 1. row *************************** sbtest1 CREATE TABLE `sbtest1` ( - `id` int(11) NOT NULL AUTO_INCREMENT, - `k` int(11) NOT NULL DEFAULT '0', + `id` int* NOT NULL AUTO_INCREMENT, (glob) + `k` int* NOT NULL DEFAULT '0', (glob) `c` char(120)* NOT NULL DEFAULT '', (glob) `pad` char(60)* NOT NULL DEFAULT '', (glob) PRIMARY KEY (`id`) diff --git a/tests/t/script_oltp_point_select_mysql.t b/tests/t/script_oltp_point_select_mysql.t index 3ae3fca..e7123a8 100644 --- a/tests/t/script_oltp_point_select_mysql.t +++ b/tests/t/script_oltp_point_select_mysql.t @@ -34,8 +34,8 @@ oltp_point_select.lua + MySQL tests *************************** 1. row *************************** sbtest1 CREATE TABLE `sbtest1` ( - `id` int(11) NOT NULL AUTO_INCREMENT, - `k` int(11) NOT NULL DEFAULT '0', + `id` int* NOT NULL AUTO_INCREMENT, (glob) + `k` int* NOT NULL DEFAULT '0', (glob) `c` char(120)* NOT NULL DEFAULT '', (glob) `pad` char(60)* NOT NULL DEFAULT '', (glob) PRIMARY KEY (`id`), @@ -44,8 +44,8 @@ oltp_point_select.lua + MySQL tests *************************** 1. row *************************** sbtest2 CREATE TABLE `sbtest2` ( - `id` int(11) NOT NULL AUTO_INCREMENT, - `k` int(11) NOT NULL DEFAULT '0', + `id` int* NOT NULL AUTO_INCREMENT, (glob) + `k` int* NOT NULL DEFAULT '0', (glob) `c` char(120)* NOT NULL DEFAULT '', (glob) `pad` char(60)* NOT NULL DEFAULT '', (glob) PRIMARY KEY (`id`), @@ -54,8 +54,8 @@ oltp_point_select.lua + MySQL tests *************************** 1. row *************************** sbtest3 CREATE TABLE `sbtest3` ( - `id` int(11) NOT NULL AUTO_INCREMENT, - `k` int(11) NOT NULL DEFAULT '0', + `id` int* NOT NULL AUTO_INCREMENT, (glob) + `k` int* NOT NULL DEFAULT '0', (glob) `c` char(120)* NOT NULL DEFAULT '', (glob) `pad` char(60)* NOT NULL DEFAULT '', (glob) PRIMARY KEY (`id`), @@ -64,8 +64,8 @@ oltp_point_select.lua + MySQL tests *************************** 1. row *************************** sbtest4 CREATE TABLE `sbtest4` ( - `id` int(11) NOT NULL AUTO_INCREMENT, - `k` int(11) NOT NULL DEFAULT '0', + `id` int* NOT NULL AUTO_INCREMENT, (glob) + `k` int* NOT NULL DEFAULT '0', (glob) `c` char(120)* NOT NULL DEFAULT '', (glob) `pad` char(60)* NOT NULL DEFAULT '', (glob) PRIMARY KEY (`id`), @@ -74,8 +74,8 @@ oltp_point_select.lua + MySQL tests *************************** 1. row *************************** sbtest5 CREATE TABLE `sbtest5` ( - `id` int(11) NOT NULL AUTO_INCREMENT, - `k` int(11) NOT NULL DEFAULT '0', + `id` int* NOT NULL AUTO_INCREMENT, (glob) + `k` int* NOT NULL DEFAULT '0', (glob) `c` char(120)* NOT NULL DEFAULT '', (glob) `pad` char(60)* NOT NULL DEFAULT '', (glob) PRIMARY KEY (`id`), @@ -84,8 +84,8 @@ oltp_point_select.lua + MySQL tests *************************** 1. row *************************** sbtest6 CREATE TABLE `sbtest6` ( - `id` int(11) NOT NULL AUTO_INCREMENT, - `k` int(11) NOT NULL DEFAULT '0', + `id` int* NOT NULL AUTO_INCREMENT, (glob) + `k` int* NOT NULL DEFAULT '0', (glob) `c` char(120)* NOT NULL DEFAULT '', (glob) `pad` char(60)* NOT NULL DEFAULT '', (glob) PRIMARY KEY (`id`), @@ -94,8 +94,8 @@ oltp_point_select.lua + MySQL tests *************************** 1. row *************************** sbtest7 CREATE TABLE `sbtest7` ( - `id` int(11) NOT NULL AUTO_INCREMENT, - `k` int(11) NOT NULL DEFAULT '0', + `id` int* NOT NULL AUTO_INCREMENT, (glob) + `k` int* NOT NULL DEFAULT '0', (glob) `c` char(120)* NOT NULL DEFAULT '', (glob) `pad` char(60)* NOT NULL DEFAULT '', (glob) PRIMARY KEY (`id`), @@ -104,8 +104,8 @@ oltp_point_select.lua + MySQL tests *************************** 1. row *************************** sbtest8 CREATE TABLE `sbtest8` ( - `id` int(11) NOT NULL AUTO_INCREMENT, - `k` int(11) NOT NULL DEFAULT '0', + `id` int* NOT NULL AUTO_INCREMENT, (glob) + `k` int* NOT NULL DEFAULT '0', (glob) `c` char(120)* NOT NULL DEFAULT '', (glob) `pad` char(60)* NOT NULL DEFAULT '', (glob) PRIMARY KEY (`id`), @@ -135,8 +135,8 @@ oltp_point_select.lua + MySQL tests *************************** 1. row *************************** sbtest1 CREATE TABLE `sbtest1` ( - `id` int(11) NOT NULL AUTO_INCREMENT, - `k` int(11) NOT NULL DEFAULT '0', + `id` int* NOT NULL AUTO_INCREMENT, (glob) + `k` int* NOT NULL DEFAULT '0', (glob) `c` char(120)* NOT NULL DEFAULT '', (glob) `pad` char(60)* NOT NULL DEFAULT '', (glob) PRIMARY KEY (`id`), @@ -145,8 +145,8 @@ oltp_point_select.lua + MySQL tests *************************** 1. row *************************** sbtest2 CREATE TABLE `sbtest2` ( - `id` int(11) NOT NULL AUTO_INCREMENT, - `k` int(11) NOT NULL DEFAULT '0', + `id` int* NOT NULL AUTO_INCREMENT, (glob) + `k` int* NOT NULL DEFAULT '0', (glob) `c` char(120)* NOT NULL DEFAULT '', (glob) `pad` char(60)* NOT NULL DEFAULT '', (glob) PRIMARY KEY (`id`), @@ -155,8 +155,8 @@ oltp_point_select.lua + MySQL tests *************************** 1. row *************************** sbtest3 CREATE TABLE `sbtest3` ( - `id` int(11) NOT NULL AUTO_INCREMENT, - `k` int(11) NOT NULL DEFAULT '0', + `id` int* NOT NULL AUTO_INCREMENT, (glob) + `k` int* NOT NULL DEFAULT '0', (glob) `c` char(120)* NOT NULL DEFAULT '', (glob) `pad` char(60)* NOT NULL DEFAULT '', (glob) PRIMARY KEY (`id`), @@ -165,8 +165,8 @@ oltp_point_select.lua + MySQL tests *************************** 1. row *************************** sbtest4 CREATE TABLE `sbtest4` ( - `id` int(11) NOT NULL AUTO_INCREMENT, - `k` int(11) NOT NULL DEFAULT '0', + `id` int* NOT NULL AUTO_INCREMENT, (glob) + `k` int* NOT NULL DEFAULT '0', (glob) `c` char(120)* NOT NULL DEFAULT '', (glob) `pad` char(60)* NOT NULL DEFAULT '', (glob) PRIMARY KEY (`id`), @@ -175,8 +175,8 @@ oltp_point_select.lua + MySQL tests *************************** 1. row *************************** sbtest5 CREATE TABLE `sbtest5` ( - `id` int(11) NOT NULL AUTO_INCREMENT, - `k` int(11) NOT NULL DEFAULT '0', + `id` int* NOT NULL AUTO_INCREMENT, (glob) + `k` int* NOT NULL DEFAULT '0', (glob) `c` char(120)* NOT NULL DEFAULT '', (glob) `pad` char(60)* NOT NULL DEFAULT '', (glob) PRIMARY KEY (`id`), @@ -185,8 +185,8 @@ oltp_point_select.lua + MySQL tests *************************** 1. row *************************** sbtest6 CREATE TABLE `sbtest6` ( - `id` int(11) NOT NULL AUTO_INCREMENT, - `k` int(11) NOT NULL DEFAULT '0', + `id` int* NOT NULL AUTO_INCREMENT, (glob) + `k` int* NOT NULL DEFAULT '0', (glob) `c` char(120)* NOT NULL DEFAULT '', (glob) `pad` char(60)* NOT NULL DEFAULT '', (glob) PRIMARY KEY (`id`), @@ -195,8 +195,8 @@ oltp_point_select.lua + MySQL tests *************************** 1. row *************************** sbtest7 CREATE TABLE `sbtest7` ( - `id` int(11) NOT NULL AUTO_INCREMENT, - `k` int(11) NOT NULL DEFAULT '0', + `id` int* NOT NULL AUTO_INCREMENT, (glob) + `k` int* NOT NULL DEFAULT '0', (glob) `c` char(120)* NOT NULL DEFAULT '', (glob) `pad` char(60)* NOT NULL DEFAULT '', (glob) PRIMARY KEY (`id`), @@ -205,8 +205,8 @@ oltp_point_select.lua + MySQL tests *************************** 1. row *************************** sbtest8 CREATE TABLE `sbtest8` ( - `id` int(11) NOT NULL AUTO_INCREMENT, - `k` int(11) NOT NULL DEFAULT '0', + `id` int* NOT NULL AUTO_INCREMENT, (glob) + `k` int* NOT NULL DEFAULT '0', (glob) `c` char(120)* NOT NULL DEFAULT '', (glob) `pad` char(60)* NOT NULL DEFAULT '', (glob) PRIMARY KEY (`id`), @@ -266,8 +266,8 @@ oltp_point_select.lua + MySQL tests *************************** 1. row *************************** sbtest1 CREATE TABLE `sbtest1` ( - `id` int(11) NOT NULL AUTO_INCREMENT, - `k` int(11) NOT NULL DEFAULT '0', + `id` int* NOT NULL AUTO_INCREMENT, (glob) + `k` int* NOT NULL DEFAULT '0', (glob) `c` char(120)* NOT NULL DEFAULT '', (glob) `pad` char(60)* NOT NULL DEFAULT '', (glob) PRIMARY KEY (`id`) diff --git a/tests/t/script_oltp_read_write_mysql.t b/tests/t/script_oltp_read_write_mysql.t index 4575b29..3f6651f 100644 --- a/tests/t/script_oltp_read_write_mysql.t +++ b/tests/t/script_oltp_read_write_mysql.t @@ -38,8 +38,8 @@ oltp_read_write.lua + MySQL tests *************************** 1. row *************************** sbtest1 CREATE TABLE `sbtest1` ( - `id` int(11) NOT NULL AUTO_INCREMENT, - `k` int(11) NOT NULL DEFAULT '0', + `id` int* NOT NULL AUTO_INCREMENT, (glob) + `k` int* NOT NULL DEFAULT '0', (glob) `c` char(120)* NOT NULL DEFAULT '', (glob) `pad` char(60)* NOT NULL DEFAULT '', (glob) PRIMARY KEY (`id`), @@ -48,8 +48,8 @@ oltp_read_write.lua + MySQL tests *************************** 1. row *************************** sbtest2 CREATE TABLE `sbtest2` ( - `id` int(11) NOT NULL AUTO_INCREMENT, - `k` int(11) NOT NULL DEFAULT '0', + `id` int* NOT NULL AUTO_INCREMENT, (glob) + `k` int* NOT NULL DEFAULT '0', (glob) `c` char(120)* NOT NULL DEFAULT '', (glob) `pad` char(60)* NOT NULL DEFAULT '', (glob) PRIMARY KEY (`id`), @@ -58,8 +58,8 @@ oltp_read_write.lua + MySQL tests *************************** 1. row *************************** sbtest3 CREATE TABLE `sbtest3` ( - `id` int(11) NOT NULL AUTO_INCREMENT, - `k` int(11) NOT NULL DEFAULT '0', + `id` int* NOT NULL AUTO_INCREMENT, (glob) + `k` int* NOT NULL DEFAULT '0', (glob) `c` char(120)* NOT NULL DEFAULT '', (glob) `pad` char(60)* NOT NULL DEFAULT '', (glob) PRIMARY KEY (`id`), @@ -68,8 +68,8 @@ oltp_read_write.lua + MySQL tests *************************** 1. row *************************** sbtest4 CREATE TABLE `sbtest4` ( - `id` int(11) NOT NULL AUTO_INCREMENT, - `k` int(11) NOT NULL DEFAULT '0', + `id` int* NOT NULL AUTO_INCREMENT, (glob) + `k` int* NOT NULL DEFAULT '0', (glob) `c` char(120)* NOT NULL DEFAULT '', (glob) `pad` char(60)* NOT NULL DEFAULT '', (glob) PRIMARY KEY (`id`), @@ -78,8 +78,8 @@ oltp_read_write.lua + MySQL tests *************************** 1. row *************************** sbtest5 CREATE TABLE `sbtest5` ( - `id` int(11) NOT NULL AUTO_INCREMENT, - `k` int(11) NOT NULL DEFAULT '0', + `id` int* NOT NULL AUTO_INCREMENT, (glob) + `k` int* NOT NULL DEFAULT '0', (glob) `c` char(120)* NOT NULL DEFAULT '', (glob) `pad` char(60)* NOT NULL DEFAULT '', (glob) PRIMARY KEY (`id`), @@ -88,8 +88,8 @@ oltp_read_write.lua + MySQL tests *************************** 1. row *************************** sbtest6 CREATE TABLE `sbtest6` ( - `id` int(11) NOT NULL AUTO_INCREMENT, - `k` int(11) NOT NULL DEFAULT '0', + `id` int* NOT NULL AUTO_INCREMENT, (glob) + `k` int* NOT NULL DEFAULT '0', (glob) `c` char(120)* NOT NULL DEFAULT '', (glob) `pad` char(60)* NOT NULL DEFAULT '', (glob) PRIMARY KEY (`id`), @@ -98,8 +98,8 @@ oltp_read_write.lua + MySQL tests *************************** 1. row *************************** sbtest7 CREATE TABLE `sbtest7` ( - `id` int(11) NOT NULL AUTO_INCREMENT, - `k` int(11) NOT NULL DEFAULT '0', + `id` int* NOT NULL AUTO_INCREMENT, (glob) + `k` int* NOT NULL DEFAULT '0', (glob) `c` char(120)* NOT NULL DEFAULT '', (glob) `pad` char(60)* NOT NULL DEFAULT '', (glob) PRIMARY KEY (`id`), @@ -108,8 +108,8 @@ oltp_read_write.lua + MySQL tests *************************** 1. row *************************** sbtest8 CREATE TABLE `sbtest8` ( - `id` int(11) NOT NULL AUTO_INCREMENT, - `k` int(11) NOT NULL DEFAULT '0', + `id` int* NOT NULL AUTO_INCREMENT, (glob) + `k` int* NOT NULL DEFAULT '0', (glob) `c` char(120)* NOT NULL DEFAULT '', (glob) `pad` char(60)* NOT NULL DEFAULT '', (glob) PRIMARY KEY (`id`), @@ -139,8 +139,8 @@ oltp_read_write.lua + MySQL tests *************************** 1. row *************************** sbtest1 CREATE TABLE `sbtest1` ( - `id` int(11) NOT NULL AUTO_INCREMENT, - `k` int(11) NOT NULL DEFAULT '0', + `id` int* NOT NULL AUTO_INCREMENT, (glob) + `k` int* NOT NULL DEFAULT '0', (glob) `c` char(120)* NOT NULL DEFAULT '', (glob) `pad` char(60)* NOT NULL DEFAULT '', (glob) PRIMARY KEY (`id`), @@ -149,8 +149,8 @@ oltp_read_write.lua + MySQL tests *************************** 1. row *************************** sbtest2 CREATE TABLE `sbtest2` ( - `id` int(11) NOT NULL AUTO_INCREMENT, - `k` int(11) NOT NULL DEFAULT '0', + `id` int* NOT NULL AUTO_INCREMENT, (glob) + `k` int* NOT NULL DEFAULT '0', (glob) `c` char(120)* NOT NULL DEFAULT '', (glob) `pad` char(60)* NOT NULL DEFAULT '', (glob) PRIMARY KEY (`id`), @@ -159,8 +159,8 @@ oltp_read_write.lua + MySQL tests *************************** 1. row *************************** sbtest3 CREATE TABLE `sbtest3` ( - `id` int(11) NOT NULL AUTO_INCREMENT, - `k` int(11) NOT NULL DEFAULT '0', + `id` int* NOT NULL AUTO_INCREMENT, (glob) + `k` int* NOT NULL DEFAULT '0', (glob) `c` char(120)* NOT NULL DEFAULT '', (glob) `pad` char(60)* NOT NULL DEFAULT '', (glob) PRIMARY KEY (`id`), @@ -169,8 +169,8 @@ oltp_read_write.lua + MySQL tests *************************** 1. row *************************** sbtest4 CREATE TABLE `sbtest4` ( - `id` int(11) NOT NULL AUTO_INCREMENT, - `k` int(11) NOT NULL DEFAULT '0', + `id` int* NOT NULL AUTO_INCREMENT, (glob) + `k` int* NOT NULL DEFAULT '0', (glob) `c` char(120)* NOT NULL DEFAULT '', (glob) `pad` char(60)* NOT NULL DEFAULT '', (glob) PRIMARY KEY (`id`), @@ -179,8 +179,8 @@ oltp_read_write.lua + MySQL tests *************************** 1. row *************************** sbtest5 CREATE TABLE `sbtest5` ( - `id` int(11) NOT NULL AUTO_INCREMENT, - `k` int(11) NOT NULL DEFAULT '0', + `id` int* NOT NULL AUTO_INCREMENT, (glob) + `k` int* NOT NULL DEFAULT '0', (glob) `c` char(120)* NOT NULL DEFAULT '', (glob) `pad` char(60)* NOT NULL DEFAULT '', (glob) PRIMARY KEY (`id`), @@ -189,8 +189,8 @@ oltp_read_write.lua + MySQL tests *************************** 1. row *************************** sbtest6 CREATE TABLE `sbtest6` ( - `id` int(11) NOT NULL AUTO_INCREMENT, - `k` int(11) NOT NULL DEFAULT '0', + `id` int* NOT NULL AUTO_INCREMENT, (glob) + `k` int* NOT NULL DEFAULT '0', (glob) `c` char(120)* NOT NULL DEFAULT '', (glob) `pad` char(60)* NOT NULL DEFAULT '', (glob) PRIMARY KEY (`id`), @@ -199,8 +199,8 @@ oltp_read_write.lua + MySQL tests *************************** 1. row *************************** sbtest7 CREATE TABLE `sbtest7` ( - `id` int(11) NOT NULL AUTO_INCREMENT, - `k` int(11) NOT NULL DEFAULT '0', + `id` int* NOT NULL AUTO_INCREMENT, (glob) + `k` int* NOT NULL DEFAULT '0', (glob) `c` char(120)* NOT NULL DEFAULT '', (glob) `pad` char(60)* NOT NULL DEFAULT '', (glob) PRIMARY KEY (`id`), @@ -209,8 +209,8 @@ oltp_read_write.lua + MySQL tests *************************** 1. row *************************** sbtest8 CREATE TABLE `sbtest8` ( - `id` int(11) NOT NULL AUTO_INCREMENT, - `k` int(11) NOT NULL DEFAULT '0', + `id` int* NOT NULL AUTO_INCREMENT, (glob) + `k` int* NOT NULL DEFAULT '0', (glob) `c` char(120)* NOT NULL DEFAULT '', (glob) `pad` char(60)* NOT NULL DEFAULT '', (glob) PRIMARY KEY (`id`), @@ -270,8 +270,8 @@ oltp_read_write.lua + MySQL tests *************************** 1. row *************************** sbtest1 CREATE TABLE `sbtest1` ( - `id` int(11) NOT NULL AUTO_INCREMENT, - `k` int(11) NOT NULL DEFAULT '0', + `id` int* NOT NULL AUTO_INCREMENT, (glob) + `k` int* NOT NULL DEFAULT '0', (glob) `c` char(120)* NOT NULL DEFAULT '', (glob) `pad` char(60)* NOT NULL DEFAULT '', (glob) PRIMARY KEY (`id`) @@ -316,8 +316,8 @@ oltp_read_write.lua + MySQL tests *************************** 1. row *************************** sbtest1 CREATE TABLE `sbtest1` ( - `id` int(11) NOT NULL AUTO_INCREMENT, - `k` int(11) NOT NULL DEFAULT '0', + `id` int* NOT NULL AUTO_INCREMENT, (glob) + `k` int* NOT NULL DEFAULT '0', (glob) `c` char(120)* NOT NULL DEFAULT '', (glob) `pad` char(60)* NOT NULL DEFAULT '', (glob) PRIMARY KEY (`id`), @@ -326,8 +326,8 @@ oltp_read_write.lua + MySQL tests *************************** 1. row *************************** sbtest2 CREATE TABLE `sbtest2` ( - `id` int(11) NOT NULL AUTO_INCREMENT, - `k` int(11) NOT NULL DEFAULT '0', + `id` int* NOT NULL AUTO_INCREMENT, (glob) + `k` int* NOT NULL DEFAULT '0', (glob) `c` char(120)* NOT NULL DEFAULT '', (glob) `pad` char(60)* NOT NULL DEFAULT '', (glob) PRIMARY KEY (`id`), @@ -336,8 +336,8 @@ oltp_read_write.lua + MySQL tests *************************** 1. row *************************** sbtest3 CREATE TABLE `sbtest3` ( - `id` int(11) NOT NULL AUTO_INCREMENT, - `k` int(11) NOT NULL DEFAULT '0', + `id` int* NOT NULL AUTO_INCREMENT, (glob) + `k` int* NOT NULL DEFAULT '0', (glob) `c` char(120)* NOT NULL DEFAULT '', (glob) `pad` char(60)* NOT NULL DEFAULT '', (glob) PRIMARY KEY (`id`), @@ -346,8 +346,8 @@ oltp_read_write.lua + MySQL tests *************************** 1. row *************************** sbtest4 CREATE TABLE `sbtest4` ( - `id` int(11) NOT NULL AUTO_INCREMENT, - `k` int(11) NOT NULL DEFAULT '0', + `id` int* NOT NULL AUTO_INCREMENT, (glob) + `k` int* NOT NULL DEFAULT '0', (glob) `c` char(120)* NOT NULL DEFAULT '', (glob) `pad` char(60)* NOT NULL DEFAULT '', (glob) PRIMARY KEY (`id`), @@ -356,8 +356,8 @@ oltp_read_write.lua + MySQL tests *************************** 1. row *************************** sbtest5 CREATE TABLE `sbtest5` ( - `id` int(11) NOT NULL AUTO_INCREMENT, - `k` int(11) NOT NULL DEFAULT '0', + `id` int* NOT NULL AUTO_INCREMENT, (glob) + `k` int* NOT NULL DEFAULT '0', (glob) `c` char(120)* NOT NULL DEFAULT '', (glob) `pad` char(60)* NOT NULL DEFAULT '', (glob) PRIMARY KEY (`id`), @@ -366,8 +366,8 @@ oltp_read_write.lua + MySQL tests *************************** 1. row *************************** sbtest6 CREATE TABLE `sbtest6` ( - `id` int(11) NOT NULL AUTO_INCREMENT, - `k` int(11) NOT NULL DEFAULT '0', + `id` int* NOT NULL AUTO_INCREMENT, (glob) + `k` int* NOT NULL DEFAULT '0', (glob) `c` char(120)* NOT NULL DEFAULT '', (glob) `pad` char(60)* NOT NULL DEFAULT '', (glob) PRIMARY KEY (`id`), @@ -376,8 +376,8 @@ oltp_read_write.lua + MySQL tests *************************** 1. row *************************** sbtest7 CREATE TABLE `sbtest7` ( - `id` int(11) NOT NULL AUTO_INCREMENT, - `k` int(11) NOT NULL DEFAULT '0', + `id` int* NOT NULL AUTO_INCREMENT, (glob) + `k` int* NOT NULL DEFAULT '0', (glob) `c` char(120)* NOT NULL DEFAULT '', (glob) `pad` char(60)* NOT NULL DEFAULT '', (glob) PRIMARY KEY (`id`), @@ -386,8 +386,8 @@ oltp_read_write.lua + MySQL tests *************************** 1. row *************************** sbtest8 CREATE TABLE `sbtest8` ( - `id` int(11) NOT NULL AUTO_INCREMENT, - `k` int(11) NOT NULL DEFAULT '0', + `id` int* NOT NULL AUTO_INCREMENT, (glob) + `k` int* NOT NULL DEFAULT '0', (glob) `c` char(120)* NOT NULL DEFAULT '', (glob) `pad` char(60)* NOT NULL DEFAULT '', (glob) PRIMARY KEY (`id`), @@ -417,8 +417,8 @@ oltp_read_write.lua + MySQL tests *************************** 1. row *************************** sbtest1 CREATE TABLE `sbtest1` ( - `id` int(11) NOT NULL AUTO_INCREMENT, - `k` int(11) NOT NULL DEFAULT '0', + `id` int* NOT NULL AUTO_INCREMENT, (glob) + `k` int* NOT NULL DEFAULT '0', (glob) `c` char(120)* NOT NULL DEFAULT '', (glob) `pad` char(60)* NOT NULL DEFAULT '', (glob) PRIMARY KEY (`id`), @@ -427,8 +427,8 @@ oltp_read_write.lua + MySQL tests *************************** 1. row *************************** sbtest2 CREATE TABLE `sbtest2` ( - `id` int(11) NOT NULL AUTO_INCREMENT, - `k` int(11) NOT NULL DEFAULT '0', + `id` int* NOT NULL AUTO_INCREMENT, (glob) + `k` int* NOT NULL DEFAULT '0', (glob) `c` char(120)* NOT NULL DEFAULT '', (glob) `pad` char(60)* NOT NULL DEFAULT '', (glob) PRIMARY KEY (`id`), @@ -437,8 +437,8 @@ oltp_read_write.lua + MySQL tests *************************** 1. row *************************** sbtest3 CREATE TABLE `sbtest3` ( - `id` int(11) NOT NULL AUTO_INCREMENT, - `k` int(11) NOT NULL DEFAULT '0', + `id` int* NOT NULL AUTO_INCREMENT, (glob) + `k` int* NOT NULL DEFAULT '0', (glob) `c` char(120)* NOT NULL DEFAULT '', (glob) `pad` char(60)* NOT NULL DEFAULT '', (glob) PRIMARY KEY (`id`), @@ -447,8 +447,8 @@ oltp_read_write.lua + MySQL tests *************************** 1. row *************************** sbtest4 CREATE TABLE `sbtest4` ( - `id` int(11) NOT NULL AUTO_INCREMENT, - `k` int(11) NOT NULL DEFAULT '0', + `id` int* NOT NULL AUTO_INCREMENT, (glob) + `k` int* NOT NULL DEFAULT '0', (glob) `c` char(120)* NOT NULL DEFAULT '', (glob) `pad` char(60)* NOT NULL DEFAULT '', (glob) PRIMARY KEY (`id`), @@ -457,8 +457,8 @@ oltp_read_write.lua + MySQL tests *************************** 1. row *************************** sbtest5 CREATE TABLE `sbtest5` ( - `id` int(11) NOT NULL AUTO_INCREMENT, - `k` int(11) NOT NULL DEFAULT '0', + `id` int* NOT NULL AUTO_INCREMENT, (glob) + `k` int* NOT NULL DEFAULT '0', (glob) `c` char(120)* NOT NULL DEFAULT '', (glob) `pad` char(60)* NOT NULL DEFAULT '', (glob) PRIMARY KEY (`id`), @@ -467,8 +467,8 @@ oltp_read_write.lua + MySQL tests *************************** 1. row *************************** sbtest6 CREATE TABLE `sbtest6` ( - `id` int(11) NOT NULL AUTO_INCREMENT, - `k` int(11) NOT NULL DEFAULT '0', + `id` int* NOT NULL AUTO_INCREMENT, (glob) + `k` int* NOT NULL DEFAULT '0', (glob) `c` char(120)* NOT NULL DEFAULT '', (glob) `pad` char(60)* NOT NULL DEFAULT '', (glob) PRIMARY KEY (`id`), @@ -477,8 +477,8 @@ oltp_read_write.lua + MySQL tests *************************** 1. row *************************** sbtest7 CREATE TABLE `sbtest7` ( - `id` int(11) NOT NULL AUTO_INCREMENT, - `k` int(11) NOT NULL DEFAULT '0', + `id` int* NOT NULL AUTO_INCREMENT, (glob) + `k` int* NOT NULL DEFAULT '0', (glob) `c` char(120)* NOT NULL DEFAULT '', (glob) `pad` char(60)* NOT NULL DEFAULT '', (glob) PRIMARY KEY (`id`), @@ -487,8 +487,8 @@ oltp_read_write.lua + MySQL tests *************************** 1. row *************************** sbtest8 CREATE TABLE `sbtest8` ( - `id` int(11) NOT NULL AUTO_INCREMENT, - `k` int(11) NOT NULL DEFAULT '0', + `id` int* NOT NULL AUTO_INCREMENT, (glob) + `k` int* NOT NULL DEFAULT '0', (glob) `c` char(120)* NOT NULL DEFAULT '', (glob) `pad` char(60)* NOT NULL DEFAULT '', (glob) PRIMARY KEY (`id`), @@ -548,8 +548,8 @@ oltp_read_write.lua + MySQL tests *************************** 1. row *************************** sbtest1 CREATE TABLE `sbtest1` ( - `id` int(11) NOT NULL AUTO_INCREMENT, - `k` int(11) NOT NULL DEFAULT '0', + `id` int* NOT NULL AUTO_INCREMENT, (glob) + `k` int* NOT NULL DEFAULT '0', (glob) `c` char(120)* NOT NULL DEFAULT '', (glob) `pad` char(60)* NOT NULL DEFAULT '', (glob) PRIMARY KEY (`id`) diff --git a/tests/t/script_select_random_mysql.t b/tests/t/script_select_random_mysql.t index 7aea877..e376d8f 100644 --- a/tests/t/script_select_random_mysql.t +++ b/tests/t/script_select_random_mysql.t @@ -12,8 +12,8 @@ select_random_*.lua + MySQL tests *************************** 1. row *************************** sbtest1 CREATE TABLE `sbtest1` ( - `id` int(11) NOT NULL AUTO_INCREMENT, - `k` int(11) NOT NULL DEFAULT '0', + `id` int* NOT NULL AUTO_INCREMENT, (glob) + `k` int* NOT NULL DEFAULT '0', (glob) `c` char(120)* NOT NULL DEFAULT '', (glob) `pad` char(60)* NOT NULL DEFAULT '', (glob) PRIMARY KEY (`id`), @@ -82,8 +82,8 @@ select_random_*.lua + MySQL tests *************************** 1. row *************************** sbtest1 CREATE TABLE `sbtest1` ( - `id` int(11) NOT NULL AUTO_INCREMENT, - `k` int(11) NOT NULL DEFAULT '0', + `id` int* NOT NULL AUTO_INCREMENT, (glob) + `k` int* NOT NULL DEFAULT '0', (glob) `c` char(120)* NOT NULL DEFAULT '', (glob) `pad` char(60)* NOT NULL DEFAULT '', (glob) PRIMARY KEY (`id`), From 921708f44055316f7db3d46fcb05c1b3337adf04 Mon Sep 17 00:00:00 2001 From: Alexey Kopytov Date: Sun, 1 Mar 2020 19:59:53 +0300 Subject: [PATCH 4/4] build/CI/packaging: remove Fedora Rawhide from CI matrix --- .travis.yml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index fa93c65..bc1f94b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -34,7 +34,6 @@ env: - OS=fedora DIST=29 - OS=fedora DIST=30 - OS=fedora DIST=31 - - OS=fedora DIST=rawhide - OS=ubuntu DIST=xenial - OS=ubuntu DIST=bionic - OS=ubuntu DIST=eoan @@ -64,8 +63,6 @@ matrix: compiler: clang - env: OS=fedora DIST=31 compiler: clang - - env: OS=fedora DIST=rawhide - compiler: clang - env: OS=ubuntu DIST=xenial compiler: clang - env: OS=ubuntu DIST=bionic @@ -110,8 +107,6 @@ matrix: os: osx - env: OS=fedora DIST=31 os: osx - - env: OS=fedora DIST=rawhide - os: osx - env: OS=ubuntu DIST=xenial os: osx - env: OS=ubuntu DIST=bionic