summaryrefslogtreecommitdiff
path: root/sql/handler.cc
diff options
context:
space:
mode:
authorunknown <msvensson@neptunus.(none)>2006-11-29 23:09:57 +0100
committerunknown <msvensson@neptunus.(none)>2006-11-29 23:09:57 +0100
commit2b58a8ec48ea5b5cf14798106b1ce6eff9dc787d (patch)
tree7bb763da1c2df6c52aedb8e0e98b75f6b0f415cc /sql/handler.cc
parent6981993e4798009f8ef8072ad18700dde5ba7767 (diff)
parente5bfeab3fd659f37b8363abd32e77d4fe29716f9 (diff)
downloadmariadb-git-2b58a8ec48ea5b5cf14798106b1ce6eff9dc787d.tar.gz
Merge neptunus.(none):/home/msvensson/mysql/bug19731/my51-bug19731
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-maint mysql-test/r/mysqltest.result: Auto merged mysql-test/t/mysqltest.test: Auto merged sql/handler.cc: Auto merged client/mysqltest.c: Manual merge
Diffstat (limited to 'sql/handler.cc')
-rw-r--r--sql/handler.cc4
1 files changed, 4 insertions, 0 deletions
diff --git a/sql/handler.cc b/sql/handler.cc
index f16876f2ffd..1436e6fcef1 100644
--- a/sql/handler.cc
+++ b/sql/handler.cc
@@ -2304,6 +2304,10 @@ int handler::check_old_types()
{
return HA_ADMIN_NEEDS_ALTER;
}
+ if ((*field)->type() == MYSQL_TYPE_VAR_STRING)
+ {
+ return HA_ADMIN_NEEDS_ALTER;
+ }
}
}
return 0;