summaryrefslogtreecommitdiff
path: root/sql/sql_string.h
Commit message (Collapse)AuthorAgeFilesLines
* Merge mysql.com:/home/my/mysql-5.0monty@narttu.mysql.fi2007-01-271-1/+2
|\ | | | | | | | | into mysql.com:/home/my/mysql-5.1 Merge of 'remove compiler warnings when using -Wshadow'
| * Merge bk-internal.mysql.com:/home/bk/mysql-5.0monty@mysql.com/narttu.mysql.fi2007-01-221-1/+2
| |\ | | | | | | | | | into mysql.com:/home/my/mysql-5.0
| | * Merge bk-internal.mysql.com:/home/bk/mysql-5.0monty@mysql.com/narttu.mysql.fi2006-12-151-1/+2
| | |\ | | | | | | | | | | | | into mysql.com:/home/my/mysql-5.0
| | | * Fixed compiler warnings detected by option -Wshadow and -Wunused:monty@mysql.com/narttu.mysql.fi2006-12-151-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Removed not used variables and functions - Added #ifdef around code that is not used - Renamed variables and functions to avoid conflicts - Removed some not used arguments Fixed some class/struct warnings in ndb Added define IS_LONGDATA() to simplify code in libmysql.c I did run gcov on the changes and added 'purecov' comments on almost all lines that was not just variable name changes
* | | | Merge mysql.com:/home/kent/bk/main/mysql-5.0kent@kent-amd64.(none)2006-12-231-2/+1
|\ \ \ \ | |/ / / | | | | | | | | into mysql.com:/home/kent/bk/main/mysql-5.1
| * | | Many files:kent@mysql.com/kent-amd64.(none)2006-12-231-2/+1
| |/ / | | | | | | | | | Changed header to GPL version 2 only
* | | Merge dl145s.mysql.com:/data0/bk/team_tree_merge/mysql-5.0-optgkodinov@dl145s.mysql.com2006-11-291-0/+6
|\ \ \ | |/ / | | | | | | into dl145s.mysql.com:/data0/bk/team_tree_merge/MERGE2/mysql-5.1-opt
| * | Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-optgkodinov/kgeorge@rakia.gmz2006-11-281-0/+6
| |\ \ | | |/ | |/| | | | into rakia.gmz:/home/kgeorge/mysql/autopush/B11927-5.0-opt
| | * BUG#11927: Warnings shown for CAST( chr as signed) but not (chr + 0)gkodinov/kgeorge@macbook.gmz2006-11-281-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When implicitly converting string fields to numbers the string-to-number conversion error was not sent to the client. Added code to send the conversion error as warning. We also need to prevent generation of warnings from the places where val_xxx() methods are called for the sole purpose of updating the Item::null_value flag. To achieve that a special function is added (and called) : update_null_value(). This function will set the no_errors flag and will call val_xxx(). The warning generation in Field_string::val_xxx() will use the flag when generating the conversion warnings.
* | | Merge mysql.com:/usr/home/bar/mysql-5.0.b18908bar@bar.intranet.mysql.r18.ru2006-11-011-0/+8
|\ \ \ | |/ / | | | | | | into mysql.com:/usr/home/bar/mysql-5.1-rpl
| * | Bug#18908: ERROR 1406 (22001): Data too long for column :: using utf8bar@mysql.com/bar.intranet.mysql.r18.ru2006-10-301-0/+8
| |/ | | | | | | | | | | | | | | | | Problem: Too confusing error message when cannot convert between string and column character sets on INSERT and UPDATE. Fix: producing a better error message, instead of "Data too long" in such cases Additional changes: Adding "DROP TABLE IF EXISTS" into several tests to be safe against failures in previous tests.
* | String::set(double) and set(longlong) -> set_real() and set_int()serg@serg.mylan2006-06-161-4/+4
| | | | | | | | | | | | fix Field::store(double) being used instead of store(longlong) NB: overloading functions is evil
* | cleanup String::set(integer)serg@serg.mylan2006-06-141-2/+5
| |
* | This is an implementation of two WL items:anozdrin@mysql.com2006-05-181-2/+0
|/ | | | | | | | | | | | | | | | - WL#3158: IM: Instance configuration extensions; - WL#3159: IM: --bootstrap and --start-default-instance modes The following new statements have been added: - CREATE INSTANCE; - DROP INSTANCE; The behaviour of the following statements have been changed: - SET; - UNSET; - FLUSH INSTANCES; - SHOW INSTANCES; - SHOW INSTANCE OPTIONS;
* Netware specific changes.jani@a193-229-222-105.elisa-laajakaista.fi2005-12-141-1/+1
|
* Inefficient usage of String::append() fixed.bell@sanja.is.com.ua2005-11-201-0/+2
| | | | | | | Bad examples of usage of a string with its length fixed. The incorrect length in the trigger file configuration descriptor fixed (BUG#14090). A hook for unknown keys added to the parser to support old .TRG files.
* Bug#8610: The ucs2_turkish_ci collation fails with upper('i')bar@mysql.com2005-06-061-2/+0
| | | | | | | | | | | | | | UPPER/LOWER now can return a string with different length. mi_test1.c: Adding new arguments. Many files: Changeing caseup/casedn to return a result with different length than argument. sql_string.h: Removing unused method, mysql_priv.h: Removing unused method
* Merge neptunus.(none):/home/msvensson/mysql/bug10241msvensson@neptunus.(none)2005-05-091-1/+1
|\ | | | | | | into neptunus.(none):/home/msvensson/mysql/mysql-5.0
| * BUG#10241 cygwin port: invalid pragma interface directivesmsvensson@neptunus.(none)2005-05-041-1/+1
| | | | | | | | - Introduce ifdefs so we can control when to use #pragma interface on cygwin
* | Cleanups during review of codemonty@mysql.com2005-03-211-4/+1
| | | | | | | | Fixed newly introduced bug in rollup
* | Merge 4.1 -> 5.0gluh@gluh.mysql.r18.ru2005-03-171-0/+4
|\ \ | |/
| * # Bug#8785 Problem with nested concats andbar@mysql.com2005-03-151-0/+4
| | | | | | | | character set conversion of a string constant.
* | Fixing failing -debug build.dlenev@brandersnatch.localdomain2005-02-151-1/+1
| | | | | | | | | | | | Since placement operator delete called only if exception was thrown in constructor and we don't use exceptions in MySQL, there is no sense to do anything in String::delete(void *ptr_arg, MEM_ROOT *mem_root).
* | Merge with 4.1monty@mysql.com2005-02-151-1/+1
|\ \ | |/
| * Fix signatures of placement operator delete in places where placement konstantin@mysql.com2005-02-151-1/+1
| | | | | | | | | | | | | | delete is declared. As we don't use exceptions placement delete is never called and the fix only affects numerous warnings when compiling with MS Visual C++. For more info see http://www.gotw.ca/gotw/010.htm.
* | Merge mysql.com:/home/psergey/mysql-4.1-bug7816sergefp@mysql.com2005-02-051-0/+10
|\ \ | |/ | | | | into mysql.com:/home/psergey/mysql-5.0-bug7716
| * Fix for BUG#7716: in in_string::set() take into account that the value returned sergefp@mysql.com2005-02-041-0/+10
| | | | | | | | | | by item->val_str() may be a substring of the passed string. Disallow string=its_substring assignment in String::operator=().
* | protection: TRASH in deleteserg@serg.mylan2004-11-281-2/+2
| | | | | | | | fixed a bug that it discovered
* | Needed for WL# 2094, MySQL Federated Storage Handlerpatg@patrick-galbraiths-computer.local2004-11-121-0/+28
| | | | | | | | | | sql_string.h: simple string method to drop last character of a string (also decrements str_length)
* | Merge with 4.1 to get in latest bug fixesmonty@mysql.com2004-11-041-2/+2
|\ \ | |/
| * A fix according to Monty's request:bar@mysql.com2004-10-291-2/+2
| | | | | | | | | | "uint *errors" is now a non-optional parameter in String:copy() and copy_and_convert().
* | merge with 4.1monty@mysql.com2004-10-291-3/+5
|\ \ | |/
| * Produce a "truncated" warning if a value cannot be convertedbar@mysql.com2004-10-281-2/+2
| | | | | | | | into the column character set on INSERT/UPDATE.
| * Fix compiler warnings (detected by Intel's C++ compiler)monty@mysql.com2004-10-221-1/+3
| | | | | | | | Fixed checking of privilege handling in CREATE ... SELECT (Bug #6094)
* | Merge with 4.1monty@mysql.com2004-09-061-0/+9
|\ \ | |/ | | | | | | (Includes merge of arena code in 4.1 and 5.0)
| * after merge fixesserg@serg.mylan2004-08-191-0/+8
| |
| * A fix (Bug #4878: Service crashes on query execution)ram@gw.mysql.r18.ru2004-08-121-0/+1
| |
* | Merging 4.1 to 5.0.pem@mysql.com2004-05-261-2/+5
|\ \ | |/
| * sql_string.h:bar@bar.intranet.mysql.r18.ru2004-05-251-1/+0
| | | | | | | | | | | | | | Not used code. , sql_string.cc: Not used code.
| * 1. Some optimization when conversion is not needed.bar@bar.intranet.mysql.r18.ru2004-05-251-1/+2
| | | | | | | | | | 2. One now must pass length argument into append(const char *str, uint length), length is not calculated internally anymore.
| * Support for character set conversion in binary protocol: another gokonstantin@mysql.com2004-05-251-0/+3
| | | | | | | | | | | | | | | | | | | | after Monty's review. - Item_param was rewritten. - it turns out that we can't convert string data to character set of connection on the fly, because they first should be written to the binary log. To support efficient conversion we need to rewrite prepared statements binlogging code first.
* | Merge 4.1 -> 5.0.pem@mysql.com2004-04-071-7/+10
|\ \ | |/
| * Portability fixesmonty@mysql.com2004-03-051-3/+1
| |
| * Optimized GIS functionsmonty@mashka.mysql.fi2004-03-041-4/+8
| |
| * After merge fixesmonty@mysql.com2004-02-161-0/+1
| | | | | | | | | | | | | | Added more DBUG statements Ensure that we are comparing end space with BINARY strings Use 'any_db' instead of '' to mean any database. (For HANDLER command) Only strip ' ' when comparing CHAR, not other space-like characters (like \t)
* | Enforce standard declaration order in SPs.pem@mysql.comhem.se2004-03-291-0/+2
|/ | | | | | | Added new test cases for this, and adjusted old tests accordingly, and new error codes and messages. Fixed bugs in some tests (bug2673 and use test). Added debug printing of instructions in SPs.
* Added --compact to mysqlbinlogmonty@mysql.com2004-02-091-3/+5
| | | | | | | | | | Fixed output from mysqlbinlog when using --skip-comments Fixed warnings from valgrind Fixed ref_length when used with HEAP tables More efficent need_conversion() Fixed error handling in UPDATE with not updateable tables Fixed bug in null handling in CAST to signed/unsigned
* Further fixes for 2390: ucs2 alignmentbar@bar.intranet.mysql.r18.ru2004-01-211-0/+3
|
* UCS-2 aligning 0xAA -> 0x00AAbar@bar.intranet.mysql.r18.ru2004-01-191-0/+1
|
* after review fixbell@sanja.is.com.ua2003-11-031-0/+1
|