diff options
| author | unknown <kostja@bodhi.(none)> | 2007-08-08 11:45:13 +0400 |
|---|---|---|
| committer | unknown <kostja@bodhi.(none)> | 2007-08-08 11:45:13 +0400 |
| commit | e23d7a37947771a8f4391607d230ae56e1013ea3 (patch) | |
| tree | 7cc58755bbc385fe7dde5a8e58a5bc65c6b5bfa7 /sql/item.cc | |
| parent | b0301f7c275ccfe27dc81bd36a665b1a291c6c3d (diff) | |
| parent | e6701d746df9f4ed778fac78870c6639e4c84880 (diff) | |
| download | mariadb-git-e23d7a37947771a8f4391607d230ae56e1013ea3.tar.gz | |
Merge bodhi.(none):/opt/local/work/mysql-5.0-runtime
into bodhi.(none):/opt/local/work/mysql-5.1-runtime
mysql-test/r/federated.result:
Auto merged
mysql-test/t/federated.test:
Auto merged
sql/item.cc:
Auto merged
tests/mysql_client_test.c:
Manual merge.
Diffstat (limited to 'sql/item.cc')
| -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 006595a39a9..76aad708d22 100644 --- a/sql/item.cc +++ b/sql/item.cc @@ -1705,7 +1705,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(); } /**********************************************/ |