- developers - lists.mariadb.org

Re: [Maria-developers] bzr commit into Mariadb 5.2, with Maria 2.0:maria/5.2 branch (igor:2742) WL#86
by Michael Widenius 04 Apr '10

04 Apr '10

Hi! >>>>> "Igor" == Igor Babaev <igor(a)askmonty.org> writes: Igor> Please review this patch that is based on the contribution patch Igor> attached to WL#86. <cut> First some things we discussed in Iceland: Functions with starts with s_.... should be changed to simple_.... Move select.test to suite/select and run it with different keycache parameters (to not repeat select.result) Igor> 2742 Igor Babaev 2010-02-16 Igor> WL#86: Partitioned key cache for MyISAM. Igor> This is the base patch for the task. Igor> === modified file 'mysys/mf_keycache.c' Igor> +#define KEYCACHE_BASE_EXPR(f, pos) Igor> \ Igor> + ((ulong) ((pos) / keycache->key_cache_block_size) + (ulong) (f)) Igor> #define KEYCACHE_HASH(f, pos) Igor> \ Igor> -(((ulong) ((pos) / keycache->key_cache_block_size) + Igor> \ Igor> - (ulong) (f)) & Igor> (keycache->hash_entries-1)) Igor> + ((KEYCACHE_BASE_EXPR(f, pos) / keycache->hash_factor) & Igor> \ Igor> + (keycache->hash_entries-1)) Igor> #define FILE_HASH(f) ((uint) (f) & (CHANGED_BLOCKS_HASH-1)) As all the divisiors are powers of two, would it be more efficent to store the shift factor in 'keycache' and do shifts instead of / ? (I assume that even on modern CPU:s shift is much faster then /) Igor> +static Igor> +void s_finish_resize_key_cache(void *keycache_cb, Igor> + my_bool with_resize_queue, Igor> + my_bool acquire_lock) Igor> +{ Igor> + S_KEY_CACHE_CB *keycache= (S_KEY_CACHE_CB *) keycache_cb; Igor> + DBUG_ENTER("s_finish_resize_key_cache"); Igor> + Igor> + if (acquire_lock) Igor> + keycache_pthread_mutex_lock(&keycache->cache_lock); Igor> + Add after this: safe_mutex_assert_owner((&keycache->cache_lock); <cut> Igor> +static Igor> +int s_resize_key_cache(void *keycache_cb, uint key_cache_block_size, Igor> + size_t use_mem, uint division_limit, Igor> + uint age_threshold) Igor> +{ Igor> + S_KEY_CACHE_CB *keycache= (S_KEY_CACHE_CB *) keycache_cb; It may be better if this function would take S_KEY_CACHE_CB as a parameter. This can easily be done by doing a cast when storing the function pointer into the st_key_cache_funcs array. This way all casts are in one place and all real functions can avoid casts. The same thing applies for all other interface functions. This mainly makes the real code look a bit nicer Igor> + int blocks= 0; Igor> + DBUG_ENTER("s_resize_key_cache"); Igor> + Igor> + if (!keycache->key_cache_inited) Igor> + DBUG_RETURN(keycache->disk_blocks); Shouldn't we return 0 if cache was not initied ? (if not inited, disk_blocks may contain random data) Igor> @@ -670,7 +894,7 @@ finish: Igor> /* Igor> Increment counter blocking resize key cache operation Igor> */ Igor> -static inline void inc_counter_for_resize_op(KEY_CACHE *keycache) Igor> +static inline void inc_counter_for_resize_op(S_KEY_CACHE_CB *keycache) Igor> { Igor> keycache->cnt_for_resize_op++; Igor> } Igor> @@ -680,35 +904,49 @@ static inline void inc_counter_for_resiz Igor> Decrement counter blocking resize key cache operation; Igor> Signal the operation to proceed when counter becomes equal zero Igor> */ Igor> -static inline void dec_counter_for_resize_op(KEY_CACHE *keycache) Igor> +static inline void dec_counter_for_resize_op(S_KEY_CACHE_CB *keycache) Many changes are just like the one above. Wouldn't it been easier to keep KEY_CACHE as the orignal value and add KEY_CACHE_MULTI as the new one ? (This would make future merger with the MySQL code easier too) <cut> Igor> + Igor> +/* Igor> + Get statistics for a simple key cache Igor> + Igor> + SYNOPSIS Igor> + get_key_cache_statistics() Igor> + keycache_cb pointer to the control block of a simple key cache Igor> + partition_no partition number (not used) Igor> + key_cache_stats OUT pointer to the structure for the returned Igor> statistics Igor> + Igor> + DESCRIPTION Igor> + This function is the implementation of the get_key_cache_statistics Igor> + interface function that is employed by simple (non-partitioned) key Igor> caches. Igor> + The function considers the parameter keycache_cb as a pointer to the Igor> + control block structure of the type S_KEY_CACHE_CB for a simple key Igor> cache. Igor> + This function returns the statistical data for the key cache. Igor> + The parameter partition_no is not used by this function. Igor> + Igor> + RETURN Igor> + none Igor> + Igor> +*/ A small thing, but better point them out (to ensure we agree on the coding style): Remove the extra empty line after 'none'. The current style is: No empty lines at end of comments One empty line between function comment and function. Two empty lines before function comment (to separate it from previous function) Igor> + Igor> +static Igor> +void s_get_key_cache_statistics(void *keycache_cb, Igor> + uint partition_no __attribute__((unused)), Igor> + KEY_CACHE_STATISTICS *key_cache_stats) Igor> +{ Igor> + S_KEY_CACHE_CB *keycache= (S_KEY_CACHE_CB *) keycache_cb; Igor> + DBUG_ENTER("s_get_key_cache_statistics"); Igor> + Igor> + key_cache_stats->mem_size= (longlong) keycache->key_cache_mem_size; Igor> + key_cache_stats->block_size= (longlong) keycache->key_cache_block_size; Igor> + key_cache_stats->blocks_used= keycache->blocks_used; Igor> + key_cache_stats->blocks_unused= keycache->blocks_unused; Igor> + key_cache_stats->blocks_changed= keycache->global_blocks_changed; Igor> + key_cache_stats->read_requests= keycache->global_cache_r_requests; Igor> + key_cache_stats->reads= keycache->global_cache_read; Igor> + key_cache_stats->write_requests= keycache->global_cache_w_requests; Igor> + key_cache_stats->writes= keycache->global_cache_write; Igor> + DBUG_VOID_RETURN; Igor> +} Please ensure that all keycache variables are of the same style. Use either keycache or key_cache everywhere! (See above for confusing example) Igor> + Igor> + Igor> +static size_t s_key_cache_stat_var_offsets[]= Igor> +{ Igor> + offsetof(S_KEY_CACHE_CB, blocks_used), Igor> + offsetof(S_KEY_CACHE_CB, blocks_unused), Igor> + offsetof(S_KEY_CACHE_CB, global_blocks_changed), Igor> + offsetof(S_KEY_CACHE_CB, global_cache_w_requests), Igor> + offsetof(S_KEY_CACHE_CB, global_cache_write), Igor> + offsetof(S_KEY_CACHE_CB, global_cache_r_requests), Igor> + offsetof(S_KEY_CACHE_CB, global_cache_read) Igor> +}; Igor> + Igor> + Igor> +/* Igor> + Get the value of a statistical variable for a simple key cache Igor> + Igor> + SYNOPSIS Igor> + s_get_key_cache_stat_value() Igor> + keycache_cb pointer to the control block of a simple key cache Igor> + var_no the ordered number of a statistical variable Igor> + Igor> + DESCRIPTION Igor> + This function is the implementation of the s_get_key_cache_stat_value Igor> + interface function that is employed by simple (non-partitioned) key Igor> caches. Igor> + The function considers the parameter keycache_cb as a pointer to the Igor> + control block structure of the type S_KEY_CACHE_CB for a simple key Igor> cache. Igor> + This function returns the value of the statistical variable var_no Igor> + for this key cache. The variables are numbered starting from 0 to 6. Igor> + Igor> + RETURN Igor> + The value of the specified statistical variable Igor> + Igor> +*/ Igor> + Igor> +static Igor> +ulonglong s_get_key_cache_stat_value(void *keycache_cb, uint var_no) Igor> +{ Igor> + S_KEY_CACHE_CB *keycache= (S_KEY_CACHE_CB *) keycache_cb; Igor> + size_t var_ofs= s_key_cache_stat_var_offsets[var_no]; Igor> + ulonglong res= 0; Igor> + DBUG_ENTER("s_get_key_cache_stat_value"); Igor> + Igor> + if (var_no < 3) Change the above to a define that is in the header file and add a comment to where s_key_cache_stat_var_offsets are defined). (Otherwise someone will surely break things sooner or later!) Igor> + res= (ulonglong) (*(long *) ((char *) keycache + var_ofs)); Igor> + else Igor> + res= *(ulonglong *) ((char *) keycache + var_ofs); Igor> + Igor> + DBUG_RETURN(res); Igor> +} Igor> + Igor> + Igor> +/* Igor> + The array of pointer to the key cache interface functions used for simple Igor> + key caches. Any simple key cache objects including those incorporated Igor> into Igor> + partitioned keys caches exploit this array. Igor> + Igor> + The current implementation of these functions allows to call them from Igor> + the MySQL server code directly. We don't do it though. Igor> +*/ Igor> + Igor> +static KEY_CACHE_FUNCS s_key_cache_funcs = Igor> +{ Igor> + s_init_key_cache, Igor> + s_resize_key_cache, Igor> + s_change_key_cache_param, Igor> + s_key_cache_read, Igor> + s_key_cache_insert, Igor> + s_key_cache_write, Igor> + s_flush_key_blocks, Igor> + s_reset_key_cache_counters, Igor> + s_end_key_cache, Igor> + s_get_key_cache_statistics, Igor> + s_get_key_cache_stat_value Igor> +}; Here is where you can add casts so that you don't need them in the functions. <cut> Igor> +/* Control block for a partitioned key cache */ Igor> + Igor> +typedef struct st_p_key_cache_cb Igor> +{ Igor> + my_bool key_cache_inited; /*<=> control block is allocated Igor> */ Igor> + S_KEY_CACHE_CB **partition_array; /* array of the key cache Igor> partitions */ Igor> + uint partitions; /* number of partitions in the key Igor> cache */ Igor> + size_t key_cache_mem_size; /* specified size of the cache memory Igor> */ Igor> + uint key_cache_block_size; /* size of the page buffer of a cache Igor> block */ Igor> +} P_KEY_CACHE_CB; Please move the uint values after each other (gives better alignment) Igor> + Igor> +static Igor> +void p_end_key_cache(void *keycache_cb, my_bool cleanup); Move the above declaration to start of file (together with all other static declarations) <cut> Igor> + Igor> +static Igor> +S_KEY_CACHE_CB *get_key_cache_partition_for_write(P_KEY_CACHE_CB Igor> *keycache, Igor> + File file, my_off_t Igor> filepos, Igor> + ulonglong* Igor> dirty_part_map) Put a new line after 'S_KEY_CACHE_CB *'; this makes the line more readable. Igor> + If keycache->key_cache_inited != 0 then we assume that the memory for Igor> + the array of partitions has been already allocated. Igor> + Igor> + It's assumed that no two threads call this function simultaneously Igor> + referring to the same key cache handle. Igor> +*/ I don't think we can assume that any memory is initialized to 0. Better to have an argument that tells if the memory is already initialized or not. Igor> + Igor> +static Igor> +int p_init_key_cache(void *keycache_cb, uint key_cache_block_size, Igor> + size_t use_mem, uint division_limit, Igor> + uint age_threshold) Igor> +{ Igor> + int i; Igor> + size_t mem_per_cache; Igor> + int cnt; Igor> + S_KEY_CACHE_CB *partition; Igor> + S_KEY_CACHE_CB **partition_ptr; Igor> + P_KEY_CACHE_CB *keycache= (P_KEY_CACHE_CB *) keycache_cb; Igor> + uint partitions= keycache->partitions; It would be better if partitions would be part of the init call, as otherwise the caller need to initialize the keycache->partitions before the call, which is more cumbersome. Igor> + int blocks= -1; Igor> + DBUG_ENTER("p_init_key_cache"); Igor> + Igor> + keycache->key_cache_block_size = key_cache_block_size; Igor> + Igor> + if (keycache->key_cache_inited) Remove above test; We can't make a decisions bases on a struct that we are about to initialize. Igor> + partition_ptr= keycache->partition_array; Igor> + else Igor> + { Igor> + if(!(partition_ptr= Igor> + (S_KEY_CACHE_CB **) my_malloc(sizeof(S_KEY_CACHE_CB *) * partitions, Igor> + MYF(0)))) Igor> + DBUG_RETURN(blocks); MYF(0) -> MYF(MY_WME) (So that we get a proper error message) Please return -1 instead of blocks (easier to understand). Igor> + keycache->partition_array= partition_ptr; Igor> + } Igor> + Igor> + mem_per_cache = use_mem / partitions; Igor> + Igor> + for (i= 0; i < (int) partitions; i++) Igor> + { Igor> + my_bool key_cache_inited= keycache->key_cache_inited; Igor> + if (key_cache_inited) Igor> + partition= *partition_ptr; Igor> + else Igor> + { Igor> + if (!(partition= (S_KEY_CACHE_CB *) Igor> my_malloc(sizeof(S_KEY_CACHE_CB), Igor> + MYF(0)))) Igor> + continue; If we fail, shouldn't we abort ? After all, we can't assume we will be able to allocate any other partition after this one. Here we should probably use MYF(MY_WME) too. Igor> + partition->key_cache_inited= 0; Igor> + } Igor> + Igor> + if ((cnt= s_init_key_cache(partition, Igor> + key_cache_block_size, mem_per_cache, Igor> + division_limit, age_threshold)) <= 0) Igor> + { Igor> + s_end_key_cache(partition, 1); Igor> + my_free((uchar *) partition, MYF(0)); my_free() don't need a cast. Igor> + partition= 0; Igor> + if (key_cache_inited) Igor> + { Igor> + memmove(partition_ptr, partition_ptr+1, Igor> + sizeof(partition_ptr)*(partitions-i-1)); Igor> + } Igor> + if (i == 0) Igor> + { Igor> + i--; Igor> + partitions--; Igor> + if (partitions) Igor> + mem_per_cache = use_mem / partitions; Igor> + } Igor> + continue; Igor> + } I don't like the above code to try to recalculate the memory size: - You uncrease the size of the next partitions, but the total will not be use_mem anyway, so it's a bit pointless. - It will make the caches of different sizes, which is probably not what the user wants anyway. I think it would be better to be able to just fail if we can't allocate all memory. - Less confusing for the user - If we get a memory error here, something is probably very wrong anyway so it's better to release memory and abort. - Simpler code Igor> + if (blocks < 0) Igor> + blocks= 0; Whey the special logic with the first loop ? Please add a commment or just set block to 0 instead of -1 and set block to -1 on error / at abort <cut> Igor> +static Igor> +int p_resize_key_cache(void *keycache_cb, uint key_cache_block_size, Igor> + size_t use_mem, uint division_limit, Igor> + uint age_threshold) Igor> +{ Igor> + uint i; Igor> + P_KEY_CACHE_CB *keycache= (P_KEY_CACHE_CB *) keycache_cb; Igor> + uint partitions= keycache->partitions; Igor> + my_bool cleanup= use_mem == 0; Igor> + int blocks= -1; Igor> + int err= 0; Igor> + DBUG_ENTER("p_resize_key_cache"); Igor> + if (use_mem == 0) Change to test if (cleanup) Igor> + { Igor> + p_end_key_cache(keycache_cb, 0); Igor> + DBUG_RETURN(blocks); change to return -1 Igor> + } Igor> + for (i= 0; i < partitions; i++) Igor> + { Igor> + err|= s_prepare_resize_key_cache(keycache->partition_array[i], 0, 1); Igor> + } Igor> + if (!err && use_mem) You don't need to test use_mem here (you know it's not 0) Igor> + blocks= p_init_key_cache(keycache_cb, key_cache_block_size, use_mem, Igor> + division_limit, age_threshold); Igor> + if (blocks > 0 && !cleanup) Cleanup is always 0 here (as otherwise we return -1 at function start functabove) Igor> + { Igor> + for (i= 0; i < partitions; i++) Igor> + { Igor> + s_finish_resize_key_cache(keycache->partition_array[i], 0, 1); Igor> + } Igor> + } Igor> + DBUG_RETURN(blocks); Igor> +} <cut> Igor> +static Igor> +void p_end_key_cache(void *keycache_cb, my_bool cleanup) Igor> +{ Igor> + uint i; Igor> + P_KEY_CACHE_CB *keycache= (P_KEY_CACHE_CB *) keycache_cb; Igor> + uint partitions= keycache->partitions; Igor> + DBUG_ENTER("p_end_key_cache"); Igor> + DBUG_PRINT("enter", ("key_cache: 0x%lx", (long) keycache)); Igor> + Igor> + for (i= 0; i < partitions; i++) Igor> + { Igor> + s_end_key_cache(keycache->partition_array[i], cleanup); Igor> + } Igor> + if (cleanup) { Move { to next line Igor> + for (i= 0; i < partitions; i++) Igor> + my_free((uchar*) keycache->partition_array[i], MYF(0)); Igor> + my_free((uchar*) keycache->partition_array, MYF(0)); Igor> + keycache->key_cache_inited= 0; Igor> + } Igor> + DBUG_VOID_RETURN; Igor> +} <cut> Offset variable can be used (it's only set). Igor> +static Igor> +int p_key_cache_insert(void *keycache_cb, Igor> + File file, my_off_t filepos, int level, Igor> + uchar *buff, uint length) Igor> +{ Igor> + uint w_length; Igor> + P_KEY_CACHE_CB *keycache= (P_KEY_CACHE_CB *) keycache_cb; Igor> + uint offset= (uint) (filepos % keycache->key_cache_block_size); Igor> + DBUG_ENTER("p_key_cache_insert"); Igor> + DBUG_PRINT("enter", ("fd: %u pos: %lu length: %u", Igor> + (uint) file,(ulong) filepos, length)); Igor> + Igor> + Igor> + /* Write data in key_cache_block_size increments */ Igor> + do Igor> + { Igor> + S_KEY_CACHE_CB *partition= get_key_cache_partition(keycache, Igor> + file, filepos); Igor> + w_length= length; Igor> + set_if_smaller(w_length, keycache->key_cache_block_size); Should be: set_if_smaller(w_length, keycache->key_cache_block_size - offset); Igor> + if (s_key_cache_insert((void *) partition, Igor> + file, filepos, level, Igor> + buff, w_length)) Igor> + DBUG_RETURN(1); Igor> + <cut> Igor> +static Igor> +int p_key_cache_write(void *keycache_cb, Igor> + File file, void *file_extra, Igor> + my_off_t filepos, int level, Igor> + uchar *buff, uint length, Igor> + uint block_length __attribute__((unused)), Igor> + int dont_write) Igor> +{ Igor> + uint w_length; Igor> + ulonglong *part_map= (ulonglong *) file_extra; Igor> + P_KEY_CACHE_CB *keycache= (P_KEY_CACHE_CB *) keycache_cb; Igor> + uint offset= (uint) (filepos % keycache->key_cache_block_size); Igor> + DBUG_ENTER("p_key_cache_write"); Igor> + DBUG_PRINT("enter", Igor> + ("fd: %u pos: %lu length: %u block_length: %u" Igor> + " key_block_length: %u", Igor> + (uint) file, (ulong) filepos, length, block_length, Igor> + keycache ? keycache->key_cache_block_size : 0)); Igor> + Igor> + Igor> + /* Write data in key_cache_block_size increments */ Igor> + do Igor> + { Igor> + S_KEY_CACHE_CB *partition= get_key_cache_partition_for_write(keycache, Igor> + file, Igor> filepos, Igor> + part_map); Igor> + w_length = length; Igor> + set_if_smaller(w_length, keycache->key_cache_block_size ); Should be: set_if_smaller(w_length, keycache->key_cache_block_size - offset); Igor> + if (s_key_cache_write(partition, Igor> + file, 0, filepos, level, Igor> + buff, w_length, block_length, Igor> + dont_write)) Igor> + DBUG_RETURN(1); <cut> Igor> +static Igor> +int p_flush_key_blocks(void *keycache_cb, Igor> + File file, void *file_extra, Igor> + enum flush_type type) Igor> +{ Igor> + uint i; Igor> + P_KEY_CACHE_CB *keycache= (P_KEY_CACHE_CB *) keycache_cb; Igor> + uint partitions= keycache->partitions; Igor> + int err= 0; Igor> + ulonglong *dirty_part_map= (ulonglong *) file_extra; Igor> + DBUG_ENTER("p_flush_key_blocks"); Igor> + DBUG_PRINT("enter", ("keycache: 0x%lx", (long) keycache)); Igor> + Igor> + for (i= 0; i < partitions; i++) Igor> + { Igor> + S_KEY_CACHE_CB *partition= keycache->partition_array[i]; Igor> + if ((type == FLUSH_KEEP || type == FLUSH_FORCE_WRITE) && Igor> + !((*dirty_part_map) & (1<<i))) Change 1<<i to ((ulonglong) 1 << i) Igor> + continue; Igor> + err+= test(s_flush_key_blocks(partition, file, 0, type)); You can change the + to |, and then remove the err > 0 below. Igor> + } Igor> + *dirty_part_map= 0; Igor> + Igor> + if (err > 0) Igor> + err= 1; Igor> + Igor> + DBUG_RETURN(err); Igor> +} <cut> Igor> +static Igor> +void p_get_key_cache_statistics(void *keycache_cb, uint partition_no, Igor> + KEY_CACHE_STATISTICS *key_cache_stats) Igor> +{ Igor> + uint i; Igor> + S_KEY_CACHE_CB *partition; Igor> + P_KEY_CACHE_CB *keycache= (P_KEY_CACHE_CB *) keycache_cb; Igor> + uint partitions= keycache->partitions; Igor> + DBUG_ENTER("p_get_key_cache_statistics_"); Igor> + Igor> + if (partition_no != 0) Igor> + { Igor> + partition= keycache->partition_array[partition_no-1]; Igor> + s_get_key_cache_statistics((void *) partition, 0, key_cache_stats); Igor> + DBUG_VOID_RETURN; Igor> + } Igor> + key_cache_stats->mem_size= (longlong) keycache->key_cache_mem_size; Igor> + key_cache_stats->block_size= (longlong) keycache->key_cache_block_size; Igor> + for (i = 0; i < partitions; i++) Igor> + { Igor> + partition= keycache->partition_array[i]; Igor> + key_cache_stats->blocks_used+= partition->blocks_used; Igor> + key_cache_stats->blocks_unused+= partition->blocks_unused; Igor> + key_cache_stats->blocks_changed+= partition->global_blocks_changed; Igor> + key_cache_stats->read_requests+= partition->global_cache_r_requests; Igor> + key_cache_stats->reads+= partition->global_cache_read; Igor> + key_cache_stats->write_requests+= partition->global_cache_w_requests; Igor> + key_cache_stats->writes+= partition->global_cache_write; Igor> + } Shouldn't you start by reseting key_cache_stats ? I think it's better to do the reset here than in get_key_cache_statistics() As you don't need the reset when you call s_get_key_cache_statistics() (as this overwrites all stats entries) Igor> + DBUG_VOID_RETURN; Igor> +} <cut> Igor> +static Igor> +ulonglong p_get_key_cache_stat_value(void *keycache_cb, uint var_no) Igor> +{ Igor> + uint i; Igor> + P_KEY_CACHE_CB *keycache= (P_KEY_CACHE_CB *) keycache_cb; Igor> + uint partitions= keycache->partitions; Igor> + size_t var_ofs= s_key_cache_stat_var_offsets[var_no]; Igor> + ulonglong res= 0; Igor> + DBUG_ENTER("p_get_key_cache_stat_value"); Igor> + Igor> + if (var_no < 3) Change to define (see earlier comment) <cut> Igor> +int init_key_cache(KEY_CACHE *keycache, uint key_cache_block_size, Igor> + size_t use_mem, uint division_limit, Igor> + uint age_threshold, uint partitions) Igor> +{ Igor> + void *keycache_cb; Igor> + int blocks; Igor> + if (keycache->key_cache_inited) Igor> + keycache_cb= keycache->keycache_cb; See earlier comment about making this a parameter. <cut> Igor> +int resize_key_cache(KEY_CACHE *keycache, uint key_cache_block_size, Igor> + size_t use_mem, uint division_limit, uint age_threshold) Igor> +{ Igor> + int blocks= -1; Igor> + if (keycache->key_cache_inited) Igor> + { Igor> + if ((uint) keycache->param_partitions != keycache->partitions && Igor> use_mem) Igor> + blocks= repartition_key_cache (keycache, Igor> + key_cache_block_size, use_mem, Igor> + division_limit, age_threshold, Igor> + (uint) keycache->param_partitions); Remove space after function name Igor> + else Igor> + { Igor> + blocks= keycache->interface_funcs->resize(keycache->keycache_cb, Igor> + key_cache_block_size, Igor> + use_mem, division_limit, Igor> + age_threshold); Igor> + Igor> + if (keycache->partitions) Igor> + keycache->partitions= Igor> + ((P_KEY_CACHE_CB *)(keycache->keycache_cb))->partitions; Igor> + } Igor> + if (blocks <= 0) Igor> + keycache->can_be_used= 0; The last should probably be: keycache->can_be_used= (blocks >= 0); Safer, as it ensures that can_be_used is always correct. Igor> +uchar *key_cache_read(KEY_CACHE *keycache, Igor> + File file, my_off_t filepos, int level, Igor> + uchar *buff, uint length, Igor> + uint block_length, int return_buffer) Igor> +{ Igor> + if (keycache->key_cache_inited && keycache->can_be_used) Could we change this to only depend on keycache->can_be_used ? (Faster if) We can of course assume that keycache_init() has been called for the object. Igor> + return keycache->interface_funcs->read(keycache->keycache_cb, Igor> + file, filepos, level, Igor> + buff, length, Igor> + block_length, return_buffer); Igor> + Igor> + /* We can't use mutex here as the key cache may not be initialized */ Igor> + keycache->global_cache_r_requests++; Igor> + keycache->global_cache_read++; Igor> + Igor> + if (my_pread(file, (uchar*) buff, length, filepos, MYF(MY_NABP))) Igor> + return (uchar *) 0; Igor> + Igor> + return buff; Igor> +} <cut> Igor> +int key_cache_insert(KEY_CACHE *keycache, Igor> + File file, my_off_t filepos, int level, Igor> + uchar *buff, uint length) Igor> +{ Igor> + if (keycache->key_cache_inited && keycache->can_be_used) Same here as above. Igor> + return keycache->interface_funcs->insert(keycache->keycache_cb, Igor> + file, filepos, level, Igor> + buff, length); Igor> + return 0; Igor> +} Igor> + <cut> Igor> +int key_cache_write(KEY_CACHE *keycache, Igor> + File file, void *file_extra, Igor> + my_off_t filepos, int level, Igor> + uchar *buff, uint length, Igor> + uint block_length, int force_write) Igor> +{ Igor> + if (keycache->key_cache_inited && keycache->can_be_used) And here. Igor> +void get_key_cache_statistics(KEY_CACHE *keycache, uint partition_no, Igor> + KEY_CACHE_STATISTICS *key_cache_stats) Igor> +{ Igor> + bzero(key_cache_stats, sizeof(KEY_CACHE_STATISTICS)); Remove the above; Better to assume that get_stats() overwrites this. (Which is the case for s_get_key_cache_statistics()) <cut> Igor> === modified file 'sql/handler.cc' Igor> --- a/sql/handler.cc 2010-02-01 06:14:12 +0000 Igor> +int ha_repartition_key_cache(KEY_CACHE *key_cache) Igor> +{ Igor> + DBUG_ENTER("ha_repartition_key_cache"); Igor> + Igor> + if (key_cache->key_cache_inited) Igor> + { Igor> + pthread_mutex_lock(&LOCK_global_system_variables); Igor> + size_t tmp_buff_size= (size_t) key_cache->param_buff_size; Igor> + long tmp_block_size= (long) key_cache->param_block_size; Igor> + uint division_limit= key_cache->param_division_limit; Igor> + uint age_threshold= key_cache->param_age_threshold; Igor> + uint partitions= key_cache->param_partitions; Igor> + pthread_mutex_unlock(&LOCK_global_system_variables); Igor> + DBUG_RETURN(!repartition_key_cache(key_cache, tmp_block_size, Igor> + tmp_buff_size, Igor> + division_limit, age_threshold, Igor> + partitions)); Igor> + } key_cache_inited may be 0 if we used a 0 size key cache. In this case one can't reparttion this cache. Is this correct? Assume on does the following: - Set key cache size to 0 - changes partition numbers - set key cache to 1G In this case, will things work and the new key cache have the new number of partitions ? (It may work, just wanted to be sure that you have tested this) <cut> Igor> === modified file 'sql/sql_show.cc' Igor> --- a/sql/sql_show.cc 2010-02-01 06:14:12 +0000 Igor> +++ b/sql/sql_show.cc 2010-02-16 16:41:11 +0000 Igor> @@ -2220,6 +2220,31 @@ void remove_status_vars(SHOW_VAR *list) Igor> } Igor> + Igor> +static void update_key_cache_stat_var(KEY_CACHE *key_cache, size_t ofs) Igor> +{ Igor> + uint var_no; Igor> + switch (ofs) { Igor> + case offsetof(KEY_CACHE, blocks_used): Igor> + case offsetof(KEY_CACHE, blocks_unused): Igor> + case offsetof(KEY_CACHE, global_blocks_changed): Igor> + var_no= (ofs-offsetof(KEY_CACHE, blocks_used))/sizeof(ulong); Igor> + *(ulong *)((char *) key_cache + ofs)= Igor> + (ulong) get_key_cache_stat_value(key_cache, var_no); Igor> + break; Igor> + case offsetof(KEY_CACHE, global_cache_r_requests): Igor> + case offsetof(KEY_CACHE, global_cache_read): Igor> + case offsetof(KEY_CACHE, global_cache_w_requests): Igor> + case offsetof(KEY_CACHE, global_cache_write): Igor> + var_no= 3+(ofs-offsetof(KEY_CACHE, global_cache_w_requests))/ Igor> + sizeof(ulonglong); Change 3 to constant. Igor> + *(ulonglong *)((char *) key_cache + ofs)= Igor> + get_key_cache_stat_value(key_cache, var_no); Igor> + break; Igor> + } Igor> +} <cut> Igor> +static Igor> +int store_key_cache_table_record(THD *thd, TABLE *table, Igor> + const char *name, uint name_length, Igor> + KEY_CACHE *key_cache, Igor> + uint partitions, uint partition_no) Igor> +{ Igor> + KEY_CACHE_STATISTICS key_cache_stats; Igor> + uint err; Igor> + DBUG_ENTER("store_key_cache_table_record"); Igor> + Igor> + get_key_cache_statistics(key_cache, partition_no, &key_cache_stats); Igor> + Igor> + if (key_cache_stats.mem_size == 0) Igor> + DBUG_RETURN(0); Shouldn't we also here test for keycache->key_cache_inited ? Regards, Monty

3 2

[Maria-developers] bzr commit into Mariadb 5.2, with Maria 2.0:maria/5.2 branch (igor:2748)
by Igor Babaev 04 Apr '10

04 Apr '10

#At lp:maria/5.2 based on revid:igor@askmonty.org-20100401214240-7ee610nf0169tqy8 2748 Igor Babaev 2010-04-03 [merge] Merge with the latest changes of 5.2 added: mysql-test/suite/pbxt/r/pbxt_xa.result mysql-test/suite/pbxt/t/pbxt_xa.test mysql-test/suite/pbxt/t/suite.opt modified: BUILD/compile-solaris-sparc CMakeLists.txt cmd-line-utils/libedit/filecomplete.c config/ac-macros/plugins.m4 configure.in extra/comp_err.c extra/libevent/evbuffer.c extra/libevent/event.c extra/libevent/kqueue.c extra/libevent/signal.c include/m_ctype.h include/my_global.h include/mysql/plugin.h include/mysql/plugin_auth.h.pp include/sql_common.h libmysqld/CMakeLists.txt mysql-test/extra/rpl_tests/rpl_tmp_table_and_DDL.test mysql-test/include/default_mysqld.cnf mysql-test/lib/My/SafeProcess/safe_process.cc mysql-test/lib/mtr_cases.pm mysql-test/lib/v1/mysql-test-run.pl mysql-test/r/status_user.result mysql-test/suite/funcs_1/r/is_columns_is.result mysql-test/suite/parts/t/rpl_partition.test mysql-test/suite/rpl/r/rpl_do_grant.result mysql-test/suite/rpl/r/rpl_optimize.result mysql-test/suite/rpl/t/rpl_do_grant.test mysql-test/suite/rpl/t/rpl_name_const.test mysql-test/suite/rpl/t/rpl_optimize.test mysql-test/suite/rpl/t/rpl_row_basic_11bugs.test mysql-test/suite/rpl/t/rpl_row_trig003.test mysql-test/t/bug47671-master.opt mysql-test/t/ctype_latin1_de-master.opt mysql-test/t/ctype_ucs2_def-master.opt mysys/mf_keycache.c mysys/my_gethostbyname.c plugin/auth/auth_socket.c plugin/auth/dialog.c plugin/daemon_example/daemon_example.cc plugin/fulltext/plugin_example.c server-tools/CMakeLists.txt server-tools/instance-manager/CMakeLists.txt sql-common/client.c sql/client_settings.h sql/ha_ndbcluster.cc sql/ha_partition.cc sql/handler.cc sql/item.cc sql/item.h sql/item_cmpfunc.cc sql/item_create.cc sql/item_create.h sql/item_sum.cc sql/item_sum.h sql/log.cc sql/log_event.cc sql/mysqld.cc sql/net_serv.cc sql/set_var.cc sql/sp_head.cc sql/sql_acl.cc sql/sql_builtin.cc.in sql/sql_class.cc sql/sql_class.h sql/sql_plugin.cc sql/sql_plugin.h sql/sql_show.cc sql/sql_table.cc sql/sql_view.cc sql/sql_yacc.yy storage/archive/ha_archive.cc storage/blackhole/ha_blackhole.cc storage/csv/ha_tina.cc storage/example/ha_example.cc storage/example/ha_example.h storage/federated/ha_federated.cc storage/federatedx/ha_federatedx.cc storage/heap/ha_heap.cc storage/ibmdb2i/ha_ibmdb2i.cc storage/innobase/handler/ha_innodb.cc storage/innodb_plugin/handler/i_s.cc storage/maria/ha_maria.cc storage/maria/ma_loghandler.c storage/maria/ma_search.c storage/maria/maria_def.h storage/myisam/ft_stopwords.c storage/myisam/ha_myisam.cc storage/myisammrg/ha_myisammrg.cc storage/myisammrg/myrg_open.c storage/pbxt/src/ha_pbxt.cc storage/xtradb/handler/ha_innodb.cc storage/xtradb/handler/i_s.cc storage/xtradb/handler/i_s.h storage/xtradb/include/page0page.h storage/xtradb/include/page0page.ic storage/xtradb/include/ut0lst.h storage/xtradb/log/log0recv.c strings/ctype-ucs2.c strings/ctype-utf8.c strings/my_vsnprintf.c support-files/compiler_warnings.supp unittest/mysys/waiting_threads-t.c === modified file 'BUILD/compile-solaris-sparc' --- a/BUILD/compile-solaris-sparc 2008-09-30 20:57:48 +0000 +++ b/BUILD/compile-solaris-sparc 2010-03-31 19:12:21 +0000 @@ -9,6 +9,6 @@ PATH=$PATH:/usr/ccs/bin:/usr/local/bin path=`dirname $0` . "$path/autorun.sh" -CFLAGS="-g -Wimplicit -Wreturn-type -Wswitch -Wtrigraphs -Wcomment -W -Wchar-subscripts -Wformat -Wparentheses -Wsign-compare -Wwrite-strings -Wunused -O3 -fno-omit-frame-pointer -mcpu=v8 -Wa,-xarch=v8plusa" CXX=gcc CXXFLAGS="-Wimplicit -Wreturn-type -Wswitch -Wtrigraphs -Wcomment -W -Wchar-subscripts -Wformat -Wparentheses -Wsign-compare -Wwrite-strings -Woverloaded-virtual -Wsign-promo -Wreorder -Wctor-dtor-privacy -Wnon-virtual-dtor -felide-constructors -fno-exceptions -fno-rtti -O3 -fno-omit-frame-pointer -mcpu=v8 -Wa,-xarch=v8plusa -g" LIBS="-lmtmalloc" ./configure --prefix=/usr/local/mysql --enable-assembler --with-extra-charsets=complex --enable-thread-safe-client +CFLAGS="-g -Wimplicit -Wreturn-type -Wswitch -Wtrigraphs -Wcomment -W -Wchar-subscripts -Wformat -Wparentheses -Wsign-compare -Wwrite-strings -Wunused -O3 -fno-omit-frame-pointer -mcpu=v8 -Wa,-xarch=v8plusa $EXTRA_FLAGS $EXTRA_CFLAGS" CXX=gcc CXXFLAGS="-Wimplicit -Wreturn-type -Wswitch -Wtrigraphs -Wcomment -W -Wchar-subscripts -Wformat -Wparentheses -Wsign-compare -Wwrite-strings -Woverloaded-virtual -Wsign-promo -Wreorder -Wctor-dtor-privacy -Wnon-virtual-dtor -felide-constructors -fno-exceptions -fno-rtti -O3 -fno-omit-frame-pointer -mcpu=v8 -Wa,-xarch=v8plusa -g $EXTRA_FLAGS $EXTRA_CXXFLAGS" LIBS="-lmtmalloc" ./configure --prefix=/usr/local/mysql --enable-assembler --with-extra-charsets=complex --enable-thread-safe-client make -j 4 === modified file 'CMakeLists.txt' --- a/CMakeLists.txt 2010-03-15 11:51:23 +0000 +++ b/CMakeLists.txt 2010-04-02 09:20:09 +0000 @@ -38,6 +38,7 @@ ADD_DEFINITIONS(-DMYSQL_DATADIR="c:/Prog ADD_DEFINITIONS(-DDEFAULT_CHARSET_HOME="c:/Program Files/MySQL/MySQL Server ${MYSQL_BASE_VERSION}/") ADD_DEFINITIONS(-DPACKAGE=mysql) ADD_DEFINITIONS(-DSHAREDIR="share") +ADD_DEFINITIONS(-DPLUGINDIR="lib/plugin") # Set debug options SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DFORCE_INIT_OF_VARS") @@ -260,7 +261,7 @@ FOREACH(SUBDIR ${STORAGE_SUBDIRS}) ENDIF(WITH_${ENGINE}_STORAGE_ENGINE AND MYSQL_PLUGIN_STATIC) IF (ENGINE_BUILD_TYPE STREQUAL "STATIC") - SET (mysql_plugin_defs "${mysql_plugin_defs},builtin_${PLUGIN_NAME}_plugin") + SET (maria_plugin_defs "${maria_plugin_defs},builtin_maria_${PLUGIN_NAME}_plugin") SET (MYSQLD_STATIC_ENGINE_LIBS ${MYSQLD_STATIC_ENGINE_LIBS} ${PLUGIN_NAME}) SET (STORAGE_ENGINE_DEFS "${STORAGE_ENGINE_DEFS} -DWITH_${ENGINE}_STORAGE_ENGINE") SET (WITH_${ENGINE}_STORAGE_ENGINE TRUE) @@ -279,7 +280,7 @@ ENDFOREACH(SUBDIR ${STORAGE_SUBDIRS}) # Special handling for partition(not really pluggable) IF(NOT WITHOUT_PARTITION_STORAGE_ENGINE) SET (STORAGE_ENGINE_DEFS "${STORAGE_ENGINE_DEFS} -DWITH_PARTITION_STORAGE_ENGINE") - SET (mysql_plugin_defs "${mysql_plugin_defs},builtin_partition_plugin") + SET (maria_plugin_defs "${maria_plugin_defs},builtin_maria_partition_plugin") ENDIF(NOT WITHOUT_PARTITION_STORAGE_ENGINE) # Special handling for tmp tables with the maria engine === modified file 'cmd-line-utils/libedit/filecomplete.c' --- a/cmd-line-utils/libedit/filecomplete.c 2009-04-30 11:53:30 +0000 +++ b/cmd-line-utils/libedit/filecomplete.c 2010-03-31 19:12:21 +0000 @@ -95,10 +95,9 @@ static char break_chars[] = { ' ', '\t', char * fn_tilde_expand(const char *txt) { - struct passwd pwres, *pass; + struct passwd *pass; char *temp; size_t len = 0; - char pwbuf[1024]; if (txt[0] != '~') return (strdup(txt)); === modified file 'config/ac-macros/plugins.m4' --- a/config/ac-macros/plugins.m4 2010-03-29 15:14:28 +0000 +++ b/config/ac-macros/plugins.m4 2010-04-01 14:34:51 +0000 @@ -460,7 +460,7 @@ dnl Although this is "pretty", it breaks ]) ]) ]) - mysql_plugin_defs="$mysql_plugin_defs, [builtin_]$2[_plugin]" + maria_plugin_defs="$maria_plugin_defs, [builtin_maria_]$2[_plugin]" [with_plugin_]$2=yes AC_MSG_RESULT([yes]) m4_ifdef([$11], [ === modified file 'configure.in' --- a/configure.in 2010-03-29 15:13:53 +0000 +++ b/configure.in 2010-04-01 14:34:51 +0000 @@ -2872,7 +2872,7 @@ AC_SUBST(server_scripts) AC_SUBST(mysql_plugin_dirs) AC_SUBST(mysql_plugin_libs) -AC_SUBST(mysql_plugin_defs) +AC_SUBST(maria_plugin_defs) # Now that sql_client_dirs and sql_server_dirs are stable, determine the union. === modified file 'extra/comp_err.c' --- a/extra/comp_err.c 2009-11-20 10:11:31 +0000 +++ b/extra/comp_err.c 2010-03-30 12:36:49 +0000 @@ -660,7 +660,7 @@ static ha_checksum checksum_format_speci case 'u': case 'x': case 's': - chksum= my_checksum(chksum, start, (uint) (p + 1 - start)); + chksum= my_checksum(chksum, (uchar*) start, (uint) (p + 1 - start)); start= 0; /* Not in format specifier anymore */ break; === modified file 'extra/libevent/evbuffer.c' --- a/extra/libevent/evbuffer.c 2010-02-01 06:14:12 +0000 +++ b/extra/libevent/evbuffer.c 2010-04-02 09:20:09 +0000 @@ -75,8 +75,7 @@ bufferevent_add(struct event *ev, int ti */ void -bufferevent_read_pressure_cb(struct evbuffer *buf, - size_t old __attribute__((unused)), size_t now, +bufferevent_read_pressure_cb(struct evbuffer *buf, size_t old, size_t now, void *arg) { struct bufferevent *bufev = arg; /* === modified file 'extra/libevent/event.c' --- a/extra/libevent/event.c 2010-01-06 19:20:16 +0000 +++ b/extra/libevent/event.c 2010-04-02 09:20:09 +0000 @@ -394,8 +394,7 @@ event_base_get_method(struct event_base } static void -event_loopexit_cb(int fd __attribute__((unused)), - short what __attribute__((unused)), void *arg) +event_loopexit_cb(int fd, short what, void *arg) { struct event_base *base = arg; base->event_gotterm = 1; === modified file 'extra/libevent/kqueue.c' --- a/extra/libevent/kqueue.c 2009-03-12 22:27:35 +0000 +++ b/extra/libevent/kqueue.c 2010-03-30 12:36:49 +0000 @@ -144,7 +144,7 @@ kq_init(struct event_base *base) */ if (kevent(kq, kqueueop->changes, 1, kqueueop->events, NEVENT, NULL) != 1 || - kqueueop->events[0].ident != -1 || + ((int) kqueueop->events[0].ident) != -1 || kqueueop->events[0].flags != EV_ERROR) { event_warn("%s: detected broken kqueue; not using.", __func__); free(kqueueop->changes); === modified file 'extra/libevent/signal.c' --- a/extra/libevent/signal.c 2010-01-06 19:20:16 +0000 +++ b/extra/libevent/signal.c 2010-04-02 09:20:09 +0000 @@ -69,7 +69,7 @@ static void evsignal_handler(int sig); /* Callback for when the signal handler write a byte to our signaling socket */ static void -evsignal_cb(int fd, short what __attribute((unused)), void *arg __attribute((unused))) +evsignal_cb(int fd, short what, void *arg) { static char signals[100]; #ifdef WIN32 === modified file 'include/m_ctype.h' --- a/include/m_ctype.h 2010-03-31 18:37:45 +0000 +++ b/include/m_ctype.h 2010-04-02 09:20:09 +0000 @@ -311,7 +311,9 @@ struct charset_info_st #define ILLEGAL_CHARSET_INFO_NUMBER (~0U) extern MYSQL_PLUGIN_IMPORT struct charset_info_st my_charset_bin; -extern struct charset_info_st my_charset_bin; +extern MYSQL_PLUGIN_IMPORT struct charset_info_st my_charset_latin1; +extern MYSQL_PLUGIN_IMPORT struct charset_info_st my_charset_filename; + extern struct charset_info_st my_charset_big5_chinese_ci; extern struct charset_info_st my_charset_big5_bin; extern struct charset_info_st my_charset_cp932_japanese_ci; @@ -324,7 +326,6 @@ extern struct charset_info_st my_charset extern struct charset_info_st my_charset_gb2312_bin; extern struct charset_info_st my_charset_gbk_chinese_ci; extern struct charset_info_st my_charset_gbk_bin; -extern struct charset_info_st my_charset_latin1; extern struct charset_info_st my_charset_latin1_german2_ci; extern struct charset_info_st my_charset_latin1_bin; extern struct charset_info_st my_charset_latin2_czech_ci; @@ -341,7 +342,6 @@ extern struct charset_info_st my_charset extern struct charset_info_st my_charset_utf8_unicode_ci; extern struct charset_info_st my_charset_utf8_bin; extern struct charset_info_st my_charset_cp1250_czech_ci; -extern struct charset_info_st my_charset_filename; /* declarations for simple charsets */ extern size_t my_strnxfrm_simple(CHARSET_INFO *, uchar *, size_t, === modified file 'include/my_global.h' --- a/include/my_global.h 2010-03-29 15:13:53 +0000 +++ b/include/my_global.h 2010-04-02 09:20:09 +0000 @@ -1522,6 +1522,9 @@ do { doubleget_union _tmp; \ #elif defined(HAVE_DLFCN_H) #include <dlfcn.h> #endif +#ifndef HAVE_DLERROR +#define dlerror() "" +#endif #endif /* FreeBSD 2.2.2 does not define RTLD_NOW) */ @@ -1529,7 +1532,7 @@ do { doubleget_union _tmp; \ #define RTLD_NOW 1 #endif -#ifndef HAVE_DLERROR +#ifndef HAVE_DLOPEN #define dlerror() "No support for dynamic loading (static build?)" #define dlopen(A,B) 0 #define dlsym(A,B) 0 === modified file 'include/mysql/plugin.h' --- a/include/mysql/plugin.h 2010-03-29 15:13:53 +0000 +++ b/include/mysql/plugin.h 2010-04-01 14:34:51 +0000 @@ -57,7 +57,10 @@ typedef struct st_mysql_xid MYSQL_XID; Plugin API. Common for all plugin types. */ +/* MySQL plugin interface version */ #define MYSQL_PLUGIN_INTERFACE_VERSION 0x0101 +/* MariaDB plugin interface version */ +#define MARIA_PLUGIN_INTERFACE_VERSION 0x0100 /* The allowable types of plugins @@ -81,6 +84,14 @@ typedef struct st_mysql_xid MYSQL_XID; #define PLUGIN_LICENSE_GPL_STRING "GPL" #define PLUGIN_LICENSE_BSD_STRING "BSD" +/* definitions of code maturity for plugins */ +#define MariaDB_PLUGIN_MATURITY_UNKNOWN 0 +#define MariaDB_PLUGIN_MATURITY_EXPERIMENTAL 1 +#define MariaDB_PLUGIN_MATURITY_ALPHA 2 +#define MariaDB_PLUGIN_MATURITY_BETA 3 +#define MariaDB_PLUGIN_MATURITY_GAMMA 4 +#define MariaDB_PLUGIN_MATURITY_STABLE 5 + /* Macros for beginning and ending plugin declarations. Between mysql_declare_plugin and mysql_declare_plugin_end there should @@ -93,11 +104,24 @@ typedef struct st_mysql_xid MYSQL_XID; int VERSION= MYSQL_PLUGIN_INTERFACE_VERSION; \ int PSIZE= sizeof(struct st_mysql_plugin); \ struct st_mysql_plugin DECLS[]= { + +#define MARIA_DECLARE_PLUGIN__(NAME, VERSION, PSIZE, DECLS) \ +int VERSION= MARIA_PLUGIN_INTERFACE_VERSION; \ +int PSIZE= sizeof(struct st_maria_plugin); \ +struct st_maria_plugin DECLS[]= { + #else + #define __MYSQL_DECLARE_PLUGIN(NAME, VERSION, PSIZE, DECLS) \ MYSQL_PLUGIN_EXPORT int _mysql_plugin_interface_version_= MYSQL_PLUGIN_INTERFACE_VERSION; \ MYSQL_PLUGIN_EXPORT int _mysql_sizeof_struct_st_plugin_= sizeof(struct st_mysql_plugin); \ MYSQL_PLUGIN_EXPORT struct st_mysql_plugin _mysql_plugin_declarations_[]= { + +#define MARIA_DECLARE_PLUGIN__(NAME, VERSION, PSIZE, DECLS) \ +MYSQL_PLUGIN_EXPORT int _maria_plugin_interface_version_= MARIA_PLUGIN_INTERFACE_VERSION; \ +MYSQL_PLUGIN_EXPORT int _maria_sizeof_struct_st_plugin_= sizeof(struct st_maria_plugin); \ +MYSQL_PLUGIN_EXPORT struct st_maria_plugin _maria_plugin_declarations_[]= { + #endif #define mysql_declare_plugin(NAME) \ @@ -106,7 +130,14 @@ __MYSQL_DECLARE_PLUGIN(NAME, \ builtin_ ## NAME ## _sizeof_struct_st_plugin, \ builtin_ ## NAME ## _plugin) +#define maria_declare_plugin(NAME) \ +MARIA_DECLARE_PLUGIN__(NAME, \ + builtin_maria_ ## NAME ## _plugin_interface_version, \ + builtin_maria_ ## NAME ## _sizeof_struct_st_plugin, \ + builtin_maria_ ## NAME ## _plugin) + #define mysql_declare_plugin_end ,{0,0,0,0,0,0,0,0,0,0,0,0}} +#define maria_declare_plugin_end ,{0,0,0,0,0,0,0,0,0,0,0,0,0}} /* declarations for SHOW STATUS support in plugins @@ -403,6 +434,30 @@ struct st_mysql_plugin void * __reserved1; /* reserved for dependency checking */ }; +/* + MariaDB extension for plugins declaration structure. + + It also copy current MySQL plugin fields to have more independency + in plugins extension +*/ + +struct st_maria_plugin +{ + int type; /* the plugin type (a MYSQL_XXX_PLUGIN value) */ + void *info; /* pointer to type-specific plugin descriptor */ + const char *name; /* plugin name */ + const char *author; /* plugin author (for SHOW PLUGINS) */ + const char *descr; /* general descriptive text (for SHOW PLUGINS ) */ + int license; /* the plugin license (PLUGIN_LICENSE_XXX) */ + int (*init)(void *); /* the function to invoke when plugin is loaded */ + int (*deinit)(void *);/* the function to invoke when plugin is unloaded */ + unsigned int version; /* plugin version (for SHOW PLUGINS) */ + struct st_mysql_show_var *status_vars; + struct st_mysql_sys_var **system_vars; + const char *version_info; /* plugin version string */ + int maturity; /* MariaDB_PLUGIN_MATURITY_XXX */ +}; + /************************************************************************* API for Full-text parser plugin. (MYSQL_FTPARSER_PLUGIN) */ === modified file 'include/mysql/plugin_auth.h.pp' --- a/include/mysql/plugin_auth.h.pp 2010-03-29 15:13:53 +0000 +++ b/include/mysql/plugin_auth.h.pp 2010-04-01 14:34:51 +0000 @@ -77,6 +77,22 @@ struct st_mysql_plugin struct st_mysql_sys_var **system_vars; void * __reserved1; }; +struct st_maria_plugin +{ + int type; + void *info; + const char *name; + const char *author; + const char *descr; + int license; + int (*init)(void *); + int (*deinit)(void *); + unsigned int version; + struct st_mysql_show_var *status_vars; + struct st_mysql_sys_var **system_vars; + const char *version_info; + int maturity; +}; enum enum_ftparser_mode { MYSQL_FTPARSER_SIMPLE_MODE= 0, === modified file 'include/sql_common.h' --- a/include/sql_common.h 2010-03-29 15:13:53 +0000 +++ b/include/sql_common.h 2010-04-01 09:04:26 +0000 @@ -96,7 +96,7 @@ void set_mysql_extended_error(MYSQL *mys struct st_plugin_vio_info; void mpvio_info(Vio *vio, struct st_plugin_vio_info *info); int run_plugin_auth(MYSQL *mysql, char *data, uint data_len, - char *data_plugin, const char *db); + const char *data_plugin, const char *db); int mysql_client_plugin_init(); void mysql_client_plugin_deinit(); struct st_mysql_client_plugin; === modified file 'libmysqld/CMakeLists.txt' --- a/libmysqld/CMakeLists.txt 2010-01-31 09:13:21 +0000 +++ b/libmysqld/CMakeLists.txt 2010-04-02 18:51:02 +0000 @@ -104,7 +104,7 @@ SET(LIBMYSQLD_SOURCES emb_qcache.cc libm ../sql-common/client.c ../sql-common/my_time.c ../sql-common/my_user.c ../sql-common/pack.c ../sql/password.c ../sql/discover.cc ../sql/derror.cc - ../sql/field.cc ../sql/field_conv.cc + ../sql/field.cc ../sql/field_conv.cc ../sql-common/client_plugin.c ../sql/filesort.cc ../sql/gstream.cc ../sql/ha_partition.cc ../sql/handler.cc ../sql/hash_filo.cc ../sql/hostname.cc ../sql/init.cc ../sql/item_buff.cc ../sql/item_cmpfunc.cc === modified file 'mysql-test/extra/rpl_tests/rpl_tmp_table_and_DDL.test' --- a/mysql-test/extra/rpl_tests/rpl_tmp_table_and_DDL.test 2010-01-22 09:38:21 +0000 +++ b/mysql-test/extra/rpl_tests/rpl_tmp_table_and_DDL.test 2010-03-28 18:10:00 +0000 @@ -157,3 +157,4 @@ INSERT INTO t1 VALUES (1); DROP TEMPORARY TABLE t1; +--sync_slave_with_master === modified file 'mysql-test/include/default_mysqld.cnf' --- a/mysql-test/include/default_mysqld.cnf 2008-04-08 14:51:26 +0000 +++ b/mysql-test/include/default_mysqld.cnf 2010-03-28 18:10:00 +0000 @@ -2,7 +2,7 @@ [mysqld] open-files-limit= 1024 local-infile -default-character-set= latin1 +character-set-server= latin1 # Increase default connect_timeout to avoid intermittent # disconnects when test servers are put under load see BUG#28359 === modified file 'mysql-test/lib/My/SafeProcess/safe_process.cc' --- a/mysql-test/lib/My/SafeProcess/safe_process.cc 2009-07-08 12:31:22 +0000 +++ b/mysql-test/lib/My/SafeProcess/safe_process.cc 2010-03-28 18:10:00 +0000 @@ -159,7 +159,7 @@ int main(int argc, char* const argv[] ) signal(SIGCHLD, handle_signal); signal(SIGABRT, handle_abort); - sprintf(safe_process_name, "safe_process[%d]", own_pid); + sprintf(safe_process_name, "safe_process[%d]", (int) own_pid); message("Started"); === modified file 'mysql-test/lib/mtr_cases.pm' --- a/mysql-test/lib/mtr_cases.pm 2010-01-15 15:27:55 +0000 +++ b/mysql-test/lib/mtr_cases.pm 2010-03-30 12:36:49 +0000 @@ -681,6 +681,8 @@ sub optimize_cases { if ( $default_engine =~ /^ndb/i ); $tinfo->{'innodb_test'}= 1 if ( $default_engine =~ /^innodb/i ); + $tinfo->{'pbxt_test'}= 1 + if ( $default_engine =~ /^pbxt/i ); } } @@ -778,6 +780,8 @@ sub collect_one_test_case { my $disabled= shift; my $suite_opts= shift; + my $local_default_storage_engine= $default_storage_engine; + #print "collect_one_test_case\n"; #print " suitedir: $suitedir\n"; #print " testdir: $testdir\n"; @@ -932,15 +936,26 @@ sub collect_one_test_case { tags_from_test_file($tinfo,"$testdir/${tname}.test"); - if ( defined $default_storage_engine ) + # Get default storage engine from suite.opt file + + if (defined $suite_opts && + "@$suite_opts" =~ "default-storage-engine=\s*([^\s]*)") + { + $local_default_storage_engine= $1; + } + + if ( defined $local_default_storage_engine ) { # Different default engine is used # tag test to require that engine $tinfo->{'ndb_test'}= 1 - if ( $default_storage_engine =~ /^ndb/i ); + if ( $local_default_storage_engine =~ /^ndb/i ); $tinfo->{'innodb_test'}= 1 - if ( $default_storage_engine =~ /^innodb/i ); + if ( $local_default_storage_engine =~ /^innodb/i ); + + $tinfo->{'pbxt_test'}= 1 + if ( $local_default_storage_engine =~ /^pbxt/i ); } @@ -1103,6 +1118,28 @@ sub collect_one_test_case { $tinfo->{template_path}= $config; } + if ( $tinfo->{'pbxt_test'} ) + { + # This is a test that needs pbxt + if ( $::mysqld_variables{'pbxt'} eq "OFF" || + ! exists $::mysqld_variables{'pbxt'} ) + { + # Engine is not supported, skip it + $tinfo->{'skip'}= 1; + return $tinfo; + } + } + else + { + # Only disable engine if it's on by default (to avoid warnings about + # not existing loose options + if ( $::mysqld_variables{'pbxt'} eq "ON") + { + push(@{$tinfo->{'master_opt'}}, "--loose-skip-pbxt"); + push(@{$tinfo->{'slave_opt'}}, "--loose-skip-pbxt"); + } + } + if ( $tinfo->{'example_plugin_test'} ) { if ( !$ENV{'EXAMPLE_PLUGIN'} ) @@ -1156,6 +1193,7 @@ my @tags= ["include/have_log_bin.inc", "need_binlog", 1], ["include/have_innodb.inc", "innodb_test", 1], + ["include/have_pbxt.inc", "pbxt_test", 1], ["include/big_test.inc", "big_test", 1], ["include/have_debug.inc", "need_debug", 1], ["include/have_ndb.inc", "ndb_test", 1], === modified file 'mysql-test/lib/v1/mysql-test-run.pl' --- a/mysql-test/lib/v1/mysql-test-run.pl 2010-03-04 08:03:07 +0000 +++ b/mysql-test/lib/v1/mysql-test-run.pl 2010-03-28 18:10:00 +0000 @@ -3965,7 +3965,7 @@ sub mysqld_arguments ($$$$) { } } - mtr_add_arg($args, "%s--default-character-set=latin1", $prefix); + mtr_add_arg($args, "%s--character-set-server-set=latin1", $prefix); mtr_add_arg($args, "%s--language=%s", $prefix, $path_language); mtr_add_arg($args, "%s--tmpdir=$opt_tmpdir", $prefix); === modified file 'mysql-test/r/status_user.result' --- a/mysql-test/r/status_user.result 2010-03-21 20:58:19 +0000 +++ b/mysql-test/r/status_user.result 2010-04-02 18:51:02 +0000 @@ -137,7 +137,7 @@ ROWS_INSERTED 8 ROWS_UPDATED 5 SELECT_COMMANDS 3 UPDATE_COMMANDS 11 -OTHER_COMMANDS 9 +OTHER_COMMANDS 7 COMMIT_TRANSACTIONS 19 ROLLBACK_TRANSACTIONS 2 DENIED_CONNECTIONS 0 @@ -154,7 +154,7 @@ ROWS_INSERTED 8 ROWS_UPDATED 5 SELECT_COMMANDS 3 UPDATE_COMMANDS 11 -OTHER_COMMANDS 9 +OTHER_COMMANDS 7 COMMIT_TRANSACTIONS 19 ROLLBACK_TRANSACTIONS 2 DENIED_CONNECTIONS 0 === modified file 'mysql-test/suite/funcs_1/r/is_columns_is.result' --- a/mysql-test/suite/funcs_1/r/is_columns_is.result 2010-02-01 06:14:12 +0000 +++ b/mysql-test/suite/funcs_1/r/is_columns_is.result 2010-04-02 10:03:39 +0000 @@ -271,10 +271,12 @@ NULL information_schema PBXT_STATISTICS NULL information_schema PBXT_STATISTICS Name 2 NO varchar 40 120 NULL NULL utf8 utf8_general_ci varchar(40) select NULL information_schema PBXT_STATISTICS Value 3 0 NO bigint NULL NULL 19 0 NULL NULL bigint(8) select NULL information_schema PLUGINS PLUGIN_AUTHOR 8 NULL YES varchar 64 192 NULL NULL utf8 utf8_general_ci varchar(64) select +NULL information_schema PLUGINS PLUGIN_AUTH_VERSION 12 NULL YES varchar 80 240 NULL NULL utf8 utf8_general_ci varchar(80) select NULL information_schema PLUGINS PLUGIN_DESCRIPTION 9 NULL YES longtext 4294967295 4294967295 NULL NULL utf8 utf8_general_ci longtext select NULL information_schema PLUGINS PLUGIN_LIBRARY 6 NULL YES varchar 64 192 NULL NULL utf8 utf8_general_ci varchar(64) select NULL information_schema PLUGINS PLUGIN_LIBRARY_VERSION 7 NULL YES varchar 20 60 NULL NULL utf8 utf8_general_ci varchar(20) select NULL information_schema PLUGINS PLUGIN_LICENSE 10 NULL YES varchar 80 240 NULL NULL utf8 utf8_general_ci varchar(80) select +NULL information_schema PLUGINS PLUGIN_MATURITY 11 NULL YES varchar 12 36 NULL NULL utf8 utf8_general_ci varchar(12) select NULL information_schema PLUGINS PLUGIN_NAME 1 NO varchar 64 192 NULL NULL utf8 utf8_general_ci varchar(64) select NULL information_schema PLUGINS PLUGIN_STATUS 3 NO varchar 10 30 NULL NULL utf8 utf8_general_ci varchar(10) select NULL information_schema PLUGINS PLUGIN_TYPE 4 NO varchar 80 240 NULL NULL utf8 utf8_general_ci varchar(80) select @@ -791,6 +793,8 @@ NULL information_schema PBXT_STATISTICS 3.0000 information_schema PLUGINS PLUGIN_AUTHOR varchar 64 192 utf8 utf8_general_ci varchar(64) 1.0000 information_schema PLUGINS PLUGIN_DESCRIPTION longtext 4294967295 4294967295 utf8 utf8_general_ci longtext 3.0000 information_schema PLUGINS PLUGIN_LICENSE varchar 80 240 utf8 utf8_general_ci varchar(80) +3.0000 information_schema PLUGINS PLUGIN_MATURITY varchar 12 36 utf8 utf8_general_ci varchar(12) +3.0000 information_schema PLUGINS PLUGIN_AUTH_VERSION varchar 80 240 utf8 utf8_general_ci varchar(80) NULL information_schema PROCESSLIST ID bigint NULL NULL NULL NULL bigint(4) 3.0000 information_schema PROCESSLIST USER varchar 16 48 utf8 utf8_general_ci varchar(16) 3.0000 information_schema PROCESSLIST HOST varchar 64 192 utf8 utf8_general_ci varchar(64) === modified file 'mysql-test/suite/parts/t/rpl_partition.test' --- a/mysql-test/suite/parts/t/rpl_partition.test 2009-02-01 12:00:48 +0000 +++ b/mysql-test/suite/parts/t/rpl_partition.test 2010-03-29 19:07:45 +0000 @@ -1,6 +1,7 @@ --source include/have_partition.inc --source include/have_innodb.inc --source include/master-slave.inc +--source include/big_test.inc --vertical_results === added file 'mysql-test/suite/pbxt/r/pbxt_xa.result' --- a/mysql-test/suite/pbxt/r/pbxt_xa.result 1970-01-01 00:00:00 +0000 +++ b/mysql-test/suite/pbxt/r/pbxt_xa.result 2010-03-24 22:12:39 +0000 @@ -0,0 +1,18 @@ +drop table if exists t1, t2; +CREATE TABLE t1 (a INT PRIMARY KEY) ENGINE=innodb; +CREATE TABLE t2 (b INT PRIMARY KEY) ENGINE=pbxt; +BEGIN; +SELECT @@log_bin; +@@log_bin +0 +INSERT INTO t1 VALUES (1); +INSERT INTO t2 VALUES (2); +COMMIT; +select * from t1; +a +1 +select * from t2; +b +2 +drop table t1, t2; +drop database pbxt; === added file 'mysql-test/suite/pbxt/t/pbxt_xa.test' --- a/mysql-test/suite/pbxt/t/pbxt_xa.test 1970-01-01 00:00:00 +0000 +++ b/mysql-test/suite/pbxt/t/pbxt_xa.test 2010-03-24 22:12:39 +0000 @@ -0,0 +1,23 @@ +-- source include/have_innodb.inc + +--disable_warnings +drop table if exists t1, t2; +--enable_warnings + +# +# bug lp:544173, xa crash with two 2pc-capable storage engines without binlog +# + +CREATE TABLE t1 (a INT PRIMARY KEY) ENGINE=innodb; +CREATE TABLE t2 (b INT PRIMARY KEY) ENGINE=pbxt; +BEGIN; +# verify that binlog is off +SELECT @@log_bin; +INSERT INTO t1 VALUES (1); +INSERT INTO t2 VALUES (2); +COMMIT; +select * from t1; +select * from t2; +drop table t1, t2; +drop database pbxt; + === added file 'mysql-test/suite/pbxt/t/suite.opt' --- a/mysql-test/suite/pbxt/t/suite.opt 1970-01-01 00:00:00 +0000 +++ b/mysql-test/suite/pbxt/t/suite.opt 2010-03-30 12:36:49 +0000 @@ -0,0 +1 @@ +--default-storage-engine=pbxt === modified file 'mysql-test/suite/rpl/r/rpl_do_grant.result' --- a/mysql-test/suite/rpl/r/rpl_do_grant.result 2010-03-16 12:38:35 +0000 +++ b/mysql-test/suite/rpl/r/rpl_do_grant.result 2010-04-01 09:04:26 +0000 @@ -165,10 +165,9 @@ USE test; DROP FUNCTION bug42217_db.upgrade_del_func; DROP FUNCTION bug42217_db.upgrade_alter_func; DROP DATABASE bug42217_db; -DROP USER 'create_rout_db'@'localhost'; -call mtr.add_suppression("Slave: Operation DROP USER failed for 'create_rout_db'@'localhost' Error_code: 1396"); -USE mtr; call mtr.add_suppression("Slave: Operation DROP USER failed for 'create_rout_db'@'localhost' Error_code: 1396"); +stop slave; +DROP USER 'create_rout_db'@'localhost'; ######## BUG#49119 ####### ### i) test case from the 'how to repeat section' stop slave; === modified file 'mysql-test/suite/rpl/r/rpl_optimize.result' --- a/mysql-test/suite/rpl/r/rpl_optimize.result 2010-01-13 09:00:03 +0000 +++ b/mysql-test/suite/rpl/r/rpl_optimize.result 2010-03-31 19:12:21 +0000 @@ -4,6 +4,7 @@ reset master; reset slave; drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9; start slave; +drop tables if exists t1; CALL mtr.add_suppression('Statement may not be safe to log in statement format.'); create table t1 (a int not null auto_increment primary key, b int, key(b)); INSERT INTO t1 (a) VALUES (1),(2),(3),(4),(5),(6),(7),(8),(9),(10); === modified file 'mysql-test/suite/rpl/t/rpl_do_grant.test' --- a/mysql-test/suite/rpl/t/rpl_do_grant.test 2010-03-16 12:38:35 +0000 +++ b/mysql-test/suite/rpl/t/rpl_do_grant.test 2010-04-01 09:04:26 +0000 @@ -209,12 +209,18 @@ USE test; DROP FUNCTION bug42217_db.upgrade_del_func; DROP FUNCTION bug42217_db.upgrade_alter_func; DROP DATABASE bug42217_db; -DROP USER 'create_rout_db'@'localhost'; call mtr.add_suppression("Slave: Operation DROP USER failed for 'create_rout_db'@'localhost' Error_code: 1396"); + +sync_slave_with_master; + +# Drop the user that was already dropped on the slave connection slave; -USE mtr; -call mtr.add_suppression("Slave: Operation DROP USER failed for 'create_rout_db'@'localhost' Error_code: 1396"); +--disable_warnings +stop slave; +connection master; +DROP USER 'create_rout_db'@'localhost'; +--enable_warnings # BUG#49119: Master crashes when executing 'REVOKE ... ON # {PROCEDURE|FUNCTION} FROM ...' === modified file 'mysql-test/suite/rpl/t/rpl_name_const.test' --- a/mysql-test/suite/rpl/t/rpl_name_const.test 2009-04-08 23:42:51 +0000 +++ b/mysql-test/suite/rpl/t/rpl_name_const.test 2010-03-28 18:10:00 +0000 @@ -45,3 +45,4 @@ select * from t1 order by id; connection master; drop table t1; drop procedure test_procedure; +--sync_slave_with_master === modified file 'mysql-test/suite/rpl/t/rpl_optimize.test' --- a/mysql-test/suite/rpl/t/rpl_optimize.test 2010-03-04 08:03:07 +0000 +++ b/mysql-test/suite/rpl/t/rpl_optimize.test 2010-03-31 19:12:21 +0000 @@ -15,6 +15,10 @@ -- source include/not_staging.inc -- source include/master-slave.inc +--disable_warnings +drop tables if exists t1; +--enable_warnings + CALL mtr.add_suppression('Statement may not be safe to log in statement format.'); create table t1 (a int not null auto_increment primary key, b int, key(b)); @@ -51,10 +55,9 @@ sync_with_master; # won't work if slave connection master; # cleanup drop table t1; -connection slave; -sync_with_master; +sync_slave_with_master; # If the machine is so fast that slave syncs before OPTIMIZE -# starts, this test wil demonstrate nothing but will pass. +# starts, this test will demonstrate nothing but will pass. # End of 4.1 tests === modified file 'mysql-test/suite/rpl/t/rpl_row_basic_11bugs.test' --- a/mysql-test/suite/rpl/t/rpl_row_basic_11bugs.test 2007-12-12 10:14:59 +0000 +++ b/mysql-test/suite/rpl/t/rpl_row_basic_11bugs.test 2010-03-28 18:10:00 +0000 @@ -53,6 +53,7 @@ UPDATE t1 SET a=99 WHERE a = 0; SHOW BINLOG EVENTS; DROP TABLE t1; +--sync_slave_with_master # BUG#17620: Replicate (Row Based) Fails when Query Cache enabled on # slave === modified file 'mysql-test/suite/rpl/t/rpl_row_trig003.test' --- a/mysql-test/suite/rpl/t/rpl_row_trig003.test 2007-12-06 15:27:10 +0000 +++ b/mysql-test/suite/rpl/t/rpl_row_trig003.test 2010-03-29 19:07:45 +0000 @@ -149,6 +149,8 @@ DROP TABLE IF EXISTS test.t2; DROP TABLE IF EXISTS test.t3; --enable_warnings +sync_slave_with_master; + diff_files $MYSQLTEST_VARDIR/tmp/trg003_master.sql $MYSQLTEST_VARDIR/tmp/trg003_slave.sql; # End of 5.0 test case === modified file 'mysql-test/t/bug47671-master.opt' --- a/mysql-test/t/bug47671-master.opt 2009-11-25 06:55:49 +0000 +++ b/mysql-test/t/bug47671-master.opt 2010-03-28 18:10:00 +0000 @@ -1 +1 @@ ---default-character-set=utf8 --skip-character-set-client-handshake +--character-set-server=utf8 --skip-character-set-client-handshake === modified file 'mysql-test/t/ctype_latin1_de-master.opt' --- a/mysql-test/t/ctype_latin1_de-master.opt 2003-05-21 23:57:27 +0000 +++ b/mysql-test/t/ctype_latin1_de-master.opt 2010-03-28 18:10:00 +0000 @@ -1 +1 @@ ---default-character-set=latin1 --default-collation=latin1_german2_ci +--character-set-server=latin1 --default-collation=latin1_german2_ci === modified file 'mysql-test/t/ctype_ucs2_def-master.opt' --- a/mysql-test/t/ctype_ucs2_def-master.opt 2007-02-19 11:04:38 +0000 +++ b/mysql-test/t/ctype_ucs2_def-master.opt 2010-03-28 18:10:00 +0000 @@ -1 +1 @@ ---default-collation=ucs2_unicode_ci --default-character-set=ucs2,latin1 +--default-collation=ucs2_unicode_ci --character-set-server=ucs2,latin1 === modified file 'mysys/mf_keycache.c' --- a/mysys/mf_keycache.c 2010-04-01 21:42:40 +0000 +++ b/mysys/mf_keycache.c 2010-04-03 20:19:35 +0000 @@ -4222,6 +4222,12 @@ restart: uint next_status; uint hash_requests; + LINT_INIT(next_hash_link); + LINT_INIT(next_diskpos); + LINT_INIT(next_file); + LINT_INIT(next_status); + LINT_INIT(hash_requests); + total_found++; found++; KEYCACHE_DBUG_ASSERT(found <= keycache->blocks_used); === modified file 'mysys/my_gethostbyname.c' --- a/mysys/my_gethostbyname.c 2006-12-31 00:32:21 +0000 +++ b/mysys/my_gethostbyname.c 2010-03-31 20:50:54 +0000 @@ -91,9 +91,12 @@ extern pthread_mutex_t LOCK_gethostbynam is finished with the structure. */ -struct hostent *my_gethostbyname_r(const char *name, - struct hostent *result, char *buffer, - int buflen, int *h_errnop) +struct hostent * +my_gethostbyname_r(const char *name, + struct hostent *result __attribute__((unused)), + char *buffer __attribute__((unused)), + int buflen __attribute__((unused)), + int *h_errnop) { struct hostent *hp; pthread_mutex_lock(&LOCK_gethostbyname_r); === modified file 'plugin/auth/auth_socket.c' --- a/plugin/auth/auth_socket.c 2010-03-29 15:13:53 +0000 +++ b/plugin/auth/auth_socket.c 2010-04-01 14:34:51 +0000 @@ -99,4 +99,21 @@ mysql_declare_plugin(socket_auth) NULL } mysql_declare_plugin_end; +maria_declare_plugin(socket_auth) +{ + MYSQL_AUTHENTICATION_PLUGIN, + &socket_auth_handler, + "socket_peercred", + "Sergei Golubchik", + "Unix Socket based authentication", + PLUGIN_LICENSE_GPL, + NULL, + NULL, + 0x0100, + NULL, + NULL, + "1.0", + MariaDB_PLUGIN_MATURITY_BETA +} +mysql_declare_plugin_end; === modified file 'plugin/auth/dialog.c' --- a/plugin/auth/dialog.c 2010-03-31 18:37:45 +0000 +++ b/plugin/auth/dialog.c 2010-04-01 14:34:51 +0000 @@ -171,6 +171,38 @@ mysql_declare_plugin(dialog) NULL } mysql_declare_plugin_end; +maria_declare_plugin(dialog) +{ + MYSQL_AUTHENTICATION_PLUGIN, + &two_handler, + "two_questions", + "Sergei Golubchik", + "Dialog plugin demo 1", + PLUGIN_LICENSE_GPL, + NULL, + NULL, + 0x0100, + NULL, + NULL, + "1.0", + MariaDB_PLUGIN_MATURITY_BETA +}, +{ + MYSQL_AUTHENTICATION_PLUGIN, + &three_handler, + "three_attempts", + "Sergei Golubchik", + "Dialog plugin demo 2", + PLUGIN_LICENSE_GPL, + NULL, + NULL, + 0x0100, + NULL, + NULL, + "1.0", + MariaDB_PLUGIN_MATURITY_BETA +} +maria_declare_plugin_end; /********************* CLIENT SIDE ***************************************/ /* === modified file 'plugin/daemon_example/daemon_example.cc' --- a/plugin/daemon_example/daemon_example.cc 2007-06-27 14:49:12 +0000 +++ b/plugin/daemon_example/daemon_example.cc 2010-04-01 14:34:51 +0000 @@ -200,3 +200,20 @@ mysql_declare_plugin(daemon_example) NULL /* config options */ } mysql_declare_plugin_end; +maria_declare_plugin(daemon_example) +{ + MYSQL_DAEMON_PLUGIN, + &daemon_example_plugin, + "daemon_example", + "Brian Aker", + "Daemon example, creates a heartbeat beat file in mysql-heartbeat.log", + PLUGIN_LICENSE_GPL, + daemon_example_plugin_init, /* Plugin Init */ + daemon_example_plugin_deinit, /* Plugin Deinit */ + 0x0100 /* 1.0 */, + NULL, /* status variables */ + NULL, /* system variables */ + "1.0", /* string version */ + MariaDB_PLUGIN_MATURITY_EXPERIMENTAL /* maturity */ +} +maria_declare_plugin_end; === modified file 'plugin/fulltext/plugin_example.c' --- a/plugin/fulltext/plugin_example.c 2010-01-04 17:54:42 +0000 +++ b/plugin/fulltext/plugin_example.c 2010-04-01 14:34:51 +0000 @@ -270,4 +270,21 @@ mysql_declare_plugin(ftexample) NULL } mysql_declare_plugin_end; +maria_declare_plugin(ftexample) +{ + MYSQL_FTPARSER_PLUGIN, /* type */ + &simple_parser_descriptor, /* descriptor */ + "simple_parser", /* name */ + "MySQL AB", /* author */ + "Simple Full-Text Parser", /* description */ + PLUGIN_LICENSE_GPL, + simple_parser_plugin_init, /* init function (when loaded) */ + simple_parser_plugin_deinit,/* deinit function (when unloaded) */ + 0x0001, /* version */ + simple_status, /* status variables */ + simple_system_variables, /* system variables */ + "0.01", /* string version */ + MariaDB_PLUGIN_MATURITY_EXPERIMENTAL /* maturity */ +} +maria_declare_plugin_end; === modified file 'server-tools/CMakeLists.txt' --- a/server-tools/CMakeLists.txt 2007-02-14 11:42:11 +0000 +++ b/server-tools/CMakeLists.txt 2010-04-02 09:20:09 +0000 @@ -27,7 +27,7 @@ ADD_EXECUTABLE(mysqlmanager buffer.cc co user_management_commands.cc ../../sql/net_serv.cc ../../sql-common/pack.c ../../sql/password.c ../../sql/sql_state.c ../../sql-common/client.c ../../libmysql/get_password.c - ../../libmysql/errmsg.c) + ../../libmysql/errmsg.c ../../sql-common/client_plugin.c) ADD_DEPENDENCIES(mysqlmanager GenError) TARGET_LINK_LIBRARIES(mysqlmanager dbug mysys strings taocrypt vio yassl zlib wsock32) === modified file 'server-tools/instance-manager/CMakeLists.txt' --- a/server-tools/instance-manager/CMakeLists.txt 2007-12-27 17:16:02 +0000 +++ b/server-tools/instance-manager/CMakeLists.txt 2010-04-02 09:20:09 +0000 @@ -28,7 +28,7 @@ ADD_EXECUTABLE(mysqlmanager buffer.cc co user_management_commands.cc ../../mysys/my_rnd.c ../../sql/net_serv.cc ../../sql-common/pack.c ../../sql/password.c ../../sql/sql_state.c ../../sql-common/client.c ../../libmysql/get_password.c - ../../libmysql/errmsg.c) + ../../libmysql/errmsg.c ../../sql-common/client_plugin.c) ADD_DEPENDENCIES(mysqlmanager GenError) TARGET_LINK_LIBRARIES(mysqlmanager debug dbug mysys strings taocrypt vio yassl zlib wsock32) === modified file 'sql-common/client.c' --- a/sql-common/client.c 2010-03-29 15:13:53 +0000 +++ b/sql-common/client.c 2010-04-02 09:20:09 +0000 @@ -2345,7 +2345,7 @@ void mpvio_info(Vio *vio, MYSQL_PLUGIN_V case VIO_TYPE_SSL: { struct sockaddr addr; - socklen_t addrlen= sizeof(addr); + SOCKET_SIZE_TYPE addrlen= sizeof(addr); if (getsockname(vio->sd, &addr, &addrlen)) return; info->protocol= addr.sa_family == AF_UNIX ? @@ -2360,7 +2360,7 @@ void mpvio_info(Vio *vio, MYSQL_PLUGIN_V return; case VIO_TYPE_SHARED_MEMORY: info->protocol= MYSQL_VIO_MEMORY; - info->handle= vio->handle_client_file_map; /* or what ? */ + info->handle= vio->handle_file_map; /* or what ? */ return; #endif default: DBUG_ASSERT(0); @@ -2394,7 +2394,7 @@ static void client_mpvio_info(MYSQL_PLUG */ int run_plugin_auth(MYSQL *mysql, char *data, uint data_len, - char *data_plugin, const char *db) + const char *data_plugin, const char *db) { const char *auth_plugin_name; auth_plugin_t *auth_plugin; @@ -2540,7 +2540,8 @@ CLI_MYSQL_REAL_CONNECT(MYSQL *mysql,cons char buff[NAME_LEN+USERNAME_LENGTH+100]; int scramble_data_len, pkt_scramble_len; char *end, *host_info=0, *server_version_end, *pkt_end; - char *scramble_data, *scramble_plugin; + char *scramble_data; + const char *scramble_plugin; my_socket sock; in_addr_t ip_addr; struct sockaddr_in sock_addr; === modified file 'sql/client_settings.h' --- a/sql/client_settings.h 2010-03-29 15:13:53 +0000 +++ b/sql/client_settings.h 2010-04-02 09:20:09 +0000 @@ -29,7 +29,6 @@ #define mysql_master_send_query(A, B, C) 1 #define mysql_slave_send_query(A, B, C) 1 #define mysql_rpl_probe(mysql) 0 -#undef HAVE_SMEM #undef _CUSTOMCONFIG_ #define mysql_server_init(a,b,c) mysql_client_plugin_init() === modified file 'sql/ha_ndbcluster.cc' --- a/sql/ha_ndbcluster.cc 2010-03-29 15:13:53 +0000 +++ b/sql/ha_ndbcluster.cc 2010-04-01 14:34:51 +0000 @@ -10564,6 +10564,23 @@ mysql_declare_plugin(ndbcluster) NULL /* config options */ } mysql_declare_plugin_end; +maria_declare_plugin(ndbcluster) +{ + MYSQL_STORAGE_ENGINE_PLUGIN, + &ndbcluster_storage_engine, + ndbcluster_hton_name, + "MySQL AB", + "Clustered, fault-tolerant tables", + PLUGIN_LICENSE_GPL, + ndbcluster_init, /* Plugin Init */ + NULL, /* Plugin Deinit */ + 0x0100 /* 1.0 */, + ndb_status_variables_export,/* status variables */ + NULL, /* system variables */ + "1.0", /* string version */ + MariaDB_PLUGIN_MATURITY_GAMMA /* maturity */ +} +maria_declare_plugin_end; #else int Sun_ar_require_a_symbol_here= 0; === modified file 'sql/ha_partition.cc' --- a/sql/ha_partition.cc 2010-03-15 11:51:23 +0000 +++ b/sql/ha_partition.cc 2010-04-01 14:34:51 +0000 @@ -6715,5 +6715,22 @@ mysql_declare_plugin(partition) NULL /* config options */ } mysql_declare_plugin_end; +maria_declare_plugin(partition) +{ + MYSQL_STORAGE_ENGINE_PLUGIN, + &partition_storage_engine, + "partition", + "Mikael Ronstrom, MySQL AB", + "Partition Storage Engine Helper", + PLUGIN_LICENSE_GPL, + partition_initialize, /* Plugin Init */ + NULL, /* Plugin Deinit */ + 0x0100, /* 1.0 */ + NULL, /* status variables */ + NULL, /* system variables */ + "1.0", /* string version */ + MariaDB_PLUGIN_MATURITY_STABLE /* maturity */ +} +maria_declare_plugin_end; #endif === modified file 'sql/handler.cc' --- a/sql/handler.cc 2010-03-29 21:16:12 +0000 +++ b/sql/handler.cc 2010-04-03 20:19:35 +0000 @@ -4282,7 +4282,7 @@ int handler::read_multi_range_first(KEY_ */ int handler::read_multi_range_next(KEY_MULTI_RANGE **found_range_p) { - int result; + int result= 0; DBUG_ENTER("handler::read_multi_range_next"); /* We should not be called after the last call returned EOF. */ === modified file 'sql/item.cc' --- a/sql/item.cc 2010-03-15 11:51:23 +0000 +++ b/sql/item.cc 2010-04-01 09:04:26 +0000 @@ -7040,7 +7040,7 @@ bool Item_cache_int::cache_value() } -void Item_cache_int::store(Item *item, longlong val_arg) +void Item_cache_int::store_longlong(Item *item, longlong val_arg) { /* An explicit values is given, save it. */ value_cached= TRUE; === modified file 'sql/item.h' --- a/sql/item.h 2010-03-15 11:51:23 +0000 +++ b/sql/item.h 2010-04-01 09:04:26 +0000 @@ -1132,7 +1132,8 @@ class Field_enumerator { public: virtual void visit_field(Field *field)= 0; - virtual ~Field_enumerator() {}; /* purecov: inspected */ + virtual ~Field_enumerator() {}; /* purecov: inspected */ + Field_enumerator() {} /* Remove gcc warning */ }; @@ -3148,7 +3149,7 @@ public: Item_cache_int(enum_field_types field_type_arg): Item_cache(field_type_arg), value(0) {} - void store(Item *item, longlong val_arg); + void store_longlong(Item *item, longlong val_arg); double val_real(); longlong val_int(); String* val_str(String *str); === modified file 'sql/item_cmpfunc.cc' --- a/sql/item_cmpfunc.cc 2010-03-04 08:03:07 +0000 +++ b/sql/item_cmpfunc.cc 2010-03-28 18:10:00 +0000 @@ -879,7 +879,7 @@ get_time_value(THD *thd, Item ***item_ar Item_cache_int *cache= new Item_cache_int(); /* Mark the cache as non-const to prevent re-caching. */ cache->set_used_tables(1); - cache->store(item, value); + cache->store_longlong(item, value); *cache_arg= cache; *item_arg= cache_arg; } @@ -917,13 +917,13 @@ int Arg_comparator::set_cmp_func(Item_re cache->set_used_tables(1); if (!(*a)->is_datetime()) { - cache->store((*a), const_value); + cache->store_longlong((*a), const_value); a_cache= cache; a= (Item **)&a_cache; } else { - cache->store((*b), const_value); + cache->store_longlong((*b), const_value); b_cache= cache; b= (Item **)&b_cache; } @@ -1145,7 +1145,7 @@ get_datetime_value(THD *thd, Item ***ite Item_cache_int *cache= new Item_cache_int(MYSQL_TYPE_DATETIME); /* Mark the cache as non-const to prevent re-caching. */ cache->set_used_tables(1); - cache->store(item, value); + cache->store_longlong(item, value); *cache_arg= cache; *item_arg= cache_arg; } === modified file 'sql/item_create.cc' --- a/sql/item_create.cc 2010-03-04 08:03:07 +0000 +++ b/sql/item_create.cc 2010-03-29 19:07:45 +0000 @@ -76,7 +76,7 @@ public: @param thd The current thread @return An item representing the function call */ - virtual Item *create(THD *thd) = 0; + virtual Item *create_builder(THD *thd) = 0; protected: /** Constructor. */ @@ -101,7 +101,7 @@ public: @param arg1 The first argument of the function @return An item representing the function call */ - virtual Item *create(THD *thd, Item *arg1) = 0; + virtual Item *create_1_arg(THD *thd, Item *arg1) = 0; protected: /** Constructor. */ @@ -127,7 +127,7 @@ public: @param arg2 The second argument of the function @return An item representing the function call */ - virtual Item *create(THD *thd, Item *arg1, Item *arg2) = 0; + virtual Item *create_2_arg(THD *thd, Item *arg1, Item *arg2) = 0; protected: /** Constructor. */ @@ -154,7 +154,7 @@ public: @param arg3 The third argument of the function @return An item representing the function call */ - virtual Item *create(THD *thd, Item *arg1, Item *arg2, Item *arg3) = 0; + virtual Item *create_3_arg(THD *thd, Item *arg1, Item *arg2, Item *arg3) = 0; protected: /** Constructor. */ @@ -171,8 +171,8 @@ protected: class Create_sp_func : public Create_qfunc { public: - virtual Item *create(THD *thd, LEX_STRING db, LEX_STRING name, - bool use_explicit_name, List<Item> *item_list); + virtual Item *create_with_db(THD *thd, LEX_STRING db, LEX_STRING name, + bool use_explicit_name, List<Item> *item_list); static Create_sp_func s_singleton; @@ -217,7 +217,7 @@ protected: class Create_func_abs : public Create_func_arg1 { public: - virtual Item *create(THD *thd, Item *arg1); + virtual Item *create_1_arg(THD *thd, Item *arg1); static Create_func_abs s_singleton; @@ -230,7 +230,7 @@ protected: class Create_func_acos : public Create_func_arg1 { public: - virtual Item *create(THD *thd, Item *arg1); + virtual Item *create_1_arg(THD *thd, Item *arg1); static Create_func_acos s_singleton; @@ -243,7 +243,7 @@ protected: class Create_func_addtime : public Create_func_arg2 { public: - virtual Item *create(THD *thd, Item *arg1, Item *arg2); + virtual Item *create_2_arg(THD *thd, Item *arg1, Item *arg2); static Create_func_addtime s_singleton; @@ -256,7 +256,7 @@ protected: class Create_func_aes_encrypt : public Create_func_arg2 { public: - virtual Item *create(THD *thd, Item *arg1, Item *arg2); + virtual Item *create_2_arg(THD *thd, Item *arg1, Item *arg2); static Create_func_aes_encrypt s_singleton; @@ -269,7 +269,7 @@ protected: class Create_func_aes_decrypt : public Create_func_arg2 { public: - virtual Item *create(THD *thd, Item *arg1, Item *arg2); + virtual Item *create_2_arg(THD *thd, Item *arg1, Item *arg2); static Create_func_aes_decrypt s_singleton; @@ -283,7 +283,7 @@ protected: class Create_func_area : public Create_func_arg1 { public: - virtual Item *create(THD *thd, Item *arg1); + virtual Item *create_1_arg(THD *thd, Item *arg1); static Create_func_area s_singleton; @@ -298,7 +298,7 @@ protected: class Create_func_as_wkb : public Create_func_arg1 { public: - virtual Item *create(THD *thd, Item *arg1); + virtual Item *create_1_arg(THD *thd, Item *arg1); static Create_func_as_wkb s_singleton; @@ -313,7 +313,7 @@ protected: class Create_func_as_wkt : public Create_func_arg1 { public: - virtual Item *create(THD *thd, Item *arg1); + virtual Item *create_1_arg(THD *thd, Item *arg1); static Create_func_as_wkt s_singleton; @@ -327,7 +327,7 @@ protected: class Create_func_asin : public Create_func_arg1 { public: - virtual Item *create(THD *thd, Item *arg1); + virtual Item *create_1_arg(THD *thd, Item *arg1); static Create_func_asin s_singleton; @@ -353,7 +353,7 @@ protected: class Create_func_benchmark : public Create_func_arg2 { public: - virtual Item *create(THD *thd, Item *arg1, Item *arg2); + virtual Item *create_2_arg(THD *thd, Item *arg1, Item *arg2); static Create_func_benchmark s_singleton; @@ -366,7 +366,7 @@ protected: class Create_func_bin : public Create_func_arg1 { public: - virtual Item *create(THD *thd, Item *arg1); + virtual Item *create_1_arg(THD *thd, Item *arg1); static Create_func_bin s_singleton; @@ -379,7 +379,7 @@ protected: class Create_func_bit_count : public Create_func_arg1 { public: - virtual Item *create(THD *thd, Item *arg1); + virtual Item *create_1_arg(THD *thd, Item *arg1); static Create_func_bit_count s_singleton; @@ -392,7 +392,7 @@ protected: class Create_func_bit_length : public Create_func_arg1 { public: - virtual Item *create(THD *thd, Item *arg1); + virtual Item *create_1_arg(THD *thd, Item *arg1); static Create_func_bit_length s_singleton; @@ -405,7 +405,7 @@ protected: class Create_func_ceiling : public Create_func_arg1 { public: - virtual Item *create(THD *thd, Item *arg1); + virtual Item *create_1_arg(THD *thd, Item *arg1); static Create_func_ceiling s_singleton; @@ -419,7 +419,7 @@ protected: class Create_func_centroid : public Create_func_arg1 { public: - virtual Item *create(THD *thd, Item *arg1); + virtual Item *create_1_arg(THD *thd, Item *arg1); static Create_func_centroid s_singleton; @@ -433,7 +433,7 @@ protected: class Create_func_char_length : public Create_func_arg1 { public: - virtual Item *create(THD *thd, Item *arg1); + virtual Item *create_1_arg(THD *thd, Item *arg1); static Create_func_char_length s_singleton; @@ -446,7 +446,7 @@ protected: class Create_func_coercibility : public Create_func_arg1 { public: - virtual Item *create(THD *thd, Item *arg1); + virtual Item *create_1_arg(THD *thd, Item *arg1); static Create_func_coercibility s_singleton; @@ -459,7 +459,7 @@ protected: class Create_func_compress : public Create_func_arg1 { public: - virtual Item *create(THD *thd, Item *arg1); + virtual Item *create_1_arg(THD *thd, Item *arg1); static Create_func_compress s_singleton; @@ -498,7 +498,7 @@ protected: class Create_func_connection_id : public Create_func_arg0 { public: - virtual Item *create(THD *thd); + virtual Item *create_builder(THD *thd); static Create_func_connection_id s_singleton; @@ -512,7 +512,7 @@ protected: class Create_func_contains : public Create_func_arg2 { public: - virtual Item *create(THD *thd, Item *arg1, Item *arg2); + virtual Item *create_2_arg(THD *thd, Item *arg1, Item *arg2); static Create_func_contains s_singleton; @@ -526,7 +526,7 @@ protected: class Create_func_conv : public Create_func_arg3 { public: - virtual Item *create(THD *thd, Item *arg1, Item *arg2, Item *arg3); + virtual Item *create_3_arg(THD *thd, Item *arg1, Item *arg2, Item *arg3); static Create_func_conv s_singleton; @@ -539,7 +539,7 @@ protected: class Create_func_convert_tz : public Create_func_arg3 { public: - virtual Item *create(THD *thd, Item *arg1, Item *arg2, Item *arg3); + virtual Item *create_3_arg(THD *thd, Item *arg1, Item *arg2, Item *arg3); static Create_func_convert_tz s_singleton; @@ -552,7 +552,7 @@ protected: class Create_func_cos : public Create_func_arg1 { public: - virtual Item *create(THD *thd, Item *arg1); + virtual Item *create_1_arg(THD *thd, Item *arg1); static Create_func_cos s_singleton; @@ -565,7 +565,7 @@ protected: class Create_func_cot : public Create_func_arg1 { public: - virtual Item *create(THD *thd, Item *arg1); + virtual Item *create_1_arg(THD *thd, Item *arg1); static Create_func_cot s_singleton; @@ -578,7 +578,7 @@ protected: class Create_func_crc32 : public Create_func_arg1 { public: - virtual Item *create(THD *thd, Item *arg1); + virtual Item *create_1_arg(THD *thd, Item *arg1); static Create_func_crc32 s_singleton; @@ -592,7 +592,7 @@ protected: class Create_func_crosses : public Create_func_arg2 { public: - virtual Item *create(THD *thd, Item *arg1, Item *arg2); + virtual Item *create_2_arg(THD *thd, Item *arg1, Item *arg2); static Create_func_crosses s_singleton; @@ -606,7 +606,7 @@ protected: class Create_func_date_format : public Create_func_arg2 { public: - virtual Item *create(THD *thd, Item *arg1, Item *arg2); + virtual Item *create_2_arg(THD *thd, Item *arg1, Item *arg2); static Create_func_date_format s_singleton; @@ -619,7 +619,7 @@ protected: class Create_func_datediff : public Create_func_arg2 { public: - virtual Item *create(THD *thd, Item *arg1, Item *arg2); + virtual Item *create_2_arg(THD *thd, Item *arg1, Item *arg2); static Create_func_datediff s_singleton; @@ -632,7 +632,7 @@ protected: class Create_func_dayname : public Create_func_arg1 { public: - virtual Item *create(THD *thd, Item *arg1); + virtual Item *create_1_arg(THD *thd, Item *arg1); static Create_func_dayname s_singleton; @@ -645,7 +645,7 @@ protected: class Create_func_dayofmonth : public Create_func_arg1 { public: - virtual Item *create(THD *thd, Item *arg1); + virtual Item *create_1_arg(THD *thd, Item *arg1); static Create_func_dayofmonth s_singleton; @@ -658,7 +658,7 @@ protected: class Create_func_dayofweek : public Create_func_arg1 { public: - virtual Item *create(THD *thd, Item *arg1); + virtual Item *create_1_arg(THD *thd, Item *arg1); static Create_func_dayofweek s_singleton; @@ -671,7 +671,7 @@ protected: class Create_func_dayofyear : public Create_func_arg1 { public: - virtual Item *create(THD *thd, Item *arg1); + virtual Item *create_1_arg(THD *thd, Item *arg1); static Create_func_dayofyear s_singleton; @@ -684,7 +684,7 @@ protected: class Create_func_decode : public Create_func_arg2 { public: - virtual Item *create(THD *thd, Item *arg1, Item *arg2); + virtual Item *create_2_arg(THD *thd, Item *arg1, Item *arg2); static Create_func_decode s_singleton; @@ -697,7 +697,7 @@ protected: class Create_func_degrees : public Create_func_arg1 { public: - virtual Item *create(THD *thd, Item *arg1); + virtual Item *create_1_arg(THD *thd, Item *arg1); static Create_func_degrees s_singleton; @@ -737,7 +737,7 @@ protected: class Create_func_dimension : public Create_func_arg1 { public: - virtual Item *create(THD *thd, Item *arg1); + virtual Item *create_1_arg(THD *thd, Item *arg1); static Create_func_dimension s_singleton; @@ -752,7 +752,7 @@ protected: class Create_func_disjoint : public Create_func_arg2 { public: - virtual Item *create(THD *thd, Item *arg1, Item *arg2); + virtual Item *create_2_arg(THD *thd, Item *arg1, Item *arg2); static Create_func_disjoint s_singleton; @@ -779,7 +779,7 @@ protected: class Create_func_encode : public Create_func_arg2 { public: - virtual Item *create(THD *thd, Item *arg1, Item *arg2); + virtual Item *create_2_arg(THD *thd, Item *arg1, Item *arg2); static Create_func_encode s_singleton; @@ -806,7 +806,7 @@ protected: class Create_func_endpoint : public Create_func_arg1 { public: - virtual Item *create(THD *thd, Item *arg1); + virtual Item *create_1_arg(THD *thd, Item *arg1); static Create_func_endpoint s_singleton; @@ -821,7 +821,7 @@ protected: class Create_func_envelope : public Create_func_arg1 { public: - virtual Item *create(THD *thd, Item *arg1); + virtual Item *create_1_arg(THD *thd, Item *arg1); static Create_func_envelope s_singleton; @@ -836,7 +836,7 @@ protected: class Create_func_equals : public Create_func_arg2 { public: - virtual Item *create(THD *thd, Item *arg1, Item *arg2); + virtual Item *create_2_arg(THD *thd, Item *arg1, Item *arg2); static Create_func_equals s_singleton; @@ -850,7 +850,7 @@ protected: class Create_func_exp : public Create_func_arg1 { public: - virtual Item *create(THD *thd, Item *arg1); + virtual Item *create_1_arg(THD *thd, Item *arg1); static Create_func_exp s_singleton; @@ -877,7 +877,7 @@ protected: class Create_func_exteriorring : public Create_func_arg1 { public: - virtual Item *create(THD *thd, Item *arg1); + virtual Item *create_1_arg(THD *thd, Item *arg1); static Create_func_exteriorring s_singleton; @@ -904,7 +904,7 @@ protected: class Create_func_find_in_set : public Create_func_arg2 { public: - virtual Item *create(THD *thd, Item *arg1, Item *arg2); + virtual Item *create_2_arg(THD *thd, Item *arg1, Item *arg2); static Create_func_find_in_set s_singleton; @@ -917,7 +917,7 @@ protected: class Create_func_floor : public Create_func_arg1 { public: - virtual Item *create(THD *thd, Item *arg1); + virtual Item *create_1_arg(THD *thd, Item *arg1); static Create_func_floor s_singleton; @@ -930,7 +930,7 @@ protected: class Create_func_format : public Create_func_arg2 { public: - virtual Item *create(THD *thd, Item *arg1, Item *arg2); + virtual Item *create_2_arg(THD *thd, Item *arg1, Item *arg2); static Create_func_format s_singleton; @@ -943,7 +943,7 @@ protected: class Create_func_found_rows : public Create_func_arg0 { public: - virtual Item *create(THD *thd); + virtual Item *create_builder(THD *thd); static Create_func_found_rows s_singleton; @@ -956,7 +956,7 @@ protected: class Create_func_from_days : public Create_func_arg1 { public: - virtual Item *create(THD *thd, Item *arg1); + virtual Item *create_1_arg(THD *thd, Item *arg1); static Create_func_from_days s_singleton; @@ -1013,7 +1013,7 @@ protected: class Create_func_geometry_type : public Create_func_arg1 { public: - virtual Item *create(THD *thd, Item *arg1); + virtual Item *create_1_arg(THD *thd, Item *arg1); static Create_func_geometry_type s_singleton; @@ -1028,7 +1028,7 @@ protected: class Create_func_geometryn : public Create_func_arg2 { public: - virtual Item *create(THD *thd, Item *arg1, Item *arg2); + virtual Item *create_2_arg(THD *thd, Item *arg1, Item *arg2); static Create_func_geometryn s_singleton; @@ -1042,7 +1042,7 @@ protected: class Create_func_get_lock : public Create_func_arg2 { public: - virtual Item *create(THD *thd, Item *arg1, Item *arg2); + virtual Item *create_2_arg(THD *thd, Item *arg1, Item *arg2); static Create_func_get_lock s_singleton; @@ -1056,7 +1056,7 @@ protected: class Create_func_glength : public Create_func_arg1 { public: - virtual Item *create(THD *thd, Item *arg1); + virtual Item *create_1_arg(THD *thd, Item *arg1); static Create_func_glength s_singleton; @@ -1083,7 +1083,7 @@ protected: class Create_func_hex : public Create_func_arg1 { public: - virtual Item *create(THD *thd, Item *arg1); + virtual Item *create_1_arg(THD *thd, Item *arg1); static Create_func_hex s_singleton; @@ -1096,7 +1096,7 @@ protected: class Create_func_ifnull : public Create_func_arg2 { public: - virtual Item *create(THD *thd, Item *arg1, Item *arg2); + virtual Item *create_2_arg(THD *thd, Item *arg1, Item *arg2); static Create_func_ifnull s_singleton; @@ -1109,7 +1109,7 @@ protected: class Create_func_inet_ntoa : public Create_func_arg1 { public: - virtual Item *create(THD *thd, Item *arg1); + virtual Item *create_1_arg(THD *thd, Item *arg1); static Create_func_inet_ntoa s_singleton; @@ -1122,7 +1122,7 @@ protected: class Create_func_inet_aton : public Create_func_arg1 { public: - virtual Item *create(THD *thd, Item *arg1); + virtual Item *create_1_arg(THD *thd, Item *arg1); static Create_func_inet_aton s_singleton; @@ -1135,7 +1135,7 @@ protected: class Create_func_instr : public Create_func_arg2 { public: - virtual Item *create(THD *thd, Item *arg1, Item *arg2); + virtual Item *create_2_arg(THD *thd, Item *arg1, Item *arg2); static Create_func_instr s_singleton; @@ -1149,7 +1149,7 @@ protected: class Create_func_interiorringn : public Create_func_arg2 { public: - virtual Item *create(THD *thd, Item *arg1, Item *arg2); + virtual Item *create_2_arg(THD *thd, Item *arg1, Item *arg2); static Create_func_interiorringn s_singleton; @@ -1164,7 +1164,7 @@ protected: class Create_func_intersects : public Create_func_arg2 { public: - virtual Item *create(THD *thd, Item *arg1, Item *arg2); + virtual Item *create_2_arg(THD *thd, Item *arg1, Item *arg2); static Create_func_intersects s_singleton; @@ -1178,7 +1178,7 @@ protected: class Create_func_is_free_lock : public Create_func_arg1 { public: - virtual Item *create(THD *thd, Item *arg1); + virtual Item *create_1_arg(THD *thd, Item *arg1); static Create_func_is_free_lock s_singleton; @@ -1191,7 +1191,7 @@ protected: class Create_func_is_used_lock : public Create_func_arg1 { public: - virtual Item *create(THD *thd, Item *arg1); + virtual Item *create_1_arg(THD *thd, Item *arg1); static Create_func_is_used_lock s_singleton; @@ -1205,7 +1205,7 @@ protected: class Create_func_isclosed : public Create_func_arg1 { public: - virtual Item *create(THD *thd, Item *arg1); + virtual Item *create_1_arg(THD *thd, Item *arg1); static Create_func_isclosed s_singleton; @@ -1220,7 +1220,7 @@ protected: class Create_func_isempty : public Create_func_arg1 { public: - virtual Item *create(THD *thd, Item *arg1); + virtual Item *create_1_arg(THD *thd, Item *arg1); static Create_func_isempty s_singleton; @@ -1234,7 +1234,7 @@ protected: class Create_func_isnull : public Create_func_arg1 { public: - virtual Item *create(THD *thd, Item *arg1); + virtual Item *create_1_arg(THD *thd, Item *arg1); static Create_func_isnull s_singleton; @@ -1248,7 +1248,7 @@ protected: class Create_func_issimple : public Create_func_arg1 { public: - virtual Item *create(THD *thd, Item *arg1); + virtual Item *create_1_arg(THD *thd, Item *arg1); static Create_func_issimple s_singleton; @@ -1262,7 +1262,7 @@ protected: class Create_func_last_day : public Create_func_arg1 { public: - virtual Item *create(THD *thd, Item *arg1); + virtual Item *create_1_arg(THD *thd, Item *arg1); static Create_func_last_day s_singleton; @@ -1288,7 +1288,7 @@ protected: class Create_func_lcase : public Create_func_arg1 { public: - virtual Item *create(THD *thd, Item *arg1); + virtual Item *create_1_arg(THD *thd, Item *arg1); static Create_func_lcase s_singleton; @@ -1314,7 +1314,7 @@ protected: class Create_func_length : public Create_func_arg1 { public: - virtual Item *create(THD *thd, Item *arg1); + virtual Item *create_1_arg(THD *thd, Item *arg1); static Create_func_length s_singleton; @@ -1327,7 +1327,7 @@ protected: class Create_func_ln : public Create_func_arg1 { public: - virtual Item *create(THD *thd, Item *arg1); + virtual Item *create_1_arg(THD *thd, Item *arg1); static Create_func_ln s_singleton; @@ -1340,7 +1340,7 @@ protected: class Create_func_load_file : public Create_func_arg1 { public: - virtual Item *create(THD *thd, Item *arg1); + virtual Item *create_1_arg(THD *thd, Item *arg1); static Create_func_load_file s_singleton; @@ -1379,7 +1379,7 @@ protected: class Create_func_log10 : public Create_func_arg1 { public: - virtual Item *create(THD *thd, Item *arg1); + virtual Item *create_1_arg(THD *thd, Item *arg1); static Create_func_log10 s_singleton; @@ -1392,7 +1392,7 @@ protected: class Create_func_log2 : public Create_func_arg1 { public: - virtual Item *create(THD *thd, Item *arg1); + virtual Item *create_1_arg(THD *thd, Item *arg1); static Create_func_log2 s_singleton; @@ -1405,7 +1405,7 @@ protected: class Create_func_lpad : public Create_func_arg3 { public: - virtual Item *create(THD *thd, Item *arg1, Item *arg2, Item *arg3); + virtual Item *create_3_arg(THD *thd, Item *arg1, Item *arg2, Item *arg3); static Create_func_lpad s_singleton; @@ -1418,7 +1418,7 @@ protected: class Create_func_ltrim : public Create_func_arg1 { public: - virtual Item *create(THD *thd, Item *arg1); + virtual Item *create_1_arg(THD *thd, Item *arg1); static Create_func_ltrim s_singleton; @@ -1431,7 +1431,7 @@ protected: class Create_func_makedate : public Create_func_arg2 { public: - virtual Item *create(THD *thd, Item *arg1, Item *arg2); + virtual Item *create_2_arg(THD *thd, Item *arg1, Item *arg2); static Create_func_makedate s_singleton; @@ -1444,7 +1444,7 @@ protected: class Create_func_maketime : public Create_func_arg3 { public: - virtual Item *create(THD *thd, Item *arg1, Item *arg2, Item *arg3); + virtual Item *create_3_arg(THD *thd, Item *arg1, Item *arg2, Item *arg3); static Create_func_maketime s_singleton; @@ -1483,7 +1483,7 @@ protected: class Create_func_md5 : public Create_func_arg1 { public: - virtual Item *create(THD *thd, Item *arg1); + virtual Item *create_1_arg(THD *thd, Item *arg1); static Create_func_md5 s_singleton; @@ -1496,7 +1496,7 @@ protected: class Create_func_monthname : public Create_func_arg1 { public: - virtual Item *create(THD *thd, Item *arg1); + virtual Item *create_1_arg(THD *thd, Item *arg1); static Create_func_monthname s_singleton; @@ -1509,7 +1509,7 @@ protected: class Create_func_name_const : public Create_func_arg2 { public: - virtual Item *create(THD *thd, Item *arg1, Item *arg2); + virtual Item *create_2_arg(THD *thd, Item *arg1, Item *arg2); static Create_func_name_const s_singleton; @@ -1522,7 +1522,7 @@ protected: class Create_func_nullif : public Create_func_arg2 { public: - virtual Item *create(THD *thd, Item *arg1, Item *arg2); + virtual Item *create_2_arg(THD *thd, Item *arg1, Item *arg2); static Create_func_nullif s_singleton; @@ -1536,7 +1536,7 @@ protected: class Create_func_numgeometries : public Create_func_arg1 { public: - virtual Item *create(THD *thd, Item *arg1); + virtual Item *create_1_arg(THD *thd, Item *arg1); static Create_func_numgeometries s_singleton; @@ -1551,7 +1551,7 @@ protected: class Create_func_numinteriorring : public Create_func_arg1 { public: - virtual Item *create(THD *thd, Item *arg1); + virtual Item *create_1_arg(THD *thd, Item *arg1); static Create_func_numinteriorring s_singleton; @@ -1566,7 +1566,7 @@ protected: class Create_func_numpoints : public Create_func_arg1 { public: - virtual Item *create(THD *thd, Item *arg1); + virtual Item *create_1_arg(THD *thd, Item *arg1); static Create_func_numpoints s_singleton; @@ -1580,7 +1580,7 @@ protected: class Create_func_oct : public Create_func_arg1 { public: - virtual Item *create(THD *thd, Item *arg1); + virtual Item *create_1_arg(THD *thd, Item *arg1); static Create_func_oct s_singleton; @@ -1593,7 +1593,7 @@ protected: class Create_func_ord : public Create_func_arg1 { public: - virtual Item *create(THD *thd, Item *arg1); + virtual Item *create_1_arg(THD *thd, Item *arg1); static Create_func_ord s_singleton; @@ -1607,7 +1607,7 @@ protected: class Create_func_overlaps : public Create_func_arg2 { public: - virtual Item *create(THD *thd, Item *arg1, Item *arg2); + virtual Item *create_2_arg(THD *thd, Item *arg1, Item *arg2); static Create_func_overlaps s_singleton; @@ -1621,7 +1621,7 @@ protected: class Create_func_period_add : public Create_func_arg2 { public: - virtual Item *create(THD *thd, Item *arg1, Item *arg2); + virtual Item *create_2_arg(THD *thd, Item *arg1, Item *arg2); static Create_func_period_add s_singleton; @@ -1634,7 +1634,7 @@ protected: class Create_func_period_diff : public Create_func_arg2 { public: - virtual Item *create(THD *thd, Item *arg1, Item *arg2); + virtual Item *create_2_arg(THD *thd, Item *arg1, Item *arg2); static Create_func_period_diff s_singleton; @@ -1647,7 +1647,7 @@ protected: class Create_func_pi : public Create_func_arg0 { public: - virtual Item *create(THD *thd); + virtual Item *create_builder(THD *thd); static Create_func_pi s_singleton; @@ -1661,7 +1661,7 @@ protected: class Create_func_pointn : public Create_func_arg2 { public: - virtual Item *create(THD *thd, Item *arg1, Item *arg2); + virtual Item *create_2_arg(THD *thd, Item *arg1, Item *arg2); static Create_func_pointn s_singleton; @@ -1675,7 +1675,7 @@ protected: class Create_func_pow : public Create_func_arg2 { public: - virtual Item *create(THD *thd, Item *arg1, Item *arg2); + virtual Item *create_2_arg(THD *thd, Item *arg1, Item *arg2); static Create_func_pow s_singleton; @@ -1688,7 +1688,7 @@ protected: class Create_func_quote : public Create_func_arg1 { public: - virtual Item *create(THD *thd, Item *arg1); + virtual Item *create_1_arg(THD *thd, Item *arg1); static Create_func_quote s_singleton; @@ -1701,7 +1701,7 @@ protected: class Create_func_radians : public Create_func_arg1 { public: - virtual Item *create(THD *thd, Item *arg1); + virtual Item *create_1_arg(THD *thd, Item *arg1); static Create_func_radians s_singleton; @@ -1727,7 +1727,7 @@ protected: class Create_func_release_lock : public Create_func_arg1 { public: - virtual Item *create(THD *thd, Item *arg1); + virtual Item *create_1_arg(THD *thd, Item *arg1); static Create_func_release_lock s_singleton; @@ -1740,7 +1740,7 @@ protected: class Create_func_reverse : public Create_func_arg1 { public: - virtual Item *create(THD *thd, Item *arg1); + virtual Item *create_1_arg(THD *thd, Item *arg1); static Create_func_reverse s_singleton; @@ -1766,7 +1766,7 @@ protected: class Create_func_row_count : public Create_func_arg0 { public: - virtual Item *create(THD *thd); + virtual Item *create_builder(THD *thd); static Create_func_row_count s_singleton; @@ -1779,7 +1779,7 @@ protected: class Create_func_rpad : public Create_func_arg3 { public: - virtual Item *create(THD *thd, Item *arg1, Item *arg2, Item *arg3); + virtual Item *create_3_arg(THD *thd, Item *arg1, Item *arg2, Item *arg3); static Create_func_rpad s_singleton; @@ -1792,7 +1792,7 @@ protected: class Create_func_rtrim : public Create_func_arg1 { public: - virtual Item *create(THD *thd, Item *arg1); + virtual Item *create_1_arg(THD *thd, Item *arg1); static Create_func_rtrim s_singleton; @@ -1805,7 +1805,7 @@ protected: class Create_func_sec_to_time : public Create_func_arg1 { public: - virtual Item *create(THD *thd, Item *arg1); + virtual Item *create_1_arg(THD *thd, Item *arg1); static Create_func_sec_to_time s_singleton; @@ -1818,7 +1818,7 @@ protected: class Create_func_sha : public Create_func_arg1 { public: - virtual Item *create(THD *thd, Item *arg1); + virtual Item *create_1_arg(THD *thd, Item *arg1); static Create_func_sha s_singleton; @@ -1831,7 +1831,7 @@ protected: class Create_func_sign : public Create_func_arg1 { public: - virtual Item *create(THD *thd, Item *arg1); + virtual Item *create_1_arg(THD *thd, Item *arg1); static Create_func_sign s_singleton; @@ -1844,7 +1844,7 @@ protected: class Create_func_sin : public Create_func_arg1 { public: - virtual Item *create(THD *thd, Item *arg1); + virtual Item *create_1_arg(THD *thd, Item *arg1); static Create_func_sin s_singleton; @@ -1857,7 +1857,7 @@ protected: class Create_func_sleep : public Create_func_arg1 { public: - virtual Item *create(THD *thd, Item *arg1); + virtual Item *create_1_arg(THD *thd, Item *arg1); static Create_func_sleep s_singleton; @@ -1870,7 +1870,7 @@ protected: class Create_func_soundex : public Create_func_arg1 { public: - virtual Item *create(THD *thd, Item *arg1); + virtual Item *create_1_arg(THD *thd, Item *arg1); static Create_func_soundex s_singleton; @@ -1883,7 +1883,7 @@ protected: class Create_func_space : public Create_func_arg1 { public: - virtual Item *create(THD *thd, Item *arg1); + virtual Item *create_1_arg(THD *thd, Item *arg1); static Create_func_space s_singleton; @@ -1896,7 +1896,7 @@ protected: class Create_func_sqrt : public Create_func_arg1 { public: - virtual Item *create(THD *thd, Item *arg1); + virtual Item *create_1_arg(THD *thd, Item *arg1); static Create_func_sqrt s_singleton; @@ -1910,7 +1910,7 @@ protected: class Create_func_srid : public Create_func_arg1 { public: - virtual Item *create(THD *thd, Item *arg1); + virtual Item *create_1_arg(THD *thd, Item *arg1); static Create_func_srid s_singleton; @@ -1925,7 +1925,7 @@ protected: class Create_func_startpoint : public Create_func_arg1 { public: - virtual Item *create(THD *thd, Item *arg1); + virtual Item *create_1_arg(THD *thd, Item *arg1); static Create_func_startpoint s_singleton; @@ -1939,7 +1939,7 @@ protected: class Create_func_str_to_date : public Create_func_arg2 { public: - virtual Item *create(THD *thd, Item *arg1, Item *arg2); + virtual Item *create_2_arg(THD *thd, Item *arg1, Item *arg2); static Create_func_str_to_date s_singleton; @@ -1952,7 +1952,7 @@ protected: class Create_func_strcmp : public Create_func_arg2 { public: - virtual Item *create(THD *thd, Item *arg1, Item *arg2); + virtual Item *create_2_arg(THD *thd, Item *arg1, Item *arg2); static Create_func_strcmp s_singleton; @@ -1965,7 +1965,7 @@ protected: class Create_func_substr_index : public Create_func_arg3 { public: - virtual Item *create(THD *thd, Item *arg1, Item *arg2, Item *arg3); + virtual Item *create_3_arg(THD *thd, Item *arg1, Item *arg2, Item *arg3); static Create_func_substr_index s_singleton; @@ -1978,7 +1978,7 @@ protected: class Create_func_subtime : public Create_func_arg2 { public: - virtual Item *create(THD *thd, Item *arg1, Item *arg2); + virtual Item *create_2_arg(THD *thd, Item *arg1, Item *arg2); static Create_func_subtime s_singleton; @@ -1991,7 +1991,7 @@ protected: class Create_func_tan : public Create_func_arg1 { public: - virtual Item *create(THD *thd, Item *arg1); + virtual Item *create_1_arg(THD *thd, Item *arg1); static Create_func_tan s_singleton; @@ -2004,7 +2004,7 @@ protected: class Create_func_time_format : public Create_func_arg2 { public: - virtual Item *create(THD *thd, Item *arg1, Item *arg2); + virtual Item *create_2_arg(THD *thd, Item *arg1, Item *arg2); static Create_func_time_format s_singleton; @@ -2017,7 +2017,7 @@ protected: class Create_func_time_to_sec : public Create_func_arg1 { public: - virtual Item *create(THD *thd, Item *arg1); + virtual Item *create_1_arg(THD *thd, Item *arg1); static Create_func_time_to_sec s_singleton; @@ -2030,7 +2030,7 @@ protected: class Create_func_timediff : public Create_func_arg2 { public: - virtual Item *create(THD *thd, Item *arg1, Item *arg2); + virtual Item *create_2_arg(THD *thd, Item *arg1, Item *arg2); static Create_func_timediff s_singleton; @@ -2043,7 +2043,7 @@ protected: class Create_func_to_days : public Create_func_arg1 { public: - virtual Item *create(THD *thd, Item *arg1); + virtual Item *create_1_arg(THD *thd, Item *arg1); static Create_func_to_days s_singleton; @@ -2057,7 +2057,7 @@ protected: class Create_func_touches : public Create_func_arg2 { public: - virtual Item *create(THD *thd, Item *arg1, Item *arg2); + virtual Item *create_2_arg(THD *thd, Item *arg1, Item *arg2); static Create_func_touches s_singleton; @@ -2071,7 +2071,7 @@ protected: class Create_func_ucase : public Create_func_arg1 { public: - virtual Item *create(THD *thd, Item *arg1); + virtual Item *create_1_arg(THD *thd, Item *arg1); static Create_func_ucase s_singleton; @@ -2084,7 +2084,7 @@ protected: class Create_func_uncompress : public Create_func_arg1 { public: - virtual Item *create(THD *thd, Item *arg1); + virtual Item *create_1_arg(THD *thd, Item *arg1); static Create_func_uncompress s_singleton; @@ -2097,7 +2097,7 @@ protected: class Create_func_uncompressed_length : public Create_func_arg1 { public: - virtual Item *create(THD *thd, Item *arg1); + virtual Item *create_1_arg(THD *thd, Item *arg1); static Create_func_uncompressed_length s_singleton; @@ -2110,7 +2110,7 @@ protected: class Create_func_unhex : public Create_func_arg1 { public: - virtual Item *create(THD *thd, Item *arg1); + virtual Item *create_1_arg(THD *thd, Item *arg1); static Create_func_unhex s_singleton; @@ -2136,7 +2136,7 @@ protected: class Create_func_uuid : public Create_func_arg0 { public: - virtual Item *create(THD *thd); + virtual Item *create_builder(THD *thd); static Create_func_uuid s_singleton; @@ -2149,7 +2149,7 @@ protected: class Create_func_uuid_short : public Create_func_arg0 { public: - virtual Item *create(THD *thd); + virtual Item *create_builder(THD *thd); static Create_func_uuid_short s_singleton; @@ -2162,7 +2162,7 @@ protected: class Create_func_version : public Create_func_arg0 { public: - virtual Item *create(THD *thd); + virtual Item *create_builder(THD *thd); static Create_func_version s_singleton; @@ -2175,7 +2175,7 @@ protected: class Create_func_weekday : public Create_func_arg1 { public: - virtual Item *create(THD *thd, Item *arg1); + virtual Item *create_1_arg(THD *thd, Item *arg1); static Create_func_weekday s_singleton; @@ -2188,7 +2188,7 @@ protected: class Create_func_weekofyear : public Create_func_arg1 { public: - virtual Item *create(THD *thd, Item *arg1); + virtual Item *create_1_arg(THD *thd, Item *arg1); static Create_func_weekofyear s_singleton; @@ -2202,7 +2202,7 @@ protected: class Create_func_within : public Create_func_arg2 { public: - virtual Item *create(THD *thd, Item *arg1, Item *arg2); + virtual Item *create_2_arg(THD *thd, Item *arg1, Item *arg2); static Create_func_within s_singleton; @@ -2217,7 +2217,7 @@ protected: class Create_func_x : public Create_func_arg1 { public: - virtual Item *create(THD *thd, Item *arg1); + virtual Item *create_1_arg(THD *thd, Item *arg1); static Create_func_x s_singleton; @@ -2231,7 +2231,7 @@ protected: class Create_func_xml_extractvalue : public Create_func_arg2 { public: - virtual Item *create(THD *thd, Item *arg1, Item *arg2); + virtual Item *create_2_arg(THD *thd, Item *arg1, Item *arg2); static Create_func_xml_extractvalue s_singleton; @@ -2244,7 +2244,7 @@ protected: class Create_func_xml_update : public Create_func_arg3 { public: - virtual Item *create(THD *thd, Item *arg1, Item *arg2, Item *arg3); + virtual Item *create_3_arg(THD *thd, Item *arg1, Item *arg2, Item *arg3); static Create_func_xml_update s_singleton; @@ -2258,7 +2258,7 @@ protected: class Create_func_y : public Create_func_arg1 { public: - virtual Item *create(THD *thd, Item *arg1); + virtual Item *create_1_arg(THD *thd, Item *arg1); static Create_func_y s_singleton; @@ -2353,7 +2353,7 @@ Create_qfunc::create(THD *thd, LEX_STRIN if (thd->lex->copy_db_to(&db.str, &db.length)) return NULL; - return create(thd, db, name, false, item_list); + return create_with_db(thd, db, name, false, item_list); } @@ -2470,8 +2470,8 @@ Create_udf_func::create(THD *thd, udf_fu Create_sp_func Create_sp_func::s_singleton; Item* -Create_sp_func::create(THD *thd, LEX_STRING db, LEX_STRING name, - bool use_explicit_name, List<Item> *item_list) +Create_sp_func::create_with_db(THD *thd, LEX_STRING db, LEX_STRING name, + bool use_explicit_name, List<Item> *item_list) { int arg_count= 0; Item *func= NULL; @@ -2538,7 +2538,7 @@ Create_func_arg0::create(THD *thd, LEX_S return NULL; } - return create(thd); + return create_builder(thd); } @@ -2564,7 +2564,7 @@ Create_func_arg1::create(THD *thd, LEX_S return NULL; } - return create(thd, param_1); + return create_1_arg(thd, param_1); } @@ -2592,7 +2592,7 @@ Create_func_arg2::create(THD *thd, LEX_S return NULL; } - return create(thd, param_1, param_2); + return create_2_arg(thd, param_1, param_2); } @@ -2622,14 +2622,14 @@ Create_func_arg3::create(THD *thd, LEX_S return NULL; } - return create(thd, param_1, param_2, param_3); + return create_3_arg(thd, param_1, param_2, param_3); } Create_func_abs Create_func_abs::s_singleton; Item* -Create_func_abs::create(THD *thd, Item *arg1) +Create_func_abs::create_1_arg(THD *thd, Item *arg1) { return new (thd->mem_root) Item_func_abs(arg1); } @@ -2638,7 +2638,7 @@ Create_func_abs::create(THD *thd, Item * Create_func_acos Create_func_acos::s_singleton; Item* -Create_func_acos::create(THD *thd, Item *arg1) +Create_func_acos::create_1_arg(THD *thd, Item *arg1) { return new (thd->mem_root) Item_func_acos(arg1); } @@ -2647,7 +2647,7 @@ Create_func_acos::create(THD *thd, Item Create_func_addtime Create_func_addtime::s_singleton; Item* -Create_func_addtime::create(THD *thd, Item *arg1, Item *arg2) +Create_func_addtime::create_2_arg(THD *thd, Item *arg1, Item *arg2) { return new (thd->mem_root) Item_func_add_time(arg1, arg2, 0, 0); } @@ -2656,7 +2656,7 @@ Create_func_addtime::create(THD *thd, It Create_func_aes_encrypt Create_func_aes_encrypt::s_singleton; Item* -Create_func_aes_encrypt::create(THD *thd, Item *arg1, Item *arg2) +Create_func_aes_encrypt::create_2_arg(THD *thd, Item *arg1, Item *arg2) { return new (thd->mem_root) Item_func_aes_encrypt(arg1, arg2); } @@ -2665,7 +2665,7 @@ Create_func_aes_encrypt::create(THD *thd Create_func_aes_decrypt Create_func_aes_decrypt::s_singleton; Item* -Create_func_aes_decrypt::create(THD *thd, Item *arg1, Item *arg2) +Create_func_aes_decrypt::create_2_arg(THD *thd, Item *arg1, Item *arg2) { return new (thd->mem_root) Item_func_aes_decrypt(arg1, arg2); } @@ -2675,7 +2675,7 @@ Create_func_aes_decrypt::create(THD *thd Create_func_area Create_func_area::s_singleton; Item* -Create_func_area::create(THD *thd, Item *arg1) +Create_func_area::create_1_arg(THD *thd, Item *arg1) { return new (thd->mem_root) Item_func_area(arg1); } @@ -2686,7 +2686,7 @@ Create_func_area::create(THD *thd, Item Create_func_as_wkb Create_func_as_wkb::s_singleton; Item* -Create_func_as_wkb::create(THD *thd, Item *arg1) +Create_func_as_wkb::create_1_arg(THD *thd, Item *arg1) { return new (thd->mem_root) Item_func_as_wkb(arg1); } @@ -2697,7 +2697,7 @@ Create_func_as_wkb::create(THD *thd, Ite Create_func_as_wkt Create_func_as_wkt::s_singleton; Item* -Create_func_as_wkt::create(THD *thd, Item *arg1) +Create_func_as_wkt::create_1_arg(THD *thd, Item *arg1) { return new (thd->mem_root) Item_func_as_wkt(arg1); } @@ -2707,7 +2707,7 @@ Create_func_as_wkt::create(THD *thd, Ite Create_func_asin Create_func_asin::s_singleton; Item* -Create_func_asin::create(THD *thd, Item *arg1) +Create_func_asin::create_1_arg(THD *thd, Item *arg1) { return new (thd->mem_root) Item_func_asin(arg1); } @@ -2753,7 +2753,7 @@ Create_func_atan::create_native(THD *thd Create_func_benchmark Create_func_benchmark::s_singleton; Item* -Create_func_benchmark::create(THD *thd, Item *arg1, Item *arg2) +Create_func_benchmark::create_2_arg(THD *thd, Item *arg1, Item *arg2) { thd->lex->uncacheable(UNCACHEABLE_SIDEEFFECT); return new (thd->mem_root) Item_func_benchmark(arg1, arg2); @@ -2763,7 +2763,7 @@ Create_func_benchmark::create(THD *thd, Create_func_bin Create_func_bin::s_singleton; Item* -Create_func_bin::create(THD *thd, Item *arg1) +Create_func_bin::create_1_arg(THD *thd, Item *arg1) { Item *i10= new (thd->mem_root) Item_int((int32) 10,2); Item *i2= new (thd->mem_root) Item_int((int32) 2,1); @@ -2774,7 +2774,7 @@ Create_func_bin::create(THD *thd, Item * Create_func_bit_count Create_func_bit_count::s_singleton; Item* -Create_func_bit_count::create(THD *thd, Item *arg1) +Create_func_bit_count::create_1_arg(THD *thd, Item *arg1) { return new (thd->mem_root) Item_func_bit_count(arg1); } @@ -2783,7 +2783,7 @@ Create_func_bit_count::create(THD *thd, Create_func_bit_length Create_func_bit_length::s_singleton; Item* -Create_func_bit_length::create(THD *thd, Item *arg1) +Create_func_bit_length::create_1_arg(THD *thd, Item *arg1) { return new (thd->mem_root) Item_func_bit_length(arg1); } @@ -2792,7 +2792,7 @@ Create_func_bit_length::create(THD *thd, Create_func_ceiling Create_func_ceiling::s_singleton; Item* -Create_func_ceiling::create(THD *thd, Item *arg1) +Create_func_ceiling::create_1_arg(THD *thd, Item *arg1) { return new (thd->mem_root) Item_func_ceiling(arg1); } @@ -2802,7 +2802,7 @@ Create_func_ceiling::create(THD *thd, It Create_func_centroid Create_func_centroid::s_singleton; Item* -Create_func_centroid::create(THD *thd, Item *arg1) +Create_func_centroid::create_1_arg(THD *thd, Item *arg1) { return new (thd->mem_root) Item_func_centroid(arg1); } @@ -2812,7 +2812,7 @@ Create_func_centroid::create(THD *thd, I Create_func_char_length Create_func_char_length::s_singleton; Item* -Create_func_char_length::create(THD *thd, Item *arg1) +Create_func_char_length::create_1_arg(THD *thd, Item *arg1) { return new (thd->mem_root) Item_func_char_length(arg1); } @@ -2821,7 +2821,7 @@ Create_func_char_length::create(THD *thd Create_func_coercibility Create_func_coercibility::s_singleton; Item* -Create_func_coercibility::create(THD *thd, Item *arg1) +Create_func_coercibility::create_1_arg(THD *thd, Item *arg1) { return new (thd->mem_root) Item_func_coercibility(arg1); } @@ -2873,7 +2873,7 @@ Create_func_concat_ws::create_native(THD Create_func_compress Create_func_compress::s_singleton; Item* -Create_func_compress::create(THD *thd, Item *arg1) +Create_func_compress::create_1_arg(THD *thd, Item *arg1) { return new (thd->mem_root) Item_func_compress(arg1); } @@ -2882,7 +2882,7 @@ Create_func_compress::create(THD *thd, I Create_func_connection_id Create_func_connection_id::s_singleton; Item* -Create_func_connection_id::create(THD *thd) +Create_func_connection_id::create_builder(THD *thd) { thd->lex->safe_to_cache_query= 0; return new (thd->mem_root) Item_func_connection_id(); @@ -2893,7 +2893,7 @@ Create_func_connection_id::create(THD *t Create_func_contains Create_func_contains::s_singleton; Item* -Create_func_contains::create(THD *thd, Item *arg1, Item *arg2) +Create_func_contains::create_2_arg(THD *thd, Item *arg1, Item *arg2) { return new (thd->mem_root) Item_func_spatial_rel(arg1, arg2, Item_func::SP_CONTAINS_FUNC); @@ -2904,7 +2904,7 @@ Create_func_contains::create(THD *thd, I Create_func_conv Create_func_conv::s_singleton; Item* -Create_func_conv::create(THD *thd, Item *arg1, Item *arg2, Item *arg3) +Create_func_conv::create_3_arg(THD *thd, Item *arg1, Item *arg2, Item *arg3) { return new (thd->mem_root) Item_func_conv(arg1, arg2, arg3); } @@ -2913,7 +2913,7 @@ Create_func_conv::create(THD *thd, Item Create_func_convert_tz Create_func_convert_tz::s_singleton; Item* -Create_func_convert_tz::create(THD *thd, Item *arg1, Item *arg2, Item *arg3) +Create_func_convert_tz::create_3_arg(THD *thd, Item *arg1, Item *arg2, Item *arg3) { return new (thd->mem_root) Item_func_convert_tz(arg1, arg2, arg3); } @@ -2922,7 +2922,7 @@ Create_func_convert_tz::create(THD *thd, Create_func_cos Create_func_cos::s_singleton; Item* -Create_func_cos::create(THD *thd, Item *arg1) +Create_func_cos::create_1_arg(THD *thd, Item *arg1) { return new (thd->mem_root) Item_func_cos(arg1); } @@ -2931,7 +2931,7 @@ Create_func_cos::create(THD *thd, Item * Create_func_cot Create_func_cot::s_singleton; Item* -Create_func_cot::create(THD *thd, Item *arg1) +Create_func_cot::create_1_arg(THD *thd, Item *arg1) { Item *i1= new (thd->mem_root) Item_int((char*) "1", 1, 1); Item *i2= new (thd->mem_root) Item_func_tan(arg1); @@ -2942,7 +2942,7 @@ Create_func_cot::create(THD *thd, Item * Create_func_crc32 Create_func_crc32::s_singleton; Item* -Create_func_crc32::create(THD *thd, Item *arg1) +Create_func_crc32::create_1_arg(THD *thd, Item *arg1) { return new (thd->mem_root) Item_func_crc32(arg1); } @@ -2952,7 +2952,7 @@ Create_func_crc32::create(THD *thd, Item Create_func_crosses Create_func_crosses::s_singleton; Item* -Create_func_crosses::create(THD *thd, Item *arg1, Item *arg2) +Create_func_crosses::create_2_arg(THD *thd, Item *arg1, Item *arg2) { return new (thd->mem_root) Item_func_spatial_rel(arg1, arg2, Item_func::SP_CROSSES_FUNC); @@ -2963,7 +2963,7 @@ Create_func_crosses::create(THD *thd, It Create_func_date_format Create_func_date_format::s_singleton; Item* -Create_func_date_format::create(THD *thd, Item *arg1, Item *arg2) +Create_func_date_format::create_2_arg(THD *thd, Item *arg1, Item *arg2) { return new (thd->mem_root) Item_func_date_format(arg1, arg2, 0); } @@ -2972,7 +2972,7 @@ Create_func_date_format::create(THD *thd Create_func_datediff Create_func_datediff::s_singleton; Item* -Create_func_datediff::create(THD *thd, Item *arg1, Item *arg2) +Create_func_datediff::create_2_arg(THD *thd, Item *arg1, Item *arg2) { Item *i1= new (thd->mem_root) Item_func_to_days(arg1); Item *i2= new (thd->mem_root) Item_func_to_days(arg2); @@ -2984,7 +2984,7 @@ Create_func_datediff::create(THD *thd, I Create_func_dayname Create_func_dayname::s_singleton; Item* -Create_func_dayname::create(THD *thd, Item *arg1) +Create_func_dayname::create_1_arg(THD *thd, Item *arg1) { return new (thd->mem_root) Item_func_dayname(arg1); } @@ -2993,7 +2993,7 @@ Create_func_dayname::create(THD *thd, It Create_func_dayofmonth Create_func_dayofmonth::s_singleton; Item* -Create_func_dayofmonth::create(THD *thd, Item *arg1) +Create_func_dayofmonth::create_1_arg(THD *thd, Item *arg1) { return new (thd->mem_root) Item_func_dayofmonth(arg1); } @@ -3002,7 +3002,7 @@ Create_func_dayofmonth::create(THD *thd, Create_func_dayofweek Create_func_dayofweek::s_singleton; Item* -Create_func_dayofweek::create(THD *thd, Item *arg1) +Create_func_dayofweek::create_1_arg(THD *thd, Item *arg1) { return new (thd->mem_root) Item_func_weekday(arg1, 1); } @@ -3011,7 +3011,7 @@ Create_func_dayofweek::create(THD *thd, Create_func_dayofyear Create_func_dayofyear::s_singleton; Item* -Create_func_dayofyear::create(THD *thd, Item *arg1) +Create_func_dayofyear::create_1_arg(THD *thd, Item *arg1) { return new (thd->mem_root) Item_func_dayofyear(arg1); } @@ -3020,7 +3020,7 @@ Create_func_dayofyear::create(THD *thd, Create_func_decode Create_func_decode::s_singleton; Item* -Create_func_decode::create(THD *thd, Item *arg1, Item *arg2) +Create_func_decode::create_2_arg(THD *thd, Item *arg1, Item *arg2) { return new (thd->mem_root) Item_func_decode(arg1, arg2); } @@ -3029,7 +3029,7 @@ Create_func_decode::create(THD *thd, Ite Create_func_degrees Create_func_degrees::s_singleton; Item* -Create_func_degrees::create(THD *thd, Item *arg1) +Create_func_degrees::create_1_arg(THD *thd, Item *arg1) { return new (thd->mem_root) Item_func_units((char*) "degrees", arg1, 180/M_PI, 0.0); @@ -3114,7 +3114,7 @@ Create_func_des_encrypt::create_native(T Create_func_dimension Create_func_dimension::s_singleton; Item* -Create_func_dimension::create(THD *thd, Item *arg1) +Create_func_dimension::create_1_arg(THD *thd, Item *arg1) { return new (thd->mem_root) Item_func_dimension(arg1); } @@ -3125,7 +3125,7 @@ Create_func_dimension::create(THD *thd, Create_func_disjoint Create_func_disjoint::s_singleton; Item* -Create_func_disjoint::create(THD *thd, Item *arg1, Item *arg2) +Create_func_disjoint::create_2_arg(THD *thd, Item *arg1, Item *arg2) { return new (thd->mem_root) Item_func_spatial_rel(arg1, arg2, Item_func::SP_DISJOINT_FUNC); @@ -3157,7 +3157,7 @@ Create_func_elt::create_native(THD *thd, Create_func_encode Create_func_encode::s_singleton; Item* -Create_func_encode::create(THD *thd, Item *arg1, Item *arg2) +Create_func_encode::create_2_arg(THD *thd, Item *arg1, Item *arg2) { return new (thd->mem_root) Item_func_encode(arg1, arg2); } @@ -3205,7 +3205,7 @@ Create_func_encrypt::create_native(THD * Create_func_endpoint Create_func_endpoint::s_singleton; Item* -Create_func_endpoint::create(THD *thd, Item *arg1) +Create_func_endpoint::create_1_arg(THD *thd, Item *arg1) { return new (thd->mem_root) Item_func_spatial_decomp(arg1, Item_func::SP_ENDPOINT); @@ -3217,7 +3217,7 @@ Create_func_endpoint::create(THD *thd, I Create_func_envelope Create_func_envelope::s_singleton; Item* -Create_func_envelope::create(THD *thd, Item *arg1) +Create_func_envelope::create_1_arg(THD *thd, Item *arg1) { return new (thd->mem_root) Item_func_envelope(arg1); } @@ -3228,7 +3228,7 @@ Create_func_envelope::create(THD *thd, I Create_func_equals Create_func_equals::s_singleton; Item* -Create_func_equals::create(THD *thd, Item *arg1, Item *arg2) +Create_func_equals::create_2_arg(THD *thd, Item *arg1, Item *arg2) { return new (thd->mem_root) Item_func_spatial_rel(arg1, arg2, Item_func::SP_EQUALS_FUNC); @@ -3239,7 +3239,7 @@ Create_func_equals::create(THD *thd, Ite Create_func_exp Create_func_exp::s_singleton; Item* -Create_func_exp::create(THD *thd, Item *arg1) +Create_func_exp::create_1_arg(THD *thd, Item *arg1) { return new (thd->mem_root) Item_func_exp(arg1); } @@ -3302,7 +3302,7 @@ Create_func_export_set::create_native(TH Create_func_exteriorring Create_func_exteriorring::s_singleton; Item* -Create_func_exteriorring::create(THD *thd, Item *arg1) +Create_func_exteriorring::create_1_arg(THD *thd, Item *arg1) { return new (thd->mem_root) Item_func_spatial_decomp(arg1, Item_func::SP_EXTERIORRING); @@ -3334,7 +3334,7 @@ Create_func_field::create_native(THD *th Create_func_find_in_set Create_func_find_in_set::s_singleton; Item* -Create_func_find_in_set::create(THD *thd, Item *arg1, Item *arg2) +Create_func_find_in_set::create_2_arg(THD *thd, Item *arg1, Item *arg2) { return new (thd->mem_root) Item_func_find_in_set(arg1, arg2); } @@ -3343,7 +3343,7 @@ Create_func_find_in_set::create(THD *thd Create_func_floor Create_func_floor::s_singleton; Item* -Create_func_floor::create(THD *thd, Item *arg1) +Create_func_floor::create_1_arg(THD *thd, Item *arg1) { return new (thd->mem_root) Item_func_floor(arg1); } @@ -3352,7 +3352,7 @@ Create_func_floor::create(THD *thd, Item Create_func_format Create_func_format::s_singleton; Item* -Create_func_format::create(THD *thd, Item *arg1, Item *arg2) +Create_func_format::create_2_arg(THD *thd, Item *arg1, Item *arg2) { return new (thd->mem_root) Item_func_format(arg1, arg2); } @@ -3361,7 +3361,7 @@ Create_func_format::create(THD *thd, Ite Create_func_found_rows Create_func_found_rows::s_singleton; Item* -Create_func_found_rows::create(THD *thd) +Create_func_found_rows::create_builder(THD *thd) { thd->lex->set_stmt_unsafe(); thd->lex->safe_to_cache_query= 0; @@ -3372,7 +3372,7 @@ Create_func_found_rows::create(THD *thd) Create_func_from_days Create_func_from_days::s_singleton; Item* -Create_func_from_days::create(THD *thd, Item *arg1) +Create_func_from_days::create_1_arg(THD *thd, Item *arg1) { return new (thd->mem_root) Item_func_from_days(arg1); } @@ -3500,7 +3500,7 @@ Create_func_geometry_from_wkb::create_na Create_func_geometry_type Create_func_geometry_type::s_singleton; Item* -Create_func_geometry_type::create(THD *thd, Item *arg1) +Create_func_geometry_type::create_1_arg(THD *thd, Item *arg1) { return new (thd->mem_root) Item_func_geometry_type(arg1); } @@ -3511,7 +3511,7 @@ Create_func_geometry_type::create(THD *t Create_func_geometryn Create_func_geometryn::s_singleton; Item* -Create_func_geometryn::create(THD *thd, Item *arg1, Item *arg2) +Create_func_geometryn::create_2_arg(THD *thd, Item *arg1, Item *arg2) { return new (thd->mem_root) Item_func_spatial_decomp_n(arg1, arg2, Item_func::SP_GEOMETRYN); @@ -3522,7 +3522,7 @@ Create_func_geometryn::create(THD *thd, Create_func_get_lock Create_func_get_lock::s_singleton; Item* -Create_func_get_lock::create(THD *thd, Item *arg1, Item *arg2) +Create_func_get_lock::create_2_arg(THD *thd, Item *arg1, Item *arg2) { thd->lex->set_stmt_unsafe(); thd->lex->uncacheable(UNCACHEABLE_SIDEEFFECT); @@ -3534,7 +3534,7 @@ Create_func_get_lock::create(THD *thd, I Create_func_glength Create_func_glength::s_singleton; Item* -Create_func_glength::create(THD *thd, Item *arg1) +Create_func_glength::create_1_arg(THD *thd, Item *arg1) { return new (thd->mem_root) Item_func_glength(arg1); } @@ -3565,7 +3565,7 @@ Create_func_greatest::create_native(THD Create_func_hex Create_func_hex::s_singleton; Item* -Create_func_hex::create(THD *thd, Item *arg1) +Create_func_hex::create_1_arg(THD *thd, Item *arg1) { return new (thd->mem_root) Item_func_hex(arg1); } @@ -3574,7 +3574,7 @@ Create_func_hex::create(THD *thd, Item * Create_func_ifnull Create_func_ifnull::s_singleton; Item* -Create_func_ifnull::create(THD *thd, Item *arg1, Item *arg2) +Create_func_ifnull::create_2_arg(THD *thd, Item *arg1, Item *arg2) { return new (thd->mem_root) Item_func_ifnull(arg1, arg2); } @@ -3583,7 +3583,7 @@ Create_func_ifnull::create(THD *thd, Ite Create_func_inet_ntoa Create_func_inet_ntoa::s_singleton; Item* -Create_func_inet_ntoa::create(THD *thd, Item *arg1) +Create_func_inet_ntoa::create_1_arg(THD *thd, Item *arg1) { return new (thd->mem_root) Item_func_inet_ntoa(arg1); } @@ -3592,7 +3592,7 @@ Create_func_inet_ntoa::create(THD *thd, Create_func_inet_aton Create_func_inet_aton::s_singleton; Item* -Create_func_inet_aton::create(THD *thd, Item *arg1) +Create_func_inet_aton::create_1_arg(THD *thd, Item *arg1) { return new (thd->mem_root) Item_func_inet_aton(arg1); } @@ -3601,7 +3601,7 @@ Create_func_inet_aton::create(THD *thd, Create_func_instr Create_func_instr::s_singleton; Item* -Create_func_instr::create(THD *thd, Item *arg1, Item *arg2) +Create_func_instr::create_2_arg(THD *thd, Item *arg1, Item *arg2) { return new (thd->mem_root) Item_func_locate(arg1, arg2); } @@ -3611,7 +3611,7 @@ Create_func_instr::create(THD *thd, Item Create_func_interiorringn Create_func_interiorringn::s_singleton; Item* -Create_func_interiorringn::create(THD *thd, Item *arg1, Item *arg2) +Create_func_interiorringn::create_2_arg(THD *thd, Item *arg1, Item *arg2) { return new (thd->mem_root) Item_func_spatial_decomp_n(arg1, arg2, Item_func::SP_INTERIORRINGN); @@ -3623,7 +3623,7 @@ Create_func_interiorringn::create(THD *t Create_func_intersects Create_func_intersects::s_singleton; Item* -Create_func_intersects::create(THD *thd, Item *arg1, Item *arg2) +Create_func_intersects::create_2_arg(THD *thd, Item *arg1, Item *arg2) { return new (thd->mem_root) Item_func_spatial_rel(arg1, arg2, Item_func::SP_INTERSECTS_FUNC); @@ -3634,7 +3634,7 @@ Create_func_intersects::create(THD *thd, Create_func_is_free_lock Create_func_is_free_lock::s_singleton; Item* -Create_func_is_free_lock::create(THD *thd, Item *arg1) +Create_func_is_free_lock::create_1_arg(THD *thd, Item *arg1) { thd->lex->set_stmt_unsafe(); thd->lex->uncacheable(UNCACHEABLE_SIDEEFFECT); @@ -3645,7 +3645,7 @@ Create_func_is_free_lock::create(THD *th Create_func_is_used_lock Create_func_is_used_lock::s_singleton; Item* -Create_func_is_used_lock::create(THD *thd, Item *arg1) +Create_func_is_used_lock::create_1_arg(THD *thd, Item *arg1) { thd->lex->set_stmt_unsafe(); thd->lex->uncacheable(UNCACHEABLE_SIDEEFFECT); @@ -3657,7 +3657,7 @@ Create_func_is_used_lock::create(THD *th Create_func_isclosed Create_func_isclosed::s_singleton; Item* -Create_func_isclosed::create(THD *thd, Item *arg1) +Create_func_isclosed::create_1_arg(THD *thd, Item *arg1) { return new (thd->mem_root) Item_func_isclosed(arg1); } @@ -3668,7 +3668,7 @@ Create_func_isclosed::create(THD *thd, I Create_func_isempty Create_func_isempty::s_singleton; Item* -Create_func_isempty::create(THD *thd, Item *arg1) +Create_func_isempty::create_1_arg(THD *thd, Item *arg1) { return new (thd->mem_root) Item_func_isempty(arg1); } @@ -3678,7 +3678,7 @@ Create_func_isempty::create(THD *thd, It Create_func_isnull Create_func_isnull::s_singleton; Item* -Create_func_isnull::create(THD *thd, Item *arg1) +Create_func_isnull::create_1_arg(THD *thd, Item *arg1) { return new (thd->mem_root) Item_func_isnull(arg1); } @@ -3688,7 +3688,7 @@ Create_func_isnull::create(THD *thd, Ite Create_func_issimple Create_func_issimple::s_singleton; Item* -Create_func_issimple::create(THD *thd, Item *arg1) +Create_func_issimple::create_1_arg(THD *thd, Item *arg1) { return new (thd->mem_root) Item_func_issimple(arg1); } @@ -3698,7 +3698,7 @@ Create_func_issimple::create(THD *thd, I Create_func_last_day Create_func_last_day::s_singleton; Item* -Create_func_last_day::create(THD *thd, Item *arg1) +Create_func_last_day::create_1_arg(THD *thd, Item *arg1) { return new (thd->mem_root) Item_func_last_day(arg1); } @@ -3744,7 +3744,7 @@ Create_func_last_insert_id::create_nativ Create_func_lcase Create_func_lcase::s_singleton; Item* -Create_func_lcase::create(THD *thd, Item *arg1) +Create_func_lcase::create_1_arg(THD *thd, Item *arg1) { return new (thd->mem_root) Item_func_lcase(arg1); } @@ -3774,7 +3774,7 @@ Create_func_least::create_native(THD *th Create_func_length Create_func_length::s_singleton; Item* -Create_func_length::create(THD *thd, Item *arg1) +Create_func_length::create_1_arg(THD *thd, Item *arg1) { return new (thd->mem_root) Item_func_length(arg1); } @@ -3783,7 +3783,7 @@ Create_func_length::create(THD *thd, Ite Create_func_ln Create_func_ln::s_singleton; Item* -Create_func_ln::create(THD *thd, Item *arg1) +Create_func_ln::create_1_arg(THD *thd, Item *arg1) { return new (thd->mem_root) Item_func_ln(arg1); } @@ -3792,7 +3792,7 @@ Create_func_ln::create(THD *thd, Item *a Create_func_load_file Create_func_load_file::s_singleton; Item* -Create_func_load_file::create(THD *thd, Item *arg1) +Create_func_load_file::create_1_arg(THD *thd, Item *arg1) { thd->lex->set_stmt_unsafe(); thd->lex->uncacheable(UNCACHEABLE_SIDEEFFECT); @@ -3881,7 +3881,7 @@ Create_func_log::create_native(THD *thd, Create_func_log10 Create_func_log10::s_singleton; Item* -Create_func_log10::create(THD *thd, Item *arg1) +Create_func_log10::create_1_arg(THD *thd, Item *arg1) { return new (thd->mem_root) Item_func_log10(arg1); } @@ -3890,7 +3890,7 @@ Create_func_log10::create(THD *thd, Item Create_func_log2 Create_func_log2::s_singleton; Item* -Create_func_log2::create(THD *thd, Item *arg1) +Create_func_log2::create_1_arg(THD *thd, Item *arg1) { return new (thd->mem_root) Item_func_log2(arg1); } @@ -3899,7 +3899,7 @@ Create_func_log2::create(THD *thd, Item Create_func_lpad Create_func_lpad::s_singleton; Item* -Create_func_lpad::create(THD *thd, Item *arg1, Item *arg2, Item *arg3) +Create_func_lpad::create_3_arg(THD *thd, Item *arg1, Item *arg2, Item *arg3) { return new (thd->mem_root) Item_func_lpad(arg1, arg2, arg3); } @@ -3908,7 +3908,7 @@ Create_func_lpad::create(THD *thd, Item Create_func_ltrim Create_func_ltrim::s_singleton; Item* -Create_func_ltrim::create(THD *thd, Item *arg1) +Create_func_ltrim::create_1_arg(THD *thd, Item *arg1) { return new (thd->mem_root) Item_func_ltrim(arg1); } @@ -3917,7 +3917,7 @@ Create_func_ltrim::create(THD *thd, Item Create_func_makedate Create_func_makedate::s_singleton; Item* -Create_func_makedate::create(THD *thd, Item *arg1, Item *arg2) +Create_func_makedate::create_2_arg(THD *thd, Item *arg1, Item *arg2) { return new (thd->mem_root) Item_func_makedate(arg1, arg2); } @@ -3926,7 +3926,7 @@ Create_func_makedate::create(THD *thd, I Create_func_maketime Create_func_maketime::s_singleton; Item* -Create_func_maketime::create(THD *thd, Item *arg1, Item *arg2, Item *arg3) +Create_func_maketime::create_3_arg(THD *thd, Item *arg1, Item *arg2, Item *arg3) { return new (thd->mem_root) Item_func_maketime(arg1, arg2, arg3); } @@ -4001,7 +4001,7 @@ Create_func_master_pos_wait::create_nati Create_func_md5 Create_func_md5::s_singleton; Item* -Create_func_md5::create(THD *thd, Item *arg1) +Create_func_md5::create_1_arg(THD *thd, Item *arg1) { return new (thd->mem_root) Item_func_md5(arg1); } @@ -4010,7 +4010,7 @@ Create_func_md5::create(THD *thd, Item * Create_func_monthname Create_func_monthname::s_singleton; Item* -Create_func_monthname::create(THD *thd, Item *arg1) +Create_func_monthname::create_1_arg(THD *thd, Item *arg1) { return new (thd->mem_root) Item_func_monthname(arg1); } @@ -4019,7 +4019,7 @@ Create_func_monthname::create(THD *thd, Create_func_name_const Create_func_name_const::s_singleton; Item* -Create_func_name_const::create(THD *thd, Item *arg1, Item *arg2) +Create_func_name_const::create_2_arg(THD *thd, Item *arg1, Item *arg2) { return new (thd->mem_root) Item_name_const(arg1, arg2); } @@ -4028,7 +4028,7 @@ Create_func_name_const::create(THD *thd, Create_func_nullif Create_func_nullif::s_singleton; Item* -Create_func_nullif::create(THD *thd, Item *arg1, Item *arg2) +Create_func_nullif::create_2_arg(THD *thd, Item *arg1, Item *arg2) { return new (thd->mem_root) Item_func_nullif(arg1, arg2); } @@ -4038,7 +4038,7 @@ Create_func_nullif::create(THD *thd, Ite Create_func_numgeometries Create_func_numgeometries::s_singleton; Item* -Create_func_numgeometries::create(THD *thd, Item *arg1) +Create_func_numgeometries::create_1_arg(THD *thd, Item *arg1) { return new (thd->mem_root) Item_func_numgeometries(arg1); } @@ -4049,7 +4049,7 @@ Create_func_numgeometries::create(THD *t Create_func_numinteriorring Create_func_numinteriorring::s_singleton; Item* -Create_func_numinteriorring::create(THD *thd, Item *arg1) +Create_func_numinteriorring::create_1_arg(THD *thd, Item *arg1) { return new (thd->mem_root) Item_func_numinteriorring(arg1); } @@ -4060,7 +4060,7 @@ Create_func_numinteriorring::create(THD Create_func_numpoints Create_func_numpoints::s_singleton; Item* -Create_func_numpoints::create(THD *thd, Item *arg1) +Create_func_numpoints::create_1_arg(THD *thd, Item *arg1) { return new (thd->mem_root) Item_func_numpoints(arg1); } @@ -4070,7 +4070,7 @@ Create_func_numpoints::create(THD *thd, Create_func_oct Create_func_oct::s_singleton; Item* -Create_func_oct::create(THD *thd, Item *arg1) +Create_func_oct::create_1_arg(THD *thd, Item *arg1) { Item *i10= new (thd->mem_root) Item_int((int32) 10,2); Item *i8= new (thd->mem_root) Item_int((int32) 8,1); @@ -4081,7 +4081,7 @@ Create_func_oct::create(THD *thd, Item * Create_func_ord Create_func_ord::s_singleton; Item* -Create_func_ord::create(THD *thd, Item *arg1) +Create_func_ord::create_1_arg(THD *thd, Item *arg1) { return new (thd->mem_root) Item_func_ord(arg1); } @@ -4091,7 +4091,7 @@ Create_func_ord::create(THD *thd, Item * Create_func_overlaps Create_func_overlaps::s_singleton; Item* -Create_func_overlaps::create(THD *thd, Item *arg1, Item *arg2) +Create_func_overlaps::create_2_arg(THD *thd, Item *arg1, Item *arg2) { return new (thd->mem_root) Item_func_spatial_rel(arg1, arg2, Item_func::SP_OVERLAPS_FUNC); @@ -4102,7 +4102,7 @@ Create_func_overlaps::create(THD *thd, I Create_func_period_add Create_func_period_add::s_singleton; Item* -Create_func_period_add::create(THD *thd, Item *arg1, Item *arg2) +Create_func_period_add::create_2_arg(THD *thd, Item *arg1, Item *arg2) { return new (thd->mem_root) Item_func_period_add(arg1, arg2); } @@ -4111,7 +4111,7 @@ Create_func_period_add::create(THD *thd, Create_func_period_diff Create_func_period_diff::s_singleton; Item* -Create_func_period_diff::create(THD *thd, Item *arg1, Item *arg2) +Create_func_period_diff::create_2_arg(THD *thd, Item *arg1, Item *arg2) { return new (thd->mem_root) Item_func_period_diff(arg1, arg2); } @@ -4120,7 +4120,7 @@ Create_func_period_diff::create(THD *thd Create_func_pi Create_func_pi::s_singleton; Item* -Create_func_pi::create(THD *thd) +Create_func_pi::create_builder(THD *thd) { return new (thd->mem_root) Item_static_float_func("pi()", M_PI, 6, 8); } @@ -4130,7 +4130,7 @@ Create_func_pi::create(THD *thd) Create_func_pointn Create_func_pointn::s_singleton; Item* -Create_func_pointn::create(THD *thd, Item *arg1, Item *arg2) +Create_func_pointn::create_2_arg(THD *thd, Item *arg1, Item *arg2) { return new (thd->mem_root) Item_func_spatial_decomp_n(arg1, arg2, Item_func::SP_POINTN); @@ -4141,7 +4141,7 @@ Create_func_pointn::create(THD *thd, Ite Create_func_pow Create_func_pow::s_singleton; Item* -Create_func_pow::create(THD *thd, Item *arg1, Item *arg2) +Create_func_pow::create_2_arg(THD *thd, Item *arg1, Item *arg2) { return new (thd->mem_root) Item_func_pow(arg1, arg2); } @@ -4150,7 +4150,7 @@ Create_func_pow::create(THD *thd, Item * Create_func_quote Create_func_quote::s_singleton; Item* -Create_func_quote::create(THD *thd, Item *arg1) +Create_func_quote::create_1_arg(THD *thd, Item *arg1) { return new (thd->mem_root) Item_func_quote(arg1); } @@ -4159,7 +4159,7 @@ Create_func_quote::create(THD *thd, Item Create_func_radians Create_func_radians::s_singleton; Item* -Create_func_radians::create(THD *thd, Item *arg1) +Create_func_radians::create_1_arg(THD *thd, Item *arg1) { return new (thd->mem_root) Item_func_units((char*) "radians", arg1, M_PI/180, 0.0); @@ -4216,7 +4216,7 @@ Create_func_rand::create_native(THD *thd Create_func_release_lock Create_func_release_lock::s_singleton; Item* -Create_func_release_lock::create(THD *thd, Item *arg1) +Create_func_release_lock::create_1_arg(THD *thd, Item *arg1) { thd->lex->set_stmt_unsafe(); thd->lex->uncacheable(UNCACHEABLE_SIDEEFFECT); @@ -4227,7 +4227,7 @@ Create_func_release_lock::create(THD *th Create_func_reverse Create_func_reverse::s_singleton; Item* -Create_func_reverse::create(THD *thd, Item *arg1) +Create_func_reverse::create_1_arg(THD *thd, Item *arg1) { return new (thd->mem_root) Item_func_reverse(arg1); } @@ -4274,7 +4274,7 @@ Create_func_round::create_native(THD *th Create_func_row_count Create_func_row_count::s_singleton; Item* -Create_func_row_count::create(THD *thd) +Create_func_row_count::create_builder(THD *thd) { thd->lex->set_stmt_unsafe(); thd->lex->safe_to_cache_query= 0; @@ -4285,7 +4285,7 @@ Create_func_row_count::create(THD *thd) Create_func_rpad Create_func_rpad::s_singleton; Item* -Create_func_rpad::create(THD *thd, Item *arg1, Item *arg2, Item *arg3) +Create_func_rpad::create_3_arg(THD *thd, Item *arg1, Item *arg2, Item *arg3) { return new (thd->mem_root) Item_func_rpad(arg1, arg2, arg3); } @@ -4294,7 +4294,7 @@ Create_func_rpad::create(THD *thd, Item Create_func_rtrim Create_func_rtrim::s_singleton; Item* -Create_func_rtrim::create(THD *thd, Item *arg1) +Create_func_rtrim::create_1_arg(THD *thd, Item *arg1) { return new (thd->mem_root) Item_func_rtrim(arg1); } @@ -4303,7 +4303,7 @@ Create_func_rtrim::create(THD *thd, Item Create_func_sec_to_time Create_func_sec_to_time::s_singleton; Item* -Create_func_sec_to_time::create(THD *thd, Item *arg1) +Create_func_sec_to_time::create_1_arg(THD *thd, Item *arg1) { return new (thd->mem_root) Item_func_sec_to_time(arg1); } @@ -4312,7 +4312,7 @@ Create_func_sec_to_time::create(THD *thd Create_func_sha Create_func_sha::s_singleton; Item* -Create_func_sha::create(THD *thd, Item *arg1) +Create_func_sha::create_1_arg(THD *thd, Item *arg1) { return new (thd->mem_root) Item_func_sha(arg1); } @@ -4321,7 +4321,7 @@ Create_func_sha::create(THD *thd, Item * Create_func_sign Create_func_sign::s_singleton; Item* -Create_func_sign::create(THD *thd, Item *arg1) +Create_func_sign::create_1_arg(THD *thd, Item *arg1) { return new (thd->mem_root) Item_func_sign(arg1); } @@ -4330,7 +4330,7 @@ Create_func_sign::create(THD *thd, Item Create_func_sin Create_func_sin::s_singleton; Item* -Create_func_sin::create(THD *thd, Item *arg1) +Create_func_sin::create_1_arg(THD *thd, Item *arg1) { return new (thd->mem_root) Item_func_sin(arg1); } @@ -4339,7 +4339,7 @@ Create_func_sin::create(THD *thd, Item * Create_func_sleep Create_func_sleep::s_singleton; Item* -Create_func_sleep::create(THD *thd, Item *arg1) +Create_func_sleep::create_1_arg(THD *thd, Item *arg1) { thd->lex->set_stmt_unsafe(); thd->lex->uncacheable(UNCACHEABLE_SIDEEFFECT); @@ -4350,7 +4350,7 @@ Create_func_sleep::create(THD *thd, Item Create_func_soundex Create_func_soundex::s_singleton; Item* -Create_func_soundex::create(THD *thd, Item *arg1) +Create_func_soundex::create_1_arg(THD *thd, Item *arg1) { return new (thd->mem_root) Item_func_soundex(arg1); } @@ -4359,7 +4359,7 @@ Create_func_soundex::create(THD *thd, It Create_func_space Create_func_space::s_singleton; Item* -Create_func_space::create(THD *thd, Item *arg1) +Create_func_space::create_1_arg(THD *thd, Item *arg1) { /** TODO: Fix Bug#23637 @@ -4387,7 +4387,7 @@ Create_func_space::create(THD *thd, Item Create_func_sqrt Create_func_sqrt::s_singleton; Item* -Create_func_sqrt::create(THD *thd, Item *arg1) +Create_func_sqrt::create_1_arg(THD *thd, Item *arg1) { return new (thd->mem_root) Item_func_sqrt(arg1); } @@ -4397,7 +4397,7 @@ Create_func_sqrt::create(THD *thd, Item Create_func_srid Create_func_srid::s_singleton; Item* -Create_func_srid::create(THD *thd, Item *arg1) +Create_func_srid::create_1_arg(THD *thd, Item *arg1) { return new (thd->mem_root) Item_func_srid(arg1); } @@ -4408,7 +4408,7 @@ Create_func_srid::create(THD *thd, Item Create_func_startpoint Create_func_startpoint::s_singleton; Item* -Create_func_startpoint::create(THD *thd, Item *arg1) +Create_func_startpoint::create_1_arg(THD *thd, Item *arg1) { return new (thd->mem_root) Item_func_spatial_decomp(arg1, Item_func::SP_STARTPOINT); @@ -4419,7 +4419,7 @@ Create_func_startpoint::create(THD *thd, Create_func_str_to_date Create_func_str_to_date::s_singleton; Item* -Create_func_str_to_date::create(THD *thd, Item *arg1, Item *arg2) +Create_func_str_to_date::create_2_arg(THD *thd, Item *arg1, Item *arg2) { return new (thd->mem_root) Item_func_str_to_date(arg1, arg2); } @@ -4428,7 +4428,7 @@ Create_func_str_to_date::create(THD *thd Create_func_strcmp Create_func_strcmp::s_singleton; Item* -Create_func_strcmp::create(THD *thd, Item *arg1, Item *arg2) +Create_func_strcmp::create_2_arg(THD *thd, Item *arg1, Item *arg2) { return new (thd->mem_root) Item_func_strcmp(arg1, arg2); } @@ -4437,7 +4437,7 @@ Create_func_strcmp::create(THD *thd, Ite Create_func_substr_index Create_func_substr_index::s_singleton; Item* -Create_func_substr_index::create(THD *thd, Item *arg1, Item *arg2, Item *arg3) +Create_func_substr_index::create_3_arg(THD *thd, Item *arg1, Item *arg2, Item *arg3) { return new (thd->mem_root) Item_func_substr_index(arg1, arg2, arg3); } @@ -4446,7 +4446,7 @@ Create_func_substr_index::create(THD *th Create_func_subtime Create_func_subtime::s_singleton; Item* -Create_func_subtime::create(THD *thd, Item *arg1, Item *arg2) +Create_func_subtime::create_2_arg(THD *thd, Item *arg1, Item *arg2) { return new (thd->mem_root) Item_func_add_time(arg1, arg2, 0, 1); } @@ -4455,7 +4455,7 @@ Create_func_subtime::create(THD *thd, It Create_func_tan Create_func_tan::s_singleton; Item* -Create_func_tan::create(THD *thd, Item *arg1) +Create_func_tan::create_1_arg(THD *thd, Item *arg1) { return new (thd->mem_root) Item_func_tan(arg1); } @@ -4464,7 +4464,7 @@ Create_func_tan::create(THD *thd, Item * Create_func_time_format Create_func_time_format::s_singleton; Item* -Create_func_time_format::create(THD *thd, Item *arg1, Item *arg2) +Create_func_time_format::create_2_arg(THD *thd, Item *arg1, Item *arg2) { return new (thd->mem_root) Item_func_date_format(arg1, arg2, 1); } @@ -4473,7 +4473,7 @@ Create_func_time_format::create(THD *thd Create_func_time_to_sec Create_func_time_to_sec::s_singleton; Item* -Create_func_time_to_sec::create(THD *thd, Item *arg1) +Create_func_time_to_sec::create_1_arg(THD *thd, Item *arg1) { return new (thd->mem_root) Item_func_time_to_sec(arg1); } @@ -4482,7 +4482,7 @@ Create_func_time_to_sec::create(THD *thd Create_func_timediff Create_func_timediff::s_singleton; Item* -Create_func_timediff::create(THD *thd, Item *arg1, Item *arg2) +Create_func_timediff::create_2_arg(THD *thd, Item *arg1, Item *arg2) { return new (thd->mem_root) Item_func_timediff(arg1, arg2); } @@ -4491,7 +4491,7 @@ Create_func_timediff::create(THD *thd, I Create_func_to_days Create_func_to_days::s_singleton; Item* -Create_func_to_days::create(THD *thd, Item *arg1) +Create_func_to_days::create_1_arg(THD *thd, Item *arg1) { return new (thd->mem_root) Item_func_to_days(arg1); } @@ -4501,7 +4501,7 @@ Create_func_to_days::create(THD *thd, It Create_func_touches Create_func_touches::s_singleton; Item* -Create_func_touches::create(THD *thd, Item *arg1, Item *arg2) +Create_func_touches::create_2_arg(THD *thd, Item *arg1, Item *arg2) { return new (thd->mem_root) Item_func_spatial_rel(arg1, arg2, Item_func::SP_TOUCHES_FUNC); @@ -4512,7 +4512,7 @@ Create_func_touches::create(THD *thd, It Create_func_ucase Create_func_ucase::s_singleton; Item* -Create_func_ucase::create(THD *thd, Item *arg1) +Create_func_ucase::create_1_arg(THD *thd, Item *arg1) { return new (thd->mem_root) Item_func_ucase(arg1); } @@ -4521,7 +4521,7 @@ Create_func_ucase::create(THD *thd, Item Create_func_uncompress Create_func_uncompress::s_singleton; Item* -Create_func_uncompress::create(THD *thd, Item *arg1) +Create_func_uncompress::create_1_arg(THD *thd, Item *arg1) { return new (thd->mem_root) Item_func_uncompress(arg1); } @@ -4530,7 +4530,7 @@ Create_func_uncompress::create(THD *thd, Create_func_uncompressed_length Create_func_uncompressed_length::s_singleton; Item* -Create_func_uncompressed_length::create(THD *thd, Item *arg1) +Create_func_uncompressed_length::create_1_arg(THD *thd, Item *arg1) { return new (thd->mem_root) Item_func_uncompressed_length(arg1); } @@ -4539,7 +4539,7 @@ Create_func_uncompressed_length::create( Create_func_unhex Create_func_unhex::s_singleton; Item* -Create_func_unhex::create(THD *thd, Item *arg1) +Create_func_unhex::create_1_arg(THD *thd, Item *arg1) { return new (thd->mem_root) Item_func_unhex(arg1); } @@ -4584,7 +4584,7 @@ Create_func_unix_timestamp::create_nativ Create_func_uuid Create_func_uuid::s_singleton; Item* -Create_func_uuid::create(THD *thd) +Create_func_uuid::create_builder(THD *thd) { thd->lex->set_stmt_unsafe(); thd->lex->safe_to_cache_query= 0; @@ -4595,7 +4595,7 @@ Create_func_uuid::create(THD *thd) Create_func_uuid_short Create_func_uuid_short::s_singleton; Item* -Create_func_uuid_short::create(THD *thd) +Create_func_uuid_short::create_builder(THD *thd) { thd->lex->set_stmt_unsafe(); thd->lex->safe_to_cache_query= 0; @@ -4606,7 +4606,7 @@ Create_func_uuid_short::create(THD *thd) Create_func_version Create_func_version::s_singleton; Item* -Create_func_version::create(THD *thd) +Create_func_version::create_builder(THD *thd) { thd->lex->set_stmt_unsafe(); return new (thd->mem_root) Item_static_string_func("version()", @@ -4620,7 +4620,7 @@ Create_func_version::create(THD *thd) Create_func_weekday Create_func_weekday::s_singleton; Item* -Create_func_weekday::create(THD *thd, Item *arg1) +Create_func_weekday::create_1_arg(THD *thd, Item *arg1) { return new (thd->mem_root) Item_func_weekday(arg1, 0); } @@ -4629,7 +4629,7 @@ Create_func_weekday::create(THD *thd, It Create_func_weekofyear Create_func_weekofyear::s_singleton; Item* -Create_func_weekofyear::create(THD *thd, Item *arg1) +Create_func_weekofyear::create_1_arg(THD *thd, Item *arg1) { Item *i1= new (thd->mem_root) Item_int((char*) "0", 3, 1); return new (thd->mem_root) Item_func_week(arg1, i1); @@ -4640,7 +4640,7 @@ Create_func_weekofyear::create(THD *thd, Create_func_within Create_func_within::s_singleton; Item* -Create_func_within::create(THD *thd, Item *arg1, Item *arg2) +Create_func_within::create_2_arg(THD *thd, Item *arg1, Item *arg2) { return new (thd->mem_root) Item_func_spatial_rel(arg1, arg2, Item_func::SP_WITHIN_FUNC); @@ -4652,7 +4652,7 @@ Create_func_within::create(THD *thd, Ite Create_func_x Create_func_x::s_singleton; Item* -Create_func_x::create(THD *thd, Item *arg1) +Create_func_x::create_1_arg(THD *thd, Item *arg1) { return new (thd->mem_root) Item_func_x(arg1); } @@ -4662,7 +4662,7 @@ Create_func_x::create(THD *thd, Item *ar Create_func_xml_extractvalue Create_func_xml_extractvalue::s_singleton; Item* -Create_func_xml_extractvalue::create(THD *thd, Item *arg1, Item *arg2) +Create_func_xml_extractvalue::create_2_arg(THD *thd, Item *arg1, Item *arg2) { return new (thd->mem_root) Item_func_xml_extractvalue(arg1, arg2); } @@ -4671,7 +4671,7 @@ Create_func_xml_extractvalue::create(THD Create_func_xml_update Create_func_xml_update::s_singleton; Item* -Create_func_xml_update::create(THD *thd, Item *arg1, Item *arg2, Item *arg3) +Create_func_xml_update::create_3_arg(THD *thd, Item *arg1, Item *arg2, Item *arg3) { return new (thd->mem_root) Item_func_xml_update(arg1, arg2, arg3); } @@ -4681,7 +4681,7 @@ Create_func_xml_update::create(THD *thd, Create_func_y Create_func_y::s_singleton; Item* -Create_func_y::create(THD *thd, Item *arg1) +Create_func_y::create_1_arg(THD *thd, Item *arg1) { return new (thd->mem_root) Item_func_y(arg1); } === modified file 'sql/item_create.h' --- a/sql/item_create.h 2007-08-15 13:43:08 +0000 +++ b/sql/item_create.h 2010-03-28 18:10:00 +0000 @@ -91,8 +91,9 @@ public: @param item_list The list of arguments to the function, can be NULL @return An item representing the parsed function call */ - virtual Item* create(THD *thd, LEX_STRING db, LEX_STRING name, - bool use_explicit_name, List<Item> *item_list) = 0; + virtual Item *create_with_db(THD *thd, LEX_STRING db, LEX_STRING name, + bool use_explicit_name, + List<Item> *item_list) = 0; protected: /** Constructor. */ === modified file 'sql/item_sum.cc' --- a/sql/item_sum.cc 2010-01-15 15:27:55 +0000 +++ b/sql/item_sum.cc 2010-03-28 18:10:00 +0000 @@ -642,7 +642,7 @@ Item_sum_hybrid::fix_fields(THD *thd, It default: DBUG_ASSERT(0); }; - setup(args[0], NULL); + setup_item(args[0], NULL); /* MIN/MAX can return NULL for empty set indepedent of the used column */ maybe_null= 1; unsigned_flag=item->unsigned_flag; @@ -676,7 +676,7 @@ Item_sum_hybrid::fix_fields(THD *thd, It of the original MIN/MAX object and it is saved in this object's cache. */ -void Item_sum_hybrid::setup(Item *item, Item *value_arg) +void Item_sum_hybrid::setup_item(Item *item, Item *value_arg) { value= Item_cache::get_cache(item); value->setup(item); @@ -1646,7 +1646,7 @@ void Item_sum_hybrid::no_rows_in_result( Item *Item_sum_min::copy_or_same(THD* thd) { Item_sum_min *item= new (thd->mem_root) Item_sum_min(thd, this); - item->setup(args[0], value); + item->setup_item(args[0], value); return item; } @@ -1669,7 +1669,7 @@ bool Item_sum_min::add() Item *Item_sum_max::copy_or_same(THD* thd) { Item_sum_max *item= new (thd->mem_root) Item_sum_max(thd, this); - item->setup(args[0], value); + item->setup_item(args[0], value); return item; } === modified file 'sql/item_sum.h' --- a/sql/item_sum.h 2010-02-01 06:14:12 +0000 +++ b/sql/item_sum.h 2010-04-01 09:04:26 +0000 @@ -870,7 +870,7 @@ protected: was_values(item->was_values) { } bool fix_fields(THD *, Item **); - void setup(Item *item, Item *value_arg); + void setup_item(Item *item, Item *value_arg); void clear(); double val_real(); longlong val_int(); === modified file 'sql/log.cc' --- a/sql/log.cc 2010-03-15 11:51:23 +0000 +++ b/sql/log.cc 2010-04-01 14:34:51 +0000 @@ -5424,7 +5424,7 @@ int TC_LOG_MMAP::open(const char *opt_na pg->state=POOL; pthread_mutex_init(&pg->lock, MY_MUTEX_INIT_FAST); pthread_cond_init (&pg->cond, 0); - pg->start=(my_xid *)(data + i*tc_log_page_size); + pg->ptr= pg->start=(my_xid *)(data + i*tc_log_page_size); pg->size=pg->free=tc_log_page_size/sizeof(my_xid); pg->end=pg->start + pg->size; } @@ -5659,7 +5659,15 @@ int TC_LOG_MMAP::sync() /* marking 'syncing' slot free */ pthread_mutex_lock(&LOCK_sync); syncing=0; - pthread_cond_signal(&active->cond); // wake up a new syncer + /* + we check the "active" pointer without LOCK_active. Still, it's safe - + "active" can change from NULL to not NULL any time, but it + will take LOCK_sync before waiting on active->cond. That is, it can never + miss a signal. + And "active" can change to NULL only after LOCK_sync, so this is safe too. + */ + if (active) + pthread_cond_signal(&active->cond); // wake up a new syncer pthread_mutex_unlock(&LOCK_sync); return err; } @@ -6028,3 +6036,20 @@ mysql_declare_plugin(binlog) NULL /* config options */ } mysql_declare_plugin_end; +maria_declare_plugin(binlog) +{ + MYSQL_STORAGE_ENGINE_PLUGIN, + &binlog_storage_engine, + "binlog", + "MySQL AB", + "This is a pseudo storage engine to represent the binlog in a transaction", + PLUGIN_LICENSE_GPL, + binlog_init, /* Plugin Init */ + NULL, /* Plugin Deinit */ + 0x0100 /* 1.0 */, + NULL, /* status variables */ + NULL, /* system variables */ + "1.0", /* string version */ + MariaDB_PLUGIN_MATURITY_STABLE /* maturity */ +} +maria_declare_plugin_end; === modified file 'sql/log_event.cc' --- a/sql/log_event.cc 2010-03-15 11:51:23 +0000 +++ b/sql/log_event.cc 2010-04-02 09:20:09 +0000 @@ -1716,8 +1716,7 @@ beg: case MYSQL_TYPE_DATETIME: { - size_t d, t; - uint64 i64= uint8korr(ptr); /* YYYYMMDDhhmmss */ + uint64 d, t, i64= uint8korr(ptr); /* YYYYMMDDhhmmss */ d= i64 / 1000000; t= i64 % 1000000; my_b_printf(file, "%04d-%02d-%02d %02d:%02d:%02d", === modified file 'sql/mysqld.cc' --- a/sql/mysqld.cc 2010-03-31 23:10:03 +0000 +++ b/sql/mysqld.cc 2010-04-03 20:19:35 +0000 @@ -6646,8 +6646,6 @@ Can't be set to 1 if --log-slave-updates {"shared-memory", OPT_ENABLE_SHARED_MEMORY, "Enable the shared memory.",(uchar**) &opt_enable_shared_memory, (uchar**) &opt_enable_shared_memory, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0}, -#endif -#ifdef HAVE_SMEM {"shared-memory-base-name",OPT_SHARED_MEMORY_BASE_NAME, "Base name of shared memory.", (uchar**) &shared_memory_base_name, (uchar**) &shared_memory_base_name, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0}, @@ -8378,6 +8376,8 @@ mysqld_get_one_option(int optid, case (int) OPT_INIT_RPL_ROLE: { int role; + LINT_INIT(role); + if (!find_opt_type(argument, &rpl_role_typelib, opt->name, &role)) { rpl_status = (role == 1) ? RPL_AUTH_MASTER : RPL_IDLE_SLAVE; @@ -8434,6 +8434,8 @@ mysqld_get_one_option(int optid, case OPT_BINLOG_FORMAT: { int id; + LINT_INIT(id); + if (!find_opt_type(argument, &binlog_format_typelib, opt->name, &id)) { global_system_variables.binlog_format= opt_binlog_format_id= id - 1; @@ -8684,6 +8686,8 @@ mysqld_get_one_option(int optid, else { int type; + LINT_INIT(type); + if (!find_opt_type(argument, &delay_key_write_typelib, opt->name, &type)) delay_key_write_options= (uint) type-1; } @@ -8695,6 +8699,8 @@ mysqld_get_one_option(int optid, case OPT_TX_ISOLATION: { int type; + LINT_INIT(type); + if (!find_opt_type(argument, &tx_isolation_typelib, opt->name, &type)) global_system_variables.tx_isolation= (type-1); break; @@ -8782,6 +8788,7 @@ mysqld_get_one_option(int optid, ulong method_conv; int method; LINT_INIT(method_conv); + LINT_INIT(method); myisam_stats_method_str= argument; if (!find_opt_type(argument, &myisam_stats_method_typelib, @@ -8844,6 +8851,7 @@ mysqld_get_one_option(int optid, case OPT_THREAD_HANDLING: { int id; + LINT_INIT(id); if (!find_opt_type(argument, &thread_handling_typelib, opt->name, &id)) global_system_variables.thread_handling= id - 1; opt_thread_handling= thread_handling_typelib.type_names[global_system_variables.thread_handling]; === modified file 'sql/net_serv.cc' --- a/sql/net_serv.cc 2010-02-23 12:04:58 +0000 +++ b/sql/net_serv.cc 2010-03-29 19:07:45 +0000 @@ -279,7 +279,7 @@ static int net_data_is_ready(my_socket s @param clear_buffer if <> 0, then clear all data from comm buff */ -void net_clear(NET *net, my_bool clear_buffer) +void net_clear(NET *net, my_bool clear_buffer __attribute__((unused))) { #if !defined(EMBEDDED_LIBRARY) && defined(DBUG_OFF) size_t count; === modified file 'sql/set_var.cc' --- a/sql/set_var.cc 2010-03-29 21:16:12 +0000 +++ b/sql/set_var.cc 2010-04-03 20:19:35 +0000 @@ -1269,16 +1269,16 @@ uchar *sys_var_set::value_ptr(THD *thd, void sys_var_set_slave_mode::set_default(THD *thd, enum_var_type type) { - slave_exec_mode_options= 0; - bit_do_set(slave_exec_mode_options, SLAVE_EXEC_MODE_STRICT); + slave_exec_mode_options= (ULL(1) << SLAVE_EXEC_MODE_STRICT); } bool sys_var_set_slave_mode::check(THD *thd, set_var *var) { bool rc= sys_var_set::check(thd, var); if (!rc && - bit_is_set(var->save_result.ulong_value, SLAVE_EXEC_MODE_STRICT) == 1 && - bit_is_set(var->save_result.ulong_value, SLAVE_EXEC_MODE_IDEMPOTENT) == 1) + test_all_bits(var->save_result.ulong_value, + ((ULL(1) << SLAVE_EXEC_MODE_STRICT) | + (ULL(1) << SLAVE_EXEC_MODE_IDEMPOTENT)))) { rc= true; my_error(ER_SLAVE_AMBIGOUS_EXEC_MODE, MYF(0), ""); @@ -1300,15 +1300,16 @@ void fix_slave_exec_mode(enum_var_type t DBUG_ENTER("fix_slave_exec_mode"); compile_time_assert(sizeof(slave_exec_mode_options) * CHAR_BIT > SLAVE_EXEC_MODE_LAST_BIT - 1); - if (bit_is_set(slave_exec_mode_options, SLAVE_EXEC_MODE_STRICT) == 1 && - bit_is_set(slave_exec_mode_options, SLAVE_EXEC_MODE_IDEMPOTENT) == 1) + if (test_all_bits(slave_exec_mode_options, + ((ULL(1) << SLAVE_EXEC_MODE_STRICT) | + (ULL(1) << SLAVE_EXEC_MODE_IDEMPOTENT)))) { sql_print_error("Ambiguous slave modes combination." " STRICT will be used"); - bit_do_clear(slave_exec_mode_options, SLAVE_EXEC_MODE_IDEMPOTENT); + slave_exec_mode_options&= ~(ULL(1) << SLAVE_EXEC_MODE_IDEMPOTENT); } - if (bit_is_set(slave_exec_mode_options, SLAVE_EXEC_MODE_IDEMPOTENT) == 0) - bit_do_set(slave_exec_mode_options, SLAVE_EXEC_MODE_STRICT); + if (!(slave_exec_mode_options & (ULL(1) << SLAVE_EXEC_MODE_IDEMPOTENT))) + slave_exec_mode_options|= (ULL(1)<< SLAVE_EXEC_MODE_STRICT); DBUG_VOID_RETURN; } === modified file 'sql/sp_head.cc' --- a/sql/sp_head.cc 2010-03-15 11:51:23 +0000 +++ b/sql/sp_head.cc 2010-04-01 09:04:26 +0000 @@ -2089,6 +2089,8 @@ sp_head::reset_lex(THD *thd) sublex->dec= NULL; sublex->interval_list.empty(); sublex->type= 0; + sublex->uint_geom_type= 0; + sublex->vcol_info= 0; DBUG_RETURN(FALSE); } === modified file 'sql/sql_acl.cc' --- a/sql/sql_acl.cc 2010-03-31 18:37:45 +0000 +++ b/sql/sql_acl.cc 2010-04-02 20:08:40 +0000 @@ -536,6 +536,9 @@ static my_bool acl_load(THD *thd, TABLE_ while (!(read_record_info.read_record(&read_record_info))) { ACL_USER user; + char *password; + uint password_len; + bzero(&user, sizeof(user)); update_hostname(&user.host, get_field(&mem, table->field[0])); user.user= get_field(&mem, table->field[1]); @@ -548,8 +551,8 @@ static my_bool acl_load(THD *thd, TABLE_ continue; } - char *password= get_field(thd->mem_root, table->field[2]); - uint password_len= password ? strlen(password) : 0; + password= get_field(&mem, table->field[2]); + password_len= password ? strlen(password) : 0; user.auth_string.str= password ? password : const_cast<char*>(""); user.auth_string.length= password_len; set_user_salt(&user, password, password_len); @@ -6846,6 +6849,7 @@ bool check_routine_level_acl(THD *thd, c #define initialized 0 #define decrease_user_connections(X) /* nothing */ #define check_for_max_user_connections(X,Y) 0 +#define get_or_create_user_conn(A,B,C,D) 0 #endif #endif #ifndef HAVE_OPENSSL @@ -7826,15 +7830,15 @@ static int do_auth_once(THD *thd, LEX_ST bool unlock_plugin= false; plugin_ref plugin; +#ifdef EMBEDDED_LIBRARY + plugin= native_password_plugin; +#else if (auth_plugin_name->str == native_password_plugin_name.str) plugin= native_password_plugin; - else -#ifndef EMBEDDED_LIBRARY - if (auth_plugin_name->str == old_password_plugin_name.str) + else if (auth_plugin_name->str == old_password_plugin_name.str) plugin= old_password_plugin; - else - if ((plugin= my_plugin_lock_by_name(thd, auth_plugin_name, - MYSQL_AUTHENTICATION_PLUGIN))) + else if ((plugin= my_plugin_lock_by_name(thd, auth_plugin_name, + MYSQL_AUTHENTICATION_PLUGIN))) unlock_plugin= true; #endif @@ -8257,3 +8261,35 @@ mysql_declare_plugin(mysql_password) } mysql_declare_plugin_end; +maria_declare_plugin(mysql_password) +{ + MYSQL_AUTHENTICATION_PLUGIN, /* type constant */ + &native_password_handler, /* type descriptor */ + native_password_plugin_name.str, /* Name */ + "R.J.Silk, Sergei Golubchik", /* Author */ + "Native MySQL authentication", /* Description */ + PLUGIN_LICENSE_GPL, /* License */ + NULL, /* Init function */ + NULL, /* Deinit function */ + 0x0100, /* Version (1.0) */ + NULL, /* status variables */ + NULL, /* system variables */ + "1.0", /* String version */ + MariaDB_PLUGIN_MATURITY_BETA /* Maturity */ +}, +{ + MYSQL_AUTHENTICATION_PLUGIN, /* type constant */ + &old_password_handler, /* type descriptor */ + old_password_plugin_name.str, /* Name */ + "R.J.Silk, Sergei Golubchik", /* Author */ + "Old MySQL-4.0 authentication", /* Description */ + PLUGIN_LICENSE_GPL, /* License */ + NULL, /* Init function */ + NULL, /* Deinit function */ + 0x0100, /* Version (1.0) */ + NULL, /* status variables */ + NULL, /* system variables */ + "1.0", /* String version */ + MariaDB_PLUGIN_MATURITY_BETA /* Maturity */ +} +maria_declare_plugin_end; === modified file 'sql/sql_builtin.cc.in' --- a/sql/sql_builtin.cc.in 2010-03-29 15:13:53 +0000 +++ b/sql/sql_builtin.cc.in 2010-04-01 14:34:51 +0000 @@ -16,13 +16,12 @@ #include <my_global.h> #include <mysql/plugin.h> -typedef struct st_mysql_plugin builtin_plugin[]; +typedef struct st_maria_plugin builtin_maria_plugin[]; -extern builtin_plugin - builtin_binlog_plugin, builtin_mysql_password_plugin@mysql_plugin_defs@; +extern builtin_maria_plugin + builtin_maria_binlog_plugin, builtin_maria_mysql_password_plugin@maria_plugin_defs@; -struct st_mysql_plugin *mysqld_builtins[]= +struct st_maria_plugin *mariadb_builtins[]= { - builtin_binlog_plugin, builtin_mysql_password_plugin@mysql_plugin_defs@,(struct st_mysql_plugin *)0 + builtin_maria_binlog_plugin, builtin_maria_mysql_password_plugin@maria_plugin_defs@,(struct st_maria_plugin *)0 }; - === modified file 'sql/sql_class.cc' --- a/sql/sql_class.cc 2010-03-29 15:13:53 +0000 +++ b/sql/sql_class.cc 2010-04-02 18:51:02 +0000 @@ -924,7 +924,7 @@ void THD::update_stats(void) /* A SQL query. */ if (lex->sql_command == SQLCOM_SELECT) select_commands++; - else if (! sql_command_flags[lex->sql_command] & CF_STATUS_COMMAND) + else if (sql_command_flags[lex->sql_command] & CF_STATUS_COMMAND) { /* Ignore 'SHOW ' commands */ } === modified file 'sql/sql_class.h' --- a/sql/sql_class.h 2010-03-29 15:13:53 +0000 +++ b/sql/sql_class.h 2010-04-01 09:04:26 +0000 @@ -63,6 +63,7 @@ public: bool report_error(THD *thd); bool is_invalidated() const { return m_invalidated; } void reset_reprepare_observer() { m_invalidated= FALSE; } + Reprepare_observer() {} /* Remove gcc warning */ private: bool m_invalidated; }; @@ -1117,6 +1118,7 @@ public: /* Ignore error */ return TRUE; } + Dummy_error_handler() {} /* Remove gcc warning */ }; === modified file 'sql/sql_plugin.cc' --- a/sql/sql_plugin.cc 2010-03-29 15:13:53 +0000 +++ b/sql/sql_plugin.cc 2010-04-01 20:05:09 +0000 @@ -20,7 +20,7 @@ #define REPORT_TO_LOG 1 #define REPORT_TO_USER 2 -extern struct st_mysql_plugin *mysqld_builtins[]; +extern struct st_maria_plugin *mariadb_builtins[]; /** @note The order of the enumeration is critical. @@ -78,6 +78,14 @@ static const char *sizeof_st_plugin_sym= "_mysql_sizeof_struct_st_plugin_"; static const char *plugin_declarations_sym= "_mysql_plugin_declarations_"; static int min_plugin_interface_version= MYSQL_PLUGIN_INTERFACE_VERSION & ~0xFF; +static const char *maria_plugin_interface_version_sym= + "_maria_plugin_interface_version_"; +static const char *maria_sizeof_st_plugin_sym= + "_maria_sizeof_struct_st_plugin_"; +static const char *maria_plugin_declarations_sym= + "_maria_plugin_declarations_"; +static int min_maria_plugin_interface_version= + MARIA_PLUGIN_INTERFACE_VERSION & ~0xFF; #endif /* Note that 'int version' must be the first field of every plugin @@ -211,7 +219,7 @@ static bool plugin_load_list(MEM_ROOT *t const char *list); static int test_plugin_options(MEM_ROOT *, struct st_plugin_int *, int *, char **); -static bool register_builtin(struct st_mysql_plugin *, struct st_plugin_int *, +static bool register_builtin(struct st_maria_plugin *, struct st_plugin_int *, struct st_plugin_int **); static void unlock_variables(THD *thd, struct system_variables *vars); static void cleanup_variables(THD *thd, struct system_variables *vars); @@ -368,6 +376,225 @@ static inline void free_plugin_mem(struc } +/** + Reads data from mysql plugin interface + + @param plugin_dl Structure where the data should be put + @param sym Reverence on version info + @param dlpath Path to the module + @param report What errors should be reported + + @retval FALSE OK + @retval TRUE ERROR +*/ + +#ifdef HAVE_DLOPEN +static my_bool read_mysql_plugin_info(struct st_plugin_dl *plugin_dl, + void *sym, char *dlpath, + int report) +{ + DBUG_ENTER("read_maria_plugin_info"); + /* Determine interface version */ + if (!sym) + { + free_plugin_mem(plugin_dl); + report_error(report, ER_CANT_FIND_DL_ENTRY, plugin_interface_version_sym); + DBUG_RETURN(TRUE); + } + plugin_dl->mariaversion= 0; + plugin_dl->mysqlversion= *(int *)sym; + /* Versioning */ + if (plugin_dl->mysqlversion < min_plugin_interface_version || + (plugin_dl->mysqlversion >> 8) > (MYSQL_PLUGIN_INTERFACE_VERSION >> 8)) + { + free_plugin_mem(plugin_dl); + report_error(report, ER_CANT_OPEN_LIBRARY, dlpath, 0, + "plugin interface version mismatch"); + DBUG_RETURN(TRUE); + } + /* Find plugin declarations */ + if (!(sym= dlsym(plugin_dl->handle, plugin_declarations_sym))) + { + free_plugin_mem(plugin_dl); + report_error(report, ER_CANT_FIND_DL_ENTRY, plugin_declarations_sym); + DBUG_RETURN(TRUE); + } + + /* convert mysql declaration to maria one */ + { + int i; + uint sizeof_st_plugin; + struct st_mysql_plugin *old; + struct st_maria_plugin *cur; + char *ptr= (char *)sym; + + if ((sym= dlsym(plugin_dl->handle, sizeof_st_plugin_sym))) + sizeof_st_plugin= *(int *)sym; + else + { + DBUG_ASSERT(min_plugin_interface_version == 0); + sizeof_st_plugin= (int)offsetof(struct st_mysql_plugin, version); + } + + for (i= 0; + ((struct st_mysql_plugin *)(ptr + i * sizeof_st_plugin))->info; + i++) + /* no op */; + + cur= (struct st_maria_plugin*) + my_malloc((i + 1) * sizeof(struct st_maria_plugin), + MYF(MY_ZEROFILL|MY_WME)); + if (!cur) + { + free_plugin_mem(plugin_dl); + report_error(report, ER_OUTOFMEMORY, plugin_dl->dl.length); + DBUG_RETURN(TRUE); + } + /* + All st_plugin fields not initialized in the plugin explicitly, are + set to 0. It matches C standard behaviour for struct initializers that + have less values than the struct definition. + */ + for (i=0; + (old= (struct st_mysql_plugin *)(ptr + i * sizeof_st_plugin))->info; + i++) + { + + cur->type= old->type; + cur->info= old->info; + cur->name= old->name; + cur->author= old->author; + cur->descr= old->descr; + cur->license= old->license; + cur->init= old->init; + cur->deinit= old->deinit; + cur->version= old->version; + cur->status_vars= old->status_vars; + cur->system_vars= old->system_vars; + /* + Something like this should be added to process + new mysql plugin versions: + if (plugin_dl->mysqlversion > 0x0101) + { + cur->newfield= CONSTANT_MEANS_UNKNOWN; + } + else + { + cur->newfield= old->newfield; + } + */ + /* Maria only fields */ + cur->version_info= "Unknown"; + cur->maturity= MariaDB_PLUGIN_MATURITY_UNKNOWN; + } + plugin_dl->allocated= true; + plugin_dl->plugins= (struct st_maria_plugin *)cur; + } + + DBUG_RETURN(FALSE); +} + + +/** + Reads data from maria plugin interface + + @param plugin_dl Structure where the data should be put + @param sym Reverence on version info + @param dlpath Path to the module + @param report what errors should be reported + + @retval FALSE OK + @retval TRUE ERROR +*/ + +static my_bool read_maria_plugin_info(struct st_plugin_dl *plugin_dl, + void *sym, char *dlpath, + int report) +{ + DBUG_ENTER("read_maria_plugin_info"); + + /* Determine interface version */ + if (!(sym)) + { + /* + Actually this branch impossible because in case of absence of maria + version we try mysql version. + */ + free_plugin_mem(plugin_dl); + report_error(report, ER_CANT_FIND_DL_ENTRY, + maria_plugin_interface_version_sym); + DBUG_RETURN(TRUE); + } + plugin_dl->mariaversion= *(int *)sym; + plugin_dl->mysqlversion= 0; + /* Versioning */ + if (plugin_dl->mariaversion < min_maria_plugin_interface_version || + (plugin_dl->mariaversion >> 8) > (MARIA_PLUGIN_INTERFACE_VERSION >> 8)) + { + free_plugin_mem(plugin_dl); + report_error(report, ER_CANT_OPEN_LIBRARY, dlpath, 0, + "plugin interface version mismatch"); + DBUG_RETURN(TRUE); + } + /* Find plugin declarations */ + if (!(sym= dlsym(plugin_dl->handle, maria_plugin_declarations_sym))) + { + free_plugin_mem(plugin_dl); + report_error(report, ER_CANT_FIND_DL_ENTRY, maria_plugin_declarations_sym); + DBUG_RETURN(TRUE); + } + if (plugin_dl->mariaversion != MARIA_PLUGIN_INTERFACE_VERSION) + { + uint sizeof_st_plugin; + struct st_maria_plugin *old, *cur; + char *ptr= (char *)sym; + + if ((sym= dlsym(plugin_dl->handle, maria_sizeof_st_plugin_sym))) + sizeof_st_plugin= *(int *)sym; + else + { + free_plugin_mem(plugin_dl); + report_error(report, ER_CANT_FIND_DL_ENTRY, maria_sizeof_st_plugin_sym); + DBUG_RETURN(TRUE); + } + + if (sizeof_st_plugin != sizeof(st_mysql_plugin)) + { + int i; + for (i= 0; + ((struct st_maria_plugin *)(ptr + i * sizeof_st_plugin))->info; + i++) + /* no op */; + + cur= (struct st_maria_plugin*) + my_malloc((i + 1) * sizeof(struct st_maria_plugin), + MYF(MY_ZEROFILL|MY_WME)); + if (!cur) + { + free_plugin_mem(plugin_dl); + report_error(report, ER_OUTOFMEMORY, plugin_dl->dl.length); + DBUG_RETURN(TRUE); + } + /* + All st_plugin fields not initialized in the plugin explicitly, are + set to 0. It matches C standard behaviour for struct initializers that + have less values than the struct definition. + */ + for (i=0; + (old= (struct st_maria_plugin *)(ptr + i * sizeof_st_plugin))->info; + i++) + memcpy(cur + i, old, min(sizeof(cur[i]), sizeof_st_plugin)); + + sym= cur; + plugin_dl->allocated= true; + } + } + plugin_dl->plugins= (struct st_maria_plugin *)sym; + + DBUG_RETURN(FALSE); +} +#endif HAVE_DLOPEN + static st_plugin_dl *plugin_dl_add(const LEX_STRING *dl, int report) { #ifdef HAVE_DLOPEN @@ -415,22 +642,21 @@ static st_plugin_dl *plugin_dl_add(const report_error(report, ER_CANT_OPEN_LIBRARY, dlpath, errno, errmsg); DBUG_RETURN(0); } - /* Determine interface version */ - if (!(sym= dlsym(plugin_dl.handle, plugin_interface_version_sym))) + + /* Checks which plugin interface present and reads info */ + if (!(sym= dlsym(plugin_dl.handle, maria_plugin_interface_version_sym))) { - free_plugin_mem(&plugin_dl); - report_error(report, ER_CANT_FIND_DL_ENTRY, plugin_interface_version_sym); - DBUG_RETURN(0); + if (read_mysql_plugin_info(&plugin_dl, + dlsym(plugin_dl.handle, + plugin_interface_version_sym), + dlpath, + report)) + DBUG_RETURN(0); } - plugin_dl.version= *(int *)sym; - /* Versioning */ - if (plugin_dl.version < min_plugin_interface_version || - (plugin_dl.version >> 8) > (MYSQL_PLUGIN_INTERFACE_VERSION >> 8)) + else { - free_plugin_mem(&plugin_dl); - report_error(report, ER_CANT_OPEN_LIBRARY, dlpath, 0, - "plugin interface version mismatch"); - DBUG_RETURN(0); + if (read_maria_plugin_info(&plugin_dl, sym, dlpath, report)) + DBUG_RETURN(0); } /* link the services in */ @@ -438,7 +664,7 @@ static st_plugin_dl *plugin_dl_add(const { if ((sym= dlsym(plugin_dl.handle, list_of_services[i].name))) { - uint ver= (uint)(intptr)*(void**)sym; + uint ver= (uint)(intptr) *(void **)sym; if (ver > list_of_services[i].version || (ver >> 8) < (list_of_services[i].version >> 8)) { @@ -449,72 +675,9 @@ static st_plugin_dl *plugin_dl_add(const report_error(report, ER_CANT_OPEN_LIBRARY, dlpath, 0, buf); DBUG_RETURN(0); } - *(void**)sym= list_of_services[i].service; - } - } - - /* Find plugin declarations */ - if (!(sym= dlsym(plugin_dl.handle, plugin_declarations_sym))) - { - free_plugin_mem(&plugin_dl); - report_error(report, ER_CANT_FIND_DL_ENTRY, plugin_declarations_sym); - DBUG_RETURN(0); - } - - if (plugin_dl.version != MYSQL_PLUGIN_INTERFACE_VERSION) - { - uint sizeof_st_plugin; - struct st_mysql_plugin *old, *cur; - char *ptr= (char *)sym; - - if ((sym= dlsym(plugin_dl.handle, sizeof_st_plugin_sym))) - sizeof_st_plugin= *(int *)sym; - else - { -#ifdef ERROR_ON_NO_SIZEOF_PLUGIN_SYMBOL - free_plugin_mem(&plugin_dl); - report_error(report, ER_CANT_FIND_DL_ENTRY, sizeof_st_plugin_sym); - DBUG_RETURN(0); -#else - /* - When the following assert starts failing, we'll have to switch - to the upper branch of the #ifdef - */ - DBUG_ASSERT(min_plugin_interface_version == 0); - sizeof_st_plugin= (int)offsetof(struct st_mysql_plugin, version); -#endif - } - - if (sizeof_st_plugin != sizeof(st_mysql_plugin)) - { - for (i= 0; - ((struct st_mysql_plugin *)(ptr+i*sizeof_st_plugin))->info; - i++) - /* no op */; - - cur= (struct st_mysql_plugin*) - my_malloc((i+1)*sizeof(struct st_mysql_plugin), MYF(MY_ZEROFILL|MY_WME)); - if (!cur) - { - free_plugin_mem(&plugin_dl); - report_error(report, ER_OUTOFMEMORY, plugin_dl.dl.length); - DBUG_RETURN(0); - } - /* - All st_plugin fields not initialized in the plugin explicitly, are - set to 0. It matches C standard behaviour for struct initializers that - have less values than the struct definition. - */ - for (i=0; - (old=(struct st_mysql_plugin *)(ptr+i*sizeof_st_plugin))->info; - i++) - memcpy(cur+i, old, min(sizeof(cur[i]), sizeof_st_plugin)); - - sym= cur; - plugin_dl.allocated= true; + *(void **)sym= list_of_services[i].service; } } - plugin_dl.plugins= (struct st_mysql_plugin *)sym; /* Duplicate and convert dll name */ plugin_dl.dl.length= dl->length * files_charset_info->mbmaxlen + 1; @@ -756,7 +919,7 @@ static bool plugin_add(MEM_ROOT *tmp_roo int *argc, char **argv, int report) { struct st_plugin_int tmp; - struct st_mysql_plugin *plugin; + struct st_maria_plugin *plugin; DBUG_ENTER("plugin_add"); if (plugin_find_internal(name, MYSQL_ANY_PLUGIN)) { @@ -1161,8 +1324,8 @@ int plugin_init(int *argc, char **argv, { uint i; bool is_myisam; - struct st_mysql_plugin **builtins; - struct st_mysql_plugin *plugin; + struct st_maria_plugin **builtins; + struct st_maria_plugin *plugin; struct st_plugin_int tmp, *plugin_ptr, **reap; MEM_ROOT tmp_root; bool reaped_mandatory_plugin= FALSE; @@ -1201,7 +1364,7 @@ int plugin_init(int *argc, char **argv, /* First we register builtin plugins */ - for (builtins= mysqld_builtins; *builtins; builtins++) + for (builtins= mariadb_builtins; *builtins; builtins++) { for (plugin= *builtins; plugin->info; plugin++) { @@ -1316,7 +1479,7 @@ err: } -static bool register_builtin(struct st_mysql_plugin *plugin, +static bool register_builtin(struct st_maria_plugin *plugin, struct st_plugin_int *tmp, struct st_plugin_int **ptr) { @@ -1352,7 +1515,7 @@ static bool register_builtin(struct st_m RETURN false - plugin registered successfully */ -bool plugin_register_builtin(THD *thd, struct st_mysql_plugin *plugin) +bool plugin_register_builtin(THD *thd, struct st_maria_plugin *plugin) { struct st_plugin_int tmp, *ptr; bool result= true; @@ -1481,7 +1644,7 @@ static bool plugin_load_list(MEM_ROOT *t char buffer[FN_REFLEN]; LEX_STRING name= {buffer, 0}, dl= {NULL, 0}, *str= &name; struct st_plugin_dl *plugin_dl; - struct st_mysql_plugin *plugin; + struct st_maria_plugin *plugin; char *p= buffer; DBUG_ENTER("plugin_load_list"); while (list) === modified file 'sql/sql_plugin.h' --- a/sql/sql_plugin.h 2010-03-15 11:51:23 +0000 +++ b/sql/sql_plugin.h 2010-04-01 14:34:51 +0000 @@ -52,8 +52,9 @@ struct st_plugin_dl { LEX_STRING dl; void *handle; - struct st_mysql_plugin *plugins; - int version; + struct st_maria_plugin *plugins; + int mysqlversion; + int mariaversion; bool allocated; uint ref_count; /* number of plugins loaded from the library */ }; @@ -63,7 +64,7 @@ struct st_plugin_dl struct st_plugin_int { LEX_STRING name; - struct st_mysql_plugin *plugin; + struct st_maria_plugin *plugin; struct st_plugin_dl *plugin_dl; uint state; uint ref_count; /* number of threads using the plugin */ === modified file 'sql/sql_show.cc' --- a/sql/sql_show.cc 2010-04-01 21:42:40 +0000 +++ b/sql/sql_show.cc 2010-04-03 20:19:35 +0000 @@ -94,11 +94,21 @@ static int make_version_string(char *buf return my_snprintf(buf, buf_length, "%d.%d", version>>8,version&0xff); } + +static const LEX_STRING maturity_name[]={ + { C_STRING_WITH_LEN("Unknown") }, + { C_STRING_WITH_LEN("Experimental") }, + { C_STRING_WITH_LEN("Alpha") }, + { C_STRING_WITH_LEN("Beta") }, + { C_STRING_WITH_LEN("Gamma") }, + { C_STRING_WITH_LEN("Stable") }}; + + static my_bool show_plugins(THD *thd, plugin_ref plugin, void *arg) { TABLE *table= (TABLE*) arg; - struct st_mysql_plugin *plug= plugin_decl(plugin); + struct st_maria_plugin *plug= plugin_decl(plugin); struct st_plugin_dl *plugin_dl= plugin_dlib(plugin); CHARSET_INFO *cs= system_charset_info; char version_buf[20]; @@ -143,7 +153,7 @@ static my_bool show_plugins(THD *thd, pl table->field[5]->set_notnull(); table->field[6]->store(version_buf, make_version_string(version_buf, sizeof(version_buf), - plugin_dl->version), + plugin_dl->mariaversion), cs); table->field[6]->set_notnull(); } @@ -186,6 +196,26 @@ static my_bool show_plugins(THD *thd, pl } table->field[9]->set_notnull(); + if ((uint) plug->maturity <= MariaDB_PLUGIN_MATURITY_STABLE) + table->field[10]->store(maturity_name[plug->maturity].str, + maturity_name[plug->maturity].length, + cs); + else + { + DBUG_ASSERT(0); + table->field[10]->store("Unknown", 7, cs); + } + table->field[10]->set_notnull(); + + if (plug->version_info) + { + table->field[11]->store(plug->version_info, + strlen(plug->version_info), cs); + table->field[11]->set_notnull(); + } + else + table->field[11]->set_null(); + return schema_table_store_record(thd, table); } @@ -2527,8 +2557,8 @@ int send_user_stats(THD* thd, HASH *all_ table->field[j++]->store(user_stats->user, user_stats->user_name_length, system_charset_info); table->field[j++]->store((longlong)user_stats->total_connections,TRUE); - table->field[j++]->store((longlong)user_stats->concurrent_connections); - table->field[j++]->store((longlong)user_stats->connected_time); + table->field[j++]->store((longlong)user_stats->concurrent_connections, TRUE); + table->field[j++]->store((longlong)user_stats->connected_time, TRUE); table->field[j++]->store((double)user_stats->busy_time); table->field[j++]->store((double)user_stats->cpu_time); table->field[j++]->store((longlong)user_stats->bytes_received, TRUE); @@ -4426,7 +4456,7 @@ static my_bool iter_schema_engines(THD * if (plugin_state(plugin) != PLUGIN_IS_READY) { - struct st_mysql_plugin *plug= plugin_decl(plugin); + struct st_maria_plugin *plug= plugin_decl(plugin); if (!(wild && wild[0] && wild_case_compare(scs, plug->name,wild))) { @@ -7207,6 +7237,8 @@ ST_FIELD_INFO plugin_fields_info[]= {"PLUGIN_AUTHOR", NAME_CHAR_LEN, MYSQL_TYPE_STRING, 0, 1, 0, SKIP_OPEN_TABLE}, {"PLUGIN_DESCRIPTION", 65535, MYSQL_TYPE_STRING, 0, 1, 0, SKIP_OPEN_TABLE}, {"PLUGIN_LICENSE", 80, MYSQL_TYPE_STRING, 0, 1, "License", SKIP_OPEN_TABLE}, + {"PLUGIN_MATURITY", 12, MYSQL_TYPE_STRING, 0, 1, 0, SKIP_OPEN_TABLE}, + {"PLUGIN_AUTH_VERSION", 80, MYSQL_TYPE_STRING, 0, 1, 0, SKIP_OPEN_TABLE}, {0, 0, MYSQL_TYPE_STRING, 0, 0, 0, SKIP_OPEN_TABLE} }; === modified file 'sql/sql_table.cc' --- a/sql/sql_table.cc 2010-03-15 11:51:23 +0000 +++ b/sql/sql_table.cc 2010-04-01 09:04:26 +0000 @@ -5704,6 +5704,10 @@ compare_tables(TABLE *table, */ Alter_info tmp_alter_info(*alter_info, thd->mem_root); uint db_options= 0; /* not used */ + + /* Set default value for return value (to ensure it's always set) */ + *need_copy_table= ALTER_TABLE_DATA_CHANGED; + /* Create the prepared information. */ if (mysql_prepare_create_table(thd, create_info, &tmp_alter_info, @@ -5762,7 +5766,6 @@ compare_tables(TABLE *table, (table->s->frm_version < FRM_VER_TRUE_VARCHAR && varchar)) { DBUG_PRINT("info", ("Basic checks -> ALTER_TABLE_DATA_CHANGED")); - *need_copy_table= ALTER_TABLE_DATA_CHANGED; DBUG_RETURN(0); } @@ -5792,7 +5795,6 @@ compare_tables(TABLE *table, { DBUG_PRINT("info", ("NULL behaviour difference in field '%s' -> " "ALTER_TABLE_DATA_CHANGED", new_field->field_name)); - *need_copy_table= ALTER_TABLE_DATA_CHANGED; DBUG_RETURN(0); } @@ -5828,7 +5830,6 @@ compare_tables(TABLE *table, { DBUG_PRINT("info", ("!field_is_equal('%s') -> ALTER_TABLE_DATA_CHANGED", new_field->field_name)); - *need_copy_table= ALTER_TABLE_DATA_CHANGED; DBUG_RETURN(0); } // Clear indexed marker @@ -5963,7 +5964,6 @@ compare_tables(TABLE *table, { DBUG_PRINT("info", ("check_if_incompatible_data() -> " "ALTER_TABLE_DATA_CHANGED")); - *need_copy_table= ALTER_TABLE_DATA_CHANGED; DBUG_RETURN(0); } === modified file 'sql/sql_view.cc' --- a/sql/sql_view.cc 2010-03-04 08:03:07 +0000 +++ b/sql/sql_view.cc 2010-03-30 12:36:49 +0000 @@ -1034,10 +1034,12 @@ bool mysql_make_view(THD *thd, File_pars bool parse_status; bool result, view_is_mergeable; TABLE_LIST *UNINIT_VAR(view_main_select_tables); - DBUG_ENTER("mysql_make_view"); DBUG_PRINT("info", ("table: 0x%lx (%s)", (ulong) table, table->table_name)); + LINT_INIT(parse_status); + LINT_INIT(view_select); + if (table->view) { /* === modified file 'sql/sql_yacc.yy' --- a/sql/sql_yacc.yy 2010-03-29 15:13:53 +0000 +++ b/sql/sql_yacc.yy 2010-04-01 09:04:26 +0000 @@ -2342,6 +2342,7 @@ sp_init_param: lex->interval_list.empty(); lex->uint_geom_type= 0; + lex->vcol_info= 0; } ; @@ -8190,7 +8191,7 @@ function_call_generic: builder= find_qualified_function_builder(thd); DBUG_ASSERT(builder); - item= builder->create(thd, $1, $3, true, $5); + item= builder->create_with_db(thd, $1, $3, true, $5); if (! ($$= item)) { === modified file 'storage/archive/ha_archive.cc' --- a/storage/archive/ha_archive.cc 2010-03-04 08:03:07 +0000 +++ b/storage/archive/ha_archive.cc 2010-04-01 14:34:51 +0000 @@ -1655,4 +1655,21 @@ mysql_declare_plugin(archive) NULL /* config options */ } mysql_declare_plugin_end; +maria_declare_plugin(archive) +{ + MYSQL_STORAGE_ENGINE_PLUGIN, + &archive_storage_engine, + "ARCHIVE", + "Brian Aker, MySQL AB", + "Archive storage engine", + PLUGIN_LICENSE_GPL, + archive_db_init, /* Plugin Init */ + archive_db_done, /* Plugin Deinit */ + 0x0300 /* 3.0 */, + NULL, /* status variables */ + NULL, /* system variables */ + "1.0", /* string version */ + MariaDB_PLUGIN_MATURITY_STABLE /* maturity */ +} +maria_declare_plugin_end; === modified file 'storage/blackhole/ha_blackhole.cc' --- a/storage/blackhole/ha_blackhole.cc 2009-10-16 10:29:42 +0000 +++ b/storage/blackhole/ha_blackhole.cc 2010-04-01 14:34:51 +0000 @@ -369,3 +369,20 @@ mysql_declare_plugin(blackhole) NULL /* config options */ } mysql_declare_plugin_end; +maria_declare_plugin(blackhole) +{ + MYSQL_STORAGE_ENGINE_PLUGIN, + &blackhole_storage_engine, + "BLACKHOLE", + "MySQL AB", + "/dev/null storage engine (anything you write to it disappears)", + PLUGIN_LICENSE_GPL, + blackhole_init, /* Plugin Init */ + blackhole_fini, /* Plugin Deinit */ + 0x0100 /* 1.0 */, + NULL, /* status variables */ + NULL, /* system variables */ + "1.0", /* string version */ + MariaDB_PLUGIN_MATURITY_STABLE /* maturity */ +} +maria_declare_plugin_end; === modified file 'storage/csv/ha_tina.cc' --- a/storage/csv/ha_tina.cc 2009-12-03 11:19:05 +0000 +++ b/storage/csv/ha_tina.cc 2010-04-01 14:34:51 +0000 @@ -1636,4 +1636,20 @@ mysql_declare_plugin(csv) NULL /* config options */ } mysql_declare_plugin_end; - +maria_declare_plugin(csv) +{ + MYSQL_STORAGE_ENGINE_PLUGIN, + &csv_storage_engine, + "CSV", + "Brian Aker, MySQL AB", + "CSV storage engine", + PLUGIN_LICENSE_GPL, + tina_init_func, /* Plugin Init */ + tina_done_func, /* Plugin Deinit */ + 0x0100 /* 1.0 */, + NULL, /* status variables */ + NULL, /* system variables */ + "1.0", /* string version */ + MariaDB_PLUGIN_MATURITY_STABLE /* maturity */ +} +maria_declare_plugin_end; === modified file 'storage/example/ha_example.cc' --- a/storage/example/ha_example.cc 2010-03-03 14:44:14 +0000 +++ b/storage/example/ha_example.cc 2010-04-01 14:34:51 +0000 @@ -924,3 +924,20 @@ mysql_declare_plugin(example) NULL /* config options */ } mysql_declare_plugin_end; +maria_declare_plugin(example) +{ + MYSQL_STORAGE_ENGINE_PLUGIN, + &example_storage_engine, + "EXAMPLE", + "Brian Aker, MySQL AB", + "Example storage engine", + PLUGIN_LICENSE_GPL, + example_init_func, /* Plugin Init */ + example_done_func, /* Plugin Deinit */ + 0x0001 /* 0.1 */, + func_status, /* status variables */ + example_system_variables, /* system variables */ + "0.1", /* string version */ + MariaDB_PLUGIN_MATURITY_EXPERIMENTAL /* maturity */ +} +maria_declare_plugin_end; === modified file 'storage/example/ha_example.h' --- a/storage/example/ha_example.h 2007-08-13 13:11:25 +0000 +++ b/storage/example/ha_example.h 2010-03-28 18:10:00 +0000 @@ -155,7 +155,8 @@ public: /** @brief This method will never be called if you do not implement indexes. */ - virtual double read_time(ha_rows rows) { return (double) rows / 20.0+1; } + virtual double read_time(uint index, uint ranges, ha_rows rows) + { return (double) rows / 20.0+1; } /* Everything below are methods that we implement in ha_example.cc. === modified file 'storage/federated/ha_federated.cc' --- a/storage/federated/ha_federated.cc 2009-09-07 20:50:10 +0000 +++ b/storage/federated/ha_federated.cc 2010-04-01 14:34:51 +0000 @@ -3379,3 +3379,20 @@ mysql_declare_plugin(federated) NULL /* config options */ } mysql_declare_plugin_end; +maria_declare_plugin(federated) +{ + MYSQL_STORAGE_ENGINE_PLUGIN, + &federated_storage_engine, + "FEDERATED", + "Patrick Galbraith and Brian Aker, MySQL AB", + "Federated MySQL storage engine", + PLUGIN_LICENSE_GPL, + federated_db_init, /* Plugin Init */ + federated_done, /* Plugin Deinit */ + 0x0100 /* 1.0 */, + NULL, /* status variables */ + NULL, /* system variables */ + "1.0", /* string version */ + MariaDB_PLUGIN_MATURITY_BETA /* maturity */ +} +maria_declare_plugin_end; === modified file 'storage/federatedx/ha_federatedx.cc' --- a/storage/federatedx/ha_federatedx.cc 2010-03-10 10:32:14 +0000 +++ b/storage/federatedx/ha_federatedx.cc 2010-04-01 14:34:51 +0000 @@ -3505,9 +3505,26 @@ mysql_declare_plugin(federated) PLUGIN_LICENSE_GPL, federatedx_db_init, /* Plugin Init */ federatedx_done, /* Plugin Deinit */ - 0x0100 /* 1.0 */, + 0x0200 /* 2.0 */, NULL, /* status variables */ NULL, /* system variables */ NULL /* config options */ } mysql_declare_plugin_end; +maria_declare_plugin(federated) +{ + MYSQL_STORAGE_ENGINE_PLUGIN, + &federatedx_storage_engine, + "FEDERATED", + "Patrick Galbraith", + "FederatedX pluggable storage engine", + PLUGIN_LICENSE_GPL, + federatedx_db_init, /* Plugin Init */ + federatedx_done, /* Plugin Deinit */ + 0x0200 /* 2.0 */, + NULL, /* status variables */ + NULL, /* system variables */ + "2.0", /* string version */ + MariaDB_PLUGIN_MATURITY_BETA /* maturity */ +} +maria_declare_plugin_end; === modified file 'storage/heap/ha_heap.cc' --- a/storage/heap/ha_heap.cc 2009-09-07 20:50:10 +0000 +++ b/storage/heap/ha_heap.cc 2010-04-01 14:34:51 +0000 @@ -767,3 +767,20 @@ mysql_declare_plugin(heap) NULL /* config options */ } mysql_declare_plugin_end; +maria_declare_plugin(heap) +{ + MYSQL_STORAGE_ENGINE_PLUGIN, + &heap_storage_engine, + "MEMORY", + "MySQL AB", + "Hash based, stored in memory, useful for temporary tables", + PLUGIN_LICENSE_GPL, + heap_init, + NULL, + 0x0100, /* 1.0 */ + NULL, /* status variables */ + NULL, /* system variables */ + "1.0", /* string version */ + MariaDB_PLUGIN_MATURITY_STABLE /* maturity */ +} +maria_declare_plugin_end; === modified file 'storage/ibmdb2i/ha_ibmdb2i.cc' --- a/storage/ibmdb2i/ha_ibmdb2i.cc 2009-12-11 07:01:16 +0000 +++ b/storage/ibmdb2i/ha_ibmdb2i.cc 2010-04-01 14:34:51 +0000 @@ -3357,3 +3357,20 @@ mysql_declare_plugin(ibmdb2i) NULL /* config options */ } mysql_declare_plugin_end; +maria_declare_plugin(ibmdb2i) +{ + MYSQL_STORAGE_ENGINE_PLUGIN, + &ibmdb2i_storage_engine, + "IBMDB2I", + "The IBM development team in Rochester, Minnesota", + "IBM DB2 for i Storage Engine", + PLUGIN_LICENSE_GPL, + ibmdb2i_init_func, /* Plugin Init */ + ibmdb2i_done_func, /* Plugin Deinit */ + 0x0100 /* 1.0 */, + NULL, /* status variables */ + ibmdb2i_system_variables, /* system variables */ + "1.0", /* string version */ + MariaDB_PLUGIN_MATURITY_UNKNOWN /* maturity */ +} +maria_declare_plugin_end; === modified file 'storage/innobase/handler/ha_innodb.cc' --- a/storage/innobase/handler/ha_innodb.cc 2010-03-15 11:51:23 +0000 +++ b/storage/innobase/handler/ha_innodb.cc 2010-04-01 14:34:51 +0000 @@ -8930,6 +8930,23 @@ mysql_declare_plugin(innobase) NULL /* reserved */ } mysql_declare_plugin_end; +maria_declare_plugin(innobase) +{ + MYSQL_STORAGE_ENGINE_PLUGIN, + &innobase_storage_engine, + innobase_hton_name, + "Innobase OY", + "Supports transactions, row-level locking, and foreign keys", + PLUGIN_LICENSE_GPL, + innobase_init, /* Plugin Init */ + NULL, /* Plugin Deinit */ + 0x0100 /* 1.0 */, + innodb_status_variables_export, /* status variables */ + innobase_system_variables, /* system variables */ + "1.0", /* string version */ + MariaDB_PLUGIN_MATURITY_STABLE, /* maturity */ +} +maria_declare_plugin_end; /** @brief Initialize the default value of innodb_commit_concurrency. === modified file 'storage/innodb_plugin/handler/i_s.cc' --- a/storage/innodb_plugin/handler/i_s.cc 2009-10-12 12:00:56 +0000 +++ b/storage/innodb_plugin/handler/i_s.cc 2010-04-01 14:34:51 +0000 @@ -455,6 +455,59 @@ UNIV_INTERN struct st_mysql_plugin i_s_i STRUCT_FLD(__reserved1, NULL) }; +UNIV_INTERN struct st_maria_plugin i_s_innodb_trx_maria = +{ + /* the plugin type (a MYSQL_XXX_PLUGIN value) */ + /* int */ + STRUCT_FLD(type, MYSQL_INFORMATION_SCHEMA_PLUGIN), + + /* pointer to type-specific plugin descriptor */ + /* void* */ + STRUCT_FLD(info, &i_s_info), + + /* plugin name */ + /* const char* */ + STRUCT_FLD(name, "INNODB_TRX"), + + /* plugin author (for SHOW PLUGINS) */ + /* const char* */ + STRUCT_FLD(author, plugin_author), + + /* general descriptive text (for SHOW PLUGINS) */ + /* const char* */ + STRUCT_FLD(descr, "InnoDB transactions"), + + /* the plugin license (PLUGIN_LICENSE_XXX) */ + /* int */ + STRUCT_FLD(license, PLUGIN_LICENSE_GPL), + + /* the function to invoke when plugin is loaded */ + /* int (*)(void*); */ + STRUCT_FLD(init, innodb_trx_init), + + /* the function to invoke when plugin is unloaded */ + /* int (*)(void*); */ + STRUCT_FLD(deinit, i_s_common_deinit), + + /* plugin version (for SHOW PLUGINS) */ + /* unsigned int */ + STRUCT_FLD(version, INNODB_VERSION_SHORT), + + /* struct st_mysql_show_var* */ + STRUCT_FLD(status_vars, NULL), + + /* struct st_mysql_sys_var** */ + STRUCT_FLD(system_vars, NULL), + + /* string version */ + /* const char * */ + STRUCT_FLD(version_info, "1.0"), + + /* Maturity */ + /* int */ + STRUCT_FLD(maturity, MariaDB_PLUGIN_MATURITY_STABLE) +}; + /* Fields of the dynamic table INFORMATION_SCHEMA.innodb_locks */ static ST_FIELD_INFO innodb_locks_fields_info[] = { @@ -730,6 +783,59 @@ UNIV_INTERN struct st_mysql_plugin i_s_i STRUCT_FLD(__reserved1, NULL) }; +UNIV_INTERN struct st_maria_plugin i_s_innodb_locks_maria = +{ + /* the plugin type (a MYSQL_XXX_PLUGIN value) */ + /* int */ + STRUCT_FLD(type, MYSQL_INFORMATION_SCHEMA_PLUGIN), + + /* pointer to type-specific plugin descriptor */ + /* void* */ + STRUCT_FLD(info, &i_s_info), + + /* plugin name */ + /* const char* */ + STRUCT_FLD(name, "INNODB_LOCKS"), + + /* plugin author (for SHOW PLUGINS) */ + /* const char* */ + STRUCT_FLD(author, plugin_author), + + /* general descriptive text (for SHOW PLUGINS) */ + /* const char* */ + STRUCT_FLD(descr, "InnoDB conflicting locks"), + + /* the plugin license (PLUGIN_LICENSE_XXX) */ + /* int */ + STRUCT_FLD(license, PLUGIN_LICENSE_GPL), + + /* the function to invoke when plugin is loaded */ + /* int (*)(void*); */ + STRUCT_FLD(init, innodb_locks_init), + + /* the function to invoke when plugin is unloaded */ + /* int (*)(void*); */ + STRUCT_FLD(deinit, i_s_common_deinit), + + /* plugin version (for SHOW PLUGINS) */ + /* unsigned int */ + STRUCT_FLD(version, INNODB_VERSION_SHORT), + + /* struct st_mysql_show_var* */ + STRUCT_FLD(status_vars, NULL), + + /* struct st_mysql_sys_var** */ + STRUCT_FLD(system_vars, NULL), + + /* string version */ + /* const char * */ + STRUCT_FLD(version_info, "1.0"), + + /* Maturity */ + /* int */ + STRUCT_FLD(maturity, MariaDB_PLUGIN_MATURITY_STABLE) +}; + /* Fields of the dynamic table INFORMATION_SCHEMA.innodb_lock_waits */ static ST_FIELD_INFO innodb_lock_waits_fields_info[] = { @@ -913,6 +1019,59 @@ UNIV_INTERN struct st_mysql_plugin i_s_i STRUCT_FLD(__reserved1, NULL) }; +UNIV_INTERN struct st_maria_plugin i_s_innodb_lock_waits_maria = +{ + /* the plugin type (a MYSQL_XXX_PLUGIN value) */ + /* int */ + STRUCT_FLD(type, MYSQL_INFORMATION_SCHEMA_PLUGIN), + + /* pointer to type-specific plugin descriptor */ + /* void* */ + STRUCT_FLD(info, &i_s_info), + + /* plugin name */ + /* const char* */ + STRUCT_FLD(name, "INNODB_LOCK_WAITS"), + + /* plugin author (for SHOW PLUGINS) */ + /* const char* */ + STRUCT_FLD(author, "Innobase Oy"), + + /* general descriptive text (for SHOW PLUGINS) */ + /* const char* */ + STRUCT_FLD(descr, "InnoDB which lock is blocking which"), + + /* the plugin license (PLUGIN_LICENSE_XXX) */ + /* int */ + STRUCT_FLD(license, PLUGIN_LICENSE_GPL), + + /* the function to invoke when plugin is loaded */ + /* int (*)(void*); */ + STRUCT_FLD(init, innodb_lock_waits_init), + + /* the function to invoke when plugin is unloaded */ + /* int (*)(void*); */ + STRUCT_FLD(deinit, i_s_common_deinit), + + /* plugin version (for SHOW PLUGINS) */ + /* unsigned int */ + STRUCT_FLD(version, INNODB_VERSION_SHORT), + + /* struct st_mysql_show_var* */ + STRUCT_FLD(status_vars, NULL), + + /* struct st_mysql_sys_var** */ + STRUCT_FLD(system_vars, NULL), + + /* string version */ + /* const char * */ + STRUCT_FLD(version_info, "1.0"), + + /* Maturity */ + /* int */ + STRUCT_FLD(maturity, MariaDB_PLUGIN_MATURITY_STABLE) +}; + /*******************************************************************//** Common function to fill any of the dynamic tables: INFORMATION_SCHEMA.innodb_trx @@ -1245,6 +1404,59 @@ UNIV_INTERN struct st_mysql_plugin i_s_i STRUCT_FLD(__reserved1, NULL) }; +UNIV_INTERN struct st_mysql_plugin i_s_innodb_cmp_maria = +{ + /* the plugin type (a MYSQL_XXX_PLUGIN value) */ + /* int */ + STRUCT_FLD(type, MYSQL_INFORMATION_SCHEMA_PLUGIN), + + /* pointer to type-specific plugin descriptor */ + /* void* */ + STRUCT_FLD(info, &i_s_info), + + /* plugin name */ + /* const char* */ + STRUCT_FLD(name, "INNODB_CMP"), + + /* plugin author (for SHOW PLUGINS) */ + /* const char* */ + STRUCT_FLD(author, plugin_author), + + /* general descriptive text (for SHOW PLUGINS) */ + /* const char* */ + STRUCT_FLD(descr, "Statistics for the InnoDB compression"), + + /* the plugin license (PLUGIN_LICENSE_XXX) */ + /* int */ + STRUCT_FLD(license, PLUGIN_LICENSE_GPL), + + /* the function to invoke when plugin is loaded */ + /* int (*)(void*); */ + STRUCT_FLD(init, i_s_cmp_init), + + /* the function to invoke when plugin is unloaded */ + /* int (*)(void*); */ + STRUCT_FLD(deinit, i_s_common_deinit), + + /* plugin version (for SHOW PLUGINS) */ + /* unsigned int */ + STRUCT_FLD(version, INNODB_VERSION_SHORT), + + /* struct st_mysql_show_var* */ + STRUCT_FLD(status_vars, NULL), + + /* struct st_mysql_sys_var** */ + STRUCT_FLD(system_vars, NULL), + + /* string version */ + /* const char * */ + STRUCT_FLD(version_info, "1.0"), + + /* Maturity */ + /* int */ + STRUCT_FLD(maturity, MariaDB_PLUGIN_MATURITY_STABLE) +}; + UNIV_INTERN struct st_mysql_plugin i_s_innodb_cmp_reset = { /* the plugin type (a MYSQL_XXX_PLUGIN value) */ @@ -1295,6 +1507,60 @@ UNIV_INTERN struct st_mysql_plugin i_s_i STRUCT_FLD(__reserved1, NULL) }; +UNIV_INTERN struct st_maria_plugin i_s_innodb_cmp_reset_maria = +{ + /* the plugin type (a MYSQL_XXX_PLUGIN value) */ + /* int */ + STRUCT_FLD(type, MYSQL_INFORMATION_SCHEMA_PLUGIN), + + /* pointer to type-specific plugin descriptor */ + /* void* */ + STRUCT_FLD(info, &i_s_info), + + /* plugin name */ + /* const char* */ + STRUCT_FLD(name, "INNODB_CMP_RESET"), + + /* plugin author (for SHOW PLUGINS) */ + /* const char* */ + STRUCT_FLD(author, plugin_author), + + /* general descriptive text (for SHOW PLUGINS) */ + /* const char* */ + STRUCT_FLD(descr, "Statistics for the InnoDB compression;" + " reset cumulated counts"), + + /* the plugin license (PLUGIN_LICENSE_XXX) */ + /* int */ + STRUCT_FLD(license, PLUGIN_LICENSE_GPL), + + /* the function to invoke when plugin is loaded */ + /* int (*)(void*); */ + STRUCT_FLD(init, i_s_cmp_reset_init), + + /* the function to invoke when plugin is unloaded */ + /* int (*)(void*); */ + STRUCT_FLD(deinit, i_s_common_deinit), + + /* plugin version (for SHOW PLUGINS) */ + /* unsigned int */ + STRUCT_FLD(version, INNODB_VERSION_SHORT), + + /* struct st_mysql_show_var* */ + STRUCT_FLD(status_vars, NULL), + + /* struct st_mysql_sys_var** */ + STRUCT_FLD(system_vars, NULL), + + /* string version */ + /* const char * */ + STRUCT_FLD(version_info, "1.0"), + + /* Maturity */ + /* int */ + STRUCT_FLD(maturity, MariaDB_PLUGIN_MATURITY_STABLE) +}; + /* Fields of the dynamic table information_schema.innodb_cmpmem. */ static ST_FIELD_INFO i_s_cmpmem_fields_info[] = { @@ -1511,6 +1777,59 @@ UNIV_INTERN struct st_mysql_plugin i_s_i STRUCT_FLD(__reserved1, NULL) }; +UNIV_INTERN struct st_maria_plugin i_s_innodb_cmpmem_maria = +{ + /* the plugin type (a MYSQL_XXX_PLUGIN value) */ + /* int */ + STRUCT_FLD(type, MYSQL_INFORMATION_SCHEMA_PLUGIN), + + /* pointer to type-specific plugin descriptor */ + /* void* */ + STRUCT_FLD(info, &i_s_info), + + /* plugin name */ + /* const char* */ + STRUCT_FLD(name, "INNODB_CMPMEM"), + + /* plugin author (for SHOW PLUGINS) */ + /* const char* */ + STRUCT_FLD(author, plugin_author), + + /* general descriptive text (for SHOW PLUGINS) */ + /* const char* */ + STRUCT_FLD(descr, "Statistics for the InnoDB compressed buffer pool"), + + /* the plugin license (PLUGIN_LICENSE_XXX) */ + /* int */ + STRUCT_FLD(license, PLUGIN_LICENSE_GPL), + + /* the function to invoke when plugin is loaded */ + /* int (*)(void*); */ + STRUCT_FLD(init, i_s_cmpmem_init), + + /* the function to invoke when plugin is unloaded */ + /* int (*)(void*); */ + STRUCT_FLD(deinit, i_s_common_deinit), + + /* plugin version (for SHOW PLUGINS) */ + /* unsigned int */ + STRUCT_FLD(version, INNODB_VERSION_SHORT), + + /* struct st_mysql_show_var* */ + STRUCT_FLD(status_vars, NULL), + + /* struct st_mysql_sys_var** */ + STRUCT_FLD(system_vars, NULL), + + /* string version */ + /* const char * */ + STRUCT_FLD(version_info, "1.0"), + + /* Maturity */ + /* int */ + STRUCT_FLD(maturity, MariaDB_PLUGIN_MATURITY_STABLE) +}; + UNIV_INTERN struct st_mysql_plugin i_s_innodb_cmpmem_reset = { /* the plugin type (a MYSQL_XXX_PLUGIN value) */ @@ -1561,6 +1880,60 @@ UNIV_INTERN struct st_mysql_plugin i_s_i STRUCT_FLD(__reserved1, NULL) }; +UNIV_INTERN struct st_maria_plugin i_s_innodb_cmpmem_reset_maria = +{ + /* the plugin type (a MYSQL_XXX_PLUGIN value) */ + /* int */ + STRUCT_FLD(type, MYSQL_INFORMATION_SCHEMA_PLUGIN), + + /* pointer to type-specific plugin descriptor */ + /* void* */ + STRUCT_FLD(info, &i_s_info), + + /* plugin name */ + /* const char* */ + STRUCT_FLD(name, "INNODB_CMPMEM_RESET"), + + /* plugin author (for SHOW PLUGINS) */ + /* const char* */ + STRUCT_FLD(author, plugin_author), + + /* general descriptive text (for SHOW PLUGINS) */ + /* const char* */ + STRUCT_FLD(descr, "Statistics for the InnoDB compressed buffer pool;" + " reset cumulated counts"), + + /* the plugin license (PLUGIN_LICENSE_XXX) */ + /* int */ + STRUCT_FLD(license, PLUGIN_LICENSE_GPL), + + /* the function to invoke when plugin is loaded */ + /* int (*)(void*); */ + STRUCT_FLD(init, i_s_cmpmem_reset_init), + + /* the function to invoke when plugin is unloaded */ + /* int (*)(void*); */ + STRUCT_FLD(deinit, i_s_common_deinit), + + /* plugin version (for SHOW PLUGINS) */ + /* unsigned int */ + STRUCT_FLD(version, INNODB_VERSION_SHORT), + + /* struct st_mysql_show_var* */ + STRUCT_FLD(status_vars, NULL), + + /* struct st_mysql_sys_var** */ + STRUCT_FLD(system_vars, NULL), + + /* string version */ + /* const char * */ + STRUCT_FLD(version_info, "1.0"), + + /* Maturity */ + /* int */ + STRUCT_FLD(maturity, MariaDB_PLUGIN_MATURITY_STABLE) +}; + /*******************************************************************//** Unbind a dynamic INFORMATION_SCHEMA table. @return 0 on success */ === modified file 'storage/maria/ha_maria.cc' --- a/storage/maria/ha_maria.cc 2010-03-15 11:51:23 +0000 +++ b/storage/maria/ha_maria.cc 2010-04-01 14:34:51 +0000 @@ -3471,9 +3471,26 @@ mysql_declare_plugin(maria) PLUGIN_LICENSE_GPL, ha_maria_init, /* Plugin Init */ NULL, /* Plugin Deinit */ - 0x0100, /* 1.0 */ + 0x0105, /* 1.5 */ status_variables, /* status variables */ system_variables, /* system variables */ NULL } mysql_declare_plugin_end; +maria_declare_plugin(maria) +{ + MYSQL_STORAGE_ENGINE_PLUGIN, + &maria_storage_engine, + "MARIA", + "MySQL AB", + "Crash-safe tables with MyISAM heritage", + PLUGIN_LICENSE_GPL, + ha_maria_init, /* Plugin Init */ + NULL, /* Plugin Deinit */ + 0x0105, /* 1.5 */ + status_variables, /* status variables */ + system_variables, /* system variables */ + "1.5", /* string version */ + MariaDB_PLUGIN_MATURITY_GAMMA /* maturity */ +} +maria_declare_plugin_end; === modified file 'storage/maria/ma_loghandler.c' --- a/storage/maria/ma_loghandler.c 2010-03-30 12:35:15 +0000 +++ b/storage/maria/ma_loghandler.c 2010-04-02 09:20:09 +0000 @@ -1275,7 +1275,10 @@ static my_bool translog_set_lsn_for_file { LOGHANDLER_FILE_INFO info; File fd= open_logfile_by_number_no_cache(file); + LINT_INIT_STRUCT(info); + LINT_INIT(info.max_lsn); + if ((fd < 0) || ((translog_read_file_header(&info, fd) || (cmp_translog_addr(lsn, info.max_lsn) > 0 && @@ -3968,6 +3971,7 @@ my_bool translog_init_with_table(const c { LOGHANDLER_FILE_INFO info; LINT_INIT_STRUCT(info); + /* Accessing &log_descriptor.open_files without mutex is safe because it is initialization === modified file 'storage/maria/ma_search.c' --- a/storage/maria/ma_search.c 2010-03-15 11:51:23 +0000 +++ b/storage/maria/ma_search.c 2010-04-01 09:04:26 +0000 @@ -76,8 +76,8 @@ int _ma_search(register MARIA_HA *info, bmove512(info->keyread_buff, page_buff, info->s->block_size); /* Save position for a possible read next / previous */ - info->int_keypos= info->keyread_buff + (ulonglong) info->int_keypos; - info->int_maxpos= info->keyread_buff + (ulonglong) info->int_maxpos; + info->int_keypos= info->keyread_buff + info->keypos_offset; + info->int_maxpos= info->keyread_buff + info->maxpos_offset; info->int_keytree_version= key->keyinfo->version; info->last_search_keypage= info->last_keypage; info->page_changed= 0; @@ -214,8 +214,8 @@ static int _ma_search_no_save(register M info->cur_row.trid= _ma_trid_from_key(&info->last_key); /* Store offset to key */ - info->int_keypos= (uchar*) (keypos - page.buff); - info->int_maxpos= (uchar*) (maxpos - page.buff); + info->keypos_offset= (uint) (keypos - page.buff); + info->maxpos_offset= (uint) (maxpos - page.buff); info->int_nod_flag= nod_flag; info->last_keypage= pos; *res_page_link= page_link; === modified file 'storage/maria/maria_def.h' --- a/storage/maria/maria_def.h 2010-03-09 19:22:24 +0000 +++ b/storage/maria/maria_def.h 2010-03-28 18:10:00 +0000 @@ -506,8 +506,10 @@ struct st_maria_handler uchar *first_mbr_key; /* Searhed spatial key */ uchar *rec_buff; /* Temp buffer for recordpack */ uchar *blob_buff; /* Temp buffer for blobs */ - uchar *int_keypos, /* Save position for next/previous */ - *int_maxpos; /* -""- */ + uchar *int_keypos; /* Save position for next/previous */ + uchar *int_maxpos; /* -""- */ + uint keypos_offset; /* Tmp storage for offset int_keypos */ + uint maxpos_offset; /* Tmp storage for offset int_maxpos */ uchar *update_field_data; /* Used by update in rows-in-block */ uint int_nod_flag; /* -""- */ uint32 int_keytree_version; /* -""- */ === modified file 'storage/myisam/ft_stopwords.c' --- a/storage/myisam/ft_stopwords.c 2010-03-10 10:32:14 +0000 +++ b/storage/myisam/ft_stopwords.c 2010-03-28 18:10:00 +0000 @@ -44,9 +44,10 @@ static void FT_STOPWORD_free(FT_STOPWORD static int ft_add_stopword(const char *w) { FT_STOPWORD sw; - return !w || - (((sw.len= (uint) strlen(sw.pos=(const uchar *)w)) >= ft_min_word_len) && - (tree_insert(stopwords3, &sw, 0, stopwords3->custom_arg)==NULL)); + return (!w || + (((sw.len= (uint) strlen((char*) (sw.pos=(const uchar *)w))) >= + ft_min_word_len) && + (tree_insert(stopwords3, &sw, 0, stopwords3->custom_arg)==NULL))); } int ft_init_stopwords() === modified file 'storage/myisam/ha_myisam.cc' --- a/storage/myisam/ha_myisam.cc 2010-01-04 17:54:42 +0000 +++ b/storage/myisam/ha_myisam.cc 2010-04-01 14:34:51 +0000 @@ -2174,6 +2174,23 @@ mysql_declare_plugin(myisam) NULL /* config options */ } mysql_declare_plugin_end; +maria_declare_plugin(myisam) +{ + MYSQL_STORAGE_ENGINE_PLUGIN, + &myisam_storage_engine, + "MyISAM", + "MySQL AB", + "Default engine as of MySQL 3.23 with great performance", + PLUGIN_LICENSE_GPL, + myisam_init, /* Plugin Init */ + NULL, /* Plugin Deinit */ + 0x0100, /* 1.0 */ + NULL, /* status variables */ + NULL, /* system variables */ + "1.0", /* string version */ + MariaDB_PLUGIN_MATURITY_STABLE /* maturity */ +} +maria_declare_plugin_end; #ifdef HAVE_QUERY_CACHE === modified file 'storage/myisammrg/ha_myisammrg.cc' --- a/storage/myisammrg/ha_myisammrg.cc 2010-03-04 08:03:07 +0000 +++ b/storage/myisammrg/ha_myisammrg.cc 2010-04-01 14:34:51 +0000 @@ -382,7 +382,7 @@ static MI_INFO *myisammrg_attach_childre my_errno= HA_ERR_WRONG_MRG_TABLE_DEF; } DBUG_PRINT("myrg", ("MyISAM handle: 0x%lx my_errno: %d", - my_errno ? NULL : (long) myisam, my_errno)); + my_errno ? 0L : (long) myisam, my_errno)); err: DBUG_RETURN(my_errno ? NULL : myisam); @@ -1289,3 +1289,20 @@ mysql_declare_plugin(myisammrg) NULL /* config options */ } mysql_declare_plugin_end; +maria_declare_plugin(myisammrg) +{ + MYSQL_STORAGE_ENGINE_PLUGIN, + &myisammrg_storage_engine, + "MRG_MYISAM", + "MySQL AB", + "Collection of identical MyISAM tables", + PLUGIN_LICENSE_GPL, + myisammrg_init, /* Plugin Init */ + NULL, /* Plugin Deinit */ + 0x0100, /* 1.0 */ + NULL, /* status variables */ + NULL, /* system variables */ + "1.0", /* string version */ + MariaDB_PLUGIN_MATURITY_STABLE /* maturity */ +} +maria_declare_plugin_end; === modified file 'storage/myisammrg/myrg_open.c' --- a/storage/myisammrg/myrg_open.c 2009-09-23 13:21:29 +0000 +++ b/storage/myisammrg/myrg_open.c 2010-03-30 12:36:49 +0000 @@ -239,6 +239,7 @@ MYRG_INFO *myrg_parent_open(const char * rc= 1; errpos= 0; bzero((char*) &file_cache, sizeof(file_cache)); + LINT_INIT(m_info); /* Open MERGE meta file. */ if ((fd= my_open(fn_format(parent_name_buff, parent_name, "", MYRG_NAME_EXT, === modified file 'storage/pbxt/src/ha_pbxt.cc' --- a/storage/pbxt/src/ha_pbxt.cc 2010-03-31 18:37:45 +0000 +++ b/storage/pbxt/src/ha_pbxt.cc 2010-04-01 14:34:51 +0000 @@ -5919,6 +5919,40 @@ mysql_declare_plugin(pbxt) drizzle_declare_plugin_end; #else mysql_declare_plugin_end; +#ifdef MARIADB_BASE_VERSION +maria_declare_plugin(pbxt) +{ /* PBXT */ + MYSQL_STORAGE_ENGINE_PLUGIN, + &pbxt_storage_engine, + "PBXT", + "Paul McCullagh, PrimeBase Technologies GmbH", + "High performance, multi-versioning transactional engine", + PLUGIN_LICENSE_GPL, + pbxt_init, /* Plugin Init */ + pbxt_end, /* Plugin Deinit */ + 0x0001 /* 0.1 */, + NULL, /* status variables */ + pbxt_system_variables, /* system variables */ + "1.0.09g RC3", /* string version */ + MariaDB_PLUGIN_MATURITY_GAMMA /* maturity */ +}, +{ /* PBXT_STATISTICS */ + MYSQL_INFORMATION_SCHEMA_PLUGIN, + &pbxt_statitics, + "PBXT_STATISTICS", + "Paul McCullagh, PrimeBase Technologies GmbH", + "PBXT internal system statitics", + PLUGIN_LICENSE_GPL, + pbxt_init_statistics, /* plugin init */ + pbxt_exit_statistics, /* plugin deinit */ + 0x0005, + NULL, /* status variables */ + NULL, /* system variables */ + "1.0.09g RC3", /* string version */ + MariaDB_PLUGIN_MATURITY_GAMMA /* maturity */ +} +maria_declare_plugin_end; +#endif #endif #if defined(XT_WIN) && defined(XT_COREDUMP) === modified file 'storage/xtradb/handler/ha_innodb.cc' --- a/storage/xtradb/handler/ha_innodb.cc 2010-02-01 06:14:12 +0000 +++ b/storage/xtradb/handler/ha_innodb.cc 2010-04-01 14:34:51 +0000 @@ -10818,6 +10818,39 @@ i_s_innodb_index_stats, i_s_innodb_admin_command, i_s_innodb_patches mysql_declare_plugin_end; +maria_declare_plugin(innobase) +{ /* InnoDB */ + MYSQL_STORAGE_ENGINE_PLUGIN, + &innobase_storage_engine, + innobase_hton_name, + "Innobase Oy", + "Supports transactions, row-level locking, and foreign keys", + PLUGIN_LICENSE_GPL, + innobase_init, /* Plugin Init */ + NULL, /* Plugin Deinit */ + INNODB_VERSION_SHORT, + innodb_status_variables_export,/* status variables */ + innobase_system_variables, /* system variables */ + INNODB_VERSION_STR, /* string version */ + MariaDB_PLUGIN_MATURITY_STABLE /* maturity */ +}, +i_s_innodb_rseg_maria, +i_s_innodb_buffer_pool_pages_maria, +i_s_innodb_buffer_pool_pages_index_maria, +i_s_innodb_buffer_pool_pages_blob_maria, +i_s_innodb_trx_maria, +i_s_innodb_locks_maria, +i_s_innodb_lock_waits_maria, +i_s_innodb_cmp_maria, +i_s_innodb_cmp_reset_maria, +i_s_innodb_cmpmem_maria, +i_s_innodb_cmpmem_reset_maria, +i_s_innodb_table_stats_maria, +i_s_innodb_index_stats_maria, +i_s_innodb_admin_command_maria, +i_s_innodb_patches_maria +maria_declare_plugin_end; + /** @brief Initialize the default value of innodb_commit_concurrency. === modified file 'storage/xtradb/handler/i_s.cc' --- a/storage/xtradb/handler/i_s.cc 2010-01-28 11:35:10 +0000 +++ b/storage/xtradb/handler/i_s.cc 2010-04-01 14:34:51 +0000 @@ -393,6 +393,59 @@ UNIV_INTERN struct st_mysql_plugin STRUCT_FLD(__reserved1, NULL) }; +UNIV_INTERN struct st_maria_plugin i_s_innodb_patches_maria = +{ + /* the plugin type (a MYSQL_XXX_PLUGIN value) */ + /* int */ + STRUCT_FLD(type, MYSQL_INFORMATION_SCHEMA_PLUGIN), + + /* pointer to type-specific plugin descriptor */ + /* void* */ + STRUCT_FLD(info, &i_s_info), + + /* plugin name */ + /* const char* */ + STRUCT_FLD(name, "XTRADB_ENHANCEMENTS"), + + /* plugin author (for SHOW PLUGINS) */ + /* const char* */ + STRUCT_FLD(author, "Percona"), + + /* general descriptive text (for SHOW PLUGINS) */ + /* const char* */ + STRUCT_FLD(descr, "Enhancements applied to InnoDB plugin"), + + /* the plugin license (PLUGIN_LICENSE_XXX) */ + /* int */ + STRUCT_FLD(license, PLUGIN_LICENSE_GPL), + + /* the function to invoke when plugin is loaded */ + /* int (*)(void*); */ + STRUCT_FLD(init, innodb_patches_init), + + /* the function to invoke when plugin is unloaded */ + /* int (*)(void*); */ + STRUCT_FLD(deinit, i_s_common_deinit), + + /* plugin version (for SHOW PLUGINS) */ + /* unsigned int */ + STRUCT_FLD(version, INNODB_VERSION_SHORT), + + /* struct st_mysql_show_var* */ + STRUCT_FLD(status_vars, NULL), + + /* struct st_mysql_sys_var** */ + STRUCT_FLD(system_vars, NULL), + + /* string version */ + /* const char * */ + STRUCT_FLD(version_info, "1.0"), + + /* Maturity */ + /* int */ + STRUCT_FLD(maturity, MariaDB_PLUGIN_MATURITY_STABLE) +}; + static ST_FIELD_INFO i_s_innodb_buffer_pool_pages_fields_info[] = { @@ -1040,6 +1093,59 @@ UNIV_INTERN struct st_mysql_plugin i_s_i STRUCT_FLD(__reserved1, NULL) }; +UNIV_INTERN struct st_maria_plugin i_s_innodb_buffer_pool_pages_maria = +{ + /* the plugin type (a MYSQL_XXX_PLUGIN value) */ + /* int */ + STRUCT_FLD(type, MYSQL_INFORMATION_SCHEMA_PLUGIN), + + /* pointer to type-specific plugin descriptor */ + /* void* */ + STRUCT_FLD(info, &i_s_info), + + /* plugin name */ + /* const char* */ + STRUCT_FLD(name, "INNODB_BUFFER_POOL_PAGES"), + + /* plugin author (for SHOW PLUGINS) */ + /* const char* */ + STRUCT_FLD(author, plugin_author), + + /* general descriptive text (for SHOW PLUGINS) */ + /* const char* */ + STRUCT_FLD(descr, "InnoDB buffer pool pages"), + + /* the plugin license (PLUGIN_LICENSE_XXX) */ + /* int */ + STRUCT_FLD(license, PLUGIN_LICENSE_GPL), + + /* the function to invoke when plugin is loaded */ + /* int (*)(void*); */ + STRUCT_FLD(init, i_s_innodb_buffer_pool_pages_init), + + /* the function to invoke when plugin is unloaded */ + /* int (*)(void*); */ + STRUCT_FLD(deinit, i_s_common_deinit), + + /* plugin version (for SHOW PLUGINS) */ + /* unsigned int */ + STRUCT_FLD(version, 0x0100 /* 1.0 */), + + /* struct st_mysql_show_var* */ + STRUCT_FLD(status_vars, NULL), + + /* struct st_mysql_sys_var** */ + STRUCT_FLD(system_vars, NULL), + + /* string version */ + /* const char * */ + STRUCT_FLD(version_info, "1.0"), + + /* Maturity */ + /* int */ + STRUCT_FLD(maturity, MariaDB_PLUGIN_MATURITY_STABLE) +}; + UNIV_INTERN struct st_mysql_plugin i_s_innodb_buffer_pool_pages_index = { /* the plugin type (a MYSQL_XXX_PLUGIN value) */ @@ -1089,6 +1195,59 @@ UNIV_INTERN struct st_mysql_plugin i_s_i STRUCT_FLD(__reserved1, NULL) }; +UNIV_INTERN struct st_maria_plugin i_s_innodb_buffer_pool_pages_index_maria = +{ + /* the plugin type (a MYSQL_XXX_PLUGIN value) */ + /* int */ + STRUCT_FLD(type, MYSQL_INFORMATION_SCHEMA_PLUGIN), + + /* pointer to type-specific plugin descriptor */ + /* void* */ + STRUCT_FLD(info, &i_s_info), + + /* plugin name */ + /* const char* */ + STRUCT_FLD(name, "INNODB_BUFFER_POOL_PAGES_INDEX"), + + /* plugin author (for SHOW PLUGINS) */ + /* const char* */ + STRUCT_FLD(author, plugin_author), + + /* general descriptive text (for SHOW PLUGINS) */ + /* const char* */ + STRUCT_FLD(descr, "InnoDB buffer pool index pages"), + + /* the plugin license (PLUGIN_LICENSE_XXX) */ + /* int */ + STRUCT_FLD(license, PLUGIN_LICENSE_GPL), + + /* the function to invoke when plugin is loaded */ + /* int (*)(void*); */ + STRUCT_FLD(init, i_s_innodb_buffer_pool_pages_index_init), + + /* the function to invoke when plugin is unloaded */ + /* int (*)(void*); */ + STRUCT_FLD(deinit, i_s_common_deinit), + + /* plugin version (for SHOW PLUGINS) */ + /* unsigned int */ + STRUCT_FLD(version, 0x0100 /* 1.0 */), + + /* struct st_mysql_show_var* */ + STRUCT_FLD(status_vars, NULL), + + /* struct st_mysql_sys_var** */ + STRUCT_FLD(system_vars, NULL), + + /* string version */ + /* const char * */ + STRUCT_FLD(version_info, "1.0"), + + /* Maturity */ + /* int */ + STRUCT_FLD(maturity, MariaDB_PLUGIN_MATURITY_STABLE) +}; + UNIV_INTERN struct st_mysql_plugin i_s_innodb_buffer_pool_pages_blob = { /* the plugin type (a MYSQL_XXX_PLUGIN value) */ @@ -1138,6 +1297,59 @@ UNIV_INTERN struct st_mysql_plugin i_s_i STRUCT_FLD(__reserved1, NULL) }; +UNIV_INTERN struct st_maria_plugin i_s_innodb_buffer_pool_pages_blob_maria = +{ + /* the plugin type (a MYSQL_XXX_PLUGIN value) */ + /* int */ + STRUCT_FLD(type, MYSQL_INFORMATION_SCHEMA_PLUGIN), + + /* pointer to type-specific plugin descriptor */ + /* void* */ + STRUCT_FLD(info, &i_s_info), + + /* plugin name */ + /* const char* */ + STRUCT_FLD(name, "INNODB_BUFFER_POOL_PAGES_BLOB"), + + /* plugin author (for SHOW PLUGINS) */ + /* const char* */ + STRUCT_FLD(author, plugin_author), + + /* general descriptive text (for SHOW PLUGINS) */ + /* const char* */ + STRUCT_FLD(descr, "InnoDB buffer pool blob pages"), + + /* the plugin license (PLUGIN_LICENSE_XXX) */ + /* int */ + STRUCT_FLD(license, PLUGIN_LICENSE_GPL), + + /* the function to invoke when plugin is loaded */ + /* int (*)(void*); */ + STRUCT_FLD(init, i_s_innodb_buffer_pool_pages_blob_init), + + /* the function to invoke when plugin is unloaded */ + /* int (*)(void*); */ + STRUCT_FLD(deinit, i_s_common_deinit), + + /* plugin version (for SHOW PLUGINS) */ + /* unsigned int */ + STRUCT_FLD(version, 0x0100 /* 1.0 */), + + /* struct st_mysql_show_var* */ + STRUCT_FLD(status_vars, NULL), + + /* struct st_mysql_sys_var** */ + STRUCT_FLD(system_vars, NULL), + + /* string version */ + /* const char * */ + STRUCT_FLD(version_info, "1.0"), + + /* Maturity */ + /* int */ + STRUCT_FLD(maturity, MariaDB_PLUGIN_MATURITY_STABLE) +}; + /* Fields of the dynamic table INFORMATION_SCHEMA.innodb_trx */ static ST_FIELD_INFO innodb_trx_fields_info[] = @@ -1373,6 +1585,60 @@ UNIV_INTERN struct st_mysql_plugin i_s_i STRUCT_FLD(__reserved1, NULL) }; + +UNIV_INTERN struct st_maria_plugin i_s_innodb_trx_maria = +{ + /* the plugin type (a MYSQL_XXX_PLUGIN value) */ + /* int */ + STRUCT_FLD(type, MYSQL_INFORMATION_SCHEMA_PLUGIN), + + /* pointer to type-specific plugin descriptor */ + /* void* */ + STRUCT_FLD(info, &i_s_info), + + /* plugin name */ + /* const char* */ + STRUCT_FLD(name, "INNODB_TRX"), + + /* plugin author (for SHOW PLUGINS) */ + /* const char* */ + STRUCT_FLD(author, plugin_author), + + /* general descriptive text (for SHOW PLUGINS) */ + /* const char* */ + STRUCT_FLD(descr, "InnoDB transactions"), + + /* the plugin license (PLUGIN_LICENSE_XXX) */ + /* int */ + STRUCT_FLD(license, PLUGIN_LICENSE_GPL), + + /* the function to invoke when plugin is loaded */ + /* int (*)(void*); */ + STRUCT_FLD(init, innodb_trx_init), + + /* the function to invoke when plugin is unloaded */ + /* int (*)(void*); */ + STRUCT_FLD(deinit, i_s_common_deinit), + + /* plugin version (for SHOW PLUGINS) */ + /* unsigned int */ + STRUCT_FLD(version, INNODB_VERSION_SHORT), + + /* struct st_mysql_show_var* */ + STRUCT_FLD(status_vars, NULL), + + /* struct st_mysql_sys_var** */ + STRUCT_FLD(system_vars, NULL), + + /* string version */ + /* const char * */ + STRUCT_FLD(version_info, "1.0"), + + /* Maturity */ + /* int */ + STRUCT_FLD(maturity, MariaDB_PLUGIN_MATURITY_STABLE) +}; + /* Fields of the dynamic table INFORMATION_SCHEMA.innodb_locks */ static ST_FIELD_INFO innodb_locks_fields_info[] = { @@ -1648,6 +1914,59 @@ UNIV_INTERN struct st_mysql_plugin i_s_i STRUCT_FLD(__reserved1, NULL) }; +UNIV_INTERN struct st_maria_plugin i_s_innodb_locks_maria = +{ + /* the plugin type (a MYSQL_XXX_PLUGIN value) */ + /* int */ + STRUCT_FLD(type, MYSQL_INFORMATION_SCHEMA_PLUGIN), + + /* pointer to type-specific plugin descriptor */ + /* void* */ + STRUCT_FLD(info, &i_s_info), + + /* plugin name */ + /* const char* */ + STRUCT_FLD(name, "INNODB_LOCKS"), + + /* plugin author (for SHOW PLUGINS) */ + /* const char* */ + STRUCT_FLD(author, plugin_author), + + /* general descriptive text (for SHOW PLUGINS) */ + /* const char* */ + STRUCT_FLD(descr, "InnoDB conflicting locks"), + + /* the plugin license (PLUGIN_LICENSE_XXX) */ + /* int */ + STRUCT_FLD(license, PLUGIN_LICENSE_GPL), + + /* the function to invoke when plugin is loaded */ + /* int (*)(void*); */ + STRUCT_FLD(init, innodb_locks_init), + + /* the function to invoke when plugin is unloaded */ + /* int (*)(void*); */ + STRUCT_FLD(deinit, i_s_common_deinit), + + /* plugin version (for SHOW PLUGINS) */ + /* unsigned int */ + STRUCT_FLD(version, INNODB_VERSION_SHORT), + + /* struct st_mysql_show_var* */ + STRUCT_FLD(status_vars, NULL), + + /* struct st_mysql_sys_var** */ + STRUCT_FLD(system_vars, NULL), + + /* string version */ + /* const char * */ + STRUCT_FLD(version_info, "1.0"), + + /* Maturity */ + /* int */ + STRUCT_FLD(maturity, MariaDB_PLUGIN_MATURITY_STABLE) +}; + /* Fields of the dynamic table INFORMATION_SCHEMA.innodb_lock_waits */ static ST_FIELD_INFO innodb_lock_waits_fields_info[] = { @@ -1831,6 +2150,59 @@ UNIV_INTERN struct st_mysql_plugin i_s_i STRUCT_FLD(__reserved1, NULL) }; +UNIV_INTERN struct st_maria_plugin i_s_innodb_lock_waits_maria = +{ + /* the plugin type (a MYSQL_XXX_PLUGIN value) */ + /* int */ + STRUCT_FLD(type, MYSQL_INFORMATION_SCHEMA_PLUGIN), + + /* pointer to type-specific plugin descriptor */ + /* void* */ + STRUCT_FLD(info, &i_s_info), + + /* plugin name */ + /* const char* */ + STRUCT_FLD(name, "INNODB_LOCK_WAITS"), + + /* plugin author (for SHOW PLUGINS) */ + /* const char* */ + STRUCT_FLD(author, "Innobase Oy"), + + /* general descriptive text (for SHOW PLUGINS) */ + /* const char* */ + STRUCT_FLD(descr, "InnoDB which lock is blocking which"), + + /* the plugin license (PLUGIN_LICENSE_XXX) */ + /* int */ + STRUCT_FLD(license, PLUGIN_LICENSE_GPL), + + /* the function to invoke when plugin is loaded */ + /* int (*)(void*); */ + STRUCT_FLD(init, innodb_lock_waits_init), + + /* the function to invoke when plugin is unloaded */ + /* int (*)(void*); */ + STRUCT_FLD(deinit, i_s_common_deinit), + + /* plugin version (for SHOW PLUGINS) */ + /* unsigned int */ + STRUCT_FLD(version, INNODB_VERSION_SHORT), + + /* struct st_mysql_show_var* */ + STRUCT_FLD(status_vars, NULL), + + /* struct st_mysql_sys_var** */ + STRUCT_FLD(system_vars, NULL), + + /* string version */ + /* const char * */ + STRUCT_FLD(version_info, "1.0"), + + /* Maturity */ + /* int */ + STRUCT_FLD(maturity, MariaDB_PLUGIN_MATURITY_STABLE) +}; + /*******************************************************************//** Common function to fill any of the dynamic tables: INFORMATION_SCHEMA.innodb_trx @@ -2163,6 +2535,59 @@ UNIV_INTERN struct st_mysql_plugin i_s_i STRUCT_FLD(__reserved1, NULL) }; +UNIV_INTERN struct st_maria_plugin i_s_innodb_cmp_maria = +{ + /* the plugin type (a MYSQL_XXX_PLUGIN value) */ + /* int */ + STRUCT_FLD(type, MYSQL_INFORMATION_SCHEMA_PLUGIN), + + /* pointer to type-specific plugin descriptor */ + /* void* */ + STRUCT_FLD(info, &i_s_info), + + /* plugin name */ + /* const char* */ + STRUCT_FLD(name, "INNODB_CMP"), + + /* plugin author (for SHOW PLUGINS) */ + /* const char* */ + STRUCT_FLD(author, plugin_author), + + /* general descriptive text (for SHOW PLUGINS) */ + /* const char* */ + STRUCT_FLD(descr, "Statistics for the InnoDB compression"), + + /* the plugin license (PLUGIN_LICENSE_XXX) */ + /* int */ + STRUCT_FLD(license, PLUGIN_LICENSE_GPL), + + /* the function to invoke when plugin is loaded */ + /* int (*)(void*); */ + STRUCT_FLD(init, i_s_cmp_init), + + /* the function to invoke when plugin is unloaded */ + /* int (*)(void*); */ + STRUCT_FLD(deinit, i_s_common_deinit), + + /* plugin version (for SHOW PLUGINS) */ + /* unsigned int */ + STRUCT_FLD(version, INNODB_VERSION_SHORT), + + /* struct st_mysql_show_var* */ + STRUCT_FLD(status_vars, NULL), + + /* struct st_mysql_sys_var** */ + STRUCT_FLD(system_vars, NULL), + + /* string version */ + /* const char * */ + STRUCT_FLD(version_info, "1.0"), + + /* Maturity */ + /* int */ + STRUCT_FLD(maturity, MariaDB_PLUGIN_MATURITY_STABLE) +}; + UNIV_INTERN struct st_mysql_plugin i_s_innodb_cmp_reset = { /* the plugin type (a MYSQL_XXX_PLUGIN value) */ @@ -2213,6 +2638,59 @@ UNIV_INTERN struct st_mysql_plugin i_s_i STRUCT_FLD(__reserved1, NULL) }; +UNIV_INTERN struct st_maria_plugin i_s_innodb_cmp_reset_maria = +{ + /* the plugin type (a MYSQL_XXX_PLUGIN value) */ + /* int */ + STRUCT_FLD(type, MYSQL_INFORMATION_SCHEMA_PLUGIN), + + /* pointer to type-specific plugin descriptor */ + /* void* */ + STRUCT_FLD(info, &i_s_info), + + /* plugin name */ + /* const char* */ + STRUCT_FLD(name, "INNODB_CMP_RESET"), + + /* plugin author (for SHOW PLUGINS) */ + /* const char* */ + STRUCT_FLD(author, plugin_author), + + /* general descriptive text (for SHOW PLUGINS) */ + /* const char* */ + STRUCT_FLD(descr, "Statistics for the InnoDB compression;" + " reset cumulated counts"), + + /* the plugin license (PLUGIN_LICENSE_XXX) */ + /* int */ + STRUCT_FLD(license, PLUGIN_LICENSE_GPL), + + /* the function to invoke when plugin is loaded */ + /* int (*)(void*); */ + STRUCT_FLD(init, i_s_cmp_reset_init), + + /* the function to invoke when plugin is unloaded */ + /* int (*)(void*); */ + STRUCT_FLD(deinit, i_s_common_deinit), + + /* plugin version (for SHOW PLUGINS) */ + /* unsigned int */ + STRUCT_FLD(version, INNODB_VERSION_SHORT), + + /* struct st_mysql_show_var* */ + STRUCT_FLD(status_vars, NULL), + + /* struct st_mysql_sys_var** */ + STRUCT_FLD(system_vars, NULL), + + /* string version */ + /* const char * */ + STRUCT_FLD(version_info, "1.0"), + + /* Maturity */ + /* int */ + STRUCT_FLD(maturity, MariaDB_PLUGIN_MATURITY_STABLE) +}; /* Fields of the dynamic table information_schema.innodb_cmpmem. */ static ST_FIELD_INFO i_s_cmpmem_fields_info[] = { @@ -2431,6 +2909,59 @@ UNIV_INTERN struct st_mysql_plugin i_s_i STRUCT_FLD(__reserved1, NULL) }; +UNIV_INTERN struct st_maria_plugin i_s_innodb_cmpmem_maria = +{ + /* the plugin type (a MYSQL_XXX_PLUGIN value) */ + /* int */ + STRUCT_FLD(type, MYSQL_INFORMATION_SCHEMA_PLUGIN), + + /* pointer to type-specific plugin descriptor */ + /* void* */ + STRUCT_FLD(info, &i_s_info), + + /* plugin name */ + /* const char* */ + STRUCT_FLD(name, "INNODB_CMPMEM"), + + /* plugin author (for SHOW PLUGINS) */ + /* const char* */ + STRUCT_FLD(author, plugin_author), + + /* general descriptive text (for SHOW PLUGINS) */ + /* const char* */ + STRUCT_FLD(descr, "Statistics for the InnoDB compressed buffer pool"), + + /* the plugin license (PLUGIN_LICENSE_XXX) */ + /* int */ + STRUCT_FLD(license, PLUGIN_LICENSE_GPL), + + /* the function to invoke when plugin is loaded */ + /* int (*)(void*); */ + STRUCT_FLD(init, i_s_cmpmem_init), + + /* the function to invoke when plugin is unloaded */ + /* int (*)(void*); */ + STRUCT_FLD(deinit, i_s_common_deinit), + + /* plugin version (for SHOW PLUGINS) */ + /* unsigned int */ + STRUCT_FLD(version, INNODB_VERSION_SHORT), + + /* struct st_mysql_show_var* */ + STRUCT_FLD(status_vars, NULL), + + /* struct st_mysql_sys_var** */ + STRUCT_FLD(system_vars, NULL), + + /* string version */ + /* const char * */ + STRUCT_FLD(version_info, "1.0"), + + /* Maturity */ + /* int */ + STRUCT_FLD(maturity, MariaDB_PLUGIN_MATURITY_STABLE) +}; + UNIV_INTERN struct st_mysql_plugin i_s_innodb_cmpmem_reset = { /* the plugin type (a MYSQL_XXX_PLUGIN value) */ @@ -2481,6 +3012,60 @@ UNIV_INTERN struct st_mysql_plugin i_s_i STRUCT_FLD(__reserved1, NULL) }; +UNIV_INTERN struct st_maria_plugin i_s_innodb_cmpmem_reset_maria = +{ + /* the plugin type (a MYSQL_XXX_PLUGIN value) */ + /* int */ + STRUCT_FLD(type, MYSQL_INFORMATION_SCHEMA_PLUGIN), + + /* pointer to type-specific plugin descriptor */ + /* void* */ + STRUCT_FLD(info, &i_s_info), + + /* plugin name */ + /* const char* */ + STRUCT_FLD(name, "INNODB_CMPMEM_RESET"), + + /* plugin author (for SHOW PLUGINS) */ + /* const char* */ + STRUCT_FLD(author, plugin_author), + + /* general descriptive text (for SHOW PLUGINS) */ + /* const char* */ + STRUCT_FLD(descr, "Statistics for the InnoDB compressed buffer pool;" + " reset cumulated counts"), + + /* the plugin license (PLUGIN_LICENSE_XXX) */ + /* int */ + STRUCT_FLD(license, PLUGIN_LICENSE_GPL), + + /* the function to invoke when plugin is loaded */ + /* int (*)(void*); */ + STRUCT_FLD(init, i_s_cmpmem_reset_init), + + /* the function to invoke when plugin is unloaded */ + /* int (*)(void*); */ + STRUCT_FLD(deinit, i_s_common_deinit), + + /* plugin version (for SHOW PLUGINS) */ + /* unsigned int */ + STRUCT_FLD(version, INNODB_VERSION_SHORT), + + /* struct st_mysql_show_var* */ + STRUCT_FLD(status_vars, NULL), + + /* struct st_mysql_sys_var** */ + STRUCT_FLD(system_vars, NULL), + + /* string version */ + /* const char * */ + STRUCT_FLD(version_info, "1.0"), + + /* Maturity */ + /* int */ + STRUCT_FLD(maturity, MariaDB_PLUGIN_MATURITY_STABLE) +}; + /*******************************************************************//** Unbind a dynamic INFORMATION_SCHEMA table. @return 0 on success */ @@ -2660,6 +3245,59 @@ UNIV_INTERN struct st_mysql_plugin i_s_i STRUCT_FLD(__reserved1, NULL) }; +UNIV_INTERN struct st_maria_plugin i_s_innodb_rseg_maria = +{ + /* the plugin type (a MYSQL_XXX_PLUGIN value) */ + /* int */ + STRUCT_FLD(type, MYSQL_INFORMATION_SCHEMA_PLUGIN), + + /* pointer to type-specific plugin descriptor */ + /* void* */ + STRUCT_FLD(info, &i_s_info), + + /* plugin name */ + /* const char* */ + STRUCT_FLD(name, "INNODB_RSEG"), + + /* plugin author (for SHOW PLUGINS) */ + /* const char* */ + STRUCT_FLD(author, plugin_author), + + /* general descriptive text (for SHOW PLUGINS) */ + /* const char* */ + STRUCT_FLD(descr, "InnoDB rollback segment information"), + + /* the plugin license (PLUGIN_LICENSE_XXX) */ + /* int */ + STRUCT_FLD(license, PLUGIN_LICENSE_GPL), + + /* the function to invoke when plugin is loaded */ + /* int (*)(void*); */ + STRUCT_FLD(init, i_s_innodb_rseg_init), + + /* the function to invoke when plugin is unloaded */ + /* int (*)(void*); */ + STRUCT_FLD(deinit, i_s_common_deinit), + + /* plugin version (for SHOW PLUGINS) */ + /* unsigned int */ + STRUCT_FLD(version, 0x0100 /* 1.0 */), + + /* struct st_mysql_show_var* */ + STRUCT_FLD(status_vars, NULL), + + /* struct st_mysql_sys_var** */ + STRUCT_FLD(system_vars, NULL), + + /* string version */ + /* const char * */ + STRUCT_FLD(version_info, "1.0"), + + /* Maturity */ + /* int */ + STRUCT_FLD(maturity, MariaDB_PLUGIN_MATURITY_STABLE) +}; + /*********************************************************************** */ static ST_FIELD_INFO i_s_innodb_table_stats_info[] = @@ -2940,6 +3578,23 @@ UNIV_INTERN struct st_mysql_plugin i_s_i STRUCT_FLD(__reserved1, NULL) }; +UNIV_INTERN struct st_maria_plugin i_s_innodb_table_stats_maria = +{ + STRUCT_FLD(type, MYSQL_INFORMATION_SCHEMA_PLUGIN), + STRUCT_FLD(info, &i_s_info), + STRUCT_FLD(name, "INNODB_TABLE_STATS"), + STRUCT_FLD(author, plugin_author), + STRUCT_FLD(descr, "InnoDB table statistics in memory"), + STRUCT_FLD(license, PLUGIN_LICENSE_GPL), + STRUCT_FLD(init, i_s_innodb_table_stats_init), + STRUCT_FLD(deinit, i_s_common_deinit), + STRUCT_FLD(version, 0x0100 /* 1.0 */), + STRUCT_FLD(status_vars, NULL), + STRUCT_FLD(system_vars, NULL), + STRUCT_FLD(version_info, "1.0"), + STRUCT_FLD(maturity, MariaDB_PLUGIN_MATURITY_STABLE) +}; + UNIV_INTERN struct st_mysql_plugin i_s_innodb_index_stats = { STRUCT_FLD(type, MYSQL_INFORMATION_SCHEMA_PLUGIN), @@ -2956,6 +3611,23 @@ UNIV_INTERN struct st_mysql_plugin i_s_i STRUCT_FLD(__reserved1, NULL) }; +UNIV_INTERN struct st_maria_plugin i_s_innodb_index_stats_maria = +{ + STRUCT_FLD(type, MYSQL_INFORMATION_SCHEMA_PLUGIN), + STRUCT_FLD(info, &i_s_info), + STRUCT_FLD(name, "INNODB_INDEX_STATS"), + STRUCT_FLD(author, plugin_author), + STRUCT_FLD(descr, "InnoDB index statistics in memory"), + STRUCT_FLD(license, PLUGIN_LICENSE_GPL), + STRUCT_FLD(init, i_s_innodb_index_stats_init), + STRUCT_FLD(deinit, i_s_common_deinit), + STRUCT_FLD(version, 0x0100 /* 1.0 */), + STRUCT_FLD(status_vars, NULL), + STRUCT_FLD(system_vars, NULL), + STRUCT_FLD(version_info, "1.0"), + STRUCT_FLD(maturity, MariaDB_PLUGIN_MATURITY_STABLE) +}; + /*********************************************************************** */ static ST_FIELD_INFO i_s_innodb_admin_command_info[] = @@ -2988,7 +3660,6 @@ i_s_innodb_admin_command_fill( COND* cond) { TABLE* i_s_table = (TABLE *) tables->table; - CHARSET_INFO *cs= system_charset_info; char** query_str; char* ptr; char quote = '\0'; @@ -3122,3 +3793,20 @@ UNIV_INTERN struct st_mysql_plugin i_s_i STRUCT_FLD(system_vars, NULL), STRUCT_FLD(__reserved1, NULL) }; + +UNIV_INTERN struct st_maria_plugin i_s_innodb_admin_command_maria = +{ + STRUCT_FLD(type, MYSQL_INFORMATION_SCHEMA_PLUGIN), + STRUCT_FLD(info, &i_s_info), + STRUCT_FLD(name, "XTRADB_ADMIN_COMMAND"), + STRUCT_FLD(author, plugin_author), + STRUCT_FLD(descr, "XtraDB specific command acceptor"), + STRUCT_FLD(license, PLUGIN_LICENSE_GPL), + STRUCT_FLD(init, i_s_innodb_admin_command_init), + STRUCT_FLD(deinit, i_s_common_deinit), + STRUCT_FLD(version, 0x0100 /* 1.0 */), + STRUCT_FLD(status_vars, NULL), + STRUCT_FLD(system_vars, NULL), + STRUCT_FLD(version_info, "1.0"), + STRUCT_FLD(maturity, MariaDB_PLUGIN_MATURITY_STABLE) +}; === modified file 'storage/xtradb/handler/i_s.h' --- a/storage/xtradb/handler/i_s.h 2009-11-04 20:11:12 +0000 +++ b/storage/xtradb/handler/i_s.h 2010-04-01 14:34:51 +0000 @@ -42,4 +42,20 @@ extern struct st_mysql_plugin i_s_innodb extern struct st_mysql_plugin i_s_innodb_index_stats; extern struct st_mysql_plugin i_s_innodb_admin_command; +extern struct st_maria_plugin i_s_innodb_buffer_pool_pages_maria; +extern struct st_maria_plugin i_s_innodb_buffer_pool_pages_index_maria; +extern struct st_maria_plugin i_s_innodb_buffer_pool_pages_blob_maria; +extern struct st_maria_plugin i_s_innodb_trx_maria; +extern struct st_maria_plugin i_s_innodb_locks_maria; +extern struct st_maria_plugin i_s_innodb_lock_waits_maria; +extern struct st_maria_plugin i_s_innodb_cmp_maria; +extern struct st_maria_plugin i_s_innodb_cmp_reset_maria; +extern struct st_maria_plugin i_s_innodb_cmpmem_maria; +extern struct st_maria_plugin i_s_innodb_cmpmem_reset_maria; +extern struct st_maria_plugin i_s_innodb_patches_maria; +extern struct st_maria_plugin i_s_innodb_rseg_maria; +extern struct st_maria_plugin i_s_innodb_table_stats_maria; +extern struct st_maria_plugin i_s_innodb_index_stats_maria; +extern struct st_maria_plugin i_s_innodb_admin_command_maria; + #endif /* i_s_h */ === modified file 'storage/xtradb/include/page0page.h' --- a/storage/xtradb/include/page0page.h 2010-01-06 12:00:14 +0000 +++ b/storage/xtradb/include/page0page.h 2010-03-28 18:10:00 +0000 @@ -517,7 +517,7 @@ UNIV_INLINE rec_t* page_rec_get_next( /*==============*/ - rec_t* rec); /*!< in: pointer to record */ + const rec_t* rec); /*!< in: pointer to record */ /************************************************************//** Gets the pointer to the next record on the page. @return pointer to next record */ === modified file 'storage/xtradb/include/page0page.ic' --- a/storage/xtradb/include/page0page.ic 2010-01-06 12:00:14 +0000 +++ b/storage/xtradb/include/page0page.ic 2010-03-28 18:10:00 +0000 @@ -731,7 +731,7 @@ UNIV_INLINE rec_t* page_rec_get_next( /*==============*/ - rec_t* rec) /*!< in: pointer to record */ + const rec_t* rec) /*!< in: pointer to record */ { return((rec_t*) page_rec_get_next_low(rec, page_rec_is_comp(rec))); } === modified file 'storage/xtradb/include/ut0lst.h' --- a/storage/xtradb/include/ut0lst.h 2009-09-07 10:22:53 +0000 +++ b/storage/xtradb/include/ut0lst.h 2010-03-30 12:36:49 +0000 @@ -158,7 +158,7 @@ Inserts a NODE2 after NODE1 in a list. /** Invalidate the pointers in a list node. @param NAME list name @param N pointer to the node that was removed */ -# define UT_LIST_REMOVE_CLEAR(NAME, N) while (0) +# define UT_LIST_REMOVE_CLEAR(NAME, N) {} while (0) #endif /*******************************************************************//** === modified file 'storage/xtradb/log/log0recv.c' --- a/storage/xtradb/log/log0recv.c 2010-01-15 15:58:25 +0000 +++ b/storage/xtradb/log/log0recv.c 2010-03-31 20:50:54 +0000 @@ -3280,7 +3280,6 @@ recv_recovery_from_checkpoint_finish(voi #endif /* UNIV_DEBUG */ if (recv_needed_recovery && srv_recovery_stats) { - FILE* file = stderr; ulint i; fprintf(stderr, === modified file 'strings/ctype-ucs2.c' --- a/strings/ctype-ucs2.c 2010-03-15 11:51:23 +0000 +++ b/strings/ctype-ucs2.c 2010-04-01 09:04:26 +0000 @@ -203,7 +203,7 @@ static int my_strnncoll_ucs2(CHARSET_INF my_bool t_is_prefix) { int s_res,t_res; - my_wc_t UNINIT_VAR(s_wc),t_wc; + my_wc_t UNINIT_VAR(s_wc), UNINIT_VAR(t_wc); const uchar *se=s+slen; const uchar *te=t+tlen; MY_UNICASE_INFO *const *uni_plane= cs->caseinfo; @@ -317,7 +317,7 @@ static int my_strncasecmp_ucs2(CHARSET_I const char *s, const char *t, size_t len) { int s_res,t_res; - my_wc_t UNINIT_VAR(s_wc),t_wc; + my_wc_t UNINIT_VAR(s_wc), UNINIT_VAR(t_wc); const char *se=s+len; const char *te=t+len; MY_UNICASE_INFO *const *uni_plane= cs->caseinfo; @@ -1384,7 +1384,7 @@ int my_strnncoll_ucs2_bin(CHARSET_INFO * my_bool t_is_prefix) { int s_res,t_res; - my_wc_t UNINIT_VAR(s_wc),t_wc; + my_wc_t UNINIT_VAR(s_wc), UNINIT_VAR(t_wc); const uchar *se=s+slen; const uchar *te=t+tlen; === modified file 'strings/ctype-utf8.c' --- a/strings/ctype-utf8.c 2010-01-06 19:20:16 +0000 +++ b/strings/ctype-utf8.c 2010-04-01 09:04:26 +0000 @@ -2308,7 +2308,7 @@ static int my_strnncoll_utf8(CHARSET_INF my_bool t_is_prefix) { int s_res,t_res; - my_wc_t UNINIT_VAR(s_wc), t_wc; + my_wc_t UNINIT_VAR(s_wc), UNINIT_VAR(t_wc); const uchar *se=s+slen; const uchar *te=t+tlen; MY_UNICASE_INFO *const *uni_plane= cs->caseinfo; @@ -2378,7 +2378,7 @@ static int my_strnncollsp_utf8(CHARSET_I my_bool diff_if_only_endspace_difference) { int s_res, t_res, res; - my_wc_t UNINIT_VAR(s_wc),t_wc; + my_wc_t UNINIT_VAR(s_wc), UNINIT_VAR(t_wc); const uchar *se= s+slen, *te= t+tlen; MY_UNICASE_INFO *const *uni_plane= cs->caseinfo; === modified file 'strings/my_vsnprintf.c' --- a/strings/my_vsnprintf.c 2010-03-03 14:44:14 +0000 +++ b/strings/my_vsnprintf.c 2010-04-01 09:04:26 +0000 @@ -400,16 +400,18 @@ start: case 's': { char *par= args_arr[print_arr[i].arg_idx].str_arg; - width= (print_arr[i].flags & WIDTH_ARG) ? - args_arr[print_arr[i].width].longlong_arg : print_arr[i].width; + width= ((print_arr[i].flags & WIDTH_ARG) ? + (uint) args_arr[print_arr[i].width].longlong_arg : + (uint) print_arr[i].width); to= process_str_arg(cs, to, end, width, par, print_arr[i].flags); break; } case 'b': { char *par = args_arr[print_arr[i].arg_idx].str_arg; - width= (print_arr[i].flags & WIDTH_ARG) ? - args_arr[print_arr[i].width].longlong_arg : print_arr[i].width; + width= ((print_arr[i].flags & WIDTH_ARG) ? + (uint) args_arr[print_arr[i].width].longlong_arg : + (uint) print_arr[i].width); to= process_bin_arg(to, end, width, par); break; } @@ -428,8 +430,9 @@ start: { /* Integer parameter */ longlong larg; - length= (print_arr[i].flags & LENGTH_ARG) ? - args_arr[print_arr[i].length].longlong_arg : print_arr[i].length; + length= ((print_arr[i].flags & LENGTH_ARG) ? + args_arr[print_arr[i].length].longlong_arg : + (longlong) print_arr[i].length); if (args_arr[print_arr[i].arg_idx].have_longlong) larg = args_arr[print_arr[i].arg_idx].longlong_arg; === modified file 'support-files/compiler_warnings.supp' --- a/support-files/compiler_warnings.supp 2010-03-10 10:32:14 +0000 +++ b/support-files/compiler_warnings.supp 2010-04-01 09:40:11 +0000 @@ -27,7 +27,7 @@ pars0grm.tab.c: .*'yyerrorlab' : unrefer _flex_tmp.c: .*not enough actual parameters for macro 'yywrap'.* pars0lex.l: .*conversion from 'ulint' to 'int', possible loss of data.* btr/btr0cur\.c: .*value computed is not used.*: 3175-3375 -include/buf0buf\.ic: unused parameter ‘mtr’ +include/buf0buf\.ic: unused parameter .*mtr.* fil/fil0fil\.c: pointer targets in passing argument.*differ in signedness fil/fil0fil\.c: comparison between signed and unsigned : 3100-3199 fil/fil0fil\.c: unused parameter @@ -39,6 +39,7 @@ sync/sync0rw\.c: unused parameter sync/sync0sync\.c: unused parameter sync/sync0sync\.c: unused variable ut/ut0ut\.c: ignoring return value of +srv/srv0srv\.c: value computed is not used # # bdb is not critical to keep up to date @@ -53,6 +54,12 @@ db_vrfy.c : .*comparison is always false # readline is not maintained by us # .*/cmd-line-utils/readline/.* : .* +readline\.c : unused parameter +term\.c : unused parameter +vi\.c : unused parameter +common\.c : unused parameter +term\.c : .* + # # Ignore some warnings in libevent, which is not maintained by us. @@ -66,6 +73,16 @@ db_vrfy.c : .*comparison is always false /usr/share/aclocal/audiofile.m4 : .* # +# Ignore strict-aliasing warnings (for now) +# +.*: break strict-aliasing rules + +# +# Ignore not important declaration warnings +# +.*: only defines private constructors and has no friends + +# # Ignore all conversion warnings on windows 64 # (Is safe as we are not yet supporting strings >= 2G) # @@ -100,6 +117,11 @@ db_vrfy.c : .*comparison is always false storage/maria/ma_pagecache.c: .*'info_check_pin' defined but not used # +# Pbxt +# +xaction_xt\.cc: may be used uninitialized in this function + +# # I think these are due to mix of C and C++. # storage/pbxt/ : typedef.*was ignored in this declaration @@ -112,6 +134,7 @@ include/runtime.hpp: .*pure_error.* .*/extra/yassl/taocrypt/src/blowfish\.cpp: array subscript is above array bounds .*/extra/yassl/taocrypt/src/file\.cpp: ignoring return value .*/extra/yassl/taocrypt/src/integer\.cpp: control reaches end of non-void function +mySTL/algorithm\.hpp: is used uninitialized in this function # # Groff warnings on OpenSUSE. @@ -123,18 +146,18 @@ include/runtime.hpp: .*pure_error.* # listener.cc : .*conversion from 'SOCKET' to 'int'.* net_serv.cc : .*conversion from 'SOCKET' to 'int'.* -set_var.cc: right-hand operand of comma has no effect : 1000-1400 - # allow a little moving space for the warning below -mi_packrec.c : .*result of 32-bit shift implicitly converted to 64 bits.* : 560-600 -ma_packrec.c : .*result of 32-bit shift implicitly converted to 64 bits.* : 550-650 +mi_packrec\.c : .*result of 32-bit shift implicitly converted to 64 bits.* : 560-600 +ma_packrec\.c : .*result of 32-bit shift implicitly converted to 64 bits.* : 550-650 # # Wrong compiler warnings # .* : .*no matching operator delete found; memory will not be freed if initialization throws an exception.* -ctype-simple.c : .*unary minus operator applied to unsigned type, result still unsigned.* +ctype-simple\.c : .*unary minus operator applied to unsigned type, result still unsigned.* # Wrong warning due to GCC bug: http://gcc.gnu.org/bugzilla/show_bug.cgi?id=29478 -regexec\.c : .*passing argument 3 of.*matcher.* discards qualifiers from pointer target type.* +regexec\.c : passing argument 3 of.*matcher.* discards qualifiers from pointer target type +libmysql\.c: passing argument 2 of .*memcpy.* discards qualifiers from pointer target type : 3000-4000 +storage/xtradb/dict/dict0dict\.c : passing argument 1 of .*strcpy.* discards qualifiers from pointer target type : 2500-3500 === modified file 'unittest/mysys/waiting_threads-t.c' --- a/unittest/mysys/waiting_threads-t.c 2010-01-28 14:49:14 +0000 +++ b/unittest/mysys/waiting_threads-t.c 2010-03-30 12:36:49 +0000 @@ -258,7 +258,7 @@ void do_tests() #define test_kill_strategy(X) \ diag("kill strategy: " #X); \ DBUG_EXECUTE("reset_file", \ - { rewind(DBUG_FILE); (void) ftruncate(fileno(DBUG_FILE), 0); }); \ + { rewind(DBUG_FILE); my_chsize(fileno(DBUG_FILE), 0, 0, MYF(MY_WME)); }); \ DBUG_PRINT("info", ("kill strategy: " #X)); \ kill_strategy=X; \ do_one_test();

1 0

[Maria-developers] Win32 bulids - can I help?
by Mchl 04 Apr '10

04 Apr '10

Regarding comment from colincharles here: http://www.bytebot.net/blog/archives/2010/04/02/mariadb-5-1-44-released I am assuming that by 'resources' needed for creeating win32 builds, you mean a buildbot slave. I have an Athlon XP box under my desk, which used to be my primary machine, but right now is being used mostly for backups, so most of the time it does nothing but gathers dust. I could probably set it up with another hard disk, install Windows XP/Vista on it and donate it for MariaDB builds. It depends on a few factors though. 1. How autoamted is the process? Ideally all I would like to do is to switch the power on, login and let the machine do its job with as little interaction from my side as possible. 2. How often and for how long would it need to run? I can run it for 8-10 hours several times a week, but certainly not 24/7 3. How much upload/download bandwidth is required? While my download bandwidth is pretty good, my upload is not. Still, as long as we are not talking several tens of gigabytes per day, I should manage. Also please take into consideration, that I've never done anything like this before, so I might require a lot of help setting this up. Please tell me what you think! ;) Mchl -- This message was sent from Launchpad by the user Mchl (https://launchpad.net/~mchlpl) using the "Contact this team" link on the Maria Discuss team page to each member directly. For more information see https://help.launchpad.net/YourAccount/ContactingPeople

1 0

[Maria-developers] FYI Current stable subquery optimizations pushed to lp:~maria-captains/maria/5.3
by Sergey Petrunya 03 Apr '10

03 Apr '10

Hello, As requested, I've pushed the latest 'stable'(*) version of subquery optimizations into lp:~maria-captains/maria/5.3. (*) - stable here means: = there are no subquery-optimizations related failures in buildbot = there are no known "new" subquery issues (there are still some subquery code issues that were inherited from buildbot, though). BR Sergey -- Sergey Petrunia, Software Developer Monty Program AB, http://askmonty.org Blog: http://s.petrunia.net/blog

1 0

[Maria-developers] Rev 2771: embedded builds used to refer to undefined functions inside if(0) { } in http://bazaar.launchpad.net/~maria-captains/maria/5.2/
by serg＠askmonty.org 03 Apr '10

03 Apr '10

At http://bazaar.launchpad.net/~maria-captains/maria/5.2/ ------------------------------------------------------------ revno: 2771 revision-id: sergii(a)pisem.net-20100402200840-0nctbdvalpetkkzp parent: sergii(a)pisem.net-20100402185102-3jj9hj51tfjblsyu committer: Sergei Golubchik <sergii(a)pisem.net> branch nick: 5.2 timestamp: Fri 2010-04-02 22:08:40 +0200 message: embedded builds used to refer to undefined functions inside if(0) { } gcc optimized this dead code away, and does not notice that functions were undefined. Other compilers are more picky === modified file 'sql/sql_acl.cc' --- a/sql/sql_acl.cc 2010-04-01 14:34:51 +0000 +++ b/sql/sql_acl.cc 2010-04-02 20:08:40 +0000 @@ -6849,6 +6849,7 @@ bool check_routine_level_acl(THD *thd, c #define initialized 0 #define decrease_user_connections(X) /* nothing */ #define check_for_max_user_connections(X,Y) 0 +#define get_or_create_user_conn(A,B,C,D) 0 #endif #endif #ifndef HAVE_OPENSSL

1 0

[Maria-developers] Rev 2770: more fixes for windows and status_user.test in http://bazaar.launchpad.net/~maria-captains/maria/5.2/
by serg＠askmonty.org 03 Apr '10

03 Apr '10

At http://bazaar.launchpad.net/~maria-captains/maria/5.2/ ------------------------------------------------------------ revno: 2770 revision-id: sergii(a)pisem.net-20100402185102-3jj9hj51tfjblsyu parent: sergii(a)pisem.net-20100402092009-fsk3s46z6furxi1k committer: Sergei Golubchik <sergii(a)pisem.net> branch nick: 5.2 timestamp: Fri 2010-04-02 20:51:02 +0200 message: more fixes for windows and status_user.test === modified file 'libmysqld/CMakeLists.txt' --- a/libmysqld/CMakeLists.txt 2010-01-31 09:13:21 +0000 +++ b/libmysqld/CMakeLists.txt 2010-04-02 18:51:02 +0000 @@ -104,7 +104,7 @@ SET(LIBMYSQLD_SOURCES emb_qcache.cc libm ../sql-common/client.c ../sql-common/my_time.c ../sql-common/my_user.c ../sql-common/pack.c ../sql/password.c ../sql/discover.cc ../sql/derror.cc - ../sql/field.cc ../sql/field_conv.cc + ../sql/field.cc ../sql/field_conv.cc ../sql-common/client_plugin.c ../sql/filesort.cc ../sql/gstream.cc ../sql/ha_partition.cc ../sql/handler.cc ../sql/hash_filo.cc ../sql/hostname.cc ../sql/init.cc ../sql/item_buff.cc ../sql/item_cmpfunc.cc === modified file 'mysql-test/r/status_user.result' --- a/mysql-test/r/status_user.result 2010-03-21 20:58:19 +0000 +++ b/mysql-test/r/status_user.result 2010-04-02 18:51:02 +0000 @@ -137,7 +137,7 @@ ROWS_INSERTED 8 ROWS_UPDATED 5 SELECT_COMMANDS 3 UPDATE_COMMANDS 11 -OTHER_COMMANDS 9 +OTHER_COMMANDS 7 COMMIT_TRANSACTIONS 19 ROLLBACK_TRANSACTIONS 2 DENIED_CONNECTIONS 0 @@ -154,7 +154,7 @@ ROWS_INSERTED 8 ROWS_UPDATED 5 SELECT_COMMANDS 3 UPDATE_COMMANDS 11 -OTHER_COMMANDS 9 +OTHER_COMMANDS 7 COMMIT_TRANSACTIONS 19 ROLLBACK_TRANSACTIONS 2 DENIED_CONNECTIONS 0 === modified file 'sql/sql_class.cc' --- a/sql/sql_class.cc 2010-04-02 09:20:09 +0000 +++ b/sql/sql_class.cc 2010-04-02 18:51:02 +0000 @@ -924,7 +924,7 @@ void THD::update_stats(void) /* A SQL query. */ if (lex->sql_command == SQLCOM_SELECT) select_commands++; - else if (! (sql_command_flags[lex->sql_command] & CF_STATUS_COMMAND)) + else if (sql_command_flags[lex->sql_command] & CF_STATUS_COMMAND) { /* Ignore 'SHOW ' commands */ }

1 0

[Maria-developers] bzr commit into file:///home/tsk/mprog/src/5.3-subqueries/ branch (timour:2788)
by timour＠askmonty.org 02 Apr '10

02 Apr '10

#At file:///home/tsk/mprog/src/5.3-subqueries/ based on revid:psergey@askmonty.org-20100329200940-9ikx6gpww0gtsx00 2788 timour(a)askmonty.org 2010-04-02 MWL#68: Subquery optimization: Efficient NOT IN execution with NULLs Fixed an error where the priority queue for the indexes used for partial matching was not emptied after each execution in all cases. modified: sql/item_subselect.cc === modified file 'sql/item_subselect.cc' --- a/sql/item_subselect.cc 2010-03-29 14:04:35 +0000 +++ b/sql/item_subselect.cc 2010-04-02 14:27:06 +0000 @@ -3882,8 +3882,9 @@ subselect_hash_sj_engine::make_unique_en cur_ref_buff + test(maybe_null), we could use that information instead. */ + cur_ref_buff + null_count, - null_count ? tab->ref.key_buff : 0, + null_count ? cur_ref_buff : 0, cur_key_part->length, tab->ref.items[i]); cur_ref_buff+= cur_key_part->store_length; } @@ -4908,6 +4909,8 @@ bool subselect_rowid_merge_engine::parti /* If there is a non-NULL key, it must be the first key in the keys array. */ DBUG_ASSERT(!non_null_key || (non_null_key && merge_keys[0] == non_null_key)); + /* The prioryty queue for keys must be empty. */ + DBUG_ASSERT(!pq.elements); /* All data accesses during execution are via handler::ha_rnd_pos() */ tmp_table->file->ha_rnd_init(0); @@ -5031,6 +5034,7 @@ bool subselect_rowid_merge_engine::parti DBUG_ASSERT(FALSE); end: + queue_remove_all(&pq); tmp_table->file->ha_rnd_end(); return res; }

1 0

[Maria-developers] Rev 2769: fixes for windows builds in http://bazaar.launchpad.net/~maria-captains/maria/5.2/
by serg＠askmonty.org 02 Apr '10

02 Apr '10

At http://bazaar.launchpad.net/~maria-captains/maria/5.2/ ------------------------------------------------------------ revno: 2769 revision-id: sergii(a)pisem.net-20100402092009-fsk3s46z6furxi1k parent: sanja(a)askmonty.org-20100402100339-oxwd8hcrstv3gs1o committer: Sergei Golubchik <sergii(a)pisem.net> branch nick: 5.2 timestamp: Fri 2010-04-02 11:20:09 +0200 message: fixes for windows builds === modified file 'CMakeLists.txt' --- a/CMakeLists.txt 2010-04-01 14:34:51 +0000 +++ b/CMakeLists.txt 2010-04-02 09:20:09 +0000 @@ -38,6 +38,7 @@ ADD_DEFINITIONS(-DMYSQL_DATADIR="c:/Prog ADD_DEFINITIONS(-DDEFAULT_CHARSET_HOME="c:/Program Files/MySQL/MySQL Server ${MYSQL_BASE_VERSION}/") ADD_DEFINITIONS(-DPACKAGE=mysql) ADD_DEFINITIONS(-DSHAREDIR="share") +ADD_DEFINITIONS(-DPLUGINDIR="lib/plugin") # Set debug options SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DFORCE_INIT_OF_VARS") === modified file 'extra/libevent/evbuffer.c' --- a/extra/libevent/evbuffer.c 2010-02-01 06:14:12 +0000 +++ b/extra/libevent/evbuffer.c 2010-04-02 09:20:09 +0000 @@ -75,8 +75,7 @@ bufferevent_add(struct event *ev, int ti */ void -bufferevent_read_pressure_cb(struct evbuffer *buf, - size_t old __attribute__((unused)), size_t now, +bufferevent_read_pressure_cb(struct evbuffer *buf, size_t old, size_t now, void *arg) { struct bufferevent *bufev = arg; /* === modified file 'extra/libevent/event.c' --- a/extra/libevent/event.c 2010-01-06 19:20:16 +0000 +++ b/extra/libevent/event.c 2010-04-02 09:20:09 +0000 @@ -394,8 +394,7 @@ event_base_get_method(struct event_base } static void -event_loopexit_cb(int fd __attribute__((unused)), - short what __attribute__((unused)), void *arg) +event_loopexit_cb(int fd, short what, void *arg) { struct event_base *base = arg; base->event_gotterm = 1; === modified file 'extra/libevent/signal.c' --- a/extra/libevent/signal.c 2010-01-06 19:20:16 +0000 +++ b/extra/libevent/signal.c 2010-04-02 09:20:09 +0000 @@ -69,7 +69,7 @@ static void evsignal_handler(int sig); /* Callback for when the signal handler write a byte to our signaling socket */ static void -evsignal_cb(int fd, short what __attribute((unused)), void *arg __attribute((unused))) +evsignal_cb(int fd, short what, void *arg) { static char signals[100]; #ifdef WIN32 === modified file 'include/m_ctype.h' --- a/include/m_ctype.h 2010-03-31 18:37:45 +0000 +++ b/include/m_ctype.h 2010-04-02 09:20:09 +0000 @@ -311,7 +311,9 @@ struct charset_info_st #define ILLEGAL_CHARSET_INFO_NUMBER (~0U) extern MYSQL_PLUGIN_IMPORT struct charset_info_st my_charset_bin; -extern struct charset_info_st my_charset_bin; +extern MYSQL_PLUGIN_IMPORT struct charset_info_st my_charset_latin1; +extern MYSQL_PLUGIN_IMPORT struct charset_info_st my_charset_filename; + extern struct charset_info_st my_charset_big5_chinese_ci; extern struct charset_info_st my_charset_big5_bin; extern struct charset_info_st my_charset_cp932_japanese_ci; @@ -324,7 +326,6 @@ extern struct charset_info_st my_charset extern struct charset_info_st my_charset_gb2312_bin; extern struct charset_info_st my_charset_gbk_chinese_ci; extern struct charset_info_st my_charset_gbk_bin; -extern struct charset_info_st my_charset_latin1; extern struct charset_info_st my_charset_latin1_german2_ci; extern struct charset_info_st my_charset_latin1_bin; extern struct charset_info_st my_charset_latin2_czech_ci; @@ -341,7 +342,6 @@ extern struct charset_info_st my_charset extern struct charset_info_st my_charset_utf8_unicode_ci; extern struct charset_info_st my_charset_utf8_bin; extern struct charset_info_st my_charset_cp1250_czech_ci; -extern struct charset_info_st my_charset_filename; /* declarations for simple charsets */ extern size_t my_strnxfrm_simple(CHARSET_INFO *, uchar *, size_t, === modified file 'include/my_global.h' --- a/include/my_global.h 2010-03-29 15:13:53 +0000 +++ b/include/my_global.h 2010-04-02 09:20:09 +0000 @@ -1522,6 +1522,9 @@ do { doubleget_union _tmp; \ #elif defined(HAVE_DLFCN_H) #include <dlfcn.h> #endif +#ifndef HAVE_DLERROR +#define dlerror() "" +#endif #endif /* FreeBSD 2.2.2 does not define RTLD_NOW) */ @@ -1529,7 +1532,7 @@ do { doubleget_union _tmp; \ #define RTLD_NOW 1 #endif -#ifndef HAVE_DLERROR +#ifndef HAVE_DLOPEN #define dlerror() "No support for dynamic loading (static build?)" #define dlopen(A,B) 0 #define dlsym(A,B) 0 === modified file 'server-tools/CMakeLists.txt' --- a/server-tools/CMakeLists.txt 2007-02-14 11:42:11 +0000 +++ b/server-tools/CMakeLists.txt 2010-04-02 09:20:09 +0000 @@ -27,7 +27,7 @@ ADD_EXECUTABLE(mysqlmanager buffer.cc co user_management_commands.cc ../../sql/net_serv.cc ../../sql-common/pack.c ../../sql/password.c ../../sql/sql_state.c ../../sql-common/client.c ../../libmysql/get_password.c - ../../libmysql/errmsg.c) + ../../libmysql/errmsg.c ../../sql-common/client_plugin.c) ADD_DEPENDENCIES(mysqlmanager GenError) TARGET_LINK_LIBRARIES(mysqlmanager dbug mysys strings taocrypt vio yassl zlib wsock32) === modified file 'server-tools/instance-manager/CMakeLists.txt' --- a/server-tools/instance-manager/CMakeLists.txt 2007-12-27 17:16:02 +0000 +++ b/server-tools/instance-manager/CMakeLists.txt 2010-04-02 09:20:09 +0000 @@ -28,7 +28,7 @@ ADD_EXECUTABLE(mysqlmanager buffer.cc co user_management_commands.cc ../../mysys/my_rnd.c ../../sql/net_serv.cc ../../sql-common/pack.c ../../sql/password.c ../../sql/sql_state.c ../../sql-common/client.c ../../libmysql/get_password.c - ../../libmysql/errmsg.c) + ../../libmysql/errmsg.c ../../sql-common/client_plugin.c) ADD_DEPENDENCIES(mysqlmanager GenError) TARGET_LINK_LIBRARIES(mysqlmanager debug dbug mysys strings taocrypt vio yassl zlib wsock32) === modified file 'sql-common/client.c' --- a/sql-common/client.c 2010-04-01 09:04:26 +0000 +++ b/sql-common/client.c 2010-04-02 09:20:09 +0000 @@ -2345,7 +2345,7 @@ void mpvio_info(Vio *vio, MYSQL_PLUGIN_V case VIO_TYPE_SSL: { struct sockaddr addr; - socklen_t addrlen= sizeof(addr); + SOCKET_SIZE_TYPE addrlen= sizeof(addr); if (getsockname(vio->sd, &addr, &addrlen)) return; info->protocol= addr.sa_family == AF_UNIX ? @@ -2360,7 +2360,7 @@ void mpvio_info(Vio *vio, MYSQL_PLUGIN_V return; case VIO_TYPE_SHARED_MEMORY: info->protocol= MYSQL_VIO_MEMORY; - info->handle= vio->handle_client_file_map; /* or what ? */ + info->handle= vio->handle_file_map; /* or what ? */ return; #endif default: DBUG_ASSERT(0); === modified file 'sql/client_settings.h' --- a/sql/client_settings.h 2010-03-29 15:13:53 +0000 +++ b/sql/client_settings.h 2010-04-02 09:20:09 +0000 @@ -29,7 +29,6 @@ #define mysql_master_send_query(A, B, C) 1 #define mysql_slave_send_query(A, B, C) 1 #define mysql_rpl_probe(mysql) 0 -#undef HAVE_SMEM #undef _CUSTOMCONFIG_ #define mysql_server_init(a,b,c) mysql_client_plugin_init() === modified file 'sql/log_event.cc' --- a/sql/log_event.cc 2010-03-15 11:51:23 +0000 +++ b/sql/log_event.cc 2010-04-02 09:20:09 +0000 @@ -1716,8 +1716,7 @@ beg: case MYSQL_TYPE_DATETIME: { - size_t d, t; - uint64 i64= uint8korr(ptr); /* YYYYMMDDhhmmss */ + uint64 d, t, i64= uint8korr(ptr); /* YYYYMMDDhhmmss */ d= i64 / 1000000; t= i64 % 1000000; my_b_printf(file, "%04d-%02d-%02d %02d:%02d:%02d", === modified file 'sql/mysqld.cc' --- a/sql/mysqld.cc 2010-04-01 09:04:26 +0000 +++ b/sql/mysqld.cc 2010-04-02 09:20:09 +0000 @@ -6645,8 +6645,6 @@ Can't be set to 1 if --log-slave-updates {"shared-memory", OPT_ENABLE_SHARED_MEMORY, "Enable the shared memory.",(uchar**) &opt_enable_shared_memory, (uchar**) &opt_enable_shared_memory, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0}, -#endif -#ifdef HAVE_SMEM {"shared-memory-base-name",OPT_SHARED_MEMORY_BASE_NAME, "Base name of shared memory.", (uchar**) &shared_memory_base_name, (uchar**) &shared_memory_base_name, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0}, === modified file 'sql/sql_class.cc' --- a/sql/sql_class.cc 2010-03-29 15:13:53 +0000 +++ b/sql/sql_class.cc 2010-04-02 09:20:09 +0000 @@ -924,7 +924,7 @@ void THD::update_stats(void) /* A SQL query. */ if (lex->sql_command == SQLCOM_SELECT) select_commands++; - else if (! sql_command_flags[lex->sql_command] & CF_STATUS_COMMAND) + else if (! (sql_command_flags[lex->sql_command] & CF_STATUS_COMMAND)) { /* Ignore 'SHOW ' commands */ } === modified file 'sql/sql_show.cc' --- a/sql/sql_show.cc 2010-04-01 14:34:51 +0000 +++ b/sql/sql_show.cc 2010-04-02 09:20:09 +0000 @@ -2529,8 +2529,8 @@ int send_user_stats(THD* thd, HASH *all_ table->field[j++]->store(user_stats->user, user_stats->user_name_length, system_charset_info); table->field[j++]->store((longlong)user_stats->total_connections,TRUE); - table->field[j++]->store((longlong)user_stats->concurrent_connections); - table->field[j++]->store((longlong)user_stats->connected_time); + table->field[j++]->store((longlong)user_stats->concurrent_connections, TRUE); + table->field[j++]->store((longlong)user_stats->connected_time, TRUE); table->field[j++]->store((double)user_stats->busy_time); table->field[j++]->store((double)user_stats->cpu_time); table->field[j++]->store((longlong)user_stats->bytes_received, TRUE); === modified file 'storage/maria/ma_loghandler.c' --- a/storage/maria/ma_loghandler.c 2010-04-01 09:04:26 +0000 +++ b/storage/maria/ma_loghandler.c 2010-04-02 09:20:09 +0000 @@ -1274,10 +1274,11 @@ static my_bool translog_set_lsn_for_file for (file= from_file; file <= to_file; file++) { LOGHANDLER_FILE_INFO info; - LINT_INIT(info.max_lsn); - File fd= open_logfile_by_number_no_cache(file); + LINT_INIT_STRUCT(info); + LINT_INIT(info.max_lsn); + if ((fd < 0) || ((translog_read_file_header(&info, fd) || (cmp_translog_addr(lsn, info.max_lsn) > 0 &&

1 0

[Maria-developers] Rev 2768: Fixed the test according to the new plugin information in file:///Users/bell/maria/bzr/work-maria-5.2-plugin/
by sanja＠askmonty.org 02 Apr '10

02 Apr '10

At file:///Users/bell/maria/bzr/work-maria-5.2-plugin/ ------------------------------------------------------------ revno: 2768 revision-id: sanja(a)askmonty.org-20100402100339-oxwd8hcrstv3gs1o parent: sanja(a)askmonty.org-20100401200509-o67qhkcgzv5s9oai committer: sanja(a)askmonty.org branch nick: work-maria-5.2-plugin timestamp: Fri 2010-04-02 13:03:39 +0300 message: Fixed the test according to the new plugin information === modified file 'mysql-test/suite/funcs_1/r/is_columns_is.result' --- a/mysql-test/suite/funcs_1/r/is_columns_is.result 2010-02-01 06:14:12 +0000 +++ b/mysql-test/suite/funcs_1/r/is_columns_is.result 2010-04-02 10:03:39 +0000 @@ -271,10 +271,12 @@ NULL information_schema PBXT_STATISTICS NULL information_schema PBXT_STATISTICS Name 2 NO varchar 40 120 NULL NULL utf8 utf8_general_ci varchar(40) select NULL information_schema PBXT_STATISTICS Value 3 0 NO bigint NULL NULL 19 0 NULL NULL bigint(8) select NULL information_schema PLUGINS PLUGIN_AUTHOR 8 NULL YES varchar 64 192 NULL NULL utf8 utf8_general_ci varchar(64) select +NULL information_schema PLUGINS PLUGIN_AUTH_VERSION 12 NULL YES varchar 80 240 NULL NULL utf8 utf8_general_ci varchar(80) select NULL information_schema PLUGINS PLUGIN_DESCRIPTION 9 NULL YES longtext 4294967295 4294967295 NULL NULL utf8 utf8_general_ci longtext select NULL information_schema PLUGINS PLUGIN_LIBRARY 6 NULL YES varchar 64 192 NULL NULL utf8 utf8_general_ci varchar(64) select NULL information_schema PLUGINS PLUGIN_LIBRARY_VERSION 7 NULL YES varchar 20 60 NULL NULL utf8 utf8_general_ci varchar(20) select NULL information_schema PLUGINS PLUGIN_LICENSE 10 NULL YES varchar 80 240 NULL NULL utf8 utf8_general_ci varchar(80) select +NULL information_schema PLUGINS PLUGIN_MATURITY 11 NULL YES varchar 12 36 NULL NULL utf8 utf8_general_ci varchar(12) select NULL information_schema PLUGINS PLUGIN_NAME 1 NO varchar 64 192 NULL NULL utf8 utf8_general_ci varchar(64) select NULL information_schema PLUGINS PLUGIN_STATUS 3 NO varchar 10 30 NULL NULL utf8 utf8_general_ci varchar(10) select NULL information_schema PLUGINS PLUGIN_TYPE 4 NO varchar 80 240 NULL NULL utf8 utf8_general_ci varchar(80) select @@ -791,6 +793,8 @@ NULL information_schema PBXT_STATISTICS 3.0000 information_schema PLUGINS PLUGIN_AUTHOR varchar 64 192 utf8 utf8_general_ci varchar(64) 1.0000 information_schema PLUGINS PLUGIN_DESCRIPTION longtext 4294967295 4294967295 utf8 utf8_general_ci longtext 3.0000 information_schema PLUGINS PLUGIN_LICENSE varchar 80 240 utf8 utf8_general_ci varchar(80) +3.0000 information_schema PLUGINS PLUGIN_MATURITY varchar 12 36 utf8 utf8_general_ci varchar(12) +3.0000 information_schema PLUGINS PLUGIN_AUTH_VERSION varchar 80 240 utf8 utf8_general_ci varchar(80) NULL information_schema PROCESSLIST ID bigint NULL NULL NULL NULL bigint(4) 3.0000 information_schema PROCESSLIST USER varchar 16 48 utf8 utf8_general_ci varchar(16) 3.0000 information_schema PROCESSLIST HOST varchar 64 192 utf8 utf8_general_ci varchar(64)

1 0

[Maria-developers] bzr commit into Mariadb 5.2, with Maria 2.0:maria/5.2 branch (igor:2747)
by Igor Babaev 02 Apr '10

02 Apr '10

#At lp:maria/5.2 based on revid:igor@askmonty.org-20100331233728-obczp1ecrffnaa2s 2747 Igor Babaev 2010-04-01 Post-review fixes. modified: include/keycache.h mysql-test/r/key_cache.result mysql-test/t/key_cache.test mysys/mf_keycache.c sql/sql_show.cc === modified file 'include/keycache.h' --- a/include/keycache.h 2010-02-16 16:41:11 +0000 +++ b/include/keycache.h 2010-04-01 21:42:40 +0000 @@ -37,7 +37,6 @@ C_MODE_START #define MAX_KEY_CACHE_PARTITIONS 64 - /* The structure to get statistical data about a key cache */ typedef struct st_key_cache_statistics @@ -53,6 +52,8 @@ typedef struct st_key_cache_statistics ulonglong writes; /* number of actual writes from buffers into files */ } KEY_CACHE_STATISTICS; +#define NO_LONG_KEY_CACHE_STAT_VARIABLES 3 + /* The type of a key cache object */ typedef enum key_cache_type { @@ -61,6 +62,55 @@ typedef enum key_cache_type } KEY_CACHE_TYPE; +typedef + int (*INIT_KEY_CACHE) + (void *, uint key_cache_block_size, + size_t use_mem, uint division_limit, uint age_threshold); +typedef + int (*RESIZE_KEY_CACHE) + (void *, uint key_cache_block_size, + size_t use_mem, uint division_limit, uint age_threshold); +typedef + void (*CHANGE_KEY_CACHE_PARAM) + (void *keycache_cb, + uint division_limit, uint age_threshold); +typedef + uchar* (*KEY_CACHE_READ) + (void *keycache_cb, + File file, my_off_t filepos, int level, + uchar *buff, uint length, + uint block_length, int return_buffer); +typedef + int (*KEY_CACHE_INSERT) + (void *keycache_cb, + File file, my_off_t filepos, int level, + uchar *buff, uint length); +typedef + int (*KEY_CACHE_WRITE) + (void *keycache_cb, + File file, void *file_extra, + my_off_t filepos, int level, + uchar *buff, uint length, + uint block_length, int force_write); +typedef + int (*FLUSH_KEY_BLOCKS) + (void *keycache_cb, + int file, void *file_extra, + enum flush_type type); +typedef + int (*RESET_KEY_CACHE_COUNTERS) + (const char *name, void *keycache_cb); +typedef + void (*END_KEY_CACHE) + (void *keycache_cb, my_bool cleanup); +typedef + void (*GET_KEY_CACHE_STATISTICS) + (void *keycache_cb, uint partition_no, + KEY_CACHE_STATISTICS *key_cache_stats); +typedef + ulonglong (*GET_KEY_CACHE_STAT_VALUE) + (void *keycache_cb, uint var_no); + /* An object of the type KEY_CACHE_FUNCS contains pointers to all functions from the key cache interface. @@ -74,32 +124,17 @@ typedef enum key_cache_type typedef struct st_key_cache_funcs { - int (*init) (void *, uint key_cache_block_size, - size_t use_mem, uint division_limit, uint age_threshold); - int (*resize) (void *, uint key_cache_block_size, - size_t use_mem, uint division_limit, uint age_threshold); - void (*change_param) (void *keycache_cb, - uint division_limit, uint age_threshold); - uchar* (*read) (void *keycache_cb, - File file, my_off_t filepos, int level, - uchar *buff, uint length, - uint block_length, int return_buffer); - int (*insert) (void *keycache_cb, - File file, my_off_t filepos, int level, - uchar *buff, uint length); - int (*write) (void *keycache_cb, - File file, void *file_extra, - my_off_t filepos, int level, - uchar *buff, uint length, - uint block_length, int force_write); - int (*flush) (void *keycache_cb, - int file, void *file_extra, - enum flush_type type); - int (*reset_counters) (const char *name, void *keycache_cb); - void (*end) (void *keycache_cb, my_bool cleanup); - void (*get_stats) (void *keycache_cb, uint partition_no, - KEY_CACHE_STATISTICS *key_cache_stats); - ulonglong (*get_stat_val) (void *keycache_cb, uint var_no); + INIT_KEY_CACHE init; + RESIZE_KEY_CACHE resize; + CHANGE_KEY_CACHE_PARAM change_param; + KEY_CACHE_READ read; + KEY_CACHE_INSERT insert; + KEY_CACHE_WRITE write; + FLUSH_KEY_BLOCKS flush; + RESET_KEY_CACHE_COUNTERS reset_counters; + END_KEY_CACHE end; + GET_KEY_CACHE_STATISTICS get_stats; + GET_KEY_CACHE_STAT_VALUE get_stat_val; } KEY_CACHE_FUNCS; === modified file 'mysql-test/r/key_cache.result' --- a/mysql-test/r/key_cache.result 2010-03-31 23:37:28 +0000 +++ b/mysql-test/r/key_cache.result 2010-04-01 21:42:40 +0000 @@ -672,12 +672,12 @@ insert into t2 values (2000, 3, 'yyyy'); select * from information_schema.key_caches where key_cache_name like "keycache2" and partition_number is null; KEY_CACHE_NAME PARTITIONS PARTITION_NUMBER FULL_SIZE BLOCK_SIZE USED_BLOCKS UNUSED_BLOCKS DIRTY_BLOCKS READ_REQUESTS READS WRITE_REQUESTS WRITES -keycache2 NULL NULL 1048576 1024 0 # 0 0 0 0 0 +keycache2 NULL NULL 1048576 1024 6 # 0 6 6 3 3 select * from information_schema.key_caches where key_cache_name like "key%" and partition_number is null; KEY_CACHE_NAME PARTITIONS PARTITION_NUMBER FULL_SIZE BLOCK_SIZE USED_BLOCKS UNUSED_BLOCKS DIRTY_BLOCKS READ_REQUESTS READS WRITE_REQUESTS WRITES keycache1 7 NULL 262143 2048 25 # 0 2082 25 1071 19 -keycache2 NULL NULL 1048576 1024 0 # 0 0 0 0 0 +keycache2 NULL NULL 1048576 1024 6 # 0 6 6 3 3 cache index t2 in keycache1; Table Op Msg_type Msg_text test.t2 assign_to_keycache status OK @@ -718,7 +718,7 @@ KEY_CACHE_NAME PARTITIONS PARTITION_NUMB default 2 NULL 32768 1024 # # 0 3172 24 1552 18 small NULL NULL 1048576 1024 # # 0 0 0 0 0 keycache1 7 NULL 262143 2048 # # 0 3201 43 1594 30 -keycache2 NULL NULL 1048576 1024 # # 0 0 0 0 0 +keycache2 NULL NULL 1048576 1024 # # 0 6 6 3 3 set global keycache1.key_cache_block_size=2*1024; insert into t2 values (7000, 3, 'yyyy'); select * from information_schema.key_caches where partition_number is null; @@ -726,66 +726,72 @@ KEY_CACHE_NAME PARTITIONS PARTITION_NUMB default 2 NULL 32768 1024 # # 0 3172 24 1552 18 small NULL NULL 1048576 1024 # # 0 0 0 0 0 keycache1 7 NULL 262143 2048 # # 0 6 6 3 3 -keycache2 NULL NULL 1048576 1024 # # 0 0 0 0 0 +keycache2 NULL NULL 1048576 1024 # # 0 6 6 3 3 set global keycache1.key_cache_block_size=8*1024; +select * from information_schema.key_caches where partition_number is null; +KEY_CACHE_NAME PARTITIONS PARTITION_NUMBER FULL_SIZE BLOCK_SIZE USED_BLOCKS UNUSED_BLOCKS DIRTY_BLOCKS READ_REQUESTS READS WRITE_REQUESTS WRITES +default 2 NULL 32768 1024 # # 0 3172 24 1552 18 +small NULL NULL 1048576 1024 # # 0 0 0 0 0 +keycache1 3 NULL 262143 8192 # # 0 0 0 0 0 +keycache2 NULL NULL 1048576 1024 # # 0 6 6 3 3 insert into t2 values (8000, 3, 'yyyy'); select * from information_schema.key_caches where partition_number is null; KEY_CACHE_NAME PARTITIONS PARTITION_NUMBER FULL_SIZE BLOCK_SIZE USED_BLOCKS UNUSED_BLOCKS DIRTY_BLOCKS READ_REQUESTS READS WRITE_REQUESTS WRITES default 2 NULL 32768 1024 # # 0 3172 24 1552 18 small NULL NULL 1048576 1024 # # 0 0 0 0 0 keycache1 3 NULL 262143 8192 # # 0 6 5 3 3 -keycache2 NULL NULL 1048576 1024 # # 0 0 0 0 0 +keycache2 NULL NULL 1048576 1024 # # 0 6 6 3 3 set global keycache1.key_buffer_size=64*1024; select * from information_schema.key_caches where partition_number is null; KEY_CACHE_NAME PARTITIONS PARTITION_NUMBER FULL_SIZE BLOCK_SIZE USED_BLOCKS UNUSED_BLOCKS DIRTY_BLOCKS READ_REQUESTS READS WRITE_REQUESTS WRITES default 2 NULL 32768 1024 # # 0 3172 24 1552 18 small NULL NULL 1048576 1024 # # 0 0 0 0 0 -keycache2 NULL NULL 1048576 1024 # # 0 0 0 0 0 +keycache2 NULL NULL 1048576 1024 # # 0 6 6 3 3 set global keycache1.key_cache_block_size=2*1024; select * from information_schema.key_caches where partition_number is null; KEY_CACHE_NAME PARTITIONS PARTITION_NUMBER FULL_SIZE BLOCK_SIZE USED_BLOCKS UNUSED_BLOCKS DIRTY_BLOCKS READ_REQUESTS READS WRITE_REQUESTS WRITES default 2 NULL 32768 1024 # # 0 3172 24 1552 18 small NULL NULL 1048576 1024 # # 0 0 0 0 0 keycache1 3 NULL 65535 2048 # # 0 0 0 0 0 -keycache2 NULL NULL 1048576 1024 # # 0 0 0 0 0 +keycache2 NULL NULL 1048576 1024 # # 0 6 6 3 3 set global keycache1.key_cache_block_size=8*1024; select * from information_schema.key_caches where partition_number is null; KEY_CACHE_NAME PARTITIONS PARTITION_NUMBER FULL_SIZE BLOCK_SIZE USED_BLOCKS UNUSED_BLOCKS DIRTY_BLOCKS READ_REQUESTS READS WRITE_REQUESTS WRITES default 2 NULL 32768 1024 # # 0 3172 24 1552 18 small NULL NULL 1048576 1024 # # 0 0 0 0 0 -keycache2 NULL NULL 1048576 1024 # # 0 0 0 0 0 +keycache2 NULL NULL 1048576 1024 # # 0 6 6 3 3 set global keycache1.key_buffer_size=0; select * from information_schema.key_caches where partition_number is null; KEY_CACHE_NAME PARTITIONS PARTITION_NUMBER FULL_SIZE BLOCK_SIZE USED_BLOCKS UNUSED_BLOCKS DIRTY_BLOCKS READ_REQUESTS READS WRITE_REQUESTS WRITES default 2 NULL 32768 1024 # # 0 3172 24 1552 18 small NULL NULL 1048576 1024 # # 0 0 0 0 0 -keycache2 NULL NULL 1048576 1024 # # 0 0 0 0 0 +keycache2 NULL NULL 1048576 1024 # # 0 6 6 3 3 set global keycache1.key_cache_block_size=8*1024; select * from information_schema.key_caches where partition_number is null; KEY_CACHE_NAME PARTITIONS PARTITION_NUMBER FULL_SIZE BLOCK_SIZE USED_BLOCKS UNUSED_BLOCKS DIRTY_BLOCKS READ_REQUESTS READS WRITE_REQUESTS WRITES default 2 NULL 32768 1024 # # 0 3172 24 1552 18 small NULL NULL 1048576 1024 # # 0 0 0 0 0 -keycache2 NULL NULL 1048576 1024 # # 0 0 0 0 0 +keycache2 NULL NULL 1048576 1024 # # 0 6 6 3 3 set global keycache1.key_buffer_size=0; select * from information_schema.key_caches where partition_number is null; KEY_CACHE_NAME PARTITIONS PARTITION_NUMBER FULL_SIZE BLOCK_SIZE USED_BLOCKS UNUSED_BLOCKS DIRTY_BLOCKS READ_REQUESTS READS WRITE_REQUESTS WRITES default 2 NULL 32768 1024 # # 0 3172 24 1552 18 small NULL NULL 1048576 1024 # # 0 0 0 0 0 -keycache2 NULL NULL 1048576 1024 # # 0 0 0 0 0 +keycache2 NULL NULL 1048576 1024 # # 0 6 6 3 3 set global keycache1.key_buffer_size=128*1024; select * from information_schema.key_caches where partition_number is null; KEY_CACHE_NAME PARTITIONS PARTITION_NUMBER FULL_SIZE BLOCK_SIZE USED_BLOCKS UNUSED_BLOCKS DIRTY_BLOCKS READ_REQUESTS READS WRITE_REQUESTS WRITES default 2 NULL 32768 1024 # # 0 3172 24 1552 18 small NULL NULL 1048576 1024 # # 0 0 0 0 0 keycache1 1 NULL 131072 8192 # # 0 0 0 0 0 -keycache2 NULL NULL 1048576 1024 # # 0 0 0 0 0 +keycache2 NULL NULL 1048576 1024 # # 0 6 6 3 3 set global keycache1.key_cache_block_size=1024; select * from information_schema.key_caches where partition_number is null; KEY_CACHE_NAME PARTITIONS PARTITION_NUMBER FULL_SIZE BLOCK_SIZE USED_BLOCKS UNUSED_BLOCKS DIRTY_BLOCKS READ_REQUESTS READS WRITE_REQUESTS WRITES default 2 NULL 32768 1024 # # 0 3172 24 1552 18 small NULL NULL 1048576 1024 # # 0 0 0 0 0 keycache1 7 NULL 131068 1024 # # 0 0 0 0 0 -keycache2 NULL NULL 1048576 1024 # # 0 0 0 0 0 +keycache2 NULL NULL 1048576 1024 # # 0 6 6 3 3 drop table t1,t2; set global keycache1.key_buffer_size=0; set global keycache2.key_buffer_size=0; === modified file 'mysql-test/t/key_cache.test' --- a/mysql-test/t/key_cache.test 2010-03-31 23:37:28 +0000 +++ b/mysql-test/t/key_cache.test 2010-04-01 21:42:40 +0000 @@ -469,6 +469,8 @@ insert into t2 values (7000, 3, 'yyyy'); select * from information_schema.key_caches where partition_number is null; set global keycache1.key_cache_block_size=8*1024; +--replace_column 6 # 7 # +select * from information_schema.key_caches where partition_number is null; insert into t2 values (8000, 3, 'yyyy'); --replace_column 6 # 7 # select * from information_schema.key_caches where partition_number is null; === modified file 'mysys/mf_keycache.c' --- a/mysys/mf_keycache.c 2010-02-16 16:41:11 +0000 +++ b/mysys/mf_keycache.c 2010-04-01 21:42:40 +0000 @@ -49,6 +49,7 @@ One cache can handle many files. It must contain buffers of the same blocksize. + init_key_cache() should be used to init cache handler. The free list (free_block_list) is a stack like structure. @@ -151,7 +152,7 @@ typedef struct st_keycache_wqueue /* Control block for a simple (non-partitioned) key cache */ -typedef struct st_s_key_cache_cb +typedef struct st_simple_key_cache_cb { my_bool key_cache_inited; /* <=> control block is allocated */ my_bool in_resize; /* true during resize operation */ @@ -202,7 +203,7 @@ typedef struct st_s_key_cache_cb int blocks; /* max number of blocks in the cache */ uint hash_factor; /* factor used to calculate hash function */ my_bool in_init; /* Set to 1 in MySQL during init/resize */ -} S_KEY_CACHE_CB; +} SIMPLE_KEY_CACHE_CB; /* Some compilation flags have been added specifically for this module @@ -314,12 +315,8 @@ KEY_CACHE *dflt_key_cache= &dflt_key_cac #define FLUSH_CACHE 2000 /* sort this many blocks at once */ -static int flush_all_key_blocks(S_KEY_CACHE_CB *keycache); -/* -static void s_change_key_cache_param(void *keycache_cb, uint division_limit, - uint age_threshold); -*/ -static void s_end_key_cache(void *keycache_cb, my_bool cleanup); +static int flush_all_key_blocks(SIMPLE_KEY_CACHE_CB *keycache); +static void end_simple_key_cache(SIMPLE_KEY_CACHE_CB *keycache, my_bool cleanup); #ifdef THREAD static void wait_on_queue(KEYCACHE_WQUEUE *wqueue, pthread_mutex_t *mutex); @@ -328,9 +325,9 @@ static void release_whole_queue(KEYCACHE #define wait_on_queue(wqueue, mutex) do {} while (0) #define release_whole_queue(wqueue) do {} while (0) #endif -static void free_block(S_KEY_CACHE_CB *keycache, BLOCK_LINK *block); +static void free_block(SIMPLE_KEY_CACHE_CB *keycache, BLOCK_LINK *block); #if !defined(DBUG_OFF) -static void test_key_cache(S_KEY_CACHE_CB *keycache, +static void test_key_cache(SIMPLE_KEY_CACHE_CB *keycache, const char *where, my_bool lock); #endif #define KEYCACHE_BASE_EXPR(f, pos) \ @@ -433,7 +430,7 @@ static int keycache_pthread_cond_signal( #define inline /* disabled inline for easier debugging */ static int fail_block(BLOCK_LINK *block); static int fail_hlink(HASH_LINK *hlink); -static int cache_empty(S_KEY_CACHE_CB *keycache); +static int cache_empty(SIMPLE_KEY_CACHE_CB *keycache); #endif @@ -447,8 +444,8 @@ static inline uint next_power(uint value Initialize a simple key cache SYNOPSIS - s_init_key_cache() - keycache_cb pointer to the control block of a simple key cache + init_simple_key_cache() + keycache pointer to the control block of a simple key cache key_cache_block_size size of blocks to keep cached data use_mem memory to use for the key cache buferrs/structures division_limit division limit (may be zero) @@ -458,8 +455,8 @@ static inline uint next_power(uint value This function is the implementation of the init_key_cache interface function that is employed by simple (non-partitioned) key caches. The function builds a simple key cache and initializes the control block - structure of the type S_KEY_CACHE_CB that is used for this key cache. - The parameter keycache_cb is supposed to point to this structure. + structure of the type SIMPLE_KEY_CACHE_CB that is used for this key cache. + The parameter keycache is supposed to point to this structure. The parameter key_cache_block_size specifies the size of the blocks in the key cache to be built. The parameters division_limit and age_threshhold determine the initial values of those characteristics of the key cache @@ -478,19 +475,17 @@ static inline uint next_power(uint value It's assumed that no two threads call this function simultaneously referring to the same key cache handle. - */ static -int s_init_key_cache(void *keycache_cb, uint key_cache_block_size, - size_t use_mem, uint division_limit, - uint age_threshold) +int init_simple_key_cache(SIMPLE_KEY_CACHE_CB *keycache, uint key_cache_block_size, + size_t use_mem, uint division_limit, + uint age_threshold) { - S_KEY_CACHE_CB *keycache= (S_KEY_CACHE_CB *) keycache_cb; ulong blocks, hash_links; size_t length; int error; - DBUG_ENTER("init_key_cache"); + DBUG_ENTER("init_simple_key_cache"); DBUG_ASSERT(key_cache_block_size >= 512); KEYCACHE_DEBUG_OPEN; @@ -653,16 +648,16 @@ err: Prepare for resizing a simple key cache SYNOPSIS - s_prepare_resize_key_cache() - keycache_cb pointer to the control block of a simple key cache + prepare_resize_simple_key_cache() + keycache pointer to the control block of a simple key cache with_resize_queue <=> resize queue is used release_lock <=> release the key cache lock before return DESCRIPTION This function flushes all dirty pages from a simple key cache and after - this it destroys the key cache calling s_end_key_cache. The function - considers the parameter keycache_cb as a pointer to the control block - structure of the type S_KEY_CACHE_CB for this key cache. + this it destroys the key cache calling end_simple_key_cache. The function + takes the parameter keycache as a pointer to the control block + structure of the type SIMPLE_KEY_CACHE_CB for this key cache. The parameter with_resize_queue determines weather the resize queue is involved (MySQL server never uses this queue). The parameter release_lock says weather the key cache lock must be released before return from @@ -673,19 +668,18 @@ err: 1 - otherwise. NOTES - This function is the called by s_resize_key_cache and p_resize_key_cache - that resize simple and partitioned key caches respectively. - + This function is the called by resize_simple_key_cache and + resize_partitioned_key_cache that resize simple and partitioned key caches + respectively. */ static -int s_prepare_resize_key_cache(void *keycache_cb, - my_bool with_resize_queue, - my_bool release_lock) +int prepare_resize_simple_key_cache(SIMPLE_KEY_CACHE_CB *keycache, + my_bool with_resize_queue, + my_bool release_lock) { int res= 0; - S_KEY_CACHE_CB *keycache= (S_KEY_CACHE_CB *) keycache_cb; - DBUG_ENTER("s_prepare_resize_key_cache"); + DBUG_ENTER("prepare_resize_simple_key_cache"); keycache_pthread_mutex_lock(&keycache->cache_lock); @@ -749,7 +743,7 @@ int s_prepare_resize_key_cache(void *key KEYCACHE_DBUG_ASSERT(keycache->cnt_for_resize_op == 0); #endif - s_end_key_cache(keycache_cb, 0); + end_simple_key_cache(keycache, 0); finish: if (release_lock) @@ -762,16 +756,16 @@ finish: Finalize resizing a simple key cache SYNOPSIS - s_finish_resize_key_cache() - keycache_cb pointer to the control block of a simple key cache + finish_resize_simple_key_cache() + keycache pointer to the control block of a simple key cache with_resize_queue <=> resize queue is used acquire_lock <=> acquire the key cache lock at start DESCRIPTION This function performs finalizing actions for the operation of - resizing a simple key cache. The function considers the parameter - keycache_cb as a pointer to the control block structure of the type - S_KEY_CACHE_CB for this key cache. The function sets the flag + resizing a simple key cache. The function takes the parameter + keycache as a pointer to the control block structure of the type + SIMPLE_KEY_CACHE_CB for this key cache. The function sets the flag in_resize in this structure to FALSE. The parameter with_resize_queue determines weather the resize queue is involved (MySQL server never uses this queue). @@ -782,22 +776,23 @@ finish: none NOTES - This function is the called by s_resize_key_cache and p_resize_key_cache - that resize simple and partitioned key caches respectively. - + This function is the called by resize_simple_key_cache and + resize_partitioned_key_cache that resize simple and partitioned key caches + respectively. */ static -void s_finish_resize_key_cache(void *keycache_cb, - my_bool with_resize_queue, - my_bool acquire_lock) +void finish_resize_simple_key_cache(SIMPLE_KEY_CACHE_CB *keycache, + my_bool with_resize_queue, + my_bool acquire_lock) { - S_KEY_CACHE_CB *keycache= (S_KEY_CACHE_CB *) keycache_cb; - DBUG_ENTER("s_finish_resize_key_cache"); + DBUG_ENTER("finish_resize_simple_key_cache"); if (acquire_lock) keycache_pthread_mutex_lock(&keycache->cache_lock); - + + safe_mutex_assert_owner(&keycache->cache_lock); + /* Mark the resize finished. This allows other threads to start a resize or to request new cache blocks. @@ -820,8 +815,8 @@ void s_finish_resize_key_cache(void *key Resize a simple key cache SYNOPSIS - s_resize_key_cache() - keycache_cb pointer to the control block of a simple key cache + resize_simple_key_cache() + keycache pointer to the control block of a simple key cache key_cache_block_size size of blocks to keep cached data use_mem memory to use for the key cache buffers/structures division_limit new division limit (if not zero) @@ -830,8 +825,8 @@ void s_finish_resize_key_cache(void *key DESCRIPTION This function is the implementation of the resize_key_cache interface function that is employed by simple (non-partitioned) key caches. - The function considers the parameter keycache_cb as a pointer to the - control block structure of the type S_KEY_CACHE_CB for the simple key + The function takes the parameter keycache as a pointer to the + control block structure of the type SIMPLE_KEY_CACHE_CB for the simple key cache to be resized. The parameter key_cache_block_size specifies the new size of the blocks in the key cache. The parameters division_limit and age_threshold @@ -845,47 +840,45 @@ void s_finish_resize_key_cache(void *key 0 - otherwise. NOTES. - The function first calls the function s_prepare_resize_key_cache + The function first calls the function prepare_resize_simple_key_cache to flush all dirty blocks from key cache, to free memory used for key cache blocks and auxiliary structures. After this the function builds a new key cache with new parameters. This implementation doesn't block the calls and executions of other functions from the key cache interface. However it assumes that the - calls of s_resize_key_cache itself are serialized. + calls of resize_simple_key_cache itself are serialized. The function starts the operation only when all other threads performing operations with the key cache let her to proceed (when cnt_for_resize=0). - */ static -int s_resize_key_cache(void *keycache_cb, uint key_cache_block_size, - size_t use_mem, uint division_limit, - uint age_threshold) +int resize_simple_key_cache(SIMPLE_KEY_CACHE_CB *keycache, uint key_cache_block_size, + size_t use_mem, uint division_limit, + uint age_threshold) { - S_KEY_CACHE_CB *keycache= (S_KEY_CACHE_CB *) keycache_cb; int blocks= 0; - DBUG_ENTER("s_resize_key_cache"); + DBUG_ENTER("resize_simple_key_cache"); if (!keycache->key_cache_inited) - DBUG_RETURN(keycache->disk_blocks); + DBUG_RETURN(blocks); /* Note that the cache_lock mutex and the resize_queue are left untouched. We do not lose the cache_lock and will release it only at the end of this function. */ - if (s_prepare_resize_key_cache(keycache_cb, 1, 0)) + if (prepare_resize_simple_key_cache(keycache, 1, 0)) goto finish; /* The following will work even if use_mem is 0 */ - blocks= s_init_key_cache(keycache, key_cache_block_size, use_mem, - division_limit, age_threshold); + blocks= init_simple_key_cache(keycache, key_cache_block_size, use_mem, + division_limit, age_threshold); finish: - s_finish_resize_key_cache(keycache_cb, 1, 0); + finish_resize_simple_key_cache(keycache, 1, 0); DBUG_RETURN(blocks); } @@ -894,7 +887,7 @@ finish: /* Increment counter blocking resize key cache operation */ -static inline void inc_counter_for_resize_op(S_KEY_CACHE_CB *keycache) +static inline void inc_counter_for_resize_op(SIMPLE_KEY_CACHE_CB *keycache) { keycache->cnt_for_resize_op++; } @@ -904,7 +897,7 @@ static inline void inc_counter_for_resiz Decrement counter blocking resize key cache operation; Signal the operation to proceed when counter becomes equal zero */ -static inline void dec_counter_for_resize_op(S_KEY_CACHE_CB *keycache) +static inline void dec_counter_for_resize_op(SIMPLE_KEY_CACHE_CB *keycache) { if (!--keycache->cnt_for_resize_op) release_whole_queue(&keycache->waiting_for_resize_cnt); @@ -915,16 +908,16 @@ static inline void dec_counter_for_resiz Change key cache parameters of a simple key cache SYNOPSIS - s_change_key_cache_param() - keycache_cb pointer to the control block of a simple key cache + change_simple_key_cache_param() + keycache pointer to the control block of a simple key cache division_limit new division limit (if not zero) age_threshold new age threshold (if not zero) DESCRIPTION This function is the implementation of the change_key_cache_param interface function that is employed by simple (non-partitioned) key caches. - The function considers the parameter keycache_cb as a pointer to the - control block structure of the type S_KEY_CACHE_CB for the simple key + The function takes the parameter keycache as a pointer to the + control block structure of the type SIMPLE_KEY_CACHE_CB for the simple key cache where new values of the division limit and the age threshold used for midpoint insertion strategy are to be set. The parameters division_limit and age_threshold provide these new values. @@ -938,15 +931,13 @@ static inline void dec_counter_for_resiz This function changes some parameters of a given key cache without reformatting it. The function does not touch the contents the key cache blocks. - */ static -void s_change_key_cache_param(void *keycache_cb, uint division_limit, - uint age_threshold) +void change_simple_key_cache_param(SIMPLE_KEY_CACHE_CB *keycache, uint division_limit, + uint age_threshold) { - S_KEY_CACHE_CB *keycache= (S_KEY_CACHE_CB *) keycache_cb; - DBUG_ENTER("s_change_key_cache_param"); + DBUG_ENTER("change_simple_key_cache_param"); keycache_pthread_mutex_lock(&keycache->cache_lock); if (division_limit) keycache->min_warm_blocks= (keycache->disk_blocks * @@ -963,15 +954,15 @@ void s_change_key_cache_param(void *keyc Destroy a simple key cache SYNOPSIS - s_end_key_cache() - keycache_cb pointer to the control block of a simple key cache + end_simple_key_cache() + keycache pointer to the control block of a simple key cache cleanup <=> complete free (free also mutex for key cache) DESCRIPTION This function is the implementation of the end_key_cache interface function that is employed by simple (non-partitioned) key caches. - The function considers the parameter keycache_cb as a pointer to the - control block structure of the type S_KEY_CACHE_CB for the simple key + The function takes the parameter keycache as a pointer to the + control block structure of the type SIMPLE_KEY_CACHE_CB for the simple key cache to be destroyed. The function frees the memory allocated for the key cache blocks and auxiliary structures. If the value of the parameter cleanup is TRUE @@ -982,10 +973,9 @@ void s_change_key_cache_param(void *keyc */ static -void s_end_key_cache(void *keycache_cb, my_bool cleanup) +void end_simple_key_cache(SIMPLE_KEY_CACHE_CB *keycache, my_bool cleanup) { - S_KEY_CACHE_CB *keycache= (S_KEY_CACHE_CB *) keycache_cb; - DBUG_ENTER("s_end_key_cache"); + DBUG_ENTER("end_simple_key_cache"); DBUG_PRINT("enter", ("key_cache: 0x%lx", (long) keycache)); if (!keycache->key_cache_inited) @@ -1276,7 +1266,7 @@ static inline void link_changed(BLOCK_LI void */ -static void link_to_file_list(S_KEY_CACHE_CB *keycache, +static void link_to_file_list(SIMPLE_KEY_CACHE_CB *keycache, BLOCK_LINK *block, int file, my_bool unlink_block) { @@ -1317,7 +1307,7 @@ static void link_to_file_list(S_KEY_CACH void */ -static void link_to_changed_list(S_KEY_CACHE_CB *keycache, +static void link_to_changed_list(SIMPLE_KEY_CACHE_CB *keycache, BLOCK_LINK *block) { DBUG_ASSERT(block->status & BLOCK_IN_USE); @@ -1372,8 +1362,8 @@ static void link_to_changed_list(S_KEY_C not linked in the LRU ring. */ -static void link_block(S_KEY_CACHE_CB *keycache, BLOCK_LINK *block, my_bool hot, - my_bool at_end) +static void link_block(SIMPLE_KEY_CACHE_CB *keycache, BLOCK_LINK *block, + my_bool hot, my_bool at_end) { BLOCK_LINK *ins; BLOCK_LINK **pins; @@ -1493,7 +1483,7 @@ static void link_block(S_KEY_CACHE_CB *k See NOTES for link_block */ -static void unlink_block(S_KEY_CACHE_CB *keycache, BLOCK_LINK *block) +static void unlink_block(SIMPLE_KEY_CACHE_CB *keycache, BLOCK_LINK *block) { DBUG_ASSERT((block->status & ~BLOCK_CHANGED) == (BLOCK_READ | BLOCK_IN_USE)); DBUG_ASSERT(block->hash_link); /*backptr to block NULL from free_block()*/ @@ -1551,7 +1541,8 @@ static void unlink_block(S_KEY_CACHE_CB RETURN void */ -static void reg_requests(S_KEY_CACHE_CB *keycache, BLOCK_LINK *block, int count) +static void reg_requests(SIMPLE_KEY_CACHE_CB *keycache, + BLOCK_LINK *block, int count) { DBUG_ASSERT(block->status & BLOCK_IN_USE); DBUG_ASSERT(block->hash_link); @@ -1594,7 +1585,7 @@ static void reg_requests(S_KEY_CACHE_CB not linked in the LRU ring. */ -static void unreg_request(S_KEY_CACHE_CB *keycache, +static void unreg_request(SIMPLE_KEY_CACHE_CB *keycache, BLOCK_LINK *block, int at_end) { DBUG_ASSERT(block->status & (BLOCK_READ | BLOCK_IN_USE)); @@ -1683,7 +1674,7 @@ static void remove_reader(BLOCK_LINK *bl signals on its termination */ -static void wait_for_readers(S_KEY_CACHE_CB *keycache, +static void wait_for_readers(SIMPLE_KEY_CACHE_CB *keycache, BLOCK_LINK *block) { #ifdef THREAD @@ -1732,7 +1723,7 @@ static inline void link_hash(HASH_LINK * Remove a hash link from the hash table */ -static void unlink_hash(S_KEY_CACHE_CB *keycache, HASH_LINK *hash_link) +static void unlink_hash(SIMPLE_KEY_CACHE_CB *keycache, HASH_LINK *hash_link) { KEYCACHE_DBUG_PRINT("unlink_hash", ("fd: %u pos_ %lu #requests=%u", (uint) hash_link->file,(ulong) hash_link->diskpos, hash_link->requests)); @@ -1788,7 +1779,7 @@ static void unlink_hash(S_KEY_CACHE_CB * Get the hash link for a page */ -static HASH_LINK *get_hash_link(S_KEY_CACHE_CB *keycache, +static HASH_LINK *get_hash_link(SIMPLE_KEY_CACHE_CB *keycache, int file, my_off_t filepos) { reg1 HASH_LINK *hash_link, **start; @@ -1909,7 +1900,7 @@ restart: waits until first of this operations links any block back. */ -static BLOCK_LINK *find_key_block(S_KEY_CACHE_CB *keycache, +static BLOCK_LINK *find_key_block(SIMPLE_KEY_CACHE_CB *keycache, File file, my_off_t filepos, int init_hits_left, int wrmode, int *page_st) @@ -2669,7 +2660,7 @@ restart: portion is less than read_length, but not less than min_length. */ -static void read_block(S_KEY_CACHE_CB *keycache, +static void read_block(SIMPLE_KEY_CACHE_CB *keycache, BLOCK_LINK *block, uint read_length, uint min_length, my_bool primary) { @@ -2761,8 +2752,8 @@ static void read_block(S_KEY_CACHE_CB *k SYNOPSIS - s_key_cache_read() - keycache_cb pointer to the control block of a simple key cache + simple_key_cache_read() + keycache pointer to the control block of a simple key cache file handler for the file for the block of data to be read filepos position of the block of data in the file level determines the weight of the data @@ -2774,8 +2765,8 @@ static void read_block(S_KEY_CACHE_CB *k DESCRIPTION This function is the implementation of the key_cache_read interface function that is employed by simple (non-partitioned) key caches. - The function considers the parameter keycache_cb as a pointer to the - control block structure of the type S_KEY_CACHE_CB for a simple key + The function takes the parameter keycache as a pointer to the + control block structure of the type SIMPLE_KEY_CACHE_CB for a simple key cache. In a general case the function reads a block of data from the key cache into the buffer buff of the size specified by the parameter length. The @@ -2799,20 +2790,18 @@ static void read_block(S_KEY_CACHE_CB *k NOTES Filepos must be a multiple of 'block_length', but it doesn't have to be a multiple of key_cache_block_size; - */ -uchar *s_key_cache_read(void *keycache_cb, - File file, my_off_t filepos, int level, - uchar *buff, uint length, - uint block_length __attribute__((unused)), - int return_buffer __attribute__((unused))) +uchar *simple_key_cache_read(SIMPLE_KEY_CACHE_CB *keycache, + File file, my_off_t filepos, int level, + uchar *buff, uint length, + uint block_length __attribute__((unused)), + int return_buffer __attribute__((unused))) { - S_KEY_CACHE_CB *keycache= (S_KEY_CACHE_CB *) keycache_cb; my_bool locked_and_incremented= FALSE; int error=0; uchar *start= buff; - DBUG_ENTER("s_key_cache_read"); + DBUG_ENTER("simple_key_cache_read"); DBUG_PRINT("enter", ("fd: %u pos: %lu length: %u", (uint) file, (ulong) filepos, length)); @@ -3010,8 +2999,8 @@ end: Insert a block of file data from a buffer into a simple key cache SYNOPSIS - s_key_cache_insert() - keycache_cb pointer to the control block of a simple key cache + simple_key_cache_insert() + keycache pointer to the control block of a simple key cache file handler for the file to insert data from filepos position of the block of data in the file to insert level determines the weight of the data @@ -3021,8 +3010,8 @@ end: DESCRIPTION This function is the implementation of the key_cache_insert interface function that is employed by simple (non-partitioned) key caches. - The function considers the parameter keycache_cb as a pointer to the - control block structure of the type S_KEY_CACHE_CB for a simple key + The function takes the parameter keycache as a pointer to the + control block structure of the type SIMPLE_KEY_CACHE_CB for a simple key cache. The function writes a block of file data from a buffer into the key cache. The buffer is specified with the parameters buff and length - the pointer @@ -3045,11 +3034,10 @@ end: */ static -int s_key_cache_insert(void *keycache_cb, - File file, my_off_t filepos, int level, - uchar *buff, uint length) +int simple_key_cache_insert(SIMPLE_KEY_CACHE_CB *keycache, + File file, my_off_t filepos, int level, + uchar *buff, uint length) { - S_KEY_CACHE_CB *keycache= (S_KEY_CACHE_CB *) keycache_cb; int error= 0; DBUG_ENTER("key_cache_insert"); DBUG_PRINT("enter", ("fd: %u pos: %lu length: %u", @@ -3272,8 +3260,8 @@ int s_key_cache_insert(void *keycache_cb SYNOPSIS - s_key_cache_write() - keycache_cb pointer to the control block of a simple key cache + simple_key_cache_write() + keycache pointer to the control block of a simple key cache file handler for the file to write data to file_extra maps of key cache partitions containing dirty pages from file @@ -3287,8 +3275,8 @@ int s_key_cache_insert(void *keycache_cb DESCRIPTION This function is the implementation of the key_cache_write interface function that is employed by simple (non-partitioned) key caches. - The function considers the parameter keycache_cb as a pointer to the - control block structure of the type S_KEY_CACHE_CB for a simple key + The function takes the parameter keycache as a pointer to the + control block structure of the type SIMPLE_KEY_CACHE_CB for a simple key cache. In a general case the function copies data from a buffer into the key cache. The buffer is specified with the parameters buff and length - @@ -3304,7 +3292,8 @@ int s_key_cache_insert(void *keycache_cb The parameter file_extra currently makes sense only for simple key caches that are elements of a partitioned key cache. It provides a pointer to the shared bitmap of the partitions that may contains dirty pages for the file. - This bitmap is used to optimize the function p_flush_key_blocks. + This bitmap is used to optimize the function + flush_partitioned_key_cache_blocks. RETURN VALUE 0 if a success, 1 - otherwise. @@ -3312,21 +3301,19 @@ int s_key_cache_insert(void *keycache_cb NOTES This implementation exploits the fact that the function is called only when a thread has got an exclusive lock for the key file. - */ static -int s_key_cache_write(void *keycache_cb, - File file, void *file_extra __attribute__((unused)), - my_off_t filepos, int level, - uchar *buff, uint length, - uint block_length __attribute__((unused)), - int dont_write) +int simple_key_cache_write(SIMPLE_KEY_CACHE_CB *keycache, + File file, void *file_extra __attribute__((unused)), + my_off_t filepos, int level, + uchar *buff, uint length, + uint block_length __attribute__((unused)), + int dont_write) { - S_KEY_CACHE_CB *keycache= (S_KEY_CACHE_CB *) keycache_cb; my_bool locked_and_incremented= FALSE; int error=0; - DBUG_ENTER("s_key_cache_write"); + DBUG_ENTER("simple_key_cache_write"); DBUG_PRINT("enter", ("fd: %u pos: %lu length: %u block_length: %u" " key_block_length: %u", @@ -3641,7 +3628,7 @@ end: Block must have a request registered on it. */ -static void free_block(S_KEY_CACHE_CB *keycache, BLOCK_LINK *block) +static void free_block(SIMPLE_KEY_CACHE_CB *keycache, BLOCK_LINK *block) { KEYCACHE_THREAD_TRACE("free block"); KEYCACHE_DBUG_PRINT("free_block", @@ -3781,7 +3768,7 @@ static int cmp_sec_link(BLOCK_LINK **a, free used blocks if requested */ -static int flush_cached_blocks(S_KEY_CACHE_CB *keycache, +static int flush_cached_blocks(SIMPLE_KEY_CACHE_CB *keycache, File file, BLOCK_LINK **cache, BLOCK_LINK **end, enum flush_type type) @@ -3909,7 +3896,7 @@ static int flush_cached_blocks(S_KEY_CAC 1 error */ -static int flush_key_blocks_int(S_KEY_CACHE_CB *keycache, +static int flush_key_blocks_int(SIMPLE_KEY_CACHE_CB *keycache, File file, enum flush_type type) { BLOCK_LINK *cache_buff[FLUSH_CACHE],**cache; @@ -4349,8 +4336,8 @@ err: SYNOPSIS - s_flush_key_blocks() - keycache_cb pointer to the control block of a simple key cache + flush_simple_key_blocks() + keycache pointer to the control block of a simple key cache file handler for the file to flush to file_extra maps of key cache partitions containing dirty pages from file (not used) @@ -4359,7 +4346,7 @@ err: DESCRIPTION This function is the implementation of the flush_key_blocks interface function that is employed by simple (non-partitioned) key caches. - The function considers the parameter keycache_cb as a pointer to the + The function takes the parameter keycache as a pointer to the control block structure of the type S_KEY_CACHE_CB for a simple key cache. In a general case the function flushes the data from all dirty key @@ -4378,16 +4365,14 @@ err: NOTES This implementation exploits the fact that the function is called only when a thread has got an exclusive lock for the key file. - */ static -int s_flush_key_blocks(void *keycache_cb, - File file, - void *file_extra __attribute__((unused)), - enum flush_type type) +int flush_simple_key_cache_blocks(SIMPLE_KEY_CACHE_CB *keycache, + File file, + void *file_extra __attribute__((unused)), + enum flush_type type) { - S_KEY_CACHE_CB *keycache= (S_KEY_CACHE_CB *) keycache_cb; int res= 0; DBUG_ENTER("flush_key_blocks"); DBUG_PRINT("enter", ("keycache: 0x%lx", (long) keycache)); @@ -4440,7 +4425,7 @@ int s_flush_key_blocks(void *keycache_cb != 0 Error */ -static int flush_all_key_blocks(S_KEY_CACHE_CB *keycache) +static int flush_all_key_blocks(SIMPLE_KEY_CACHE_CB *keycache) { BLOCK_LINK *block; uint total_found; @@ -4546,14 +4531,14 @@ static int flush_all_key_blocks(S_KEY_CA Reset the counters of a simple key cache SYNOPSIS - s_reset_key_cache_counters() + reset_simple_key_cache_counters() name the name of a key cache - keycache_cb pointer to the control block of a simple key cache + keycache pointer to the control block of a simple key cache DESCRIPTION This function is the implementation of the reset_key_cache_counters interface function that is employed by simple (non-partitioned) key caches. - The function considers the parameter keycache_cb as a pointer to the + The function takes the parameter keycache as a pointer to the control block structure of the type S_KEY_CACHE_CB for a simple key cache. This function resets the values of all statistical counters for the key cache to 0. @@ -4561,15 +4546,13 @@ static int flush_all_key_blocks(S_KEY_CA RETURN 0 on success (always because it can't fail) - */ static -int s_reset_key_cache_counters(const char *name __attribute__((unused)), - void *keycache_cb) +int reset_simple_key_cache_counters(const char *name __attribute__((unused)), + SIMPLE_KEY_CACHE_CB *keycache) { - S_KEY_CACHE_CB *keycache= (S_KEY_CACHE_CB *) keycache_cb; - DBUG_ENTER("s_reset_key_cache_counters"); + DBUG_ENTER("reset_simple_key_cache_counters"); if (!keycache->key_cache_inited) { DBUG_PRINT("info", ("Key cache %s not initialized.", name)); @@ -4590,9 +4573,10 @@ int s_reset_key_cache_counters(const cha /* Test if disk-cache is ok */ -static void test_key_cache(S_KEY_CACHE_CB *keycache __attribute__((unused)), - const char *where __attribute__((unused)), - my_bool lock __attribute__((unused))) +static +void test_key_cache(SIMPLE_KEY_CACHE_CB *keycache __attribute__((unused)), + const char *where __attribute__((unused)), + my_bool lock __attribute__((unused))) { /* TODO */ } @@ -4604,7 +4588,7 @@ static void test_key_cache(S_KEY_CACHE_C #define MAX_QUEUE_LEN 100 -static void keycache_dump(S_KEY_CACHE_CB *keycache) +static void keycache_dump(SIMPLE_KEY_CACHE_CB *keycache) { FILE *keycache_dump_file=fopen(KEYCACHE_DUMP_FILE, "w"); struct st_my_thread_var *last; @@ -4844,7 +4828,7 @@ static int fail_hlink(HASH_LINK *hlink) return 0; /* Let the assert fail. */ } -static int cache_empty(S_KEY_CACHE_CB *keycache) +static int cache_empty(SIMPLE_KEY_CACHE_CB *keycache) { int errcnt= 0; int idx; @@ -4887,54 +4871,57 @@ static int cache_empty(S_KEY_CACHE_CB *k Get statistics for a simple key cache SYNOPSIS - get_key_cache_statistics() - keycache_cb pointer to the control block of a simple key cache + get_simple_key_cache_statistics() + keycache pointer to the control block of a simple key cache partition_no partition number (not used) key_cache_stats OUT pointer to the structure for the returned statistics DESCRIPTION This function is the implementation of the get_key_cache_statistics interface function that is employed by simple (non-partitioned) key caches. - The function considers the parameter keycache_cb as a pointer to the - control block structure of the type S_KEY_CACHE_CB for a simple key cache. - This function returns the statistical data for the key cache. + The function takes the parameter keycache as a pointer to the + control block structure of the type SIMPLE_KEY_CACHE_CB for a simple key + cache. This function returns the statistical data for the key cache. The parameter partition_no is not used by this function. RETURN none - */ static -void s_get_key_cache_statistics(void *keycache_cb, - uint partition_no __attribute__((unused)), - KEY_CACHE_STATISTICS *key_cache_stats) -{ - S_KEY_CACHE_CB *keycache= (S_KEY_CACHE_CB *) keycache_cb; - DBUG_ENTER("s_get_key_cache_statistics"); - - key_cache_stats->mem_size= (longlong) keycache->key_cache_mem_size; - key_cache_stats->block_size= (longlong) keycache->key_cache_block_size; - key_cache_stats->blocks_used= keycache->blocks_used; - key_cache_stats->blocks_unused= keycache->blocks_unused; - key_cache_stats->blocks_changed= keycache->global_blocks_changed; - key_cache_stats->read_requests= keycache->global_cache_r_requests; - key_cache_stats->reads= keycache->global_cache_read; - key_cache_stats->write_requests= keycache->global_cache_w_requests; - key_cache_stats->writes= keycache->global_cache_write; +void get_simple_key_cache_statistics(SIMPLE_KEY_CACHE_CB *keycache, + uint partition_no __attribute__((unused)), + KEY_CACHE_STATISTICS *keycache_stats) +{ + DBUG_ENTER("simple_get_key_cache_statistics"); + + keycache_stats->mem_size= (longlong) keycache->key_cache_mem_size; + keycache_stats->block_size= (longlong) keycache->key_cache_block_size; + keycache_stats->blocks_used= keycache->blocks_used; + keycache_stats->blocks_unused= keycache->blocks_unused; + keycache_stats->blocks_changed= keycache->global_blocks_changed; + keycache_stats->read_requests= keycache->global_cache_r_requests; + keycache_stats->reads= keycache->global_cache_read; + keycache_stats->write_requests= keycache->global_cache_w_requests; + keycache_stats->writes= keycache->global_cache_write; DBUG_VOID_RETURN; } -static size_t s_key_cache_stat_var_offsets[]= +/* + Offsets of the statistical values in the control block for a simple key cache + The first NO_LONG_KEY_CACHE_STAT_VARIABLES=3 are of the ulong type while the + remaining are of the ulonglong type. + */ +static size_t simple_key_cache_stat_var_offsets[]= { - offsetof(S_KEY_CACHE_CB, blocks_used), - offsetof(S_KEY_CACHE_CB, blocks_unused), - offsetof(S_KEY_CACHE_CB, global_blocks_changed), - offsetof(S_KEY_CACHE_CB, global_cache_w_requests), - offsetof(S_KEY_CACHE_CB, global_cache_write), - offsetof(S_KEY_CACHE_CB, global_cache_r_requests), - offsetof(S_KEY_CACHE_CB, global_cache_read) + offsetof(SIMPLE_KEY_CACHE_CB, blocks_used), + offsetof(SIMPLE_KEY_CACHE_CB, blocks_unused), + offsetof(SIMPLE_KEY_CACHE_CB, global_blocks_changed), + offsetof(SIMPLE_KEY_CACHE_CB, global_cache_w_requests), + offsetof(SIMPLE_KEY_CACHE_CB, global_cache_write), + offsetof(SIMPLE_KEY_CACHE_CB, global_cache_r_requests), + offsetof(SIMPLE_KEY_CACHE_CB, global_cache_read) }; @@ -4942,16 +4929,16 @@ static size_t s_key_cache_stat_var_offse Get the value of a statistical variable for a simple key cache SYNOPSIS - s_get_key_cache_stat_value() - keycache_cb pointer to the control block of a simple key cache + get_simple_key_cache_stat_value() + keycache pointer to the control block of a simple key cache var_no the ordered number of a statistical variable DESCRIPTION - This function is the implementation of the s_get_key_cache_stat_value + This function is the implementation of the get_simple_key_cache_stat_value interface function that is employed by simple (non-partitioned) key caches. - The function considers the parameter keycache_cb as a pointer to the - control block structure of the type S_KEY_CACHE_CB for a simple key cache. - This function returns the value of the statistical variable var_no + The function takes the parameter keycache as a pointer to the + control block structure of the type SIMPLE_KEY_CACHE_CB for a simple key + cache. This function returns the value of the statistical variable var_no for this key cache. The variables are numbered starting from 0 to 6. RETURN @@ -4960,12 +4947,12 @@ static size_t s_key_cache_stat_var_offse */ static -ulonglong s_get_key_cache_stat_value(void *keycache_cb, uint var_no) +ulonglong get_simple_key_cache_stat_value(SIMPLE_KEY_CACHE_CB *keycache, + uint var_no) { - S_KEY_CACHE_CB *keycache= (S_KEY_CACHE_CB *) keycache_cb; - size_t var_ofs= s_key_cache_stat_var_offsets[var_no]; + size_t var_ofs= simple_key_cache_stat_var_offsets[var_no]; ulonglong res= 0; - DBUG_ENTER("s_get_key_cache_stat_value"); + DBUG_ENTER("get_simple_key_cache_stat_value"); if (var_no < 3) res= (ulonglong) (*(long *) ((char *) keycache + var_ofs)); @@ -4985,19 +4972,19 @@ ulonglong s_get_key_cache_stat_value(voi the MySQL server code directly. We don't do it though. */ -static KEY_CACHE_FUNCS s_key_cache_funcs = +static KEY_CACHE_FUNCS simple_key_cache_funcs = { - s_init_key_cache, - s_resize_key_cache, - s_change_key_cache_param, - s_key_cache_read, - s_key_cache_insert, - s_key_cache_write, - s_flush_key_blocks, - s_reset_key_cache_counters, - s_end_key_cache, - s_get_key_cache_statistics, - s_get_key_cache_stat_value + (INIT_KEY_CACHE) init_simple_key_cache, + (RESIZE_KEY_CACHE) resize_simple_key_cache, + (CHANGE_KEY_CACHE_PARAM) change_simple_key_cache_param, + (KEY_CACHE_READ) simple_key_cache_read, + (KEY_CACHE_INSERT) simple_key_cache_insert, + (KEY_CACHE_WRITE) simple_key_cache_write, + (FLUSH_KEY_BLOCKS) flush_simple_key_cache_blocks, + (RESET_KEY_CACHE_COUNTERS) reset_simple_key_cache_counters, + (END_KEY_CACHE) end_simple_key_cache, + (GET_KEY_CACHE_STATISTICS) get_simple_key_cache_statistics, + (GET_KEY_CACHE_STAT_VALUE) get_simple_key_cache_stat_value }; @@ -5038,17 +5025,22 @@ static KEY_CACHE_FUNCS s_key_cache_funcs /* Control block for a partitioned key cache */ -typedef struct st_p_key_cache_cb +typedef struct st_partitioned_key_cache_cb { my_bool key_cache_inited; /*<=> control block is allocated */ - S_KEY_CACHE_CB **partition_array; /* array of the key cache partitions */ - uint partitions; /* number of partitions in the key cache */ + SIMPLE_KEY_CACHE_CB **partition_array; /* the key cache partitions */ size_t key_cache_mem_size; /* specified size of the cache memory */ uint key_cache_block_size; /* size of the page buffer of a cache block */ -} P_KEY_CACHE_CB; + uint partitions; /* number of partitions in the key cache */ +} PARTITIONED_KEY_CACHE_CB; static -void p_end_key_cache(void *keycache_cb, my_bool cleanup); +void end_partitioned_key_cache(PARTITIONED_KEY_CACHE_CB *keycache, + my_bool cleanup); + +static int +reset_partitioned_key_cache_counters(const char *name, + PARTITIONED_KEY_CACHE_CB *keycache); /* Determine the partition to which the index block to read is ascribed @@ -5070,11 +5062,12 @@ void p_end_key_cache(void *keycache_cb, file block is ascribed. */ -static -S_KEY_CACHE_CB *get_key_cache_partition(P_KEY_CACHE_CB *keycache, - File file, my_off_t filepos) +static +SIMPLE_KEY_CACHE_CB * +get_key_cache_partition(PARTITIONED_KEY_CACHE_CB *keycache, + File file, my_off_t filepos) { - uint i= KEYCACHE_BASE_EXPR( file, filepos) % keycache->partitions; + uint i= KEYCACHE_BASE_EXPR(file, filepos) % keycache->partitions; return keycache->partition_array[i]; } @@ -5101,10 +5094,10 @@ S_KEY_CACHE_CB *get_key_cache_partition( file block is ascribed. */ -static -S_KEY_CACHE_CB *get_key_cache_partition_for_write(P_KEY_CACHE_CB *keycache, - File file, my_off_t filepos, - ulonglong* dirty_part_map) +static SIMPLE_KEY_CACHE_CB +*get_key_cache_partition_for_write(PARTITIONED_KEY_CACHE_CB *keycache, + File file, my_off_t filepos, + ulonglong* dirty_part_map) { uint i= KEYCACHE_BASE_EXPR( file, filepos) % keycache->partitions; *dirty_part_map|= 1<<i; @@ -5116,8 +5109,8 @@ S_KEY_CACHE_CB *get_key_cache_partition_ Initialize a partitioned key cache SYNOPSIS - p_init_key_cache() - keycache_cb pointer to the control block of a partitioned key cache + init_partitioned_key_cache() + keycache pointer to the control block of a partitioned key cache key_cache_block_size size of blocks to keep cached data use_mem total memory to use for all key cache partitions division_limit division limit (may be zero) @@ -5127,17 +5120,17 @@ S_KEY_CACHE_CB *get_key_cache_partition_ This function is the implementation of the init_key_cache interface function that is employed by partitioned key caches. The function builds and initializes an array of simple key caches, and then - initializes the control block structure of the type P_KEY_CACHE_CB that is - used for a partitioned key cache. The parameter keycache_cb is supposed to - point to this structure. The number of partitions in the partitioned key - cache to be built must be passed through the field 'partitions' of this - structure. The parameter key_cache_block_size specifies the size of the - blocks in the the simple key caches to be built. The parameters - division_limit and age_threshold determine the initial values of those - characteristics of the simple key caches that are used for midpoint - insertion strategy. The parameter use_mem specifies the total amount of - memory to be allocated for the key cache blocks in all simple key caches - and for all auxiliary structures. + initializes the control block structure of the type PARTITIONED_KEY_CACHE_CB + that is used for a partitioned key cache. The parameter keycache is + supposed to point to this structure. The number of partitions in the + partitioned key cache to be built must be passed through the field + 'partitions' of this structure. The parameter key_cache_block_size specifies + the size of the blocks in the the simple key caches to be built. + The parameters division_limit and age_threshold determine the initial + values of those characteristics of the simple key caches that are used for + midpoint insertion strategy. The parameter use_mem specifies the total + amount of memory to be allocated for the key cache blocks in all simple key + caches and for all auxiliary structures. RETURN VALUE total number of blocks in key cache partitions, if successful, @@ -5152,19 +5145,19 @@ S_KEY_CACHE_CB *get_key_cache_partition_ */ static -int p_init_key_cache(void *keycache_cb, uint key_cache_block_size, - size_t use_mem, uint division_limit, - uint age_threshold) +int init_partitioned_key_cache(PARTITIONED_KEY_CACHE_CB *keycache, + uint key_cache_block_size, + size_t use_mem, uint division_limit, + uint age_threshold) { int i; size_t mem_per_cache; int cnt; - S_KEY_CACHE_CB *partition; - S_KEY_CACHE_CB **partition_ptr; - P_KEY_CACHE_CB *keycache= (P_KEY_CACHE_CB *) keycache_cb; + SIMPLE_KEY_CACHE_CB *partition; + SIMPLE_KEY_CACHE_CB **partition_ptr; uint partitions= keycache->partitions; - int blocks= -1; - DBUG_ENTER("p_init_key_cache"); + int blocks= 0; + DBUG_ENTER("partitioned_init_key_cache"); keycache->key_cache_block_size = key_cache_block_size; @@ -5173,9 +5166,9 @@ int p_init_key_cache(void *keycache_cb, else { if(!(partition_ptr= - (S_KEY_CACHE_CB **) my_malloc(sizeof(S_KEY_CACHE_CB *) * partitions, - MYF(0)))) - DBUG_RETURN(blocks); + (SIMPLE_KEY_CACHE_CB **) my_malloc(sizeof(SIMPLE_KEY_CACHE_CB *) * + partitions, MYF(MY_WME)))) + DBUG_RETURN(-1); keycache->partition_array= partition_ptr; } @@ -5188,36 +5181,35 @@ int p_init_key_cache(void *keycache_cb, partition= *partition_ptr; else { - if (!(partition= (S_KEY_CACHE_CB *) my_malloc(sizeof(S_KEY_CACHE_CB), - MYF(0)))) + if (!(partition= + (SIMPLE_KEY_CACHE_CB *) my_malloc(sizeof(SIMPLE_KEY_CACHE_CB), + MYF(MY_WME)))) continue; partition->key_cache_inited= 0; } - if ((cnt= s_init_key_cache(partition, - key_cache_block_size, mem_per_cache, - division_limit, age_threshold)) <= 0) + if ((cnt= init_simple_key_cache(partition, + key_cache_block_size, mem_per_cache, + division_limit, age_threshold)) <= 0) { - s_end_key_cache(partition, 1); - my_free((uchar *) partition, MYF(0)); + end_simple_key_cache(partition, 1); + my_free(partition, MYF(0)); partition= 0; if (key_cache_inited) { memmove(partition_ptr, partition_ptr+1, sizeof(partition_ptr)*(partitions-i-1)); } + if (!--partitions) + break; if (i == 0) { i--; - partitions--; - if (partitions) - mem_per_cache = use_mem / partitions; + mem_per_cache = use_mem / partitions; + continue; } - continue; } - if (blocks < 0) - blocks= 0; blocks+= cnt; *partition_ptr++= partition; } @@ -5229,6 +5221,9 @@ int p_init_key_cache(void *keycache_cb, keycache->key_cache_inited= 1; + if (!partitions) + blocks= -1; + DBUG_RETURN(blocks); } @@ -5237,8 +5232,8 @@ int p_init_key_cache(void *keycache_cb, Resize a partitioned key cache SYNOPSIS - p_resize_key_cache() - keycache_cb pointer to the control block of a partitioned key cache + resize_partitioned_key_cache() + keycache pointer to the control block of a partitioned key cache key_cache_block_size size of blocks to keep cached data use_mem total memory to use for the new key cache division_limit new division limit (if not zero) @@ -5247,9 +5242,9 @@ int p_init_key_cache(void *keycache_cb, DESCRIPTION This function is the implementation of the resize_key_cache interface function that is employed by partitioned key caches. - The function considers the parameter keycache_cb as a pointer to the - control block structure of the type P_KEY_CACHE_CB for the partitioned - key cache to be resized. + The function takes the parameter keycache as a pointer to the + control block structure of the type PARTITIONED_KEY_CACHE_CB for the + partitioned key cache to be resized. The parameter key_cache_block_size specifies the new size of the blocks in the simple key caches that comprise the partitioned key cache. The parameters division_limit and age_threshold determine the new initial @@ -5263,48 +5258,47 @@ int p_init_key_cache(void *keycache_cb, 0 - otherwise. NOTES. - The function first calls s_prepare_resize_key_cache for each simple + The function first calls prepare_resize_simple_key_cache for each simple key cache effectively flushing all dirty pages from it and destroying - the key cache. Then p_init_key cache is called. This call builds all - the new array of simple key caches containing the same number of - elements as the old one. After this the function calls the function - s_finish_resize_key_cache for each simple key cache from this array. + the key cache. Then init_partitioned_key_cache is called. This call builds + a new array of simple key caches containing the same number of elements + as the old one. After this the function calls the function + finish_resize_simple_key_cache for each simple key cache from this array. This implementation doesn't block the calls and executions of other functions from the key cache interface. However it assumes that the - calls of s_resize_key_cache itself are serialized. - + calls of resize_partitioned_key_cache itself are serialized. */ static -int p_resize_key_cache(void *keycache_cb, uint key_cache_block_size, - size_t use_mem, uint division_limit, - uint age_threshold) +int resize_partitioned_key_cache(PARTITIONED_KEY_CACHE_CB *keycache, + uint key_cache_block_size, + size_t use_mem, uint division_limit, + uint age_threshold) { uint i; - P_KEY_CACHE_CB *keycache= (P_KEY_CACHE_CB *) keycache_cb; uint partitions= keycache->partitions; my_bool cleanup= use_mem == 0; int blocks= -1; int err= 0; - DBUG_ENTER("p_resize_key_cache"); - if (use_mem == 0) + DBUG_ENTER("partitioned_resize_key_cache"); + if (cleanup) { - p_end_key_cache(keycache_cb, 0); - DBUG_RETURN(blocks); + end_partitioned_key_cache(keycache, 0); + DBUG_RETURN(-1); } for (i= 0; i < partitions; i++) { - err|= s_prepare_resize_key_cache(keycache->partition_array[i], 0, 1); + err|= prepare_resize_simple_key_cache(keycache->partition_array[i], 0, 1); } - if (!err && use_mem) - blocks= p_init_key_cache(keycache_cb, key_cache_block_size, use_mem, - division_limit, age_threshold); - if (blocks > 0 && !cleanup) + if (!err) + blocks= init_partitioned_key_cache(keycache, key_cache_block_size, + use_mem, division_limit, age_threshold); + if (blocks > 0) { for (i= 0; i < partitions; i++) { - s_finish_resize_key_cache(keycache->partition_array[i], 0, 1); + finish_resize_simple_key_cache(keycache->partition_array[i], 0, 1); } } DBUG_RETURN(blocks); @@ -5315,17 +5309,17 @@ int p_resize_key_cache(void *keycache_cb Change key cache parameters of a partitioned key cache SYNOPSIS - p_change_key_cache_param() - keycache_cb pointer to the control block of a partitioned key cache + partitioned_change_key_cache_param() + keycache pointer to the control block of a partitioned key cache division_limit new division limit (if not zero) age_threshold new age threshold (if not zero) DESCRIPTION This function is the implementation of the change_key_cache_param interface function that is employed by partitioned key caches. - The function considers the parameter keycache_cb as a pointer to the - control block structure of the type P_KEY_CACHE_CB for the simple key - cache where new values of the division limit and the age threshold used + The function takes the parameter keycache as a pointer to the + control block structure of the type PARTITIONED_KEY_CACHE_CB for the simple + key cache where new values of the division limit and the age threshold used for midpoint insertion strategy are to be set. The parameters division_limit and age_threshold provide these new values. @@ -5333,23 +5327,22 @@ int p_resize_key_cache(void *keycache_cb none NOTES - The function just calls s_change_key_cache_param for each element from the - array of simple caches that comprise the partitioned key cache. - + The function just calls change_simple_key_cache_param for each element from + the array of simple caches that comprise the partitioned key cache. */ static -void p_change_key_cache_param(void *keycache_cb, uint division_limit, - uint age_threshold) +void change_partitioned_key_cache_param(PARTITIONED_KEY_CACHE_CB *keycache, + uint division_limit, + uint age_threshold) { uint i; - P_KEY_CACHE_CB *keycache= (P_KEY_CACHE_CB *) keycache_cb; uint partitions= keycache->partitions; - DBUG_ENTER("p_change_key_cache_param"); + DBUG_ENTER("partitioned_change_key_cache_param"); for (i= 0; i < partitions; i++) { - s_change_key_cache_param(keycache->partition_array[i], division_limit, - age_threshold); + change_simple_key_cache_param(keycache->partition_array[i], division_limit, + age_threshold); } DBUG_VOID_RETURN; } @@ -5359,17 +5352,17 @@ void p_change_key_cache_param(void *keyc Destroy a partitioned key cache SYNOPSIS - p_end_key_cache() - keycache_cb pointer to the control block of a partitioned key cache + end_partitioned_key_cache() + keycache pointer to the control block of a partitioned key cache cleanup <=> complete free (free also control block structures for all simple key caches) DESCRIPTION This function is the implementation of the end_key_cache interface function that is employed by partitioned key caches. - The function considers the parameter keycache_cb as a pointer to the - control block structure of the type P_KEY_CACHE_CB for the partitioned - key cache to be destroyed. + The function takes the parameter keycache as a pointer to the + control block structure of the type PARTITIONED_KEY_CACHE_CB for the + partitioned key cache to be destroyed. The function frees the memory allocated for the cache blocks and auxiliary structures used by simple key caches that comprise the partitioned key cache. If the value of the parameter cleanup is TRUE @@ -5378,23 +5371,23 @@ void p_change_key_cache_param(void *keyc RETURN VALUE none - */ static -void p_end_key_cache(void *keycache_cb, my_bool cleanup) +void end_partitioned_key_cache(PARTITIONED_KEY_CACHE_CB *keycache, + my_bool cleanup) { uint i; - P_KEY_CACHE_CB *keycache= (P_KEY_CACHE_CB *) keycache_cb; uint partitions= keycache->partitions; - DBUG_ENTER("p_end_key_cache"); + DBUG_ENTER("partitioned_end_key_cache"); DBUG_PRINT("enter", ("key_cache: 0x%lx", (long) keycache)); for (i= 0; i < partitions; i++) { - s_end_key_cache(keycache->partition_array[i], cleanup); + end_simple_key_cache(keycache->partition_array[i], cleanup); } - if (cleanup) { + if (cleanup) + { for (i= 0; i < partitions; i++) my_free((uchar*) keycache->partition_array[i], MYF(0)); my_free((uchar*) keycache->partition_array, MYF(0)); @@ -5409,8 +5402,8 @@ void p_end_key_cache(void *keycache_cb, SYNOPSIS - p_key_cache_read() - keycache_cb pointer to the control block of a partitioned key cache + partitioned_key_cache_read() + keycache pointer to the control block of a partitioned key cache file handler for the file for the block of data to be read filepos position of the block of data in the file level determines the weight of the data @@ -5422,9 +5415,9 @@ void p_end_key_cache(void *keycache_cb, DESCRIPTION This function is the implementation of the key_cache_read interface function that is employed by partitioned key caches. - The function considers the parameter keycache_cb as a pointer to the - control block structure of the type P_KEY_CACHE_CB for a partitioned - key cache. + The function takes the parameter keycache as a pointer to the + control block structure of the type PARTITIONED_KEY_CACHE_CB for a + partitioned key cache. In a general case the function reads a block of data from the key cache into the buffer buff of the size specified by the parameter length. The beginning of the block of data to be read is specified by the parameters @@ -5432,7 +5425,7 @@ void p_end_key_cache(void *keycache_cb, of the buffer. The data is read into the buffer in key_cache_block_size increments. To read each portion the function first finds out in what partition of the key cache this portion(page) is to be saved, and calls - s_key_cache_read with the pointer to the corresponding simple key as + simple_key_cache_read with the pointer to the corresponding simple key as its first parameter. If the parameter return_buffer is not ignored and its value is TRUE, and the data to be read of the specified size block_length can be read from one @@ -5445,21 +5438,19 @@ void p_end_key_cache(void *keycache_cb, RETURN VALUE Returns address from where the data is placed if successful, 0 - otherwise. - */ static -uchar *p_key_cache_read(void *keycache_cb, - File file, my_off_t filepos, int level, - uchar *buff, uint length, - uint block_length __attribute__((unused)), - int return_buffer __attribute__((unused))) +uchar *partitioned_key_cache_read(PARTITIONED_KEY_CACHE_CB *keycache, + File file, my_off_t filepos, int level, + uchar *buff, uint length, + uint block_length __attribute__((unused)), + int return_buffer __attribute__((unused))) { uint r_length; - P_KEY_CACHE_CB *keycache= (P_KEY_CACHE_CB *) keycache_cb; uint offset= (uint) (filepos % keycache->key_cache_block_size); uchar *start= buff; - DBUG_ENTER("p_key_cache_read"); + DBUG_ENTER("partitioned_key_cache_read"); DBUG_PRINT("enter", ("fd: %u pos: %lu length: %u", (uint) file, (ulong) filepos, length)); @@ -5471,15 +5462,15 @@ uchar *p_key_cache_read(void *keycache_c /* Read data in key_cache_block_size increments */ do { - S_KEY_CACHE_CB *partition= get_key_cache_partition(keycache, - file, filepos); + SIMPLE_KEY_CACHE_CB *partition= get_key_cache_partition(keycache, + file, filepos); uchar *ret_buff= 0; r_length= length; set_if_smaller(r_length, keycache->key_cache_block_size - offset); - ret_buff= s_key_cache_read((void *) partition, - file, filepos, level, - buff, r_length, - block_length, return_buffer); + ret_buff= simple_key_cache_read((void *) partition, + file, filepos, level, + buff, r_length, + block_length, return_buffer); if (ret_buff == 0) DBUG_RETURN(0); #ifndef THREAD @@ -5500,8 +5491,8 @@ uchar *p_key_cache_read(void *keycache_c Insert a block of file data from a buffer into a partitioned key cache SYNOPSIS - p_key_cache_insert() - keycache_cb pointer to the control block of a partitioned key cache + partitioned_key_cache_insert() + keycache pointer to the control block of a partitioned key cache file handler for the file to insert data from filepos position of the block of data in the file to insert level determines the weight of the data @@ -5511,9 +5502,9 @@ uchar *p_key_cache_read(void *keycache_c DESCRIPTION This function is the implementation of the key_cache_insert interface function that is employed by partitioned key caches. - The function considers the parameter keycache_cb as a pointer to the - control block structure of the type P_KEY_CACHE_CB for a partitioned key - cache. + The function takes the parameter keycache as a pointer to the + control block structure of the type PARTITIONED_KEY_CACHE_CB for a + partitioned key cache. The function writes a block of file data from a buffer into the key cache. The buffer is specified with the parameters buff and length - the pointer to the beginning of the buffer and its size respectively. It's assumed @@ -5521,8 +5512,8 @@ uchar *p_key_cache_read(void *keycache_c filepos. The data is copied from the buffer in key_cache_block_size increments. For every portion of data the function finds out in what simple key cache from the array of partitions the data must be stored, and after - this calls s_key_cache_insert to copy the data into a key buffer of this - simple key cache. + this calls simple_key_cache_insert to copy the data into a key buffer of + this simple key cache. The parameter level is used to set one characteristic for the key buffers loaded with the data from buff. The characteristic is used only by the midpoint insertion strategy. @@ -5534,18 +5525,16 @@ uchar *p_key_cache_read(void *keycache_c The function is used by MyISAM to move all blocks from a index file to the key cache. It can be performed in parallel with reading the file data from the key buffers by other threads. - */ static -int p_key_cache_insert(void *keycache_cb, - File file, my_off_t filepos, int level, - uchar *buff, uint length) +int partitioned_key_cache_insert(PARTITIONED_KEY_CACHE_CB *keycache, + File file, my_off_t filepos, int level, + uchar *buff, uint length) { uint w_length; - P_KEY_CACHE_CB *keycache= (P_KEY_CACHE_CB *) keycache_cb; uint offset= (uint) (filepos % keycache->key_cache_block_size); - DBUG_ENTER("p_key_cache_insert"); + DBUG_ENTER("partitioned_key_cache_insert"); DBUG_PRINT("enter", ("fd: %u pos: %lu length: %u", (uint) file,(ulong) filepos, length)); @@ -5553,13 +5542,13 @@ int p_key_cache_insert(void *keycache_cb /* Write data in key_cache_block_size increments */ do { - S_KEY_CACHE_CB *partition= get_key_cache_partition(keycache, - file, filepos); + SIMPLE_KEY_CACHE_CB *partition= get_key_cache_partition(keycache, + file, filepos); w_length= length; - set_if_smaller(w_length, keycache->key_cache_block_size); - if (s_key_cache_insert((void *) partition, - file, filepos, level, - buff, w_length)) + set_if_smaller(w_length, keycache->key_cache_block_size - offset); + if (simple_key_cache_insert((void *) partition, + file, filepos, level, + buff, w_length)) DBUG_RETURN(1); filepos+= w_length; @@ -5576,8 +5565,8 @@ int p_key_cache_insert(void *keycache_cb SYNOPSIS - p_key_cache_write() - keycache_cb pointer to the control block of a partitioned key cache + partitioned_key_cache_write() + keycache pointer to the control block of a partitioned key cache file handler for the file to write data to filepos position in the file to write data to level determines the weight of the data @@ -5591,9 +5580,9 @@ int p_key_cache_insert(void *keycache_cb DESCRIPTION This function is the implementation of the key_cache_write interface function that is employed by partitioned key caches. - The function considers the parameter keycache_cb as a pointer to the - control block structure of the type P_KEY_CACHE_CB for a partitioned - key cache. + The function takes the parameter keycache as a pointer to the + control block structure of the type PARTITIONED_KEY_CACHE_CB for a + partitioned key cache. In a general case the function copies data from a buffer into the key cache. The buffer is specified with the parameters buff and length - the pointer to the beginning of the buffer and its size respectively. @@ -5601,8 +5590,8 @@ int p_key_cache_insert(void *keycache_cb starting from the position filepos. The data is copied from the buffer in key_cache_block_size increments. For every portion of data the function finds out in what simple key cache from the array of partitions - the data must be stored, and after this calls s_key_cache_write to copy - the data into a key buffer of this simple key cache. + the data must be stored, and after this calls simple_key_cache_write to + copy the data into a key buffer of this simple key cache. If the value of the parameter dont_write is FALSE then the function also writes the data into file. The parameter level is used to set one characteristic for the key buffers @@ -5610,7 +5599,7 @@ int p_key_cache_insert(void *keycache_cb the midpoint insertion strategy. The parameter file_expra provides a pointer to the shared bitmap of the partitions that may contains dirty pages for the file. This bitmap - is used to optimize the function p_flush_key_blocks. + is used to optimize the function flush_partitioned_key_cache_blocks. RETURN VALUE 0 if a success, 1 - otherwise. @@ -5618,22 +5607,20 @@ int p_key_cache_insert(void *keycache_cb NOTES This implementation exploits the fact that the function is called only when a thread has got an exclusive lock for the key file. - */ static -int p_key_cache_write(void *keycache_cb, - File file, void *file_extra, - my_off_t filepos, int level, - uchar *buff, uint length, - uint block_length __attribute__((unused)), - int dont_write) +int partitioned_key_cache_write(PARTITIONED_KEY_CACHE_CB *keycache, + File file, void *file_extra, + my_off_t filepos, int level, + uchar *buff, uint length, + uint block_length __attribute__((unused)), + int dont_write) { uint w_length; ulonglong *part_map= (ulonglong *) file_extra; - P_KEY_CACHE_CB *keycache= (P_KEY_CACHE_CB *) keycache_cb; uint offset= (uint) (filepos % keycache->key_cache_block_size); - DBUG_ENTER("p_key_cache_write"); + DBUG_ENTER("partitioned_key_cache_write"); DBUG_PRINT("enter", ("fd: %u pos: %lu length: %u block_length: %u" " key_block_length: %u", @@ -5644,15 +5631,16 @@ int p_key_cache_write(void *keycache_cb, /* Write data in key_cache_block_size increments */ do { - S_KEY_CACHE_CB *partition= get_key_cache_partition_for_write(keycache, - file, filepos, - part_map); + SIMPLE_KEY_CACHE_CB *partition= get_key_cache_partition_for_write(keycache, + file, + filepos, + part_map); w_length = length; - set_if_smaller(w_length, keycache->key_cache_block_size ); - if (s_key_cache_write(partition, - file, 0, filepos, level, - buff, w_length, block_length, - dont_write)) + set_if_smaller(w_length, keycache->key_cache_block_size - offset ); + if (simple_key_cache_write(partition, + file, 0, filepos, level, + buff, w_length, block_length, + dont_write)) DBUG_RETURN(1); filepos+= w_length; @@ -5669,8 +5657,8 @@ int p_key_cache_write(void *keycache_cb, SYNOPSIS - p_flush_key_blocks() - keycache_cb pointer to the control block of a partitioned key cache + flush_partitioned_key_cache_blocks() + keycache pointer to the control block of a partitioned key cache file handler for the file to flush to file_extra maps of key cache partitions containing dirty pages from file (not used) @@ -5679,9 +5667,9 @@ int p_key_cache_write(void *keycache_cb, DESCRIPTION This function is the implementation of the flush_key_blocks interface function that is employed by partitioned key caches. - The function considers the parameter keycache_cb as a pointer to the - control block structure of the type P_KEY_CACHE_CB for a partitioned - key cache. + The function takes the parameter keycache as a pointer to the + control block structure of the type PARTITIONED_KEY_CACHE_CB for a + partitioned key cache. In a general case the function flushes the data from all dirty key buffers related to the file 'file' into this file. The function does exactly this if the value of the parameter type is FLUSH_KEEP. If the @@ -5689,12 +5677,12 @@ int p_key_cache_write(void *keycache_cb, releases the key buffers containing data from 'file' for new usage. If the value of the parameter type is FLUSH_IGNORE_CHANGED the function just releases the key buffers containing data from 'file'. - The function performs the operation by calling s_flush_key_blocks - for the elements of the array of the simple key caches that comprise - the partitioned key_cache. If the value of the parameter type is - FLUSH_KEEP s_flush_key_blocks is called only for the partitions with - possibly dirty pages marked in the bitmap pointed to by the parameter - file_extra. + The function performs the operation by calling the function + flush_simple_key_cache_blocks for the elements of the array of the + simple key caches that comprise the partitioned key_cache. If the value + of the parameter type is FLUSH_KEEP s_flush_key_blocks is called only + for the partitions with possibly dirty pages marked in the bitmap + pointed to by the parameter file_extra. RETURN 0 ok @@ -5703,35 +5691,30 @@ int p_key_cache_write(void *keycache_cb, NOTES This implementation exploits the fact that the function is called only when a thread has got an exclusive lock for the key file. - */ static -int p_flush_key_blocks(void *keycache_cb, - File file, void *file_extra, - enum flush_type type) +int flush_partitioned_key_cache_blocks(PARTITIONED_KEY_CACHE_CB *keycache, + File file, void *file_extra, + enum flush_type type) { uint i; - P_KEY_CACHE_CB *keycache= (P_KEY_CACHE_CB *) keycache_cb; uint partitions= keycache->partitions; int err= 0; ulonglong *dirty_part_map= (ulonglong *) file_extra; - DBUG_ENTER("p_flush_key_blocks"); + DBUG_ENTER("partitioned_flush_key_blocks"); DBUG_PRINT("enter", ("keycache: 0x%lx", (long) keycache)); for (i= 0; i < partitions; i++) { - S_KEY_CACHE_CB *partition= keycache->partition_array[i]; + SIMPLE_KEY_CACHE_CB *partition= keycache->partition_array[i]; if ((type == FLUSH_KEEP || type == FLUSH_FORCE_WRITE) && - !((*dirty_part_map) & (1<<i))) + !((*dirty_part_map) & ((ulonglong) 1 << i))) continue; - err+= test(s_flush_key_blocks(partition, file, 0, type)); + err|= test(flush_simple_key_cache_blocks(partition, file, 0, type)); } *dirty_part_map= 0; - if (err > 0) - err= 1; - DBUG_RETURN(err); } @@ -5740,38 +5723,36 @@ int p_flush_key_blocks(void *keycache_cb Reset the counters of a partitioned key cache SYNOPSIS - p_reset_key_cache_counters() + reset_partitioned_key_cache_counters() name the name of a key cache - keycache_cb pointer to the control block of a partitioned key cache + keycache pointer to the control block of a partitioned key cache DESCRIPTION This function is the implementation of the reset_key_cache_counters interface function that is employed by partitioned key caches. - The function considers the parameter keycache_cb as a pointer to the - control block structure of the type P_KEY_CACHE_CB for a partitioned + The function takes the parameter keycache as a pointer to the + control block structure of the type PARTITIONED_KEY_CACHE_CB for a partitioned key cache. This function resets the values of the statistical counters of the simple key caches comprising partitioned key cache to 0. It does it by calling - s_reset_key_cache_counters for each key cache partition. + reset_simple_key_cache_counters for each key cache partition. The parameter name is currently not used. RETURN 0 on success (always because it can't fail) - */ -static -int p_reset_key_cache_counters(const char *name __attribute__((unused)), - void *keycache_cb) +static int +reset_partitioned_key_cache_counters(const char *name __attribute__((unused)), + PARTITIONED_KEY_CACHE_CB *keycache) { uint i; - P_KEY_CACHE_CB *keycache= (P_KEY_CACHE_CB *) keycache_cb; uint partitions= keycache->partitions; - DBUG_ENTER("p_reset_key_cache_counters"); + DBUG_ENTER("partitioned_reset_key_cache_counters"); for (i = 0; i < partitions; i++) { - s_reset_key_cache_counters(name, keycache->partition_array[i]); + reset_simple_key_cache_counters(name, keycache->partition_array[i]); } DBUG_RETURN(0); } @@ -5781,17 +5762,17 @@ int p_reset_key_cache_counters(const cha Get statistics for a partition key cache SYNOPSIS - p_get_key_cache_statistics() - keycache_cb pointer to the control block of a partitioned key cache + get_partitioned_key_cache_statistics() + keycache pointer to the control block of a partitioned key cache partition_no partition number to get statistics for key_cache_stats OUT pointer to the structure for the returned statistics DESCRIPTION This function is the implementation of the get_key_cache_statistics interface function that is employed by partitioned key caches. - The function considers the parameter keycache_cb as a pointer to the - control block structure of the type P_KEY_CACHE_CB for a partitioned - key cache. + The function takes the parameter keycache as a pointer to the + control block structure of the type PARTITIONED_KEY_CACHE_CB for + a partitioned key cache. If the value of the parameter partition_no is equal to 0 then aggregated statistics for all partitions is returned in the fields of the structure key_cache_stat of the type KEY_CACHE_STATISTICS . Otherwise @@ -5801,37 +5782,38 @@ int p_reset_key_cache_counters(const cha RETURN none - */ static -void p_get_key_cache_statistics(void *keycache_cb, uint partition_no, - KEY_CACHE_STATISTICS *key_cache_stats) +void +get_partitioned_key_cache_statistics(PARTITIONED_KEY_CACHE_CB *keycache, + uint partition_no, + KEY_CACHE_STATISTICS *keycache_stats) { uint i; - S_KEY_CACHE_CB *partition; - P_KEY_CACHE_CB *keycache= (P_KEY_CACHE_CB *) keycache_cb; + SIMPLE_KEY_CACHE_CB *partition; uint partitions= keycache->partitions; - DBUG_ENTER("p_get_key_cache_statistics_"); + DBUG_ENTER("get_partitioned_key_cache_statistics"); if (partition_no != 0) { partition= keycache->partition_array[partition_no-1]; - s_get_key_cache_statistics((void *) partition, 0, key_cache_stats); + get_simple_key_cache_statistics((void *) partition, 0, keycache_stats); DBUG_VOID_RETURN; } - key_cache_stats->mem_size= (longlong) keycache->key_cache_mem_size; - key_cache_stats->block_size= (longlong) keycache->key_cache_block_size; + bzero(keycache_stats, sizeof(KEY_CACHE_STATISTICS)); + keycache_stats->mem_size= (longlong) keycache->key_cache_mem_size; + keycache_stats->block_size= (longlong) keycache->key_cache_block_size; for (i = 0; i < partitions; i++) { partition= keycache->partition_array[i]; - key_cache_stats->blocks_used+= partition->blocks_used; - key_cache_stats->blocks_unused+= partition->blocks_unused; - key_cache_stats->blocks_changed+= partition->global_blocks_changed; - key_cache_stats->read_requests+= partition->global_cache_r_requests; - key_cache_stats->reads+= partition->global_cache_read; - key_cache_stats->write_requests+= partition->global_cache_w_requests; - key_cache_stats->writes+= partition->global_cache_write; + keycache_stats->blocks_used+= partition->blocks_used; + keycache_stats->blocks_unused+= partition->blocks_unused; + keycache_stats->blocks_changed+= partition->global_blocks_changed; + keycache_stats->read_requests+= partition->global_cache_r_requests; + keycache_stats->reads+= partition->global_cache_read; + keycache_stats->write_requests+= partition->global_cache_w_requests; + keycache_stats->writes+= partition->global_cache_write; } DBUG_VOID_RETURN; } @@ -5840,16 +5822,16 @@ void p_get_key_cache_statistics(void *ke Get the value of a statistical variable for a partitioned key cache SYNOPSIS - p_get_key_cache_stat_value() - keycache_cb pointer to the control block of a partitioned key cache + get_partitioned_key_cache_stat_value() + keycache pointer to the control block of a partitioned key cache var_no the ordered number of a statistical variable DESCRIPTION This function is the implementation of the get_key_cache_stat_value interface function that is employed by partitioned key caches. - The function considers the parameter keycache_cb as a pointer to the - control block structure of the type P_KEY_CACHE_CB for a partitioned - key cache. + The function takes the parameter keycache as a pointer to the + control block structure of the type PARTITIONED_KEY_CACHE_CB for a + partitioned key cache. This function returns the value of the statistical variable var_no for this key cache. The variables are numbered starting from 0 to 6. The returned value is calculated as the sum of the values of the @@ -5858,24 +5840,24 @@ void p_get_key_cache_statistics(void *ke RETURN The value of the specified statistical variable - */ static -ulonglong p_get_key_cache_stat_value(void *keycache_cb, uint var_no) +ulonglong +get_partitioned_key_cache_stat_value(PARTITIONED_KEY_CACHE_CB *keycache, + uint var_no) { uint i; - P_KEY_CACHE_CB *keycache= (P_KEY_CACHE_CB *) keycache_cb; uint partitions= keycache->partitions; - size_t var_ofs= s_key_cache_stat_var_offsets[var_no]; + size_t var_ofs= simple_key_cache_stat_var_offsets[var_no]; ulonglong res= 0; - DBUG_ENTER("p_get_key_cache_stat_value"); + DBUG_ENTER("get_partitioned_key_cache_stat_value"); - if (var_no < 3) + if (var_no < NO_LONG_KEY_CACHE_STAT_VARIABLES) { for (i = 0; i < partitions; i++) { - S_KEY_CACHE_CB *partition= keycache->partition_array[i]; + SIMPLE_KEY_CACHE_CB *partition= keycache->partition_array[i]; res+= (ulonglong) (*(long *) ((char *) partition + var_ofs)); } } @@ -5883,7 +5865,7 @@ ulonglong p_get_key_cache_stat_value(voi { for (i = 0; i < partitions; i++) { - S_KEY_CACHE_CB *partition= keycache->partition_array[i]; + SIMPLE_KEY_CACHE_CB *partition= keycache->partition_array[i]; res+= *(ulonglong *) ((char *) partition + var_ofs); } } @@ -5901,19 +5883,19 @@ ulonglong p_get_key_cache_stat_value(voi wrappers must be used for this purpose. */ -static KEY_CACHE_FUNCS p_key_cache_funcs = +static KEY_CACHE_FUNCS partitioned_key_cache_funcs = { - p_init_key_cache, - p_resize_key_cache, - p_change_key_cache_param, - p_key_cache_read, - p_key_cache_insert, - p_key_cache_write, - p_flush_key_blocks, - p_reset_key_cache_counters, - p_end_key_cache, - p_get_key_cache_statistics, - p_get_key_cache_stat_value + (INIT_KEY_CACHE) init_partitioned_key_cache, + (RESIZE_KEY_CACHE) resize_partitioned_key_cache, + (CHANGE_KEY_CACHE_PARAM) change_partitioned_key_cache_param, + (KEY_CACHE_READ) partitioned_key_cache_read, + (KEY_CACHE_INSERT) partitioned_key_cache_insert, + (KEY_CACHE_WRITE) partitioned_key_cache_write, + (FLUSH_KEY_BLOCKS) flush_partitioned_key_cache_blocks, + (RESET_KEY_CACHE_COUNTERS) reset_partitioned_key_cache_counters, + (END_KEY_CACHE) end_partitioned_key_cache, + (GET_KEY_CACHE_STATISTICS) get_partitioned_key_cache_statistics, + (GET_KEY_CACHE_STAT_VALUE) get_partitioned_key_cache_stat_value }; @@ -5926,12 +5908,12 @@ static KEY_CACHE_FUNCS p_key_cache_funcs partitioned key caches. Each type (class) has its own implementation of the basic key cache operations used the MyISAM storage engine. The pointers to the implementation functions are stored in two static structures of the - type KEY_CACHE_FUNC: s_key_cache_funcs - for simple key caches, and - p_key_cache_funcs - for partitioned key caches. When a key cache object is - created the constructor procedure init_key_cache places a pointer to the - corresponding table into one of its fields. The procedure also initializes - a control block for the key cache oject and saves the pointer to this - block in another field of the key cache object. + type KEY_CACHE_FUNC: simple_key_cache_funcs - for simple key caches, and + partitioned_key_cache_funcs - for partitioned key caches. When a key cache + object is created the constructor procedure init_key_cache places a pointer + to the corresponding table into one of its fields. The procedure also + initializes a control block for the key cache oject and saves the pointer + to this block in another field of the key cache object. When a key cache wrapper function is invoked for a key cache object to perform a basic key cache operation it looks into the interface table associated with the key cache oject and calls the corresponding @@ -5982,7 +5964,6 @@ static KEY_CACHE_FUNCS p_key_cache_funcs It's assumed that no two threads call this function simultaneously referring to the same key cache handle. - */ int init_key_cache(KEY_CACHE *keycache, uint key_cache_block_size, @@ -5997,19 +5978,21 @@ int init_key_cache(KEY_CACHE *keycache, { if (partitions == 0) { - if (!(keycache_cb= (void *) my_malloc(sizeof(S_KEY_CACHE_CB), MYF(0)))) + if (!(keycache_cb= (void *) my_malloc(sizeof(SIMPLE_KEY_CACHE_CB), + MYF(0)))) return 0; - ((S_KEY_CACHE_CB *) keycache_cb)->key_cache_inited= 0; + ((SIMPLE_KEY_CACHE_CB *) keycache_cb)->key_cache_inited= 0; keycache->key_cache_type= SIMPLE_KEY_CACHE; - keycache->interface_funcs= &s_key_cache_funcs; + keycache->interface_funcs= &simple_key_cache_funcs; } else { - if (!(keycache_cb= (void *) my_malloc(sizeof(P_KEY_CACHE_CB), MYF(0)))) + if (!(keycache_cb= (void *) my_malloc(sizeof(PARTITIONED_KEY_CACHE_CB), + MYF(0)))) return 0; - ((P_KEY_CACHE_CB *) keycache_cb)->key_cache_inited= 0; + ((PARTITIONED_KEY_CACHE_CB *) keycache_cb)->key_cache_inited= 0; keycache->key_cache_type= PARTITIONED_KEY_CACHE; - keycache->interface_funcs= &p_key_cache_funcs; + keycache->interface_funcs= &partitioned_key_cache_funcs; } keycache->keycache_cb= keycache_cb; keycache->key_cache_inited= 1; @@ -6017,14 +6000,15 @@ int init_key_cache(KEY_CACHE *keycache, if (partitions != 0) { - ((P_KEY_CACHE_CB *) keycache_cb)->partitions= partitions; + ((PARTITIONED_KEY_CACHE_CB *) keycache_cb)->partitions= partitions; } keycache->can_be_used= 0; blocks= keycache->interface_funcs->init(keycache_cb, key_cache_block_size, use_mem, division_limit, age_threshold); keycache->partitions= partitions ? - ((P_KEY_CACHE_CB *) keycache_cb)->partitions : 0; + ((PARTITIONED_KEY_CACHE_CB *) keycache_cb)->partitions : + 0; DBUG_ASSERT(partitions <= MAX_KEY_CACHE_PARTITIONS); if (blocks > 0) keycache->can_be_used= 1; @@ -6037,7 +6021,7 @@ int init_key_cache(KEY_CACHE *keycache, SYNOPSIS resize_key_cache() - keycache pointer to the key cache to be resized + keycache pointer to the key cache to be resized key_cache_block_size size of blocks to keep cached data use_mem total memory to use for the new key cache division_limit new division limit (if not zero) @@ -6064,7 +6048,6 @@ int init_key_cache(KEY_CACHE *keycache, Currently the function is called when the values of the variables key_buffer_size and/or key_cache_block_size are being reset for the key cache keycache. - */ int resize_key_cache(KEY_CACHE *keycache, uint key_cache_block_size, @@ -6074,10 +6057,10 @@ int resize_key_cache(KEY_CACHE *keycache if (keycache->key_cache_inited) { if ((uint) keycache->param_partitions != keycache->partitions && use_mem) - blocks= repartition_key_cache (keycache, - key_cache_block_size, use_mem, - division_limit, age_threshold, - (uint) keycache->param_partitions); + blocks= repartition_key_cache(keycache, + key_cache_block_size, use_mem, + division_limit, age_threshold, + (uint) keycache->param_partitions); else { blocks= keycache->interface_funcs->resize(keycache->keycache_cb, @@ -6087,10 +6070,10 @@ int resize_key_cache(KEY_CACHE *keycache if (keycache->partitions) keycache->partitions= - ((P_KEY_CACHE_CB *)(keycache->keycache_cb))->partitions; + ((PARTITIONED_KEY_CACHE_CB *)(keycache->keycache_cb))->partitions; } - if (blocks <= 0) - keycache->can_be_used= 0; + + keycache->can_be_used= (blocks >= 0); } return blocks; } @@ -6117,7 +6100,6 @@ int resize_key_cache(KEY_CACHE *keycache Currently the function is called when the values of the variables key_cache_division_limit and/or key_cache_age_threshold are being reset for the key cache keycache. - */ void change_key_cache_param(KEY_CACHE *keycache, uint division_limit, @@ -6262,7 +6244,6 @@ uchar *key_cache_read(KEY_CACHE *keycach the key cache. It is assumed that it may be performed in parallel with reading the file data from the key buffers by other threads. - */ int key_cache_insert(KEY_CACHE *keycache, @@ -6316,7 +6297,6 @@ int key_cache_insert(KEY_CACHE *keycache NOTES This implementation may exploit the fact that the function is called only when a thread has got an exclusive lock for the key file. - */ int key_cache_write(KEY_CACHE *keycache, @@ -6373,7 +6353,6 @@ int key_cache_write(KEY_CACHE *keycache, NOTES Any implementation of the function may exploit the fact that the function is called only when a thread has got an exclusive lock for the key file. - */ int flush_key_blocks(KEY_CACHE *keycache, @@ -6406,7 +6385,6 @@ int flush_key_blocks(KEY_CACHE *keycache NOTES This procedure is used by process_key_caches() to reset the counters of all currently used key caches, both the default one and the named ones. - */ int reset_key_cache_counters(const char *name __attribute__((unused)), @@ -6441,13 +6419,11 @@ int reset_key_cache_counters(const char RETURN none - */ void get_key_cache_statistics(KEY_CACHE *keycache, uint partition_no, KEY_CACHE_STATISTICS *key_cache_stats) { - bzero(key_cache_stats, sizeof(KEY_CACHE_STATISTICS)); if (keycache->key_cache_inited) { keycache->interface_funcs->get_stats(keycache->keycache_cb, @@ -6484,7 +6460,6 @@ void get_key_cache_statistics(KEY_CACHE reads 4 write_requests 5 writes 6 - */ ulonglong get_key_cache_stat_value(KEY_CACHE *keycache, uint var_no) @@ -6534,7 +6509,6 @@ ulonglong get_key_cache_stat_value(KEY_C Currently the function is called when the value of the variable key_cache_partitions is being reset for the key cache keycache. - */ int repartition_key_cache(KEY_CACHE *keycache, uint key_cache_block_size, === modified file 'sql/sql_show.cc' --- a/sql/sql_show.cc 2010-03-29 21:16:12 +0000 +++ b/sql/sql_show.cc 2010-04-01 21:42:40 +0000 @@ -2235,8 +2235,9 @@ static void update_key_cache_stat_var(KE case offsetof(KEY_CACHE, global_cache_read): case offsetof(KEY_CACHE, global_cache_w_requests): case offsetof(KEY_CACHE, global_cache_write): - var_no= 3+(ofs-offsetof(KEY_CACHE, global_cache_w_requests))/ - sizeof(ulonglong); + var_no= NO_LONG_KEY_CACHE_STAT_VARIABLES + + (ofs-offsetof(KEY_CACHE, global_cache_w_requests))/ + sizeof(ulonglong); *(ulonglong *)((char *) key_cache + ofs)= get_key_cache_stat_value(key_cache, var_no); break; @@ -6643,13 +6644,13 @@ int store_key_cache_table_record(THD *th KEY_CACHE *key_cache, uint partitions, uint partition_no) { - KEY_CACHE_STATISTICS key_cache_stats; + KEY_CACHE_STATISTICS keycache_stats; uint err; DBUG_ENTER("store_key_cache_table_record"); - get_key_cache_statistics(key_cache, partition_no, &key_cache_stats); + get_key_cache_statistics(key_cache, partition_no, &keycache_stats); - if (key_cache_stats.mem_size == 0) + if (!key_cache->key_cache_inited || keycache_stats.mem_size == 0) DBUG_RETURN(0); restore_record(table, s->default_values); @@ -6669,15 +6670,15 @@ int store_key_cache_table_record(THD *th table->field[2]->set_notnull(); table->field[2]->store((long) partition_no, TRUE); } - table->field[3]->store(key_cache_stats.mem_size, TRUE); - table->field[4]->store(key_cache_stats.block_size, TRUE); - table->field[5]->store(key_cache_stats.blocks_used, TRUE); - table->field[6]->store(key_cache_stats.blocks_unused, TRUE); - table->field[7]->store(key_cache_stats.blocks_changed, TRUE); - table->field[8]->store(key_cache_stats.read_requests, TRUE); - table->field[9]->store(key_cache_stats.reads, TRUE); - table->field[10]->store(key_cache_stats.write_requests, TRUE); - table->field[11]->store(key_cache_stats.writes, TRUE); + table->field[3]->store(keycache_stats.mem_size, TRUE); + table->field[4]->store(keycache_stats.block_size, TRUE); + table->field[5]->store(keycache_stats.blocks_used, TRUE); + table->field[6]->store(keycache_stats.blocks_unused, TRUE); + table->field[7]->store(keycache_stats.blocks_changed, TRUE); + table->field[8]->store(keycache_stats.read_requests, TRUE); + table->field[9]->store(keycache_stats.reads, TRUE); + table->field[10]->store(keycache_stats.write_requests, TRUE); + table->field[11]->store(keycache_stats.writes, TRUE); err= schema_table_store_record(thd, table); DBUG_RETURN(err);

1 0