summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rwxr-xr-xBUILD/compile-alpha-cxx2
-rw-r--r--acinclude.m42
-rw-r--r--client/mysql.cc2
-rw-r--r--client/mysqlmanager-pwgen.c2
-rw-r--r--innobase/que/que0que.c2
-rw-r--r--myisam/ft_boolean_search.c10
-rw-r--r--myisam/sort.c28
-rw-r--r--mysys/queues.c6
-rw-r--r--strings/ctype-latin1_de.c5
-rw-r--r--tools/mysqlmanager.c4
10 files changed, 35 insertions, 28 deletions
diff --git a/BUILD/compile-alpha-cxx b/BUILD/compile-alpha-cxx
index d1fa5e3b43f..971b8b4ab3a 100755
--- a/BUILD/compile-alpha-cxx
+++ b/BUILD/compile-alpha-cxx
@@ -11,7 +11,7 @@ rm */.deps/*
make
if [ $? = 0 ]
then
- rm */.deps/*
+ find . -name ".deps" | xargs rm -r
bin/mysqladmin shutdown
sur make install
if [ $? = 0 ]
diff --git a/acinclude.m4 b/acinclude.m4
index ad043adf783..907202ac757 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -1126,9 +1126,9 @@ dnl circular references.
\$(top_builddir)/innobase/usr/libusr.a\
\$(top_builddir)/innobase/odbc/libodbc.a\
\$(top_builddir)/innobase/srv/libsrv.a\
+ \$(top_builddir)/innobase/dict/libdict.a\
\$(top_builddir)/innobase/que/libque.a\
\$(top_builddir)/innobase/srv/libsrv.a\
- \$(top_builddir)/innobase/dict/libdict.a\
\$(top_builddir)/innobase/ibuf/libibuf.a\
\$(top_builddir)/innobase/row/librow.a\
\$(top_builddir)/innobase/pars/libpars.a\
diff --git a/client/mysql.cc b/client/mysql.cc
index d62e3bfe3cf..701fb629bab 100644
--- a/client/mysql.cc
+++ b/client/mysql.cc
@@ -129,7 +129,7 @@ static String glob_buffer,old_buffer;
static int wait_time = 5;
static STATUS status;
static ulong select_limit,max_join_size,opt_connect_timeout=0;
-char mysql_charsets_dir[FN_REFLEN+1];
+static char mysql_charsets_dir[FN_REFLEN+1];
static const char *xmlmeta[] = {
"&", "&",
"<", "&lt;",
diff --git a/client/mysqlmanager-pwgen.c b/client/mysqlmanager-pwgen.c
index f0fc5871ca1..f6d4cda49e5 100644
--- a/client/mysqlmanager-pwgen.c
+++ b/client/mysqlmanager-pwgen.c
@@ -145,7 +145,7 @@ int main(int argc, char** argv)
die("Could not open '%s'(errno=%d)",outfile,errno);
get_pass(pw,sizeof(pw)-1);
my_MD5Init(&context);
- my_MD5Update(&context,pw,sizeof(pw)-1);
+ my_MD5Update(&context,(uchar*) pw,sizeof(pw)-1);
my_MD5Final(digest,&context);
fprintf(fp,"%s:",user);
for (i=0;i<sizeof(digest);i++)
diff --git a/innobase/que/que0que.c b/innobase/que/que0que.c
index b43e8ea48bc..67f7b48187d 100644
--- a/innobase/que/que0que.c
+++ b/innobase/que/que0que.c
@@ -103,7 +103,7 @@ que_thr_add_update_info(
mach_write_to_8(thr->msg_buf + SESS_SRV_MSG_N_DELETES,
graph->n_deletes);
}
-#endif
+#endif
/***************************************************************************
Adds a query graph to the session's list of graphs. */
diff --git a/myisam/ft_boolean_search.c b/myisam/ft_boolean_search.c
index bda76cb09a8..d349df9fa85 100644
--- a/myisam/ft_boolean_search.c
+++ b/myisam/ft_boolean_search.c
@@ -163,13 +163,14 @@ void _ftb_init_index_search(FT_INFO *ftb)
{
ftbw=(FTB_WORD *)(ftb->queue.root[i]);
- r=_mi_search(info, keyinfo, ftbw->word, ftbw->len,
+ r=_mi_search(info, keyinfo, (uchar*) ftbw->word, ftbw->len,
SEARCH_FIND | SEARCH_PREFIX, keyroot);
if (!r)
{
r=_mi_compare_text(default_charset_info,
info->lastkey+ftbw->trunc,ftbw->len-ftbw->trunc,
- ftbw->word+ftbw->trunc,ftbw->len-ftbw->trunc,0);
+ (uchar*) ftbw->word+ftbw->trunc,ftbw->len-ftbw->trunc,
+ 0);
}
if (r) /* not found */
{
@@ -306,13 +307,14 @@ int ft_boolean_read_next(FT_INFO *ftb, char *record)
_ftb_climb_the_tree(ftbw, curdoc);
/* update queue */
- r=_mi_search(info, keyinfo, ftbw->word, USE_WHOLE_KEY,
+ r=_mi_search(info, keyinfo, (uchar*) ftbw->word, USE_WHOLE_KEY,
SEARCH_BIGGER , keyroot);
if (!r)
{
r=_mi_compare_text(default_charset_info,
info->lastkey+ftbw->trunc,ftbw->len-ftbw->trunc,
- ftbw->word+ftbw->trunc,ftbw->len-ftbw->trunc,0);
+ (uchar*) ftbw->word+ftbw->trunc,
+ ftbw->len-ftbw->trunc,0);
}
if (r) /* not found */
{
diff --git a/myisam/sort.c b/myisam/sort.c
index e78ccc8c136..66a8254732a 100644
--- a/myisam/sort.c
+++ b/myisam/sort.c
@@ -162,16 +162,16 @@ int _create_index_by_sort(MI_SORT_PARAM *info,my_bool no_messages,
printf(" - Merging %lu keys\n",records); /* purecov: tested */
if (merge_many_buff(info,keys,sort_keys,
dynamic_element(&buffpek,0,BUFFPEK *),&maxbuffer,&tempfile))
- goto err; /* purecov: inspected */
+ goto err; /* purecov: inspected */
}
if (flush_io_cache(&tempfile) ||
reinit_io_cache(&tempfile,READ_CACHE,0L,0,0))
- goto err; /* purecov: inspected */
+ goto err; /* purecov: inspected */
if (!no_messages)
puts(" - Last merge and dumping keys"); /* purecov: tested */
if (merge_index(info,keys,sort_keys,dynamic_element(&buffpek,0,BUFFPEK *),
maxbuffer,&tempfile))
- goto err; /* purecov: inspected */
+ goto err; /* purecov: inspected */
}
if (flush_pending_blocks(info->sort_info->param))
@@ -187,10 +187,13 @@ int _create_index_by_sort(MI_SORT_PARAM *info,my_bool no_messages,
reinit_io_cache(&tempfile_for_exceptions,READ_CACHE,0L,0,0))
goto err;
- while (!my_b_read(&tempfile_for_exceptions,(byte*)&key_length, sizeof(key_length))
- && !my_b_read(&tempfile_for_exceptions,(byte*)sort_keys,(uint)key_length))
+ while (!my_b_read(&tempfile_for_exceptions,(byte*)&key_length,
+ sizeof(key_length))
+ && !my_b_read(&tempfile_for_exceptions,(byte*)sort_keys,
+ (uint) key_length))
{
- if (_mi_ck_write(index,keyno,(byte*)sort_keys,key_length-ref_length)) goto err;
+ if (_mi_ck_write(index,keyno,(uchar*) sort_keys,key_length-ref_length))
+ goto err;
}
}
@@ -219,23 +222,24 @@ static ha_rows NEAR_F find_all_keys(MI_SORT_PARAM *info, uint keys,
DBUG_ENTER("find_all_keys");
idx=error=0;
- sort_keys[0]=(char*)(sort_keys+keys);
+ sort_keys[0]=(uchar*) (sort_keys+keys);
while(!(error=(*info->key_read)(info->sort_info,sort_keys[idx])))
{
if (info->sort_info->real_key_length > info->key_length)
{
if (write_key(info,sort_keys[idx],tempfile_for_exceptions))
- DBUG_RETURN(HA_POS_ERROR); /* purecov: inspected */
+ DBUG_RETURN(HA_POS_ERROR); /* purecov: inspected */
continue;
}
if (++idx == keys)
{
- if (write_keys(info,sort_keys,idx-1,(BUFFPEK *)alloc_dynamic(buffpek),tempfile))
- DBUG_RETURN(HA_POS_ERROR); /* purecov: inspected */
+ if (write_keys(info,sort_keys,idx-1,(BUFFPEK *)alloc_dynamic(buffpek),
+ tempfile))
+ DBUG_RETURN(HA_POS_ERROR); /* purecov: inspected */
- sort_keys[0]=(char*)(sort_keys+keys);
+ sort_keys[0]=(uchar*) (sort_keys+keys);
memcpy(sort_keys[0],sort_keys[idx-1],(size_t) info->key_length);
idx=1;
}
@@ -246,7 +250,7 @@ static ha_rows NEAR_F find_all_keys(MI_SORT_PARAM *info, uint keys,
if (buffpek->elements)
{
if (write_keys(info,sort_keys,idx,(BUFFPEK *)alloc_dynamic(buffpek),tempfile))
- DBUG_RETURN(HA_POS_ERROR); /* purecov: inspected */
+ DBUG_RETURN(HA_POS_ERROR); /* purecov: inspected */
*maxbuffer=buffpek->elements-1;
}
else
diff --git a/mysys/queues.c b/mysys/queues.c
index 3deee86c23a..78da8a15842 100644
--- a/mysys/queues.c
+++ b/mysys/queues.c
@@ -170,14 +170,14 @@ void _downheap(register QUEUE *queue, uint idx)
static int queue_fix_cmp(QUEUE *queue, void *a, void *b)
{
return queue->compare(queue->first_cmp_arg,
- a+queue->offset_to_key,
- b+queue->offset_to_key);
+ (char*) a+queue->offset_to_key,
+ (char*) b+queue->offset_to_key);
}
/* Fix heap when every element was changed */
void queue_fix(QUEUE *queue)
{
qsort2(queue->root+1,queue->elements, sizeof(void *),
- (qsort2_cmp)queue_fix_cmp, queue);
+ (qsort2_cmp)queue_fix_cmp, queue);
}
diff --git a/strings/ctype-latin1_de.c b/strings/ctype-latin1_de.c
index afdf4a28d03..ca9ce492c4e 100644
--- a/strings/ctype-latin1_de.c
+++ b/strings/ctype-latin1_de.c
@@ -278,13 +278,14 @@ int my_strnxfrm_latin1_de(uchar * dest, const uchar * src, int len, int srclen)
int my_strcoll_latin1_de(const uchar * s1, const uchar * s2)
{
/* XXX QQ: This should be fixed to not call strlen */
- return my_strnncoll_latin1_de(s1, strlen(s1), s2, strlen(s2));
+ return my_strnncoll_latin1_de(s1, strlen((char*) s1),
+ s2, strlen((char*) s2));
}
int my_strxfrm_latin1_de(uchar * dest, const uchar * src, int len)
{
/* XXX QQ: This should be fixed to not call strlen */
- return my_strnxfrm_latin1_de(dest, src, len, strlen(src));
+ return my_strnxfrm_latin1_de(dest, src, len, strlen((char*) src));
}
/*
diff --git a/tools/mysqlmanager.c b/tools/mysqlmanager.c
index 5783d151107..c9307bf5d0c 100644
--- a/tools/mysqlmanager.c
+++ b/tools/mysqlmanager.c
@@ -978,7 +978,7 @@ static int authenticate(struct manager_thd* thd)
for (;isspace(*buf) && buf<buf_end;buf++) /* empty */;
my_MD5Init(&context);
- my_MD5Update(&context,buf,(uint)(buf_end-buf));
+ my_MD5Update(&context,(uchar*) buf,(uint)(buf_end-buf));
my_MD5Final(digest,&context);
if (memcmp(u->md5_pass,digest,MD5_LEN))
return 1;
@@ -1218,7 +1218,7 @@ struct manager_thd* manager_thd_new(Vio* vio)
tmp->user[0]=0;
tmp->priv_flags=0;
tmp->fatal=tmp->finished=0;
- tmp->cmd_buf=tmp->net.read_pos;
+ tmp->cmd_buf= (char*) tmp->net.read_pos;
return tmp;
}
View Lorry Controller Status