diff options
| author | Monty <monty@mariadb.org> | 2016-01-03 12:48:55 +0200 |
|---|---|---|
| committer | Monty <monty@mariadb.org> | 2016-01-03 12:48:55 +0200 |
| commit | 4b4777ab63522b2bdd1f98ad03558a5b1da53dc0 (patch) | |
| tree | 6ec90186e428027324179e3d9d39681649d95140 /storage | |
| parent | ae7b39a13a312d9787a4895874f641e2dfe3adca (diff) | |
| download | mariadb-git-4b4777ab63522b2bdd1f98ad03558a5b1da53dc0.tar.gz | |
Backported fix for ccache
Fixed compiler warnings
Added --big-test to tokudb change_column_char & change_column_bin
Diffstat (limited to 'storage')
| -rw-r--r-- | storage/connect/json.cpp | 2 | ||||
| -rw-r--r-- | storage/connect/jsonudf.cpp | 2 | ||||
| -rw-r--r-- | storage/tokudb/mysql-test/tokudb/t/change_column_bin.py | 1 | ||||
| -rw-r--r-- | storage/tokudb/mysql-test/tokudb/t/change_column_bin.test | 1 | ||||
| -rw-r--r-- | storage/tokudb/mysql-test/tokudb/t/change_column_char.py | 1 | ||||
| -rw-r--r-- | storage/tokudb/mysql-test/tokudb/t/change_column_char.test | 1 |
6 files changed, 6 insertions, 2 deletions
diff --git a/storage/connect/json.cpp b/storage/connect/json.cpp index fc7edb84c0f..aa677342fac 100644 --- a/storage/connect/json.cpp +++ b/storage/connect/json.cpp @@ -594,7 +594,7 @@ PSZ Serialize(PGLOBAL g, PJSON jsp, char *fn, int pretty) if (fs) { fputs(EL, fs); fclose(fs); - str = (err) ? NULL : "Ok"; + str = (err) ? NULL : (char*) "Ok"; } else if (!err) { str = ((JOUTSTR*)jp)->Strp; jp->WriteChr('\0'); diff --git a/storage/connect/jsonudf.cpp b/storage/connect/jsonudf.cpp index 40685ae0f0e..215562af46e 100644 --- a/storage/connect/jsonudf.cpp +++ b/storage/connect/jsonudf.cpp @@ -3365,7 +3365,7 @@ my_bool jsoncontains_init(UDF_INIT *initid, UDF_ARGS *args, char *message) long long jsoncontains(UDF_INIT *initid, UDF_ARGS *args, char *result, unsigned long *res_length, char *is_null, char *error) { - char *p, res[256]; + char *p __attribute__((unused)), res[256]; long long n; unsigned long reslen; diff --git a/storage/tokudb/mysql-test/tokudb/t/change_column_bin.py b/storage/tokudb/mysql-test/tokudb/t/change_column_bin.py index 0ddee301d1b..b94a80ec7be 100644 --- a/storage/tokudb/mysql-test/tokudb/t/change_column_bin.py +++ b/storage/tokudb/mysql-test/tokudb/t/change_column_bin.py @@ -24,6 +24,7 @@ def gen_test(n): def main(): print "# this test is generated by change_bin.py" print "# test binary expansion is hot" + print "--source include/big_test.inc" print "--disable_warnings" print "DROP TABLE IF EXISTS t,ti;" print "--enable_warnings" diff --git a/storage/tokudb/mysql-test/tokudb/t/change_column_bin.test b/storage/tokudb/mysql-test/tokudb/t/change_column_bin.test index 0365c155302..6053a263cf0 100644 --- a/storage/tokudb/mysql-test/tokudb/t/change_column_bin.test +++ b/storage/tokudb/mysql-test/tokudb/t/change_column_bin.test @@ -1,6 +1,7 @@ source include/have_tokudb.inc; # this test is generated by change_bin.py # test binary expansion is hot +--source include/big_test.inc --disable_warnings DROP TABLE IF EXISTS t,ti; --enable_warnings diff --git a/storage/tokudb/mysql-test/tokudb/t/change_column_char.py b/storage/tokudb/mysql-test/tokudb/t/change_column_char.py index 99d99d1c017..7481d9092f2 100644 --- a/storage/tokudb/mysql-test/tokudb/t/change_column_char.py +++ b/storage/tokudb/mysql-test/tokudb/t/change_column_char.py @@ -24,6 +24,7 @@ def gen_test(n): def main(): print "# this test is generated by change_char.py" print "# test char expansion" + print "--source include/big_test.inc" print "--disable_warnings" print "DROP TABLE IF EXISTS t,ti;" print "--enable_warnings" diff --git a/storage/tokudb/mysql-test/tokudb/t/change_column_char.test b/storage/tokudb/mysql-test/tokudb/t/change_column_char.test index 8a0b0a9abd8..977420ad07e 100644 --- a/storage/tokudb/mysql-test/tokudb/t/change_column_char.test +++ b/storage/tokudb/mysql-test/tokudb/t/change_column_char.test @@ -1,6 +1,7 @@ source include/have_tokudb.inc; # this test is generated by change_char.py # test char expansion +--source include/big_test.inc --disable_warnings DROP TABLE IF EXISTS t,ti; --enable_warnings |