mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-18 04:53:01 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

SQL: VTMD_table::get_archive_tables() misc fixes

Browse source
This commit is contained in:
Aleksey Midenkov 2017-09-27 10:24:40 +03:00
parent 75bc483d7a
commit 79e17b26fb
2 changed files with 38 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

67
sql/vtmd.cc
View file

@ -485,7 +485,8 @@ VTMD_rename::revert_rename(THD *thd, LString new_db)
return rc;
}
void VTMD_table::archive_name(
void
VTMD_table::archive_name(
THD* thd,
const char* table_name,
char* new_name,
@ -497,7 +498,8 @@ void VTMD_table::archive_name(
now.second, now.second_part);
}
bool VTMD_table::find_archive_name(THD *thd, String &out)
bool
VTMD_table::find_archive_name(THD *thd, String &out)
{
String vtmd_name;
if (about.vers_vtmd_name(vtmd_name))
@ -575,11 +577,28 @@ err:
return error ? true : false;
}
Dynamic_array<String> VTMD_table::get_archive_tables(THD *thd)
static
bool
get_vtmd_tables(THD *thd, Dynamic_array<LEX_STRING *> &table_names)
{
Dynamic_array<String> result;
// Note function retrieves table names from current db only.
LOOKUP_FIELD_VALUES lookup_field_values= {
*thd->make_lex_string(thd->db, strlen(thd->db)),
*thd->make_lex_string(C_STRING_WITH_LEN("%_vtmd")), false, true};
int res= make_table_name_list(thd, &table_names, thd->lex, &lookup_field_values,
&lookup_field_values.db_value);
return res;
}
bool
VTMD_table::get_archive_tables(THD *thd, Dynamic_array<String> &result)
{
Dynamic_array<LEX_STRING *> vtmd_tables;
if (get_vtmd_tables(thd, vtmd_tables))
return true;
Dynamic_array<LEX_STRING *> vtmd_tables= get_vtmd_tables(thd);
for (uint i= 0; i < vtmd_tables.elements(); i++)
{
LEX_STRING table_name= *vtmd_tables.at(i);
@ -593,16 +612,23 @@ Dynamic_array<String> VTMD_table::get_archive_tables(THD *thd)
TABLE *table= open_log_table(thd, &table_list, &open_tables_backup);
if (!table)
return result;
return true;
READ_RECORD read_record;
int error= 0;
SQL_SELECT *sql_select= make_select(table, 0, 0, NULL, NULL, 0, &error);
if (error)
goto error1;
if (error = init_read_record(&read_record, thd, table, sql_select, NULL, 1, 1,
false))
goto error2;
{
close_log_table(thd, &open_tables_backup);
return true;
}
error= init_read_record(&read_record, thd, table, sql_select, NULL, 1, 1, false);
if (error)
{
delete sql_select;
close_log_table(thd, &open_tables_backup);
return true;
}
while (!(error= read_record.read_record(&read_record)))
{
@ -619,28 +645,9 @@ Dynamic_array<String> VTMD_table::get_archive_tables(THD *thd)
}
end_read_record(&read_record);
error2:
delete sql_select;
error1:
close_log_table(thd, &open_tables_backup);
if (error)
break;
}
return result;
}
Dynamic_array<LEX_STRING *> get_vtmd_tables(THD *thd)
{
// Note function retrieves table names from current db only.
LOOKUP_FIELD_VALUES lookup_field_values= {
*thd->make_lex_string(thd->db, strlen(thd->db)),
*thd->make_lex_string(C_STRING_WITH_LEN("%_vtmd")), false, true};
Dynamic_array<LEX_STRING *> table_names;
make_table_name_list(thd, &table_names, thd->lex, &lookup_field_values,
&lookup_field_values.db_value);
return table_names;
return false;
}

5
sql/vtmd.h
View file

@ -87,12 +87,9 @@ public:
}
bool find_archive_name(THD *thd, String &out);
static Dynamic_array<String> get_archive_tables(THD *thd);
bool get_archive_tables(THD *thd, Dynamic_array<String> &result);
};
Dynamic_array<LEX_STRING *> get_vtmd_tables(THD *thd);
class VTMD_exists : public VTMD_table
{
protected: