diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2014-05-09 12:35:11 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2014-05-09 12:35:11 +0200 |
| commit | d3e2e1243bb0dae95ce35b0380dd4f8f476b254d (patch) | |
| tree | 8779ad6b2059f181770cc07e2437925d7d5d5d04 /storage/myisam | |
| parent | 229dad1f9b12f8e9f64b6a605bdf8e31c339d018 (diff) | |
| parent | 124428a9e28e59f98b25d8ee07b57d264f63cbe4 (diff) | |
| download | mariadb-git-d3e2e1243bb0dae95ce35b0380dd4f8f476b254d.tar.gz | |
5.5 merge
Diffstat (limited to 'storage/myisam')
| -rwxr-xr-x | storage/myisam/ftbench/Ecompare.pl | 1 | ||||
| -rwxr-xr-x | storage/myisam/ftbench/Ecreate.pl | 1 | ||||
| -rwxr-xr-x | storage/myisam/ftbench/Ereport.pl | 1 | ||||
| -rw-r--r-- | storage/myisam/ha_myisam.cc | 3 | ||||
| -rwxr-xr-x | storage/myisam/mi_test_all.sh | 1 |
5 files changed, 6 insertions, 1 deletions
diff --git a/storage/myisam/ftbench/Ecompare.pl b/storage/myisam/ftbench/Ecompare.pl index ae077cdce37..c958db6e9a9 100755 --- a/storage/myisam/ftbench/Ecompare.pl +++ b/storage/myisam/ftbench/Ecompare.pl @@ -1,6 +1,7 @@ #!/usr/bin/perl # Copyright (c) 2003, 2005 MySQL AB +# Use is subject to license terms # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/storage/myisam/ftbench/Ecreate.pl b/storage/myisam/ftbench/Ecreate.pl index 0e81abfbce8..9e0ef321b74 100755 --- a/storage/myisam/ftbench/Ecreate.pl +++ b/storage/myisam/ftbench/Ecreate.pl @@ -1,6 +1,7 @@ #!/usr/bin/perl # Copyright (c) 2003, 2005 MySQL AB +# Use is subject to license terms # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/storage/myisam/ftbench/Ereport.pl b/storage/myisam/ftbench/Ereport.pl index 0f13f0eac14..c3dad3d82be 100755 --- a/storage/myisam/ftbench/Ereport.pl +++ b/storage/myisam/ftbench/Ereport.pl @@ -1,6 +1,7 @@ #!/usr/bin/perl # Copyright (c) 2003, 2005 MySQL AB +# Use is subject to license terms # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/storage/myisam/ha_myisam.cc b/storage/myisam/ha_myisam.cc index c997f03463a..bc4c5139810 100644 --- a/storage/myisam/ha_myisam.cc +++ b/storage/myisam/ha_myisam.cc @@ -2186,7 +2186,8 @@ bool ha_myisam::check_if_incompatible_data(HA_CREATE_INFO *info, int ha_myisam::check_for_upgrade(HA_CHECK_OPT *check_opt) { - if (!(file->s->options & HA_OPTION_NULL_FIELDS) && + if ((file->s->options & HA_OPTION_CHECKSUM) && + !(file->s->options & HA_OPTION_NULL_FIELDS) && !(file->s->options & HA_OPTION_PACK_RECORD) && file->s->has_varchar_fields) { diff --git a/storage/myisam/mi_test_all.sh b/storage/myisam/mi_test_all.sh index f08f75298a1..12c28d7d132 100755 --- a/storage/myisam/mi_test_all.sh +++ b/storage/myisam/mi_test_all.sh @@ -1,6 +1,7 @@ #!/bin/sh # Copyright (C) 2000, 2007 MySQL AB +# Use is subject to license terms # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU Library General Public |