summaryrefslogtreecommitdiff
path: root/sql/handler.cc
diff options
context:
space:
mode:
authorunknown <msvensson@neptunus.(none)>2006-11-29 23:08:35 +0100
committerunknown <msvensson@neptunus.(none)>2006-11-29 23:08:35 +0100
commit30278aedced207e1cc5284c2c5fcb8f36f467d6d (patch)
treefee046d7ddf29bccad0ada6847bb80589739ab28 /sql/handler.cc
parent66466ddfa66d4e360b854176735e5067c2de4fe0 (diff)
parent8e0614c83950b6189eb1dfc218b13546fa663c13 (diff)
downloadmariadb-git-30278aedced207e1cc5284c2c5fcb8f36f467d6d.tar.gz
Merge neptunus.(none):/home/msvensson/mysql/bug19731/my50-bug19731
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-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 3f0411d6198..93442b4f852 100644
--- a/sql/handler.cc
+++ b/sql/handler.cc
@@ -1982,6 +1982,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;