diff options
| author | unknown <msvensson@pilot.(none)> | 2007-08-20 13:46:57 +0200 |
|---|---|---|
| committer | unknown <msvensson@pilot.(none)> | 2007-08-20 13:46:57 +0200 |
| commit | e878be4cc9608b2879cb8ed84052dfe19aa4f375 (patch) | |
| tree | 7c8fe5721de5e5d528b557c9db9aec63761bab89 /sql | |
| parent | 80aa720a8911bfa14bd52c0a4a3b06a7ff3ae4aa (diff) | |
| parent | 78d62e87d9e1174612e20357570ed8280e4dfd58 (diff) | |
| download | mariadb-git-e878be4cc9608b2879cb8ed84052dfe19aa4f375.tar.gz | |
Merge pilot.(none):/data/msvensson/mysql/work/my50-work
into pilot.(none):/data/msvensson/mysql/mysql-5.0-maint
mysql-test/mysql-test-run.pl:
Auto merged
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/item.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/item.cc b/sql/item.cc index c99946ac9d2..8ce77e9cd4f 100644 --- a/sql/item.cc +++ b/sql/item.cc @@ -1670,7 +1670,7 @@ void Item_ident_for_show::make_field(Send_field *tmp_field) tmp_field->type=field->type(); tmp_field->flags= field->table->maybe_null ? (field->flags & ~NOT_NULL_FLAG) : field->flags; - tmp_field->decimals= 0; + tmp_field->decimals= field->decimals(); } /**********************************************/ |