summaryrefslogtreecommitdiff
path: root/sql/sql_select.cc
diff options
context:
space:
mode:
authorunknown <gkodinov/kgeorge@magare.gmz>2007-11-23 13:40:53 +0200
committerunknown <gkodinov/kgeorge@magare.gmz>2007-11-23 13:40:53 +0200
commitabad0dee92db7c467517f184ca0f250ea5a7bb2b (patch)
treecaa7be4c4101ee14098da25e9f805ad30ddb7f6d /sql/sql_select.cc
parent11a0d0d424df36966e5e5167e66e07f6e380eb7a (diff)
downloadmariadb-git-abad0dee92db7c467517f184ca0f250ea5a7bb2b.tar.gz
merge 5.0-opt -> 5.1-opt
Diffstat (limited to 'sql/sql_select.cc')
-rw-r--r--sql/sql_select.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_select.cc b/sql/sql_select.cc
index bec8d987276..f379542f8d7 100644
--- a/sql/sql_select.cc
+++ b/sql/sql_select.cc
@@ -2367,7 +2367,7 @@ static ha_rows get_quick_record_count(THD *thd, SQL_SELECT *select,
int error;
DBUG_ENTER("get_quick_record_count");
#ifndef EMBEDDED_LIBRARY // Avoid compiler warning
- char buff[STACK_BUFF_ALLOC];
+ uchar buff[STACK_BUFF_ALLOC];
#endif
if (check_stack_overrun(thd, STACK_MIN_SIZE, buff))
DBUG_RETURN(0); // Fatal error flag is set