Skip to content

Commit c38a957

Browse files
AliSQLAliSQL
authored andcommitted
Fix failed test cases and compile problem
1 parent e047350 commit c38a957

17 files changed

Lines changed: 769 additions & 45 deletions

mysql-test/r/information_schema.result

Lines changed: 52 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,12 @@ USER_PRIVILEGES
8787
VIEWS
8888
TABLE_STATISTICS
8989
INDEX_STATISTICS
90+
TokuDB_file_map
91+
TokuDB_trx
92+
TokuDB_locks
93+
TokuDB_lock_waits
94+
TokuDB_fractal_tree_block_map
95+
TokuDB_fractal_tree_info
9096
columns_priv
9197
db
9298
event
@@ -128,6 +134,12 @@ TABLE_CONSTRAINTS TABLE_CONSTRAINTS
128134
TABLE_PRIVILEGES TABLE_PRIVILEGES
129135
TRIGGERS TRIGGERS
130136
TABLE_STATISTICS TABLE_STATISTICS
137+
TokuDB_file_map TokuDB_file_map
138+
TokuDB_trx TokuDB_trx
139+
TokuDB_locks TokuDB_locks
140+
TokuDB_lock_waits TokuDB_lock_waits
141+
TokuDB_fractal_tree_block_map TokuDB_fractal_tree_block_map
142+
TokuDB_fractal_tree_info TokuDB_fractal_tree_info
131143
tables_priv tables_priv
132144
time_zone time_zone
133145
time_zone_leap_second time_zone_leap_second
@@ -149,6 +161,12 @@ TABLE_CONSTRAINTS TABLE_CONSTRAINTS
149161
TABLE_PRIVILEGES TABLE_PRIVILEGES
150162
TRIGGERS TRIGGERS
151163
TABLE_STATISTICS TABLE_STATISTICS
164+
TokuDB_file_map TokuDB_file_map
165+
TokuDB_trx TokuDB_trx
166+
TokuDB_locks TokuDB_locks
167+
TokuDB_lock_waits TokuDB_lock_waits
168+
TokuDB_fractal_tree_block_map TokuDB_fractal_tree_block_map
169+
TokuDB_fractal_tree_info TokuDB_fractal_tree_info
152170
tables_priv tables_priv
153171
time_zone time_zone
154172
time_zone_leap_second time_zone_leap_second
@@ -170,6 +188,12 @@ TABLE_CONSTRAINTS TABLE_CONSTRAINTS
170188
TABLE_PRIVILEGES TABLE_PRIVILEGES
171189
TRIGGERS TRIGGERS
172190
TABLE_STATISTICS TABLE_STATISTICS
191+
TokuDB_file_map TokuDB_file_map
192+
TokuDB_trx TokuDB_trx
193+
TokuDB_locks TokuDB_locks
194+
TokuDB_lock_waits TokuDB_lock_waits
195+
TokuDB_fractal_tree_block_map TokuDB_fractal_tree_block_map
196+
TokuDB_fractal_tree_info TokuDB_fractal_tree_info
173197
tables_priv tables_priv
174198
time_zone time_zone
175199
time_zone_leap_second time_zone_leap_second
@@ -664,6 +688,12 @@ TABLE_CONSTRAINTS
664688
TABLE_PRIVILEGES
665689
TRIGGERS
666690
TABLE_STATISTICS
691+
TokuDB_file_map
692+
TokuDB_trx
693+
TokuDB_locks
694+
TokuDB_lock_waits
695+
TokuDB_fractal_tree_block_map
696+
TokuDB_fractal_tree_info
667697
create database information_schema;
668698
ERROR 42000: Access denied for user 'root'@'localhost' to database 'information_schema'
669699
use information_schema;
@@ -675,6 +705,12 @@ TABLE_CONSTRAINTS SYSTEM VIEW
675705
TABLE_PRIVILEGES SYSTEM VIEW
676706
TRIGGERS SYSTEM VIEW
677707
TABLE_STATISTICS SYSTEM VIEW
708+
TokuDB_file_map SYSTEM VIEW
709+
TokuDB_trx SYSTEM VIEW
710+
TokuDB_locks SYSTEM VIEW
711+
TokuDB_lock_waits SYSTEM VIEW
712+
TokuDB_fractal_tree_block_map SYSTEM VIEW
713+
TokuDB_fractal_tree_info SYSTEM VIEW
678714
create table t1(a int);
679715
ERROR 42000: Access denied for user 'root'@'localhost' to database 'information_schema'
680716
use test;
@@ -689,6 +725,12 @@ TABLE_CONSTRAINTS
689725
TABLE_PRIVILEGES
690726
TRIGGERS
691727
TABLE_STATISTICS
728+
TokuDB_file_map
729+
TokuDB_trx
730+
TokuDB_locks
731+
TokuDB_lock_waits
732+
TokuDB_fractal_tree_block_map
733+
TokuDB_fractal_tree_info
692734
select table_name from tables where table_name='user';
693735
table_name
694736
user
@@ -897,6 +939,9 @@ TABLES TABLE_NAME select
897939
TABLE_CONSTRAINTS TABLE_NAME select
898940
TABLE_PRIVILEGES TABLE_NAME select
899941
TABLE_STATISTICS TABLE_NAME select
942+
TokuDB_file_map table_name select
943+
TokuDB_fractal_tree_block_map table_name select
944+
TokuDB_fractal_tree_info table_name select
900945
VIEWS TABLE_NAME select
901946
delete from mysql.user where user='mysqltest_4';
902947
delete from mysql.db where user='mysqltest_4';
@@ -906,7 +951,7 @@ table_schema IN ('mysql', 'INFORMATION_SCHEMA', 'test', 'mysqltest')
906951
AND table_name not like 'ndb%' AND table_name not like 'innodb_%'
907952
GROUP BY TABLE_SCHEMA;
908953
table_schema count(*)
909-
information_schema 34
954+
information_schema 40
910955
mysql 25
911956
create table t1 (i int, j int);
912957
create trigger trg1 before insert on t1 for each row
@@ -1377,6 +1422,12 @@ TABLESPACES information_schema.TABLESPACES 1
13771422
TABLE_CONSTRAINTS information_schema.TABLE_CONSTRAINTS 1
13781423
TABLE_PRIVILEGES information_schema.TABLE_PRIVILEGES 1
13791424
TABLE_STATISTICS information_schema.TABLE_STATISTICS 1
1425+
TokuDB_file_map information_schema.TokuDB_file_map 1
1426+
TokuDB_fractal_tree_block_map information_schema.TokuDB_fractal_tree_block_map 1
1427+
TokuDB_fractal_tree_info information_schema.TokuDB_fractal_tree_info 1
1428+
TokuDB_locks information_schema.TokuDB_locks 1
1429+
TokuDB_lock_waits information_schema.TokuDB_lock_waits 1
1430+
TokuDB_trx information_schema.TokuDB_trx 1
13801431
TRIGGERS information_schema.TRIGGERS 1
13811432
USER_PRIVILEGES information_schema.USER_PRIVILEGES 1
13821433
VIEWS information_schema.VIEWS 1

