summaryrefslogtreecommitdiff
path: root/sql/field.h
diff options
context:
space:
mode:
authorunknown <tomas@poseidon.ndb.mysql.com>2005-05-31 14:37:47 +0200
committerunknown <tomas@poseidon.ndb.mysql.com>2005-05-31 14:37:47 +0200
commitaba391dd344e99aaa1625677f2b394e506980ebf (patch)
tree7c45fd5243b3cfbcdac69f6a06c9b1ae00ddc11e /sql/field.h
parent8128e3e417e15489f61ad783182d7affc579330a (diff)
parentb1480cc00d7d5dcea716e422567495c96f6f5736 (diff)
downloadmariadb-git-aba391dd344e99aaa1625677f2b394e506980ebf.tar.gz
Merge
BitKeeper/etc/logging_ok: auto-union Makefile.am: Auto merged mysql-test/mysql-test-run.sh: Auto merged mysql-test/r/information_schema_db.result: Auto merged sql/field.cc: Auto merged sql/field.h: Auto merged sql/ha_federated.cc: Auto merged sql/ha_innodb.cc: Auto merged sql/ha_myisam.cc: Auto merged sql/ha_myisammrg.cc: Auto merged sql/ha_ndbcluster.cc: Auto merged sql/handler.cc: Auto merged sql/item.cc: Auto merged sql/log.cc: Auto merged sql/log_event.cc: Auto merged sql/mysql_priv.h: Auto merged sql/mysqld.cc: Auto merged sql/opt_range.cc: Auto merged sql/sql_base.cc: Auto merged sql/sql_class.h: Auto merged sql/sql_insert.cc: Auto merged sql/sql_lex.cc: Auto merged sql/sql_lex.h: Auto merged sql/sql_load.cc: Auto merged sql/sql_parse.cc: Auto merged sql/sql_repl.cc: Auto merged sql/sql_select.cc: Auto merged sql/sql_table.cc: Auto merged sql/sql_udf.cc: Auto merged sql/sql_yacc.yy: Auto merged sql/unireg.cc: Auto merged storage/innobase/row/row0mysql.c: Auto merged storage/innobase/srv/srv0start.c: Auto merged storage/innobase/trx/trx0trx.c: Auto merged storage/myisam/rt_split.c: Auto merged storage/myisammrg/myrg_open.c: Auto merged storage/ndb/src/common/debugger/SignalLoggerManager.cpp: Auto merged storage/ndb/src/common/util/File.cpp: Auto merged storage/ndb/src/cw/cpcd/Process.cpp: Auto merged storage/ndb/src/kernel/blocks/dbtux/Dbtux.hpp: Auto merged storage/ndb/src/kernel/blocks/ndbfs/AsyncFile.cpp: Auto merged storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp: Auto merged sql/sql_delete.cc: merge sql/sql_update.cc: merge sql/table.cc: SCCS merged support-files/mysql.spec.sh: merge
Diffstat (limited to 'sql/field.h')
-rw-r--r--sql/field.h10
1 files changed, 6 insertions, 4 deletions
diff --git a/sql/field.h b/sql/field.h
index 9ea8acb1377..b99acd43123 100644
--- a/sql/field.h
+++ b/sql/field.h
@@ -443,10 +443,12 @@ public:
/* The maximum number of decimal digits can be stored */
uint precision;
uint bin_size;
- /* Constructors take max_length of the field as a parameter - not the */
- /* precision as the number of decimal digits allowed */
- /* So for example we need to count length from precision handling */
- /* CREATE TABLE ( DECIMAL(x,y)) */
+ /*
+ Constructors take max_length of the field as a parameter - not the
+ precision as the number of decimal digits allowed.
+ So for example we need to count length from precision handling
+ CREATE TABLE ( DECIMAL(x,y))
+ */
Field_new_decimal(char *ptr_arg, uint32 len_arg, uchar *null_ptr_arg,
uchar null_bit_arg,
enum utype unireg_check_arg, const char *field_name_arg,