mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-19 21:42:35 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
24852 commits 2784 branches 343 tags 1.6 GiB
Commit graph

142 commits

Author SHA1 Message Date
jimw@mysql.com
49e5636410 Merge mysql.com:/home/jimw/my/mysql-4.1-clean 
into  mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-07-22 12:35:15 -07:00
jimw@mysql.com
e26a344d19 Fix calculation for length of LPAD() and RPAD() reported to 
client via mysql_fetch_fields(). (Bug #11311)
 2005-07-22 11:46:29 -07:00
gluh@mysql.com
b0ec1cd84e Merge mysql.com:/home/gluh/MySQL/Merge/4.1 
into mysql.com:/home/gluh/MySQL/Merge/5.0
 2005-07-13 16:08:13 +05:00
gluh@eagle.intranet.mysql.r18.ru
672e1f20cb Bug #9854 hex() and out of range handling 
added out of range handling
 2005-07-13 14:23:09 +05:00
bell@sanja.is.com.ua
8b71793766 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 
into  sanja.is.com.ua:/home/bell/mysql/bk/work-bug4-5.0
 2005-07-06 16:59:56 +03:00
bell@sanja.is.com.ua
c41c8accd7 Merge 2005-07-06 11:36:27 +03:00
monty@mysql.com
86d7b02199 Merge with 4.1 2005-07-03 14:17:52 +03:00
igor@rurik.mysql.com
4b8f2e9bb4 func_str.test: 
Added test cases for bug #11469.
item_strfunc.h:
  Fixed bug #11469: wrong implementation of the not_null_tables
  method for CONCAT_WS.
 2005-06-29 02:40:25 -07:00
bell@sanja.is.com.ua
0e30eea141 fixed substring() length calculation in case of constant negative argument (BUG#10269) 2005-06-28 21:45:11 +03:00
msvensson@neptunus.(none)
88c96026af Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0 
into neptunus.(none):/home/msvensson/mysql/bug10466
 2005-06-27 13:12:10 +02:00
igor@rurik.mysql.com
268110b34b Manual merge 2005-06-23 11:22:30 -07:00
igor@rurik.mysql.com
c73c2af614 func_str.result, func_str.test: 
Added a test case for bug #10124.
sql_select.h, item_subselect.cc, sql_select.cc:
  Fixed bug #10124.
  The copy method of the store_key classes can return
  STORE_KEY_OK=0, STORE_KEY_FATAL=1, STORE_KEY_CONV=2 now.
field.cc:
  Fixed bug #10124.
  When ussuing a warning the store methods return 2 instead of 1 now.
 2005-06-23 06:15:50 -07:00
msvensson@neptunus.(none)
6282d89b0a bug#10466: Datatype "timestamp" displays "YYYYMMDDHHMMSS" irrespective of display sizes. 
- Print warning that says display width is not supported for datatype TIMESTAMP, if user tries to create a TIMESTAMP column with display width.
 - Use display width for TIMESTAMP only in type_timestamp test to make sure warning is displayed correctly.
 2005-06-20 12:09:00 +02:00
jimw@mysql.com
5a271e2c12 Merge mysql.com:/home/jimw/my/mysql-4.1-clean 
into  mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-06-01 16:13:24 -07:00
jimw@mysql.com
7ac7bfc3c8 Fix handling of NULL fields in FIELD(). (Bug #10944) 2005-06-01 09:48:25 -07:00
monty@mysql.com
201ee3eb78 Invalid DEFAULT values for CREATE TABLE now generates errors. (Bug #5902) 
CAST() now produces warnings when casting a wrong INTEGER or CHAR values. This also applies to implicite string to number casts. (Bug #5912)
ALTER TABLE now fails in STRICT mode if it generates warnings.
Inserting a zero date in a DATE, DATETIME or TIMESTAMP column during TRADITIONAL mode now produces an error. (Bug #5933)
 2005-04-01 15:04:50 +03:00
bar@eagle.intranet.mysql.r18.ru
9fbfa7a9af func_str.result: 
post-merge fix.
  ,
 2005-03-25 11:47:25 +04:00
bar@mysql.com
29ffcad226 Fixed that LEFT OUTER JOIN was replaced with a regulat join 
in some cases, because "charset(x) = 'string'" was considered
as "x is not null" due to incorrect not_null_tables().
 2005-03-24 18:10:46 +04:00
gluh@gluh.mysql.r18.ru
edb4dd5366 after merge fix 2005-03-17 18:44:24 +03: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
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
4406118cf8 func_str.result: 
Correction after manual merge.
 2005-03-09 13:20:52 -08:00
igor@rurik.mysql.com
af5d21357e Manual merge 2005-03-09 10:58:52 -08: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
bar@deer.(none)
42e5de1bee func_group.test, func_str.result, func_group.result: 
after merge fixes
 2005-03-05 20:44:22 +04: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
b233ddba8e After merge fixes 2005-02-03 18:00:50 +02:00
monty@mysql.com
422c2eb868 4.1 -> 5.0 merge 2005-02-03 13:18:30 +02:00
jimw@mysql.com
bcac063558 Fix merge of func_str tests (accidently duplicated a test). 2005-02-02 09:05:52 -08: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
bar@deer.(none)
3b7eb23e6b func_str.result: 
after merge fix
 2005-01-17 13:23:56 +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
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
ca74ce3398 additional 4.0 -> 4.1 merge !! 2004-12-25 00:07:22 +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
monty@mishka.local
4f4bbfc279 Merge with 4.1 2004-12-22 13:54:39 +02:00
serg@serg.mylan
d16c9e8615 getting rid of now() is tests 2004-12-11 09:39:29 +01:00
Sinisa@sinisa.nasamreza.org
6772f0a721 A fix for a crashing bug #7101, which occures when the 
expression involving LEFT() function is used in GROUP BY
field.
 2004-12-10 00:17:43 +02:00
bar@mysql.com
f90caa5826 - VARCHAR(n) with binary character set is now displayed as VARBINARY(N). 
- CREATE TABLE t1 SELECT BINARY 'literal'
  now creates a VARBINARY() column, not a BINARY().
 2004-12-08 14:03:29 +04:00
monty@mysql.com
563500994a Update results for new varchar handling 
Fixed compiler warnings
String results in CREATE ... SELECT are now created as CHAR(0), VARCHAR(X) or TEXT() depending on item->max_length
 2004-12-07 15:47:00 +02:00