mysql-test/r/information_schema_db.result

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,12 @@ USER_PRIVILEGES
3939
VIEWS
4040
TABLE_STATISTICS
4141
INDEX_STATISTICS
42+
TokuDB_file_map
43+
TokuDB_trx
44+
TokuDB_locks
45+
TokuDB_lock_waits
46+
TokuDB_fractal_tree_block_map
47+
TokuDB_fractal_tree_info
4248
show tables from INFORMATION_SCHEMA like 'T%';
4349
Tables_in_information_schema (T%)
4450
TABLES
@@ -47,6 +53,12 @@ TABLE_CONSTRAINTS
4753
TABLE_PRIVILEGES
4854
TRIGGERS
4955
TABLE_STATISTICS
56+
TokuDB_file_map
57+
TokuDB_trx
58+
TokuDB_locks
59+
TokuDB_lock_waits
60+
TokuDB_fractal_tree_block_map
61+
TokuDB_fractal_tree_info
5062
create database `inf%`;
5163
create database mbase;
5264
use `inf%`;

mysql-test/r/insert_select.result

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@ WHERE numeropost=9 ORDER BY numreponse ASC;
6161
show variables like '%bulk%';
6262
Variable_name Value
6363
bulk_insert_buffer_size 8388608
64+
tokudb_bulk_fetch ON
6465
INSERT INTO t1 (numeropost,icone,contenu,pseudo,date,signature,ip)
6566
SELECT 1718,icone,contenu,pseudo,date,signature,ip FROM t2
6667
WHERE numeropost=9 ORDER BY numreponse ASC;

mysql-test/r/mysqld--help-notwin.result

