diff options
author | unknown <dlenev@brandersnatch.localdomain> | 2005-01-20 00:54:01 +0300 |
---|---|---|
committer | unknown <dlenev@brandersnatch.localdomain> | 2005-01-20 00:54:01 +0300 |
commit | 1f6070a4b992a9e09ced0e3ec495e05f9e989fd5 (patch) | |
tree | 4f4ff97c5b4b9d78a131d1adb1230a438c496eb4 /sql/set_var.h | |
parent | 628804d9348afdbe489d259de4ac625651a0c2ef (diff) | |
download | mariadb-git-1f6070a4b992a9e09ced0e3ec495e05f9e989fd5.tar.gz |
Fix for bug #7637: "Test failure: 'user_limits' on QNX and 64-bit systems"
Made user_limits.test scheduling independant (this solves failure on QNX).
Made sys_var_max_user_conn variable int sized. Changed
max_user_connections from ulong to uint to be able to use it in
sys_var_max_user_conn::value_ptr() (solves failures on 64-bit platforms).
mysql-test/r/user_limits.result:
Made test scheduling independant.
mysql-test/t/user_limits.test:
Made test scheduling independant.
sql/mysql_priv.h:
Made max_user_connections to be the same size as
USER_RESOURCES::user_conn (to be able to use them in
sys_var_max_user_conn::value_ptr()).
sql/mysqld.cc:
Made max_user_connections to be the same size as
USER_RESOURCES::user_conn (to be able to use them in
sys_var_max_user_conn::value_ptr()).
sql/set_var.cc:
sys_var::item():
Added support for int system variables.
sql/set_var.h:
Made sys_var_max_user_conn to be int sized variable.
Diffstat (limited to 'sql/set_var.h')
-rw-r--r-- | sql/set_var.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/set_var.h b/sql/set_var.h index 7c9f11041c8..0f30f764ed5 100644 --- a/sql/set_var.h +++ b/sql/set_var.h @@ -740,7 +740,7 @@ public: return type != OPT_GLOBAL || !option_limits; } void set_default(THD *thd, enum_var_type type); - SHOW_TYPE type() { return SHOW_LONG; } + SHOW_TYPE type() { return SHOW_INT; } byte *value_ptr(THD *thd, enum_var_type type, LEX_STRING *base); }; |