mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-15 19:37:16 +02:00
Code Issues Projects Releases Packages Wiki Activity

merge with 5.5

Browse source
This commit is contained in:
Sergei Golubchik 2012-11-03 12:28:51 +01:00
commit 40e94a3734
210 changed files with 5896 additions and 1462 deletions
Download patch file Download diff file Expand all files Collapse all files

6
storage/archive/ha_archive.cc
View file

@ -275,7 +275,7 @@ int archive_discover(handlerton *hton, THD* thd, const char *db,
build_table_filename(az_file, sizeof(az_file) - 1, db, name, ARZ, 0);
if (!(mysql_file_stat(arch_key_file_data, az_file, &file_stat, MYF(0))))
if (!(mysql_file_stat(/* arch_key_file_data */ 0, az_file, &file_stat, MYF(0))))
goto err;
if (!(azopen(&frm_stream, az_file, O_RDONLY|O_BINARY)))
@ -738,7 +738,7 @@ int ha_archive::create(const char *name, TABLE *table_arg,
There is a chance that the file was "discovered". In this case
just use whatever file is there.
*/
if (!(mysql_file_stat(arch_key_file_data, name_buff, &file_stat, MYF(0))))
if (!(mysql_file_stat(/* arch_key_file_data */ 0, name_buff, &file_stat, MYF(0))))
{
my_errno= 0;
if (!(azopen(&create_stream, name_buff, O_CREAT|O_RDWR|O_BINARY)))
@ -1625,7 +1625,7 @@ int ha_archive::info(uint flag)
{
MY_STAT file_stat; // Stat information for the data file
(void) mysql_file_stat(arch_key_file_data, share->data_file_name, &file_stat, MYF(MY_WME));
(void) mysql_file_stat(/* arch_key_file_data */ 0, share->data_file_name, &file_stat, MYF(MY_WME));
if (flag & HA_STATUS_TIME)
stats.update_time= (ulong) file_stat.st_mtime;