diff options
| author | unknown <msvensson@neptunus.(none)> | 2006-08-01 20:24:30 +0200 |
|---|---|---|
| committer | unknown <msvensson@neptunus.(none)> | 2006-08-01 20:24:30 +0200 |
| commit | 1081dd6f0da5814fecad628d509e71c250ad1730 (patch) | |
| tree | 846b441c9730546494aa063e2bc4f74751efde48 /sql/sql_class.h | |
| parent | edeea349b9cf8125c3ca19eff144b1334fddad28 (diff) | |
| parent | 2660a6bb5936a215876468e94fb88b3f0c58f3bf (diff) | |
| download | mariadb-git-1081dd6f0da5814fecad628d509e71c250ad1730.tar.gz | |
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
configure.in:
Auto merged
client/mysql.cc:
Auto merged
client/mysqldump.c:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/r/date_formats.result:
Auto merged
mysql-test/r/federated.result:
Auto merged
mysql-test/r/func_time.result:
Auto merged
mysql-test/r/mysql.result:
Auto merged
mysql-test/r/type_ranges.result:
Auto merged
mysql-test/t/func_time.test:
Auto merged
mysql-test/t/mysql.test:
Auto merged
sql/field.cc:
Auto merged
sql/item_strfunc.cc:
Auto merged
sql/item_strfunc.h:
Auto merged
sql/item_subselect.cc:
Auto merged
sql/item_timefunc.cc:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_yacc.yy:
Auto merged
Diffstat (limited to 'sql/sql_class.h')
| -rw-r--r-- | sql/sql_class.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/sql_class.h b/sql/sql_class.h index 5134efcfb32..53a95a89b51 100644 --- a/sql/sql_class.h +++ b/sql/sql_class.h @@ -2015,6 +2015,7 @@ class user_var_entry ulong length; query_id_t update_query_id, used_query_id; Item_result type; + bool unsigned_flag; double val_real(my_bool *null_value); longlong val_int(my_bool *null_value); |