database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

WL#2645 (CHECK FOR UPGRADE)

Browse Source 
5.1-related fixes
This commit is contained in:
holyfoot@deer.(none)
2006-02-17 13:37:37 +04:00
parent be02944df6
commit 942503927a
3 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
sql/handler.cc
View File

@ -2081,10 +2081,7 @@ static bool update_frm_version(TABLE *table, bool needs_lock)
if (table->s->mysql_version != MYSQL_VERSION_ID)
DBUG_RETURN(0);
strxnmov(path, sizeof(path)-1, mysql_data_home, "/", table->s->db, "/",
table->s->table_name, reg_ext, NullS);
if (!unpack_filename(path, path))
DBUG_RETURN(1);
strxmov(path, table->s->normalized_path.str, reg_ext, NullS);
if (needs_lock)
pthread_mutex_lock(&LOCK_open);
@ -2092,8 +2089,8 @@ static bool update_frm_version(TABLE *table, bool needs_lock)
if ((file= my_open(path, O_RDWR|O_BINARY, MYF(MY_WME))) >= 0)
{
uchar version[4];
char *key= table->s->table_cache_key;
uint key_length= table->s->key_length;
char *key= table->s->table_cache_key.str;
uint key_length= table->s->table_cache_key.length;
TABLE *entry;
HASH_SEARCH_STATE state;