mirror of
https://github.com/MariaDB/server.git
synced 2025-01-16 03:52:35 +01:00
70823e1d91
The reason for the failure was a bug in an include file on debian that causes 'struct stat' to have different sized depending on the environment. This patch fixes so that we always include my_global.h or my_config.h before we include any other files. Other things: - Removed #include <my_global.h> in some include files; Better to always do this at the top level to have as few "always-include-this-file-first' files as possible. - Removed usage of some include files that where already included by my_global.h or by other files. client/mysql_plugin.c: Use my_global.h first client/mysqlslap.c: Remove duplicated include files extra/comp_err.c: Remove duplicated include files include/m_string.h: Remove duplicated include files include/maria.h: Remove duplicated include files libmysqld/emb_qcache.cc: Use my_global.h first plugin/semisync/semisync.h: Use my_pthread.h first sql/datadict.cc: Use my_global.h first sql/debug_sync.cc: Use my_global.h first sql/derror.cc: Use my_global.h first sql/des_key_file.cc: Use my_global.h first sql/discover.cc: Use my_global.h first sql/event_data_objects.cc: Use my_global.h first sql/event_db_repository.cc: Use my_global.h first sql/event_parse_data.cc: Use my_global.h first sql/event_queue.cc: Use my_global.h first sql/event_scheduler.cc: Use my_global.h first sql/events.cc: Use my_global.h first sql/field.cc: Use my_global.h first Remove duplicated include files sql/field_conv.cc: Use my_global.h first sql/filesort.cc: Use my_global.h first Remove duplicated include files sql/gstream.cc: Use my_global.h first sql/ha_ndbcluster.cc: Use my_global.h first sql/ha_ndbcluster_binlog.cc: Use my_global.h first sql/ha_ndbcluster_cond.cc: Use my_global.h first sql/ha_partition.cc: Use my_global.h first sql/handler.cc: Use my_global.h first sql/hash_filo.cc: Use my_global.h first sql/hostname.cc: Use my_global.h first sql/init.cc: Use my_global.h first sql/item.cc: Use my_global.h first sql/item_buff.cc: Use my_global.h first sql/item_cmpfunc.cc: Use my_global.h first sql/item_create.cc: Use my_global.h first sql/item_geofunc.cc: Use my_global.h first sql/item_inetfunc.cc: Use my_global.h first sql/item_row.cc: Use my_global.h first sql/item_strfunc.cc: Use my_global.h first sql/item_subselect.cc: Use my_global.h first sql/item_sum.cc: Use my_global.h first sql/item_timefunc.cc: Use my_global.h first sql/item_xmlfunc.cc: Use my_global.h first sql/key.cc: Use my_global.h first sql/lock.cc: Use my_global.h first sql/log.cc: Use my_global.h first sql/log_event.cc: Use my_global.h first sql/log_event_old.cc: Use my_global.h first sql/mf_iocache.cc: Use my_global.h first sql/mysql_install_db.cc: Remove duplicated include files sql/mysqld.cc: Remove duplicated include files sql/net_serv.cc: Remove duplicated include files sql/opt_range.cc: Use my_global.h first sql/opt_subselect.cc: Use my_global.h first sql/opt_sum.cc: Use my_global.h first sql/parse_file.cc: Use my_global.h first sql/partition_info.cc: Use my_global.h first sql/procedure.cc: Use my_global.h first sql/protocol.cc: Use my_global.h first sql/records.cc: Use my_global.h first sql/records.h: Don't include my_global.h Better to do this at the upper level sql/repl_failsafe.cc: Use my_global.h first sql/rpl_filter.cc: Use my_global.h first sql/rpl_gtid.cc: Use my_global.h first sql/rpl_handler.cc: Use my_global.h first sql/rpl_injector.cc: Use my_global.h first sql/rpl_record.cc: Use my_global.h first sql/rpl_record_old.cc: Use my_global.h first sql/rpl_reporting.cc: Use my_global.h first sql/rpl_rli.cc: Use my_global.h first sql/rpl_tblmap.cc: Use my_global.h first sql/rpl_utility.cc: Use my_global.h first sql/set_var.cc: Added comment sql/slave.cc: Use my_global.h first sql/sp.cc: Use my_global.h first sql/sp_cache.cc: Use my_global.h first sql/sp_head.cc: Use my_global.h first sql/sp_pcontext.cc: Use my_global.h first sql/sp_rcontext.cc: Use my_global.h first sql/spatial.cc: Use my_global.h first sql/sql_acl.cc: Use my_global.h first sql/sql_admin.cc: Use my_global.h first sql/sql_analyse.cc: Use my_global.h first sql/sql_audit.cc: Use my_global.h first sql/sql_base.cc: Use my_global.h first sql/sql_binlog.cc: Use my_global.h first sql/sql_bootstrap.cc: Use my_global.h first Use my_global.h first sql/sql_cache.cc: Use my_global.h first sql/sql_class.cc: Use my_global.h first sql/sql_client.cc: Use my_global.h first sql/sql_connect.cc: Use my_global.h first sql/sql_crypt.cc: Use my_global.h first sql/sql_cursor.cc: Use my_global.h first sql/sql_db.cc: Use my_global.h first sql/sql_delete.cc: Use my_global.h first sql/sql_derived.cc: Use my_global.h first sql/sql_do.cc: Use my_global.h first sql/sql_error.cc: Use my_global.h first sql/sql_explain.cc: Use my_global.h first sql/sql_expression_cache.cc: Use my_global.h first sql/sql_handler.cc: Use my_global.h first sql/sql_help.cc: Use my_global.h first sql/sql_insert.cc: Use my_global.h first sql/sql_lex.cc: Use my_global.h first sql/sql_load.cc: Use my_global.h first sql/sql_locale.cc: Use my_global.h first sql/sql_manager.cc: Use my_global.h first sql/sql_parse.cc: Use my_global.h first sql/sql_partition.cc: Use my_global.h first sql/sql_plugin.cc: Added comment sql/sql_prepare.cc: Use my_global.h first sql/sql_priv.h: Added error if we use this before including my_global.h This check is here becasue so many files includes sql_priv.h first. sql/sql_profile.cc: Use my_global.h first sql/sql_reload.cc: Use my_global.h first sql/sql_rename.cc: Use my_global.h first sql/sql_repl.cc: Use my_global.h first sql/sql_select.cc: Use my_global.h first sql/sql_servers.cc: Use my_global.h first sql/sql_show.cc: Added comment sql/sql_signal.cc: Use my_global.h first sql/sql_statistics.cc: Use my_global.h first sql/sql_table.cc: Use my_global.h first sql/sql_tablespace.cc: Use my_global.h first sql/sql_test.cc: Use my_global.h first sql/sql_time.cc: Use my_global.h first sql/sql_trigger.cc: Use my_global.h first sql/sql_udf.cc: Use my_global.h first sql/sql_union.cc: Use my_global.h first sql/sql_update.cc: Use my_global.h first sql/sql_view.cc: Use my_global.h first sql/sys_vars.cc: Added comment sql/table.cc: Use my_global.h first sql/thr_malloc.cc: Use my_global.h first sql/transaction.cc: Use my_global.h first sql/uniques.cc: Use my_global.h first sql/unireg.cc: Use my_global.h first sql/unireg.h: Removed inclusion of my_global.h storage/archive/ha_archive.cc: Added comment storage/blackhole/ha_blackhole.cc: Use my_global.h first storage/csv/ha_tina.cc: Use my_global.h first storage/csv/transparent_file.cc: Use my_global.h first storage/federated/ha_federated.cc: Use my_global.h first storage/federatedx/federatedx_io.cc: Use my_global.h first storage/federatedx/federatedx_io_mysql.cc: Use my_global.h first storage/federatedx/federatedx_io_null.cc: Use my_global.h first storage/federatedx/federatedx_txn.cc: Use my_global.h first storage/heap/ha_heap.cc: Use my_global.h first storage/innobase/handler/handler0alter.cc: Use my_global.h first storage/maria/ha_maria.cc: Use my_global.h first storage/maria/unittest/ma_maria_log_cleanup.c: Remove duplicated include files storage/maria/unittest/test_file.c: Added comment storage/myisam/ha_myisam.cc: Move sql_plugin.h first as this includes my_global.h storage/myisammrg/ha_myisammrg.cc: Use my_global.h first storage/oqgraph/oqgraph_thunk.cc: Use my_config.h and my_global.h first One could not include my_global.h before oqgraph_thunk.h (don't know why) storage/spider/ha_spider.cc: Use my_global.h first storage/spider/hs_client/config.cpp: Use my_global.h first storage/spider/hs_client/escape.cpp: Use my_global.h first storage/spider/hs_client/fatal.cpp: Use my_global.h first storage/spider/hs_client/hstcpcli.cpp: Use my_global.h first storage/spider/hs_client/socket.cpp: Use my_global.h first storage/spider/hs_client/string_util.cpp: Use my_global.h first storage/spider/spd_conn.cc: Use my_global.h first storage/spider/spd_copy_tables.cc: Use my_global.h first storage/spider/spd_db_conn.cc: Use my_global.h first storage/spider/spd_db_handlersocket.cc: Use my_global.h first storage/spider/spd_db_mysql.cc: Use my_global.h first storage/spider/spd_db_oracle.cc: Use my_global.h first storage/spider/spd_direct_sql.cc: Use my_global.h first storage/spider/spd_i_s.cc: Use my_global.h first storage/spider/spd_malloc.cc: Use my_global.h first storage/spider/spd_param.cc: Use my_global.h first storage/spider/spd_ping_table.cc: Use my_global.h first storage/spider/spd_sys_table.cc: Use my_global.h first storage/spider/spd_table.cc: Use my_global.h first storage/spider/spd_trx.cc: Use my_global.h first storage/xtradb/handler/handler0alter.cc: Use my_global.h first storage/xtradb/handler/i_s.cc: Use my_global.h first
270 lines
7.5 KiB
C++
270 lines
7.5 KiB
C++
/* Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved.
|
|
|
|
This program is free software; you can redistribute it and/or modify
|
|
it under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation; version 2 of the License.
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
GNU General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with this program; if not, write to the Free Software
|
|
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */
|
|
|
|
|
|
/**
|
|
@file
|
|
|
|
@brief
|
|
Functions for discover of frm file from handler
|
|
*/
|
|
|
|
#include <my_global.h>
|
|
#include "sql_priv.h"
|
|
#include "unireg.h"
|
|
#include "discover.h"
|
|
#include <my_dir.h>
|
|
|
|
/**
|
|
Read the contents of a .frm file.
|
|
|
|
frmdata and len are set to 0 on error.
|
|
|
|
@param name path to table-file "db/name"
|
|
@param frmdata frm data
|
|
@param len length of the read frmdata
|
|
|
|
@retval
|
|
0 ok
|
|
@retval
|
|
1 Could not open file
|
|
@retval
|
|
2 Could not stat file
|
|
@retval
|
|
3 Could not allocate data for read. Could not read file
|
|
*/
|
|
|
|
int readfrm(const char *name, const uchar **frmdata, size_t *len)
|
|
{
|
|
int error;
|
|
char index_file[FN_REFLEN];
|
|
File file;
|
|
size_t read_len;
|
|
uchar *read_data;
|
|
MY_STAT state;
|
|
DBUG_ENTER("readfrm");
|
|
DBUG_PRINT("enter",("name: '%s'",name));
|
|
|
|
*frmdata= NULL; // In case of errors
|
|
*len= 0;
|
|
error= 1;
|
|
if ((file= mysql_file_open(key_file_frm,
|
|
fn_format(index_file, name, "", reg_ext,
|
|
MY_UNPACK_FILENAME|MY_APPEND_EXT),
|
|
O_RDONLY | O_SHARE,
|
|
MYF(0))) < 0)
|
|
goto err_end;
|
|
|
|
// Get length of file
|
|
error= 2;
|
|
if (mysql_file_fstat(file, &state, MYF(0)))
|
|
goto err;
|
|
read_len= (size_t)MY_MIN(FRM_MAX_SIZE, state.st_size); // safety
|
|
|
|
// Read whole frm file
|
|
error= 3;
|
|
if (!(read_data= (uchar*)my_malloc(read_len, MYF(MY_WME))))
|
|
goto err;
|
|
if (mysql_file_read(file, read_data, read_len, MYF(MY_NABP)))
|
|
{
|
|
my_free(read_data);
|
|
goto err;
|
|
}
|
|
|
|
// Setup return data
|
|
*frmdata= (uchar*) read_data;
|
|
*len= read_len;
|
|
error= 0;
|
|
|
|
err:
|
|
if (file > 0)
|
|
(void) mysql_file_close(file, MYF(MY_WME));
|
|
|
|
err_end: /* Here when no file */
|
|
DBUG_RETURN (error);
|
|
} /* readfrm */
|
|
|
|
|
|
/*
|
|
Write the content of a frm data pointer
|
|
to a frm file.
|
|
|
|
@param path path to table-file "db/name"
|
|
@param frmdata frm data
|
|
@param len length of the frmdata
|
|
|
|
@retval
|
|
0 ok
|
|
@retval
|
|
2 Could not write file
|
|
*/
|
|
|
|
int writefrm(const char *path, const char *db, const char *table,
|
|
bool tmp_table, const uchar *frmdata, size_t len)
|
|
{
|
|
char file_name[FN_REFLEN+1];
|
|
int error;
|
|
int create_flags= O_RDWR | O_TRUNC;
|
|
DBUG_ENTER("writefrm");
|
|
DBUG_PRINT("enter",("name: '%s' len: %lu ",path, (ulong) len));
|
|
|
|
if (tmp_table)
|
|
create_flags|= O_EXCL | O_NOFOLLOW;
|
|
|
|
strxnmov(file_name, sizeof(file_name)-1, path, reg_ext, NullS);
|
|
|
|
File file= mysql_file_create(key_file_frm, file_name,
|
|
CREATE_MODE, create_flags, MYF(0));
|
|
|
|
if ((error= file < 0))
|
|
{
|
|
if (my_errno == ENOENT)
|
|
my_error(ER_BAD_DB_ERROR, MYF(0), db);
|
|
else
|
|
my_error(ER_CANT_CREATE_TABLE, MYF(0), db, table, my_errno);
|
|
}
|
|
else
|
|
{
|
|
error= mysql_file_write(file, frmdata, len, MYF(MY_WME | MY_NABP));
|
|
|
|
if (!error && !tmp_table && opt_sync_frm)
|
|
error= mysql_file_sync(file, MYF(MY_WME)) ||
|
|
my_sync_dir_by_file(file_name, MYF(MY_WME));
|
|
|
|
error|= mysql_file_close(file, MYF(MY_WME));
|
|
}
|
|
DBUG_RETURN(error);
|
|
} /* writefrm */
|
|
|
|
static inline void advance(FILEINFO* &from, FILEINFO* &to,
|
|
FILEINFO* cur, bool &skip)
|
|
{
|
|
if (skip) // if not copying
|
|
from= cur; // just advance the start pointer
|
|
else // if copying
|
|
if (to == from) // but to the same place (not shifting the data)
|
|
from= to= cur; // advance both pointers
|
|
else // otherwise
|
|
while (from < cur) // have to copy [from...cur) to [to...)
|
|
*to++ = *from++;
|
|
skip= false;
|
|
}
|
|
|
|
/**
|
|
Go through the directory listing looking for files with a specified
|
|
extension and add them to the result list
|
|
|
|
@details
|
|
This function may be called many times on the same directory listing
|
|
but with different extensions. To avoid discovering the same table twice,
|
|
whenever a table file is discovered, all files with the same name
|
|
(independently from the extensions) are removed from the list.
|
|
|
|
Example: the list contained
|
|
{ "db.opt", "t1.MYD", "t1.MYI", "t1.frm", "t2.ARZ", "t3.ARZ", "t3.frm" }
|
|
on discovering all ".frm" files, tables "t1" and "t3" will be found,
|
|
and list will become
|
|
{ "db.opt", "t2.ARZ" }
|
|
and now ".ARZ" discovery can discover the table "t2"
|
|
|
|
@note
|
|
This function assumes that the directory listing is sorted alphabetically.
|
|
|
|
@note Partitioning makes this more complicated. A partitioned table t1 might
|
|
have files, like t1.frm, t1#P#part1.ibd, t1#P#foo.ibd, etc.
|
|
That means we need to compare file names only up to the first '#' or '.'
|
|
whichever comes first.
|
|
*/
|
|
int extension_based_table_discovery(MY_DIR *dirp, const char *ext_meta,
|
|
handlerton::discovered_list *result)
|
|
{
|
|
CHARSET_INFO *cs= character_set_filesystem;
|
|
size_t ext_meta_len= strlen(ext_meta);
|
|
FILEINFO *from, *to, *cur, *end;
|
|
bool skip= false;
|
|
|
|
from= to= cur= dirp->dir_entry;
|
|
end= cur + dirp->number_of_files;
|
|
while (cur < end)
|
|
{
|
|
char *octothorp= strrchr(cur->name + 1, '#');
|
|
char *ext= strchr(octothorp ? octothorp : cur->name, FN_EXTCHAR);
|
|
|
|
if (ext)
|
|
{
|
|
size_t len= (octothorp ? octothorp : ext) - cur->name;
|
|
if (from != cur &&
|
|
(my_strnncoll(cs, (uchar*)from->name, len, (uchar*)cur->name, len) ||
|
|
(from->name[len] != FN_EXTCHAR && from->name[len] != '#')))
|
|
advance(from, to, cur, skip);
|
|
|
|
if (my_strnncoll(cs, (uchar*)ext, strlen(ext),
|
|
(uchar*)ext_meta, ext_meta_len) == 0)
|
|
{
|
|
*ext = 0;
|
|
if (result->add_file(cur->name))
|
|
return 1;
|
|
*ext = FN_EXTCHAR;
|
|
skip= true; // table discovered, skip all files with the same name
|
|
}
|
|
}
|
|
else
|
|
{
|
|
advance(from, to, cur, skip);
|
|
from++;
|
|
}
|
|
|
|
cur++;
|
|
}
|
|
advance(from, to, cur, skip);
|
|
dirp->number_of_files= to - dirp->dir_entry;
|
|
return 0;
|
|
}
|
|
|
|
/**
|
|
Simple, not reusable file-based table discovery
|
|
|
|
@details
|
|
simplified version of extension_based_table_discovery(), that does not
|
|
modify the list of files. It cannot be called many times for the same
|
|
directory listing, otherwise it'll produce duplicate results.
|
|
*/
|
|
int ext_table_discovery_simple(MY_DIR *dirp,
|
|
handlerton::discovered_list *result)
|
|
{
|
|
CHARSET_INFO *cs= character_set_filesystem;
|
|
FILEINFO *cur, *end;
|
|
|
|
cur= dirp->dir_entry;
|
|
end= cur + dirp->number_of_files;
|
|
while (cur < end)
|
|
{
|
|
char *ext= strrchr(cur->name, FN_EXTCHAR);
|
|
|
|
if (ext)
|
|
{
|
|
if (my_strnncoll(cs, (uchar*)ext, strlen(ext),
|
|
(uchar*)reg_ext, reg_ext_length) == 0)
|
|
{
|
|
*ext = 0;
|
|
if (result->add_file(cur->name))
|
|
return 1;
|
|
}
|
|
}
|
|
cur++;
|
|
}
|
|
return 0;
|
|
}
|
|
|