Commit 45c70a2e authored by Georgi Kodinov's avatar Georgi Kodinov

fixed compilation warnings

parent 3df67bc2
...@@ -3113,7 +3113,7 @@ int key_cache_write(KEY_CACHE *keycache, ...@@ -3113,7 +3113,7 @@ int key_cache_write(KEY_CACHE *keycache,
/* Used in the server. */ /* Used in the server. */
keycache->global_cache_write++; keycache->global_cache_write++;
keycache_pthread_mutex_unlock(&keycache->cache_lock); keycache_pthread_mutex_unlock(&keycache->cache_lock);
if (my_pwrite(file, (uchar*) buff, read_length, filepos + offset, if (my_pwrite(file, (byte*) buff, read_length, filepos + offset,
MYF(MY_NABP | MY_WAIT_IF_FULL))) MYF(MY_NABP | MY_WAIT_IF_FULL)))
error=1; error=1;
keycache_pthread_mutex_lock(&keycache->cache_lock); keycache_pthread_mutex_lock(&keycache->cache_lock);
......
...@@ -4201,7 +4201,7 @@ void Item_func_set_user_var::save_item_result(Item *item) ...@@ -4201,7 +4201,7 @@ void Item_func_set_user_var::save_item_result(Item *item)
bool bool
Item_func_set_user_var::update() Item_func_set_user_var::update()
{ {
bool res= NULL; bool res= 0;
DBUG_ENTER("Item_func_set_user_var::update"); DBUG_ENTER("Item_func_set_user_var::update");
switch (cached_result_type) { switch (cached_result_type) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment