diff options
| author | unknown <igor@olga.mysql.com> | 2007-07-07 17:29:19 -0700 |
|---|---|---|
| committer | unknown <igor@olga.mysql.com> | 2007-07-07 17:29:19 -0700 |
| commit | 2e5be55ae946e43f03367db818e80a5a7a21c8c4 (patch) | |
| tree | a266ee4367094cee4223e1d5c3b97d27b547f5bb /sql/item_create.cc | |
| parent | a0336ad7d8f28b8de5a2b01ec285634952692abb (diff) | |
| parent | 3561de50b1ef473ef9d82af53809b3fb84fa94c8 (diff) | |
| download | mariadb-git-2e5be55ae946e43f03367db818e80a5a7a21c8c4.tar.gz | |
Merge olga.mysql.com:/home/igor/mysql-5.0-opt
into olga.mysql.com:/home/igor/dev-opt/mysql-5.1-opt
sql/field.cc:
Auto merged
mysql-test/r/type_newdecimal.result:
Manual merge
sql/item_create.cc:
Manual merge
mysql-test/t/type_newdecimal.test:
Manual merge.
Diffstat (limited to 'sql/item_create.cc')
0 files changed, 0 insertions, 0 deletions