kent@mysql.com
f0fcc54b0c
Merge
2005-06-02 04:45:09 +02:00
kent@mysql.com
bd48eed988
tztime.cc:
...
Set #pragma implementation" earlier
Many files:
Need to include <my_global.h> before #ifdef USE_PRAGMA_IMPLEMENTATION
2005-06-02 02:43:32 +02:00
msvensson@neptunus.(none)
697cfe7f07
Merge from 4.1
2005-05-26 21:01:55 +02:00
msvensson@neptunus.(none)
83d430353e
Add ifdefs to control when "#pragma implementation" should be used
...
Added some more ifdefs for "#pragma interface"
2005-05-26 12:09:14 +02:00
ramil@mysql.com
b06181bccd
hf's fix for bug #9060 (FORMAT returns incorrect result)
...
we need proper rounding there
2005-05-20 01:04:08 +05:00
monty@mysql.com
c1b512fad3
Change update_auto_increment to return 1 if get_auto_increment() returned ~(ulonglong)
...
This makes it easier to give an error in the handler if there was a problem generating an auto-increment value
2005-05-18 10:41:35 +03:00
jimw@mysql.com
cde9f56b45
Merge
2005-05-09 11:28:57 -07:00
bar@noter.(none)
c783cb3d7e
SUBSTR with negative argument didn't work
...
with multi-byte strings, length() instead
of numchars() where used in a mistake.
2005-05-09 20:55:06 +05:00
jimw@mysql.com
ee2b4ec959
Eliminate warnings noticed by VC7. This includes fixing my_mmap() on
...
Windows to call CreateFileMapping() with correct arguments, and
propogating the introduction of query_id_t to everywhere query ids are
passed around. (Bug #8826 )
2005-03-18 16:12:25 -08:00
gluh@gluh.mysql.r18.ru
b435d6e862
Merge 4.1 -> 5.0
2005-03-17 16:51:07 +03:00
bar@mysql.com
a7b877df78
Bugs#9129: CHARSET(), COLLATION(), COERCIBILITY()
...
not always correct for NULL values.
Now they always result a non NULL value even
the argument is NULL. It is more usefull for
debugging purposes.
2005-03-16 17:44:29 +04:00
bar@mysql.com
c6c887b990
# Bug#8785 Problem with nested concats and
...
character set conversion of a string constant.
2005-03-15 17:15:47 +04:00
igor@rurik.mysql.com
db4ca33f52
Merge rurik.mysql.com:/home/igor/dev/mysql-4.1-0
...
into rurik.mysql.com:/home/igor/dev/mysql-5.0-0
2005-03-09 16:53:20 -08:00
igor@rurik.mysql.com
af5d21357e
Manual merge
2005-03-09 10:58:52 -08:00
serg@serg.mylan
956682de1a
merged
2005-03-09 14:09:06 +01:00
igor@rurik.mysql.com
4559fb998b
func_str.result, func_str.test:
...
Added a test case for bug #8669 .
item_strfunc.cc:
Fixed bug #8669 .
Function AES_DECRYPT can return NULL value.
2005-03-09 00:15:51 -08:00
joerg@mysql.com
28b65497da
Manual merge, no effect on 4.1.
2005-03-08 14:17:57 +01:00
gluh@gluh.mysql.r18.ru
00449b8f9c
Fix for bug#8978 : Crash on 'select format ...'
2005-03-07 18:56:18 +03:00
bar@mysql.com
d50d213162
Merge
2005-03-05 18:20:35 +04:00
bar@mysql.com
7e8e033290
type_blob.result, func_system.result, func_str.result, ctype_collate.result:
...
fixing test results accordingly.
func_system.test:
New test that illegal mix of collations does not happen anymore.
item_strfunc.h:
safe_charset_converter() was added for system constants.
item_strfunc.cc:
safe_charset_converter() was added for system constants.
item_func.cc, item.h, item.cc:
Bug#8291: Illegal collation mix with USER() function.
After discussion with PeterG and Serge, a new coercibility
level for "system constants" was introduced, between
COERRIBLE and IMPLICIT. Thus:
SELECT col1 = USER() FROM t1; - is done according to col1 collation.
SELECT 'string' = USER(); - is done according to USER() collation.
At the same time, "nagg" and "strong" members were removed as unused.
item_create.cc:
Version is a system constant too.
2005-03-04 14:20:49 +04:00
gluh@gluh.mysql.r18.ru
907c7af3ce
Merge gluh.mysql.r18.ru:/home/gluh/MySQL-MERGE/mysql-4.1
...
into gluh.mysql.r18.ru:/home/gluh/MySQL-MERGE/mysql-5.0
2005-02-23 18:47:00 +03:00
gluh@gluh.mysql.r18.ru
2b5ee94a33
Fix for bug#6317: string function CHAR, parameter is NULL, wrong result
2005-02-23 18:15:45 +03:00
monty@mysql.com
e2dc9b4099
Backport my_strntod() from 5.0
...
Change string->float conversion to delay division as long as possible.
This gives us more exact integer->float conversion for numbers of type '123.45E+02' (Bug #7740 )
2005-02-22 12:51:23 +02:00
monty@mysql.com
218e00ac68
Fixed BUILD script to use --with-berkeley-db instead of --with-bdb
...
Lots of small fixes to multi-precision-math path
Give Note for '123.4e'
Added helper functions type 'val_string_from_real()
Don't give warnings for end space for string2decimal()
Changed storage of values for SP so that we can detect length of argument without strlen()
Changed interface for str2dec() so that we must supple the pointer to the last character in the buffer
2005-02-19 18:58:27 +02:00
monty@mysql.com
38d1a42481
Merge with 4.1
2005-02-15 17:12:13 +02:00
ramil@mysql.com
9a042c81e7
A fix. "(int) var" type cast doesn't work correctly for uint32 var
...
on some 64-bit platforms (e.g. IRIX, non-debug build).
2005-02-15 15:01:20 +04:00
monty@mysql.com
a1a39fab84
Merge with 4.1
2005-02-10 02:27:37 +02:00
hf@deer.(none)
b94a482ee9
Precision Math implementation
2005-02-09 02:50:45 +04:00
monty@mysql.com
79ec81071a
Better bugfix for "HAVING when refering to RAND()" (Bug #8216 )
...
Ensure that references in HAVING, ORDER BY or GROUP BY are calculated after fields in SELECT.
This will ensure that any reference to these has a valid value.
Generalized the code for split_sum_func()
2005-02-08 14:41:09 +02:00
monty@mysql.com
dcb7865548
Merge with 4.1 to get bug fix
2005-02-07 19:42:03 +02:00
monty@mysql.com
32f91f48e8
Fixed bug in HAVING when refering to RAND() through alias
...
(BUG 8216)
2005-02-07 18:13:57 +02:00
monty@mysql.com
422c2eb868
4.1 -> 5.0 merge
2005-02-03 13:18:30 +02:00
jimw@mysql.com
5f0c4ff140
Merge fixes for #8248 , #5569 .
2005-02-02 08:21:11 -08:00
igor@rurik.mysql.com
0fb0dab4ca
func_str.result, func_str.test:
...
Added a test case for bug #7751 .
item_strfunc.cc:
Fixed bug #7751 .
The function Item_func_conv::val_str did not update
the unsigned_flag value.
2005-02-01 23:34:31 -08:00
jimw@mysql.com
e86457cef0
Fix QUOTE() to not reuse the input field for output, which resulted in
...
incorrect results when the input was a constant across a multi-row SELECT
statement. (Bug #8248 )
2005-02-01 18:29:10 -08:00
serg@serg.mylan
c76405a7ee
merged
2005-01-24 19:41:42 +01:00
serg@serg.mylan
67ba2e367a
fixes/cleanups according to Coverity report
2005-01-24 15:48:25 +01:00
bar@mysql.com
b2dbddc39d
Merge mysql.com:/usr/home/bar/mysql-4.1
...
into mysql.com:/usr/home/bar/mysql-5.0
2005-01-18 10:45:09 +04:00
bar@mysql.com
8f23e90232
#7874 : CONCAT() gives wrong results mixing latin1 field and utf8 string literals
...
We should not overwrite res if it is returned from a const item.
2005-01-18 10:42:29 +04:00
bar@mysql.com
3d4714424c
Merge
2005-01-17 12:30:12 +04:00
bar@mysql.com
e7e5e8b1e7
user_var.result, func_str.result, item_strfunc.cc:
...
bug#7839 ncorrect collation for char(ascii('a'))
2005-01-17 10:38:35 +04:00
monty@mysql.com
a37e91e435
Changed interface for my_strntod() to make it more general and more portable
2005-01-15 12:28:38 +02:00
hf@deer.(none)
196c95e938
Merging conflicts resolved
2005-01-11 21:00:53 +04:00
bar@mysql.com
2bd854c859
Bug #7730 Server crash using soundex on an utf8 table
...
Don't use my_tolower: it works only for 8bit charsets.
2005-01-11 19:58:53 +04:00
monty@mysql.com
1e88bdbf90
Streamlined code for trim, ltrim and rtrim
...
Portability fixes
2005-01-02 23:31:37 +02:00
serg@sergbook.mysql.com
a04fc26c54
manually merged
2004-12-31 15:26:24 +01:00
timour@mysql.com
064c73490b
Fix for BUG#7455.
...
The fix checks if the trim string argument is NULL. If so, the standard
mandates that the function result must be also NULL.
2004-12-28 11:57:56 +02:00
Sinisa@sinisa.nasamreza.org
f385e79ad4
4.0 -> 4.1 merge
2004-12-24 23:07:10 +02:00
Sinisa@sinisa.nasamreza.org
3c5a325897
Fix for a bug #7495
2004-12-23 21:08:54 +02:00
Sinisa@sinisa.nasamreza.org
e409ebf143
A fix for the bug #7495
2004-12-22 21:31:17 +02:00
