summaryrefslogtreecommitdiff
path: root/sql/field.cc
Commit message (Collapse)AuthorAgeFilesLines
* Merge weblab.(none):/home/marcsql/TREE/mysql-5.1-basemalff/marcsql@weblab.(none)2007-08-201-1/+1
|\ | | | | | | into weblab.(none):/home/marcsql/TREE/mysql-5.1-rt-merge
| * Doxygen warnings.kostja@bodhi.(none)2007-08-161-1/+1
| |
* | Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.1-new-rpllars/lthalmann@dl145k.mysql.com2007-08-151-31/+6
|\ \ | | | | | | | | | into mysql.com:/nfsdisk1/lars/MERGE/mysql-5.1-merge
| * \ Merge gleb.loc:/home/uchum/work/bk/5.1gshchepa/uchum@gleb.loc2007-08-111-3/+3
| |\ \ | | |/ | |/| | | | into gleb.loc:/home/uchum/work/bk/5.1-opt
| | * Merge magare.gmz:/home/kgeorge/mysql/work/B29536-5.0-optgkodinov/kgeorge@magare.gmz2007-08-061-3/+3
| | |\ | | | | | | | | | | | | into magare.gmz:/home/kgeorge/mysql/work/B29536-5.1-opt
| | | * Bug #29536: timestamp inconsistent in replication around 1970gkodinov/kgeorge@magare.gmz2007-08-061-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MySQL replicates the time zone only when operations that involve it are performed. This is controlled by a flag. But this flag is set only on successful operation. The flag must be set also when there is an error that involves a timezone (so the master would replicate the error to the slaves). Fixed by moving the setting of the flag before the operation (so it apples to errors as well).
| | | * Merge gleb.loc:/home/uchum/work/bk/5.0gshchepa/uchum@gleb.loc2007-07-261-2/+5
| | | |\ | | | | | | | | | | | | | | | into gleb.loc:/home/uchum/work/bk/5.0-opt
| | | * \ Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0kent@kent-amd64.(none)2007-07-211-1/+2
| | | |\ \ | | | | | | | | | | | | | | | | | | into mysql.com:/home/kent/bk/tmp3/mysql-5.0-build
| | | * \ \ Merge trift-lap.fambruehe:/MySQL/M50/mysql-5.0joerg@trift-lap.fambruehe2007-07-161-0/+1
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | into trift-lap.fambruehe:/MySQL/M50/push-5.0
| | | | * \ \ Merge dev:/data0/mysqldev/my/build-200706140748-5.0.44/mysql-5.0-releasedf@pippilotta.erinye.com2007-06-291-0/+1
| | | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
| * | | | \ \ \ Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1df@pippilotta.erinye.com2007-08-041-28/+3
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
| | * | | | | | Simplify logging code a bit (to make code smaller and faster)monty@mysql.com/nosik.monty.fi2007-08-031-28/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Moved duplicated code to inline function store_timestamp() Save thd->time_zone_used when logging to table as CSV internally cases it to be changed Added MYSQL_LOCK_IGNORE_FLUSH to log tables to avoid deadlock in case of flush tables. Mark log tables with TIMESTAMP_NO_AUTO_SET to avoid automatic timestamping Set TABLE->no_replicate on open
* | | | | | | | Merge mysql_cab_desk.:C:/source/c++/mysql-5.1-new-rplcbell/Chuck@mysql_cab_desk.2007-08-101-1/+271
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | | | | | | | | into mysql_cab_desk.:C:/source/c++/mysql-5.1_BUG_22086
| * | | | | | | BUG#22086 : Extra Slave Col: Char(5) on slave and Char(10) on master cause ↵cbell/Chuck@mysql_cab_desk.2007-08-101-1/+271
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysqld crash This patch adds functionality to row-based replication to ensure the slave's column sizes are >= to that of the master. It also includes some refactoring for the code from WL#3228.
* | | | | | | | WL#3228 (NDB) : RBR using different table defs on slave/mastercbell/Chuck@mysql_cab_desk.2007-08-021-7/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch corrects a problem found during testing on Solaris. The code changes how length values are retrieved on big endian machines. The patch allows the rpl_extraColmaster tests to run on these machines.
* | | | | | | | Merge mysql_cab_desk.:C:/source/c++/mysql-5.1cbell/Chuck@mysql_cab_desk.2007-08-021-2/+5
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| / / / / / / | |/ / / / / / into mysql_cab_desk.:C:/source/c++/mysql-5.1-new-rpl-merge
| * | | | | | Merge gleb.loc:/home/uchum/work/bk/5.0-optgshchepa/uchum@gleb.loc2007-07-261-2/+5
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | | | | | | | | | into gleb.loc:/home/uchum/work/bk/5.1-opt
| | * | | | | Fixed bug #29611.igor@olga.mysql.com2007-07-221-2/+5
| | | |_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If a primary key is defined over column c of enum type then the EXPLAIN command for a look-up query of the form SELECT * FROM t WHERE c=0 said that the query was with an impossible where condition though the query correctly returned non-empty result set when the table indeed contained rows with error empty strings for column c. This kind of misbehavior was due to a bug in the function Field_enum::store(longlong,bool) that erroneously returned 1 if the the value to be stored was equal to 0. Note that the method Field_enum::store(const char *from,uint length,CHARSET_INFO *cs) correctly returned 0 if a value of the error empty string was stored.
* | | | | | WL#3228 (NDB) : RBR using different table defs on slave/mastercbell/Chuck@mysql_cab_desk.2007-07-291-0/+236
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch adds the ability to store extra field metadata in the table map event. This data can include pack_length() or field_lenght() for fields such as CHAR or VARCHAR enabling developers to add code that can check for compatibilty between master and slave columns. More importantly, the extra field metadata can be used to store data from the master correctly should a VARCHAR field on the master be <= 255 bytes while the same field on the slave is > 255 bytes. The patch also includes the needed changes to unpack to ensure that data which is smaller on the master can be unpacked correctly on the slave. WL#3915 : (NDB) master's cols > slave Slave starts accepting and handling rows of master's tables which have more columns. The most important part of implementation is how to caclulate the amount of bytes to skip for unknown by slave column.
* | | | | Merge magare.gmz:/home/kgeorge/mysql/work/mysql-5.0-optgkodinov/kgeorge@magare.gmz2007-07-181-1/+2
|\ \ \ \ \ | |/ / / / | | | | | | | | | | into magare.gmz:/home/kgeorge/mysql/work/merge-5.0-5.1-opt
| * | | | Bug#29729: Wrong conversion error led to an empty result set.evgen@moonbone.local2007-07-141-1/+2
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Field_newdate::store when storing a DATETIME value was returning the 'value was cut' error even if the thd->count_cuted_fields flag is set to CHECK_FIELD_IGNORE. This made range optimizr think that there is no appropriate data in the table and thus to return an empty set. Now the Field_newdate::store function returns conversion error only if the thd->count_cuted_fields flag isn't set to CHECK_FIELD_IGNORE.
* | | | Merge sita.local:/Users/tsmith/m/bk/51tsmith@sita.local2007-07-091-0/+3
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into sita.local:/Users/tsmith/m/bk/maint/51 This merge requires a post-merge fix to remove rpl_udf from suite/rpl/t/disabled.def.
| * \ \ \ Merge gshchepa@bk-internal.mysql.com:/home/bk/mysql-5.1-optgshchepa/uchum@gleb.loc2007-07-081-0/+2
| |\ \ \ \ | | | | | | | | | | | | | | | | | | into gleb.loc:/home/uchum/work/bk/5.1-opt
| | * \ \ \ Merge olga.mysql.com:/home/igor/mysql-5.0-optigor@olga.mysql.com2007-07-071-0/+2
| | |\ \ \ \ | | | |/ / / | | | | | | | | | | | | into olga.mysql.com:/home/igor/dev-opt/mysql-5.1-opt
| | | * | | Fixed bug #29417.igor@olga.mysql.com2007-07-071-0/+2
| | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | An assertion abort could occur for some grouping queries that employed decimal user variables with assignments to them. The problem appeared the constructors of the class Field_new_decimal because the function my_decimal_length_to_precision did not guarantee returning decimal precision not greater than DECIMAL_MAX_PRECISION.
| | | * | Merge weblab.(none):/home/marcsql/TREE/mysql-5.0-basemalff/marcsql@weblab.(none)2007-06-151-1/+2
| | | |\ \ | | | | | | | | | | | | | | | | | | into weblab.(none):/home/marcsql/TREE/mysql-5.0-rt-merge
| | | * \ \ Merge weblab.(none):/home/marcsql/TREE/mysql-5.0-basemalff/marcsql@weblab.(none)2007-06-111-10/+14
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | into weblab.(none):/home/marcsql/TREE/mysql-5.0-rt-merge
| | | | * | | Fix for BUG#27592: stack overrun when storing datetime valueanozdrin/alik@ibm.2007-06-071-10/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | using prepared statements.
| * | | | | | Merge trift2.:/MySQL/M50/clone-5.0joerg@trift2.2007-06-251-0/+1
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | / | | | |_|_|/ | | |/| | | into trift2.:/MySQL/M51/push-5.1
| | * | | | configure.in:kent/mysqldev@mysql.com/production.mysql.com2007-06-201-0/+1
| | | |_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | Added --with-system-type=<systype> and --with-machine-type=<machtype> options, to be able to override the one detected, for --version strings field.cc, field.h, listener.cc: C++ compatibility change for IBM VisualAge 6 and i5/OS
| | * | | Merge bk@192.168.21.1:mysql-5.0holyfoot/hf@hfmain.(none)2007-06-141-1/+2
| | |\ \ \ | | | |/ / | | |/| | | | | | | into mysql.com:/d2/hf/mrg/mysql-5.0-opt
| | * | | Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0tsmith@quadxeon.mysql.com2007-06-051-0/+2
| | |\ \ \ | | | | | | | | | | | | | | | | | | into quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/jun05/50
* | | | | | Complementary fix for bug #29353: inserting a negative value to a csv table ramil/ram@mysql.com/ramil.myoffice.izhnet.ru2007-07-031-0/+12
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | leads to the table corruption New Field::store() method implemented to explicitly set thd->count_cuted_fields before value storing, instead of (incorrectly) setting it in the CSV storage engine. Thread row counter now properly incremented during check and repair in the CSV engine.
* | | | | Merge mysql.com:/nfsdisk1/lars/bk/mysql-5.1lars/lthalmann@dl145k.mysql.com2007-06-211-29/+33
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | into mysql.com:/nfsdisk1/lars/bk/mysql-5.1-new-rpl
| * \ \ \ \ Merge weblab.(none):/home/marcsql/TREE/mysql-5.1-basemalff/marcsql@weblab.(none)2007-06-151-1/+2
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | into weblab.(none):/home/marcsql/TREE/mysql-5.1-rt-merge
| * | | | | | Resolved merge conflictsmalff/marcsql@weblab.(none)2007-06-111-1/+1
| | | | | | |
| * | | | | | Merge weblab.(none):/home/marcsql/TREE/mysql-5.1-basemalff/marcsql@weblab.(none)2007-06-111-28/+32
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | into weblab.(none):/home/marcsql/TREE/mysql-5.1-rt-merge
| | * | | | | | Manual merge of Bug 27592 (5.0-runtime to 5.1-runtime)malff/marcsql@weblab.(none)2007-06-111-10/+14
| | | | | | | |
| | * | | | | | Follow up after work on Bug 4968kostja@bodhi.(none)2007-06-101-18/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Coding style: classes start with a capital letter. Rename some classes related to parsing: create_field -> Create_field foreign_key -> Foreign_key key_part_spec -> Key_part_spec
* | | | | | | | Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.1-new-rpllars/lthalmann@dl145j.mysql.com2007-06-181-5/+17
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | | | | | | | | | into mysql.com:/nfsdisk1/lars/MERGE/mysql-5.1-merge
| * | | | | | | Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.1-new-rpllars/lthalmann@dl145k.mysql.com2007-06-111-5/+17
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | into mysql.com:/nfsdisk1/lars/MERGE/mysql-5.1-merge
| | * | | | | | Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.1-new-rpllars/lthalmann@dl145h.mysql.com2007-06-051-284/+308
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/nfsdisk1/lars/MERGE/mysql-5.1-merge
| | * \ \ \ \ \ \ Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.1-rplbar@bar.myoffice.izhnet.ru2007-05-311-5/+17
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/bar/mysql-5.1.b28600
| | | * | | | | | | Bug#28600 Yen sign and overline ujis conversion changebar@mysql.com/bar.myoffice.izhnet.ru2007-05-301-5/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Problem: Unicode->UJIS followed incorrect conversion rules for U+00A5 YEN SIGN and U+203E OVERLINE, so these characters were converted to ujis 0x8E5C and 0x8E7E accordingly. This behaviour would be correct for a JIS-X-0201 based character set, but this is wrong for UJIS, which is documented as x-eucjp-unicode-0.9, and which is based on ASCII for the range U+0000..U+007F. Fix: removing JIS-X-0201 conversion rules, making UJIS ASCII compatible. YEN SIGN and OVERLINE do not have corresponding UJIS characters anymore and converted to 0x3F QUESTION MARK, throwing a warning in appropriative cases. This patch also includes a test covering full UJIS->Unicode->UJIS mapping.
* | | | | | | | | | Merge bk@192.168.21.1:mysql-5.1holyfoot/hf@hfmain.(none)2007-06-141-1/+2
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | into mysql.com:/d2/hf/mrg/mysql-5.1-opt
| * | | | | | | | | item_cmpfunc.cc, field.cc, sql_insert.cc, sql_class.h, sql_yacc.yy:evgen@moonbone.local2007-06-111-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Post merge fix.
| * | | | | | | | | Merge moonbone.local:/mnt/gentoo64/work/test-5.0-opt-mysqlevgen@moonbone.local2007-06-111-1/+2
| |\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / | |/| | | | | | / / | | | |_|_|_|_|/ / | | |/| | | | | | into moonbone.local:/mnt/gentoo64/work/test-5.1-opt-mysql
| | * | | | | | | Bug#28878: InnoDB tables with UTF8 character set and indexes cause gkodinov/kgeorge@magare.gmz2007-06-071-1/+2
| | | |_|_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | wrong result for DML When making key reference buffers over CHAR fields whitespace (0x20) must be used to fill in the remaining space in the field's buffer. This is what Field_string::store() does. Fixed Field_string::get_key_image() to do the same.
* | | | | | | | Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1tsmith@quadxeon.mysql.com2007-06-051-0/+2
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | into quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/jun05/51
| * | | | | | | Merge bk-internal.mysql.com:/data0/bk/mysql-5.1ibabaev@bk-internal.mysql.com2007-06-011-0/+2
| |\ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | | | | | | | | | | into bk-internal.mysql.com:/data0/bk/mysql-5.1-opt