-
Notifications
You must be signed in to change notification settings - Fork 1.7k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'merge-tokudb-5.6' into 10.1
- Loading branch information
Showing
9 changed files
with
109 additions
and
13 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,40 @@ | ||
# .clang-format file for Percona TokuDB | ||
# Minimum required version of clang-format is 5.0.1. Earlier versions will work | ||
# but may need removal of some parameters. | ||
Language: Cpp | ||
BasedOnStyle: Google | ||
|
||
# The following parameters are default for Google style, | ||
# but as they are important for our project they | ||
# are set explicitly here | ||
AlignAfterOpenBracket: Align | ||
BreakBeforeBinaryOperators: None | ||
ColumnLimit: 80 | ||
PointerAlignment: Left | ||
SpaceAfterCStyleCast: false | ||
SpaceBeforeAssignmentOperators: true | ||
SpaceBeforeParens: ControlStatements | ||
SpaceInEmptyParentheses: false | ||
SpacesBeforeTrailingComments: 2 | ||
SpacesInAngles: false | ||
SpacesInContainerLiterals: true | ||
SpacesInCStyleCastParentheses: false | ||
SpacesInParentheses: false | ||
SpacesInSquareBrackets: false | ||
UseTab: Never | ||
|
||
# Non-default parameters | ||
NamespaceIndentation: All | ||
IndentWidth: 4 | ||
TabWidth: 4 | ||
AllowShortIfStatementsOnASingleLine: false | ||
AllowShortLoopsOnASingleLine: false | ||
BinPackParameters: false | ||
BinPackArguments: false | ||
ExperimentalAutoDetectBinPacking: false | ||
AllowAllParametersOfDeclarationOnNextLine: false | ||
# not supported in 5.0.1 | ||
#AlignConsecutiveAssignments: yes | ||
#AlignConsecutiveDeclarations: yes | ||
BreakStringLiterals: false | ||
ReflowComments: true |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,6 @@ | ||
CREATE DATABASE `new..............................................end`; | ||
USE `new..............................................end`; | ||
CREATE TABLE t1(a INT KEY,b INT)ENGINE=TokuDB; | ||
INSERT INTO t1 VALUES(1,11),(2,12),(3,13),(4,14),(5,15); | ||
USE test; | ||
DROP DATABASE `new..............................................end`; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,5 @@ | ||
CREATE TABLE t1(c1 INT,c2 INT,c3 CHAR(10),c4 CHAR(10),c5 CHAR(10),PRIMARY KEY(c1),INDEX(c3,c4(1),c5(1)),INDEX(c2)) ENGINE=TokuDB; | ||
INSERT INTO t1 VALUES(),(),(),(),(); | ||
ERROR 23000: Duplicate entry '0' for key 'PRIMARY' | ||
UPDATE t1 SET c1=1 WHERE c1=1 OR c2=1; | ||
DROP TABLE t1; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,2 @@ | ||
--loose-tokudb_dir_per_db=ON | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,27 @@ | ||
# Test for PS-5163 : [PS8QA] handle_fatal_signal (sig=11) in DsMrr_impl::dsmrr_init | ||
# and PS-4828 : Inserting data into TokuDB database with name that contains non-alphanumerical characters can lead to the ZN9ha_tokudb16bulk_insert_pollEPvf assertion | ||
# | ||
# The cause is a buffer overrun in LOADER_CONTEXT where the char buffer used for | ||
# maintaining the proc info string was too small and no validation or prevention | ||
# was being done to ensure the string stayed within the limits of the buffer. | ||
# Normally this would have been difficult to hit, but, now with the combination | ||
# of tokudb_dir_per_db=ON and the expansion of the database name from latin1 | ||
# (or whatever) to the fscs encoding the space required for a max length | ||
# db.table name could be quite larger than the buffer was originally sized. | ||
|
||
--source include/have_tokudb.inc | ||
|
||
if (`SELECT @@tokudb_dir_per_db != 1`) { | ||
skip Requires tokudb_dir_per_db=1; | ||
} | ||
|
||
CREATE DATABASE `new..............................................end`; | ||
USE `new..............................................end`; | ||
CREATE TABLE t1(a INT KEY,b INT)ENGINE=TokuDB; | ||
|
||
# | ||
# TokuDB bulk_insert_poll would crash here | ||
# | ||
INSERT INTO t1 VALUES(1,11),(2,12),(3,13),(4,14),(5,15); | ||
USE test; | ||
DROP DATABASE `new..............................................end`; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,11 @@ | ||
--source include/have_tokudb.inc | ||
|
||
CREATE TABLE t1(c1 INT,c2 INT,c3 CHAR(10),c4 CHAR(10),c5 CHAR(10),PRIMARY KEY(c1),INDEX(c3,c4(1),c5(1)),INDEX(c2)) ENGINE=TokuDB; | ||
--error ER_DUP_ENTRY | ||
INSERT INTO t1 VALUES(),(),(),(),(); | ||
|
||
# 8.0 asserts here down in data dictionary because ha_tokudb::ds_mrr did not | ||
# properly call ds_mrr.init(this, table) | ||
UPDATE t1 SET c1=1 WHERE c1=1 OR c2=1; | ||
|
||
DROP TABLE t1; |