diff options
| author | unknown <tnurnberg@white.intern.koehntopp.de> | 2007-12-06 01:46:49 +0100 |
|---|---|---|
| committer | unknown <tnurnberg@white.intern.koehntopp.de> | 2007-12-06 01:46:49 +0100 |
| commit | 55dea2fc982cf7fb8f14404f51b1b6cb2d2a66ca (patch) | |
| tree | 038d9a3e067da02e2ab26a075a1e121815e3c3a6 /sql/set_var.h | |
| parent | 09bf5b91693110bc91fa949bb2d85a0ac587d07e (diff) | |
| parent | 4618d68d6d85141cd2422c892ed5053c72aa097a (diff) | |
| download | mariadb-git-55dea2fc982cf7fb8f14404f51b1b6cb2d2a66ca.tar.gz | |
Merge mysql.com:/misc/mysql/31177/50-31177
into mysql.com:/misc/mysql/31177/51-31177
BitKeeper/deleted/.del-ps_6bdb.result:
Auto merged
mysys/my_getopt.c:
Auto merged
mysql-test/r/ps_2myisam.result:
manual merge
mysql-test/r/ps_3innodb.result:
manual merge
mysql-test/r/ps_4heap.result:
manual merge
mysql-test/r/ps_5merge.result:
manual merge
mysql-test/suite/ndb/r/ps_7ndb.result:
manual merge
mysql-test/t/variables.test:
manual merge
sql/mysqld.cc:
NULL
sql/item_func.cc:
Signedness is already propagated properly for user-vars in 5.1.
sql/set_var.cc:
add correct handling of signedness when assigning 64-bit
values to sysvars.
sql/set_var.h:
cleanliness.
Diffstat (limited to 'sql/set_var.h')
| -rw-r--r-- | sql/set_var.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/set_var.h b/sql/set_var.h index eb2c893c89e..2881903133d 100644 --- a/sql/set_var.h +++ b/sql/set_var.h @@ -379,6 +379,7 @@ public: void set_default(THD *thd, enum_var_type type); SHOW_TYPE show_type() { return SHOW_LONGLONG; } uchar *value_ptr(THD *thd, enum_var_type type, LEX_STRING *base); + bool check(THD *thd, set_var *var); bool check_default(enum_var_type type) { return type == OPT_GLOBAL && !option_limits; |