diff options
| author | unknown <sasha@mysql.sashanet.com> | 2001-10-04 15:46:04 -0600 |
|---|---|---|
| committer | unknown <sasha@mysql.sashanet.com> | 2001-10-04 15:46:04 -0600 |
| commit | 89055361b9203be1d4e813b00aa5dfbc6e9b0caa (patch) | |
| tree | f15f127921d230171bb0ac60a5a854a61af3b185 /sql/item_func.cc | |
| parent | 5ee900d38a1d20247823ab23a441cbb78ac9942a (diff) | |
| parent | 6bede5bed1add70fb5bb442ba70fe029c4c534f7 (diff) | |
| download | mariadb-git-89055361b9203be1d4e813b00aa5dfbc6e9b0caa.tar.gz | |
Merge
client/mysqltest.c:
Auto merged
include/mysql.h:
Auto merged
include/mysql_com.h:
Auto merged
libmysql/libmysql.c:
Auto merged
libmysqld/libmysqld.c:
Auto merged
mysql-test/mysql-test-run.sh:
Auto merged
sql/item_func.cc:
Auto merged
sql/log_event.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
acinclude.m4:
SCCS merged
Diffstat (limited to 'sql/item_func.cc')
| -rw-r--r-- | sql/item_func.cc | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/sql/item_func.cc b/sql/item_func.cc index a20a045f2d7..0ce342d09c8 100644 --- a/sql/item_func.cc +++ b/sql/item_func.cc @@ -209,7 +209,6 @@ void Item_func::fix_num_length_and_dec() max_length=float_length(decimals); } - String *Item_int_func::val_str(String *str) { longlong nr=val_int(); |