database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

sql_acl.cc, item.h:

Browse Source 
use of new argument
sql_analyse.h:
  macros from mysql_priv.h. Should be deleted soon.
mysql_priv.h:
  _default_charset_info has been removed
item_cmpfunc.h:
  Use cmp_charset
hostname.cc, hash_filo.h:
  Move charset to constructor argument


sql/hash_filo.h:
  Move charset to constructor argument
sql/hostname.cc:
  Move charset to constructor argument
sql/item_cmpfunc.h:
  Use cmp_charset
sql/mysql_priv.h:
  _default_charset_info has been removed
sql/sql_analyse.h:
  macros from mysql_priv.h. Should be deleted soon.
sql/item.h:
  use of new argument
sql/sql_acl.cc:
  use of new argument
This commit is contained in:
unknown
2003-03-07 12:21:32 +04:00
parent 8d9d12d182
commit 11da9dede6
7 changed files with 17 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
sql/hash_filo.h
View File

@ -42,6 +42,7 @@ class hash_filo
const hash_get_key get_key;
hash_free_key free_element;
bool init;
CHARSET_INFO *hash_charset;
hash_filo_element *first_link,*last_link;
public:
@ -49,9 +50,11 @@ public:
HASH cache;
hash_filo(uint size_arg, uint key_offset_arg , uint key_length_arg,
hash_get_key get_key_arg, hash_free_key free_element_arg)
hash_get_key get_key_arg, hash_free_key free_element_arg,
CHARSET_INFO *hash_charset_arg)
:size(size_arg), key_offset(key_offset_arg), key_length(key_length_arg),
get_key(get_key_arg), free_element(free_element_arg),init(0)
get_key(get_key_arg), free_element(free_element_arg),init(0),
hash_charset(hash_charset_arg)
{
bzero((char*) &cache,sizeof(cache));
}
@ -75,7 +78,7 @@ public:
if (!locked)
(void) pthread_mutex_lock(&lock);
(void) hash_free(&cache);
(void) hash_init(&cache,system_charset_info,size,key_offset,
(void) hash_init(&cache,hash_charset,size,key_offset,
key_length, get_key, free_element,0);
if (!locked)
(void) pthread_mutex_unlock(&lock);