diff options
| author | unknown <svoj@june.mysql.com> | 2007-07-19 15:54:31 +0500 |
|---|---|---|
| committer | unknown <svoj@june.mysql.com> | 2007-07-19 15:54:31 +0500 |
| commit | 8d7eb7139e49a3f7c1c6ddf2bff8f642697a084d (patch) | |
| tree | 7d0f3ef8910c9ebc184a9b2f33806a0018d9abec /sql/handler.cc | |
| parent | 082c3cb46a5e6e4a5ca5375ba663f3417be72c84 (diff) | |
| parent | 2486c23ca6d10b17365f8502f8bba10fe0bc2edd (diff) | |
| download | mariadb-git-8d7eb7139e49a3f7c1c6ddf2bff8f642697a084d.tar.gz | |
Merge mysql.com:/home/svoj/devel/mysql/BUG26325/mysql-5.0-engines
into mysql.com:/home/svoj/devel/mysql/BUG26325/mysql-5.1-engines
mysql-test/r/check.result:
Auto merged
mysql-test/t/check.test:
Auto merged
sql/handler.cc:
Auto merged
Diffstat (limited to 'sql/handler.cc')
| -rw-r--r-- | sql/handler.cc | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/sql/handler.cc b/sql/handler.cc index 2d836b30862..55e2e478027 100644 --- a/sql/handler.cc +++ b/sql/handler.cc @@ -2355,7 +2355,13 @@ static bool update_frm_version(TABLE *table) int result= 1; DBUG_ENTER("update_frm_version"); - if (table->s->mysql_version != MYSQL_VERSION_ID) + /* + No need to update frm version in case table was created or checked + by server with the same version. This also ensures that we do not + update frm version for temporary tables as this code doesn't support + temporary tables. + */ + if (table->s->mysql_version == MYSQL_VERSION_ID) DBUG_RETURN(0); strxmov(path, table->s->normalized_path.str, reg_ext, NullS); |