Lines changed: 169 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1024,6 +1024,123 @@ The following options may be given as the first argument:
10241024
-t, --tmpdir=name Path for temporary files. Several paths may be specified,
10251025
separated by a colon (:), in this case they are used in a
10261026
round-robin fashion
1027+
--tokudb-alter-print-error
1028+
Print errors for alter table operations
1029+
--tokudb-analyze-delete-fraction=#
1030+
fraction of rows allowed to be deleted
1031+
--tokudb-analyze-time=#
1032+
analyze time (seconds)
1033+
--tokudb-block-size=#
1034+
fractal tree block size
1035+
--tokudb-bulk-fetch enable bulk fetch
1036+
(Defaults to on; use --skip-tokudb-bulk-fetch to disable.)
1037+
--tokudb-cache-size=#
1038+
TokuDB cache table size
1039+
--tokudb-checkpoint-lock
1040+
Tokudb Checkpoint Lock
1041+
--tokudb-checkpoint-on-flush-logs
1042+
TokuDB Checkpoint on Flush Logs
1043+
--tokudb-checkpointing-period=#
1044+
TokuDB Checkpointing period
1045+
--tokudb-cleaner-iterations=#
1046+
TokuDB cleaner_iterations
1047+
--tokudb-cleaner-period=#
1048+
TokuDB cleaner_period
1049+
--tokudb-commit-sync
1050+
sync on txn commit
1051+
(Defaults to on; use --skip-tokudb-commit-sync to disable.)
1052+
--tokudb-cpu-nums=# TokuDB CPU nums
1053+
--tokudb-create-index-online
1054+
if on, create index done online
1055+
(Defaults to on; use --skip-tokudb-create-index-online to disable.)
1056+
--tokudb-data-dir=name
1057+
TokuDB Data Directory
1058+
--tokudb-debug=# TokuDB Debug
1059+
--tokudb-directio TokuDB Enable Direct I/O
1060+
--tokudb-disable-hot-alter
1061+
if on, hot alter table is disabled
1062+
--tokudb-disable-prefetching
1063+
if on, prefetching disabled
1064+
--tokudb-disable-slow-alter
1065+
if on, alter tables that require copy are disabled
1066+
--tokudb-disable-slow-update
1067+
disable slow update
1068+
--tokudb-disable-slow-upsert
1069+
disable slow upsert
1070+
--tokudb-empty-scan[=name]
1071+
TokuDB algorithm to check if the table is empty when
1072+
opened.
1073+
--tokudb-fs-reserve-percent=#
1074+
TokuDB file system space reserve (percent free required)
1075+
--tokudb-fsync-log-period=#
1076+
TokuDB fsync log period
1077+
--tokudb-hide-default-row-format
1078+
hide the default row format
1079+
(Defaults to on; use --skip-tokudb-hide-default-row-format to disable.)
1080+
--tokudb-killed-time=#
1081+
TokuDB killed time
1082+
--tokudb-last-lock-timeout=name
1083+
last TokuDB lock timeout
1084+
--tokudb-load-save-space
1085+
compress intermediate bulk loader files to save space
1086+
(Defaults to on; use --skip-tokudb-load-save-space to disable.)
1087+
--tokudb-loader-memory-size=#
1088+
TokuDB loader memory size
1089+
--tokudb-lock-timeout=#
1090+
TokuDB lock timeout
1091+
--tokudb-lock-timeout-debug=#
1092+
TokuDB lock timeout debug
1093+
--tokudb-log-dir=name
1094+
TokuDB Log Directory
1095+
--tokudb-max-lock-memory=#
1096+
TokuDB max memory for locks
1097+
--tokudb-optimize-index-fraction=#
1098+
optimize index fraction (default 1.0 all)
1099+
--tokudb-optimize-index-name=name
1100+
optimize index name (default all indexes)
1101+
--tokudb-optimize-throttle=#
1102+
optimize throttle (default no throttle)
1103+
--tokudb-pk-insert-mode=#
1104+
set the primary key insert mode
1105+
--tokudb-prelock-empty
1106+
Tokudb Prelock Empty Table
1107+
(Defaults to on; use --skip-tokudb-prelock-empty to disable.)
1108+
--tokudb-read-block-size=#
1109+
fractal tree read block size
1110+
--tokudb-read-buf-size=#
1111+
fractal tree read block size
1112+
--tokudb-read-status-frequency=#
1113+
TokuDB frequency that show processlist updates status of
1114+
reads
1115+
--tokudb-row-format[=name]
1116+
Specifies the compression method for a table during this
1117+
session. Possible values are TOKUDB_UNCOMPRESSED,
1118+
TOKUDB_ZLIB, TOKUDB_QUICKLZ, TOKUDB_LZMA, TOKUDB_FAST,
1119+
TOKUDB_SMALL and TOKUDB_DEFAULT
1120+
--tokudb-rpl-check-readonly
1121+
check if the slave is read only
1122+
(Defaults to on; use --skip-tokudb-rpl-check-readonly to disable.)
1123+
--tokudb-rpl-lookup-rows
1124+
lookup a row on rpl slave
1125+
(Defaults to on; use --skip-tokudb-rpl-lookup-rows to disable.)
1126+
--tokudb-rpl-lookup-rows-delay=#
1127+
time in milliseconds to add to lookups on replication
1128+
slave
1129+
--tokudb-rpl-unique-checks
1130+
enable unique checks on replication slave
1131+
(Defaults to on; use --skip-tokudb-rpl-unique-checks to disable.)
1132+
--tokudb-rpl-unique-checks-delay=#
1133+
time in milliseconds to add to unique checks test on
1134+
replication slave
1135+
--tokudb-support-xa Enable TokuDB support for the XA two-phase commit
1136+
(Defaults to on; use --skip-tokudb-support-xa to disable.)
1137+
--tokudb-tmp-dir=name
1138+
Tokudb Tmp Dir
1139+
--tokudb-version=name
1140+
TokuDB Version
1141+
--tokudb-write-status-frequency=#
1142+
TokuDB frequency that show processlist updates status of
1143+
writes
10271144
--transaction-alloc-block-size=#
10281145
Allocation block size for transactions to be stored in
10291146
binary log
@@ -1356,6 +1473,58 @@ thread-stack 262144
13561473
time-format %H:%i:%s
13571474
timed-mutexes FALSE
13581475
tmp-table-size 16777216
1476+
tokudb-alter-print-error FALSE
1477+
tokudb-analyze-delete-fraction 1
1478+
tokudb-analyze-time 5
1479+
tokudb-block-size 4194304
1480+
tokudb-bulk-fetch TRUE
1481+
tokudb-cache-size 0
1482+
tokudb-checkpoint-lock FALSE
1483+
tokudb-checkpoint-on-flush-logs FALSE
1484+
tokudb-checkpointing-period 60
1485+
tokudb-cleaner-iterations 5
1486+
tokudb-cleaner-period 1
1487+
tokudb-commit-sync TRUE
1488+
tokudb-cpu-nums 0
1489+
tokudb-create-index-online TRUE
1490+
tokudb-data-dir (No default value)
1491+
tokudb-debug 0
1492+
tokudb-directio FALSE
1493+
tokudb-disable-hot-alter FALSE
1494+
tokudb-disable-prefetching FALSE
1495+
tokudb-disable-slow-alter FALSE
1496+
tokudb-disable-slow-update FALSE
1497+
tokudb-disable-slow-upsert FALSE
1498+
tokudb-empty-scan rl
1499+
tokudb-fs-reserve-percent 5
1500+
tokudb-fsync-log-period 0
1501+
tokudb-hide-default-row-format TRUE
1502+
tokudb-killed-time 4000
1503+
tokudb-last-lock-timeout (No default value)
1504+
tokudb-load-save-space TRUE
1505+
tokudb-loader-memory-size 100000000
1506+
tokudb-lock-timeout 4000
1507+
tokudb-lock-timeout-debug 1
1508+
tokudb-log-dir (No default value)
1509+
tokudb-max-lock-memory 0
1510+
tokudb-optimize-index-fraction 1
1511+
tokudb-optimize-index-name (No default value)
1512+
tokudb-optimize-throttle 0
1513+
tokudb-pk-insert-mode 1
1514+
tokudb-prelock-empty TRUE
1515+
tokudb-read-block-size 65536
1516+
tokudb-read-buf-size 131072
1517+
tokudb-read-status-frequency 10000
1518+
tokudb-row-format tokudb_zlib
1519+
tokudb-rpl-check-readonly TRUE
1520+
tokudb-rpl-lookup-rows TRUE
1521+
tokudb-rpl-lookup-rows-delay 0
1522+
tokudb-rpl-unique-checks TRUE
1523+
tokudb-rpl-unique-checks-delay 0
1524+
tokudb-support-xa TRUE
1525+
tokudb-tmp-dir (No default value)
1526+
tokudb-version 7.5.6
1527+
tokudb-write-status-frequency 1000
13591528
transaction-alloc-block-size 8192
13601529
transaction-isolation REPEATABLE-READ
13611530
transaction-prealloc-size 4096

0 commit comments

Comments
 (0)