summaryrefslogtreecommitdiff
path: root/sql/sql_acl.cc
diff options
context:
space:
mode:
authorunknown <miguel@hegel.local>2002-05-12 23:01:45 -0300
committerunknown <miguel@hegel.local>2002-05-12 23:01:45 -0300
commit716ed1168f280cd75df310ca80d85b58339b10ef (patch)
tree81c84bd394a1f2fdc40c770346f550acb2c79f58 /sql/sql_acl.cc
parent77957ae868263b7439289d7ae3a79e858f32427c (diff)
downloadmariadb-git-716ed1168f280cd75df310ca80d85b58339b10ef.tar.gz
Sergei's MyODBC fix
Diffstat (limited to 'sql/sql_acl.cc')
-rw-r--r--sql/sql_acl.cc8
1 files changed, 4 insertions, 4 deletions
diff --git a/sql/sql_acl.cc b/sql/sql_acl.cc
index 33924ada8ab..e6b0248e29b 100644
--- a/sql/sql_acl.cc
+++ b/sql/sql_acl.cc
@@ -158,7 +158,7 @@ int acl_init(bool dont_read_acl_tables)
init_sql_alloc(&mem,1024,0);
init_read_record(&read_record_info,thd,table= tables[0].table,NULL,1,0);
- VOID(init_dynamic_array(&acl_hosts,sizeof(ACL_HOST),20,50));
+ VOID(my_init_dynamic_array(&acl_hosts,sizeof(ACL_HOST),20,50));
while (!(read_record_info.read_record(&read_record_info)))
{
ACL_HOST host;
@@ -182,7 +182,7 @@ int acl_init(bool dont_read_acl_tables)
freeze_size(&acl_hosts);
init_read_record(&read_record_info,thd,table=tables[1].table,NULL,1,0);
- VOID(init_dynamic_array(&acl_users,sizeof(ACL_USER),50,100));
+ VOID(my_init_dynamic_array(&acl_users,sizeof(ACL_USER),50,100));
if (table->field[2]->field_length == 8 &&
protocol_version == PROTOCOL_VERSION)
{
@@ -236,7 +236,7 @@ int acl_init(bool dont_read_acl_tables)
freeze_size(&acl_users);
init_read_record(&read_record_info,thd,table=tables[2].table,NULL,1,0);
- VOID(init_dynamic_array(&acl_dbs,sizeof(ACL_DB),50,100));
+ VOID(my_init_dynamic_array(&acl_dbs,sizeof(ACL_DB),50,100));
while (!(read_record_info.read_record(&read_record_info)))
{
ACL_DB db;
@@ -688,7 +688,7 @@ int wild_case_compare(const char *str,const char *wildstr)
static void init_check_host(void)
{
DBUG_ENTER("init_check_host");
- VOID(init_dynamic_array(&acl_wild_hosts,sizeof(struct acl_host_and_ip),
+ VOID(my_init_dynamic_array(&acl_wild_hosts,sizeof(struct acl_host_and_ip),
acl_users.elements,1));
VOID(hash_init(&acl_check_hosts,acl_users.elements,0,0,
(hash_get_key) check_get_key,0,HASH_CASE_INSENSITIVE));