diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2019-01-03 09:56:24 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2019-01-03 09:56:24 +0100 |
| commit | 3ba3f81ae0d4c1a74e98bbeaba70d2fd1e63a76a (patch) | |
| tree | 058a475d177565ddcd589805e2fbf2d7cf50bfae /storage | |
| parent | aeefd26ecb1089678e343c64998749e9f2e3a1e4 (diff) | |
| parent | b87eb04f77234acdbee1e626338ea95b04f4db2e (diff) | |
| download | mariadb-git-3ba3f81ae0d4c1a74e98bbeaba70d2fd1e63a76a.tar.gz | |
Merge branch '10.0' into 10.1
Diffstat (limited to 'storage')
| -rw-r--r-- | storage/innobase/handler/handler0alter.cc | 2 | ||||
| -rw-r--r--[-rwxr-xr-x] | storage/tokudb/mysql-test/tokudb/t/change_column_bin.py | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | storage/tokudb/mysql-test/tokudb/t/change_column_bin_rename.py | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | storage/tokudb/mysql-test/tokudb/t/change_column_char.py | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | storage/tokudb/mysql-test/tokudb/t/change_column_char_binary.py | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | storage/tokudb/mysql-test/tokudb/t/change_column_char_charbinary.py | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | storage/tokudb/mysql-test/tokudb/t/change_column_char_rename.py | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | storage/tokudb/mysql-test/tokudb/t/change_column_int.py | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | storage/tokudb/mysql-test/tokudb/t/change_column_int_key.py | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | storage/tokudb/mysql-test/tokudb/t/change_column_int_not_supported.py | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | storage/tokudb/mysql-test/tokudb/t/change_column_int_rename.py | 0 | ||||
| -rw-r--r-- | storage/xtradb/handler/handler0alter.cc | 2 |
12 files changed, 2 insertions, 2 deletions
diff --git a/storage/innobase/handler/handler0alter.cc b/storage/innobase/handler/handler0alter.cc index 6b40edef390..c710a2403e3 100644 --- a/storage/innobase/handler/handler0alter.cc +++ b/storage/innobase/handler/handler0alter.cc @@ -4668,7 +4668,7 @@ err_exit: info = pars_info_create(); - int pos = i; + ulint pos = i; if (has_prefixes) { pos = (pos << 16) + field->prefix_len; } 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 2c7d8dd9a54..2c7d8dd9a54 100755..100644 --- a/storage/tokudb/mysql-test/tokudb/t/change_column_bin.py +++ b/storage/tokudb/mysql-test/tokudb/t/change_column_bin.py diff --git a/storage/tokudb/mysql-test/tokudb/t/change_column_bin_rename.py b/storage/tokudb/mysql-test/tokudb/t/change_column_bin_rename.py index 6bd5de38fe8..6bd5de38fe8 100755..100644 --- a/storage/tokudb/mysql-test/tokudb/t/change_column_bin_rename.py +++ b/storage/tokudb/mysql-test/tokudb/t/change_column_bin_rename.py 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 c53442ade50..c53442ade50 100755..100644 --- a/storage/tokudb/mysql-test/tokudb/t/change_column_char.py +++ b/storage/tokudb/mysql-test/tokudb/t/change_column_char.py diff --git a/storage/tokudb/mysql-test/tokudb/t/change_column_char_binary.py b/storage/tokudb/mysql-test/tokudb/t/change_column_char_binary.py index e92797918d5..e92797918d5 100755..100644 --- a/storage/tokudb/mysql-test/tokudb/t/change_column_char_binary.py +++ b/storage/tokudb/mysql-test/tokudb/t/change_column_char_binary.py diff --git a/storage/tokudb/mysql-test/tokudb/t/change_column_char_charbinary.py b/storage/tokudb/mysql-test/tokudb/t/change_column_char_charbinary.py index 065e37b186d..065e37b186d 100755..100644 --- a/storage/tokudb/mysql-test/tokudb/t/change_column_char_charbinary.py +++ b/storage/tokudb/mysql-test/tokudb/t/change_column_char_charbinary.py diff --git a/storage/tokudb/mysql-test/tokudb/t/change_column_char_rename.py b/storage/tokudb/mysql-test/tokudb/t/change_column_char_rename.py index fe73fce0d53..fe73fce0d53 100755..100644 --- a/storage/tokudb/mysql-test/tokudb/t/change_column_char_rename.py +++ b/storage/tokudb/mysql-test/tokudb/t/change_column_char_rename.py diff --git a/storage/tokudb/mysql-test/tokudb/t/change_column_int.py b/storage/tokudb/mysql-test/tokudb/t/change_column_int.py index 6f69156e260..6f69156e260 100755..100644 --- a/storage/tokudb/mysql-test/tokudb/t/change_column_int.py +++ b/storage/tokudb/mysql-test/tokudb/t/change_column_int.py diff --git a/storage/tokudb/mysql-test/tokudb/t/change_column_int_key.py b/storage/tokudb/mysql-test/tokudb/t/change_column_int_key.py index fd7e5868c40..fd7e5868c40 100755..100644 --- a/storage/tokudb/mysql-test/tokudb/t/change_column_int_key.py +++ b/storage/tokudb/mysql-test/tokudb/t/change_column_int_key.py diff --git a/storage/tokudb/mysql-test/tokudb/t/change_column_int_not_supported.py b/storage/tokudb/mysql-test/tokudb/t/change_column_int_not_supported.py index 1708c65efde..1708c65efde 100755..100644 --- a/storage/tokudb/mysql-test/tokudb/t/change_column_int_not_supported.py +++ b/storage/tokudb/mysql-test/tokudb/t/change_column_int_not_supported.py diff --git a/storage/tokudb/mysql-test/tokudb/t/change_column_int_rename.py b/storage/tokudb/mysql-test/tokudb/t/change_column_int_rename.py index 5222564a9a2..5222564a9a2 100755..100644 --- a/storage/tokudb/mysql-test/tokudb/t/change_column_int_rename.py +++ b/storage/tokudb/mysql-test/tokudb/t/change_column_int_rename.py diff --git a/storage/xtradb/handler/handler0alter.cc b/storage/xtradb/handler/handler0alter.cc index 0f34dc5ab11..dd2ffaad3fc 100644 --- a/storage/xtradb/handler/handler0alter.cc +++ b/storage/xtradb/handler/handler0alter.cc @@ -4684,7 +4684,7 @@ err_exit: info = pars_info_create(); - int pos = i; + ulint pos = i; if (has_prefixes) { pos = (pos << 16) + field->prefix_len; } |