mirror of
https://github.com/MariaDB/server.git
synced 2025-01-16 20:12:31 +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
176 lines
5 KiB
C++
176 lines
5 KiB
C++
/* Copyright (c) 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 */
|
|
|
|
#include <my_global.h>
|
|
#include "datadict.h"
|
|
#include "sql_priv.h"
|
|
#include "sql_class.h"
|
|
#include "sql_table.h"
|
|
|
|
static int read_string(File file, uchar**to, size_t length)
|
|
{
|
|
DBUG_ENTER("read_string");
|
|
|
|
my_free(*to);
|
|
if (!(*to= (uchar*) my_malloc(length+1,MYF(MY_WME))) ||
|
|
mysql_file_read(file, *to, length, MYF(MY_NABP)))
|
|
{
|
|
my_free(*to);
|
|
*to= 0;
|
|
DBUG_RETURN(1);
|
|
}
|
|
*((char*) *to+length)= '\0'; // C-style safety
|
|
DBUG_RETURN (0);
|
|
}
|
|
|
|
|
|
/**
|
|
Check type of .frm if we are not going to parse it.
|
|
|
|
@param[in] thd The current session.
|
|
@param[in] path path to FRM file.
|
|
@param[out] dbt db_type of the table if FRMTYPE_TABLE, otherwise undefined.
|
|
|
|
@retval FRMTYPE_ERROR error
|
|
@retval FRMTYPE_TABLE table
|
|
@retval FRMTYPE_VIEW view
|
|
*/
|
|
|
|
frm_type_enum dd_frm_type(THD *thd, char *path, enum legacy_db_type *dbt)
|
|
{
|
|
File file;
|
|
uchar header[10]; //"TYPE=VIEW\n" it is 10 characters
|
|
size_t error;
|
|
frm_type_enum type= FRMTYPE_ERROR;
|
|
DBUG_ENTER("dd_frm_type");
|
|
|
|
*dbt= DB_TYPE_UNKNOWN;
|
|
|
|
if ((file= mysql_file_open(key_file_frm, path, O_RDONLY | O_SHARE, MYF(0))) < 0)
|
|
DBUG_RETURN(FRMTYPE_ERROR);
|
|
error= mysql_file_read(file, (uchar*) header, sizeof(header), MYF(MY_NABP));
|
|
|
|
if (error)
|
|
goto err;
|
|
if (!strncmp((char*) header, "TYPE=VIEW\n", sizeof(header)))
|
|
{
|
|
type= FRMTYPE_VIEW;
|
|
goto err;
|
|
}
|
|
|
|
type= FRMTYPE_TABLE;
|
|
|
|
/*
|
|
This is just a check for DB_TYPE. We'll return default unknown type
|
|
if the following test is true (arg #3). This should not have effect
|
|
on return value from this function (default FRMTYPE_TABLE)
|
|
*/
|
|
if (!is_binary_frm_header(header))
|
|
goto err;
|
|
|
|
*dbt= (enum legacy_db_type) (uint) *(header + 3);
|
|
|
|
if (*dbt >= DB_TYPE_FIRST_DYNAMIC) /* read the true engine name */
|
|
{
|
|
MY_STAT state;
|
|
uchar *frm_image= 0;
|
|
uint n_length;
|
|
|
|
if (mysql_file_fstat(file, &state, MYF(MY_WME)))
|
|
goto err;
|
|
|
|
if (mysql_file_seek(file, 0, SEEK_SET, MYF(MY_WME)))
|
|
goto err;
|
|
|
|
if (read_string(file, &frm_image, state.st_size))
|
|
goto err;
|
|
|
|
if ((n_length= uint4korr(frm_image+55)))
|
|
{
|
|
uint record_offset= uint2korr(frm_image+6)+
|
|
((uint2korr(frm_image+14) == 0xffff ?
|
|
uint4korr(frm_image+47) : uint2korr(frm_image+14)));
|
|
uint reclength= uint2korr(frm_image+16);
|
|
|
|
uchar *next_chunk= frm_image + record_offset + reclength;
|
|
uchar *buff_end= next_chunk + n_length;
|
|
uint connect_string_length= uint2korr(next_chunk);
|
|
next_chunk+= connect_string_length + 2;
|
|
if (next_chunk + 2 < buff_end)
|
|
{
|
|
uint str_db_type_length= uint2korr(next_chunk);
|
|
LEX_STRING name;
|
|
name.str= (char*) next_chunk + 2;
|
|
name.length= str_db_type_length;
|
|
plugin_ref tmp_plugin= ha_resolve_by_name(thd, &name);
|
|
if (tmp_plugin)
|
|
*dbt= plugin_data(tmp_plugin, handlerton *)->db_type;
|
|
else
|
|
*dbt= DB_TYPE_UNKNOWN;
|
|
}
|
|
}
|
|
|
|
my_free(frm_image);
|
|
}
|
|
|
|
/* Probably a table. */
|
|
err:
|
|
mysql_file_close(file, MYF(MY_WME));
|
|
DBUG_RETURN(type);
|
|
}
|
|
|
|
|
|
/*
|
|
Regenerate a metadata locked table.
|
|
|
|
@param thd Thread context.
|
|
@param db Name of the database to which the table belongs to.
|
|
@param name Table name.
|
|
@param path For temporary tables only - path to table files.
|
|
Otherwise NULL (the path is calculated from db and table names).
|
|
|
|
@retval FALSE Success.
|
|
@retval TRUE Error.
|
|
*/
|
|
|
|
bool dd_recreate_table(THD *thd, const char *db, const char *table_name,
|
|
const char *path)
|
|
{
|
|
bool error= TRUE;
|
|
HA_CREATE_INFO create_info;
|
|
char path_buf[FN_REFLEN + 1];
|
|
DBUG_ENTER("dd_recreate_table");
|
|
|
|
memset(&create_info, 0, sizeof(create_info));
|
|
|
|
if (path)
|
|
create_info.options|= HA_LEX_CREATE_TMP_TABLE;
|
|
else
|
|
{
|
|
build_table_filename(path_buf, sizeof(path_buf) - 1,
|
|
db, table_name, "", 0);
|
|
path= path_buf;
|
|
|
|
/* There should be a exclusive metadata lock on the table. */
|
|
DBUG_ASSERT(thd->mdl_context.is_lock_owner(MDL_key::TABLE, db, table_name,
|
|
MDL_EXCLUSIVE));
|
|
}
|
|
|
|
/* Attempt to reconstruct the table. */
|
|
error= ha_create_table(thd, path, db, table_name, &create_info, NULL);
|
|
|
|
DBUG_RETURN(error);
|
|
}
|
|
|