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

client/mysqldump.c

Browse source 
compilation failure fixed
    cleanup
This commit is contained in:
serg@serg.mylan 2004-12-28 17:33:49 +01:00
parent 1613bf2731
commit cf6e2214d8
1 changed files with 15 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
client/mysqldump.c
View file

@ -137,7 +137,6 @@ typedef struct st_table_rule_ent
uint key_len; uint key_len;
} TABLE_RULE_ENT; } TABLE_RULE_ENT;
my_bool ignore_table_inited;
HASH ignore_table; HASH ignore_table;
static struct my_option my_long_options[] = static struct my_option my_long_options[] =
@ -532,16 +531,12 @@ static byte* get_table_key(TABLE_RULE_ENT* e, uint* len,
} }
void init_table_rule_hash(HASH* h, bool* h_inited) void init_table_rule_hash(HASH* h)
{ {
if(hash_init(h, charset_info, TABLE_RULE_HASH_SIZE, 0, 0, if(hash_init(h, charset_info, TABLE_RULE_HASH_SIZE, 0, 0,
(hash_get_key) get_table_key, (hash_get_key) get_table_key,
(hash_free_key) free_table_ent, 0)) (hash_free_key) free_table_ent, 0))
{ exit(EX_EOM);
fprintf(stderr, "Internal hash initialization error\n");
exit(1);
}
*h_inited= 1;
} }
@ -617,37 +612,30 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)),
break; break;
case (int) OPT_IGNORE_TABLE: case (int) OPT_IGNORE_TABLE:
{ {
const char* dot = strchr(argument, '.'); uint len= (uint)strlen(argument);
if (!dot) TABLE_RULE_ENT* e;
if (!strchr(argument, '.'))
{ {
fprintf(stderr, "Illegal use of option --ignore-table=<database>.<table>\n"); fprintf(stderr, "Illegal use of option --ignore-table=<database>.<table>\n");
exit(1); exit(1);
} }
// len is always > 0 because we know the there exists a '.' /* len is always > 0 because we know the there exists a '.' */
uint len= (uint)strlen(argument); e= (TABLE_RULE_ENT*)my_malloc(sizeof(TABLE_RULE_ENT) + len, MYF(MY_WME));
TABLE_RULE_ENT* e= (TABLE_RULE_ENT*)my_malloc(sizeof(TABLE_RULE_ENT) if (!e)
+ len, MYF(MY_WME)); exit(EX_EOM);
if (!e)
{
fprintf(stderr, "Internal memory allocation error\n");
exit(1);
}
e->key= (char*)e + sizeof(TABLE_RULE_ENT); e->key= (char*)e + sizeof(TABLE_RULE_ENT);
e->key_len= len; e->key_len= len;
memcpy(e->key, argument, len); memcpy(e->key, argument, len);
if (!ignore_table_inited) if (!hash_inited(&ignore_table))
init_table_rule_hash(&ignore_table, &ignore_table_inited); init_table_rule_hash(&ignore_table);
if(my_hash_insert(&ignore_table, (byte*)e)) if(my_hash_insert(&ignore_table, (byte*)e))
{ exit(EX_EOM);
fprintf(stderr, "Internal hash insert error\n");
exit(1);
}
break; break;
} }
case (int) OPT_COMPATIBLE: case (int) OPT_COMPATIBLE:
{ {
char buff[255]; char buff[255];
char *end= compatible_mode_normal_str; char *end= compatible_mode_normal_str;
int i; int i;
@ -2021,8 +2009,7 @@ static int init_dumping(char *database)
my_bool include_table(byte* hash_key, uint len) my_bool include_table(byte* hash_key, uint len)
{ {
if (ignore_table_inited && if (hash_search(&ignore_table, (byte*) hash_key, len))
hash_search(&ignore_table, (byte*) hash_key, len))
return FALSE; return FALSE;
return TRUE; return TRUE;