diff options
| author | unknown <tnurnberg@white.intern.koehntopp.de> | 2007-12-10 08:20:33 +0100 |
|---|---|---|
| committer | unknown <tnurnberg@white.intern.koehntopp.de> | 2007-12-10 08:20:33 +0100 |
| commit | 76a5b3b976de1ad938ae46525f11992fcb392103 (patch) | |
| tree | b263f388005c953c660dc23231418f1760ed86a6 /sql | |
| parent | a7fa078141acd6cde43c9121de8d3df208374c3d (diff) | |
| parent | 1ebb563422e5650f80addc3adf08f88044b4b340 (diff) | |
| download | mariadb-git-76a5b3b976de1ad938ae46525f11992fcb392103.tar.gz | |
Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-opt
into mysql.com:/misc/mysql/31177/51-31177
tests/mysql_client_test.c:
Auto merged
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/set_var.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/set_var.cc b/sql/set_var.cc index d78a691768e..8a6f0ac6285 100644 --- a/sql/set_var.cc +++ b/sql/set_var.cc @@ -1551,7 +1551,7 @@ Item *sys_var::item(THD *thd, enum_var_type var_type, LEX_STRING *base) pthread_mutex_lock(&LOCK_global_system_variables); value= *(ha_rows*) value_ptr(thd, var_type, base); pthread_mutex_unlock(&LOCK_global_system_variables); - return new Item_int((longlong) value); + return new Item_int((ulonglong) value); } case SHOW_MY_BOOL: { |