1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.1-new

Browse Source 
into  april.(none):/home/svoj/devel/mysql/mysql-5.1-new
This commit is contained in:
unknown 2005-12-30 16:32:32 +04:00
commit 565e729e38
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
sql/mysqld.cc
View File

@ -7477,10 +7477,9 @@ static void fix_paths(void)
(void) my_load_path(mysql_home,mysql_home,""); // Resolve current dir
(void) my_load_path(mysql_real_data_home,mysql_real_data_home,mysql_home);
(void) my_load_path(pidfile_name,pidfile_name,mysql_real_data_home);
strmake(opt_plugin_dir, get_relative_path(LIBDIR),
sizeof(opt_plugin_dir) - 1);
(void) my_load_path(opt_plugin_dir, opt_plugin_dir_ptr ? opt_plugin_dir_ptr :
get_relative_path(LIBDIR), mysql_home);
opt_plugin_dir_ptr= opt_plugin_dir;
(void) my_load_path(opt_plugin_dir, opt_plugin_dir_ptr, mysql_home);
char *sharedir=get_relative_path(SHAREDIR);
if (test_if_hard_path(sharedir))

4
sql/table.cc
View File

@ -538,7 +538,7 @@ static int open_binary_frm(THD *thd, TABLE_SHARE *share, uchar *head,
#endif
next_chunk+= str_db_type_length + 2;
}
if (next_chunk + 4 < buff_end)
if (next_chunk + 5 < buff_end)
{
uint32 partition_info_len = uint4korr(next_chunk);
#ifdef WITH_PARTITION_STORAGE_ENGINE
@ -561,7 +561,7 @@ static int open_binary_frm(THD *thd, TABLE_SHARE *share, uchar *head,
goto err;
}
#endif
next_chunk+= 4 + partition_info_len;
next_chunk+= 5 + partition_info_len;
}
keyinfo= share->key_info;
for (i= 0; i < keys; i++, keyinfo++)