summaryrefslogtreecommitdiff
path: root/sql
diff options
context:
space:
mode:
authorunknown <Sinisa@sinisa.nasamreza.org>2002-11-28 16:27:42 +0200
committerunknown <Sinisa@sinisa.nasamreza.org>2002-11-28 16:27:42 +0200
commitfa56d0bf29b052fbdcdc85d7b3e9fc9570baf081 (patch)
treecb30339ba3c74125b2e6b467d8d477db52e930eb /sql
parent09a621897616ecdf0217db082a0b52c26b4c4adc (diff)
parentbbb0f7788457a43821e2ae29bbd1599ea044b9dc (diff)
downloadmariadb-git-fa56d0bf29b052fbdcdc85d7b3e9fc9570baf081.tar.gz
Merge sinisa@work.mysql.com:/home/bk/mysql
into sinisa.nasamreza.org:/mnt/work/mysql
Diffstat (limited to 'sql')
-rw-r--r--sql/sql_show.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_show.cc b/sql/sql_show.cc
index 9829f7f0b78..1d737f0bf62 100644
--- a/sql/sql_show.cc
+++ b/sql/sql_show.cc
@@ -1145,7 +1145,7 @@ int mysqld_show(THD *thd, const char *wild, show_var_st *variables)
switch (variables[i].type){
case SHOW_LONG:
case SHOW_LONG_CONST:
- net_store_data(&packet2,(uint32) *(ulong*) variables[i].value);
+ net_store_data(&packet2,(long long) *(ulong*) variables[i].value);
break;
case SHOW_BOOL:
net_store_data(&packet2,(ulong) *(bool*) variables[i].value ?