jamppa@bk-internal.mysql.com
b465b30847
Merge bk-internal.mysql.com:/data0/bk/mysql-5.1
...
into bk-internal.mysql.com:/data0/bk/mysql-5.1-marvel
2007-04-17 15:45:35 +02:00
igor@olga.mysql.com
e04289704d
Merge olga.mysql.com:/home/igor/mysql-5.0-opt
...
into olga.mysql.com:/home/igor/mysql-5.1-opt
2007-04-11 15:12:49 -07:00
jani@ua141d10.elisa.omakaista.fi
4a065f5f60
Fixed result.
2007-04-11 21:16:10 +03:00
gluh@mysql.com/eagle.(none)
b80d373b6a
Bug#27069 set with identical elements are created(additional fix)
...
issue an error in strict mode
if enum|set column has duplicates members in 'create table'
2007-04-10 15:01:04 +05:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
73f0c5d7c6
Merge mysql.com:/home/ram/work/mysql-5.0-maint
...
into mysql.com:/home/ram/work/b26359/b26359.5.0
2007-03-29 11:06:15 +05:00
ramil/ram@ramil.myoffice.izhnet.ru
95b58449f9
Merge mysql.com:/home/ram/work/b26359/b26359.5.0
...
into mysql.com:/home/ram/work/b26359/b26359.5.1
2007-03-29 09:38:46 +05:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
e3c34c9cbf
Fix for bugs
...
#27176 : Assigning a string to an year column has unexpected results
#26359 : Strings becoming truncated and converted to numbers under STRICT mode
Problems:
1. storing a string to an integer field we don't check
if strntoull10rnd() returns MY_ERRNO_EDOM error.
Fix: check for MY_ERRNO_EDOM.
2. storing a string to an year field we use my_strntol() function.
Fix: use strntoull10rnd() instead.
2007-03-29 09:08:30 +05:00
ramil/ram@ramil.myoffice.izhnet.ru
5add691aa3
Merge mysql.com:/home/ram/work/b25301/b25301.5.0
...
into mysql.com:/home/ram/work/b25301/b25301.5.1
2007-02-08 13:02:53 +04:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
505ec52b04
After merge fix.
...
Reverted fix for 19370 DateTime datatype in MySQL has two bugs in it
as it's not a bug.
2007-02-08 12:53:18 +04:00
msvensson@neptunus.(none)
237779218c
Merge bk-internal:/home/bk/mysql-5.1-new-rpl
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
2006-10-03 15:56:56 +02:00
msvensson@neptunus.(none)
3f8edc3706
Merge bk-internal:/home/bk/mysql-5.0-rpl
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-10-03 14:24:43 +02:00
bar@bar.intranet.mysql.r18.ru
3cfbe36adc
After merge fix
2006-10-03 16:00:09 +05:00
bar@mysql.com/bar.intranet.mysql.r18.ru
07f9efd1e1
Merge mysql.com:/usr/home/bar/mysql-5.0.b6147v2
...
into mysql.com:/usr/home/bar/mysql-5.0.b6147rpl
2006-09-29 16:40:18 +05:00
kaa@polly.local
8c625a3987
Merge polly.local:/tmp/22129/bug22129/my50-bug22129
...
into polly.local:/home/kaa/src/maint/m50-maint--07OGt
2006-09-25 13:04:46 +04:00
kaa@polly.local
c7c9cdf2d1
Merge polly.local:/tmp/22129/bug22129/my50-bug22129
...
into polly.local:/tmp/22129/bug22129/my51-bug22129
2006-09-25 12:52:01 +04:00
kaa@polly.local
781879adf9
Fixed broken 'strict' test which relied on incorrect behaviour of my_strtod() (fixed in bug #22129 )
2006-09-25 12:50:32 +04:00
acurtis/antony@xiphis.org/ltantony.xiphis.org
e2d4aa2ca4
Merge xiphis.org:/home/antony/work2/mysql-5.0-engines
...
into xiphis.org:/home/antony/work2/mysql-5.0-merge
2006-08-14 21:27:36 -07:00
kostja@bodhi.local
5dfdc8bfce
Manual merge 5.0->5.1. Post-merge fixes.
2006-08-14 13:27:11 +04:00
kostja@bodhi.local
04c97488f9
Merge bodhi.local:/opt/local/work/tmp_merge
...
into bodhi.local:/opt/local/work/mysql-5.1-runtime-merge
2006-08-12 21:06:51 +04:00
svoj@may.pils.ru
6c6f435b03
BUG#14770 - LOAD DATA INFILE doesn't respect default values for
...
columns
Fixed confusing warning.
Quoting INSERT section of the manual:
----
Inserting NULL into a column that has been declared NOT NULL. For
multiple-row INSERT statements or INSERT INTO ... SELECT statements, the
column is set to the implicit default value for the column data type. This
is 0 for numeric types, the empty string ('') for string types, and the
"zero" value for date and time types. INSERT INTO ... SELECT statements are
handled the same way as multiple-row inserts because the server does not
examine the result set from the SELECT to see whether it returns a single
row. (For a single-row INSERT, no warning occurs when NULL is inserted into
a NOT NULL column. Instead, the statement fails with an error.)
----
This is also true for LOAD DATA INFILE. For INSERT user can specify
DEFAULT keyword as a value to set column default. There is no similiar
feature available for LOAD DATA INFILE.
2006-08-02 17:15:50 +05:00
bar@mysql.com/bar.intranet.mysql.r18.ru
29bc5cc179
Bug#6147: Traditional: Assigning a string to a numeric column has unexpected results
...
The problem was that when converting a string to an exact number,
rounding didn't work, because conversion didn't understand
approximate numbers notation.
Fix: a new function for string-to-number conversion was implemented,
which is aware of approxinate number notation (with decimal point
and exponent, e.g. -19.55e-1)
2006-07-20 13:41:12 +05:00
gluh@mysql.com/vva.(none)
7c0930c4ae
after merge fix
2006-07-18 20:13:13 +05:00
gluh@myoffice.izhnet.ru
f76aec6d90
Merge myoffice.izhnet.ru:/usr/home/gluh/MySQL/tmp_merge
...
into myoffice.izhnet.ru:/usr/home/gluh/MySQL/5.1
2006-07-18 18:43:55 +05:00
ramil/ram@mysql.com/myoffice.izhnet.ru
794fe3435c
Fix for bug #19370 : DateTime datatype in MySQL has two bugs in it
2006-07-12 11:38:11 +05:00
gluh@eagle.intranet.mysql.r18.ru
a230166f28
Fix for bug#13934 Silent truncation of table comments
...
Table comment: issue a warning(error in traditional mode) if length of comment > 60 symbols
Column comment: issue a warning(error in traditional mode) if length of comment > 255 symbols
Table 'comment' is changed from char* to LEX_STRING
2006-06-29 18:39:34 +05:00
gluh@mysql.com
023317d68a
after merge fix
2006-05-25 19:20:34 +05:00
gluh@eagle.intranet.mysql.r18.ru
474ef8ed43
Fix for bug#17626 CREATE TABLE ... SELECT failure with TRADITIONAL SQL mode
...
transfer NO_DEFAULT_VALUE_FLAG flag to new field
2006-05-23 13:27:45 +05:00
msvensson@neptunus.(none)
c4b1fb68b4
Bug#10460 SHOW CREATE TABLE uses inconsistent upper/lower case
2006-02-22 10:09:59 +01:00
jimw@mysql.com
95f1b04929
Remove extra space in SHOW CREATE TABLE output. (Bug #13883 )
2006-02-02 11:39:28 -08:00
gluh@eagle.intranet.mysql.r18.ru
e9d70e4b97
Fix for bug#8294 Traditional: Misleading error message for invalid CAST to DATE
...
-issue more correct message for incorrect date|datetime|time values
-ER_WARN_DATA_OUT_OF_RANGE message is changed
-added new error message
2005-12-02 15:01:44 +04:00
gluh@eagle.intranet.mysql.r18.ru
21cc3ae561
Fix for bug#11491 Misleading error message if not NULL column set to NULL,
...
SQL mode TRADITIONAL
Message is chenged from 'ER_WARN_NULL_TO_NOTNULL' to 'ER_BAD_NULL_ERROR'
2005-12-01 15:30:11 +04:00
monty@mishka.mysql.fi
f348f62cc3
Added option --valgrind-mysqltest to mysql-test-run
...
Added flag to Field::store(longlong) to specify if value is unsigned.
This fixes bug #12750 : Incorrect storage of 9999999999999999999 in DECIMAL(19, 0)
Fixed warning from valgrind in CREATE ... SELECT
Fixed double free of mysql.options if reconnect failed
2005-09-14 01:41:44 +03:00
ramil@mysql.com
5ac378ba15
after-merge fix
2005-07-27 15:57:00 +05:00
ramil@mysql.com
e43dff67f5
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/usr/home/ram/work/mysql-5.0
2005-07-27 15:09:06 +05:00
ramil@mysql.com
afb1ad8415
a fix (bug #11546 : Bad error message from inserting out of range values, SQL_MODE='tradition').
2005-07-26 12:18:35 +05:00
ramil@mysql.com
efc8404a40
fix (bug #11964 : ALTER TABLE gives wrong error message with sql-mode TRADITIONAL (timestamp)).
2005-07-25 14:36:07 +05:00
jimw@mysql.com
d4e0d60156
Clean up after merge of bug fixes
2005-07-19 19:59:36 -07:00
jimw@mysql.com
d7fbff3ec5
Merge mysql.com:/home/jimw/my/mysql-5.0-5906
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-07-19 19:59:34 -07:00
jimw@mysql.com
dd2f631ec4
Fix number to date conversion so it always honors the NO_ZERO_DATE,
...
NO_ZERO_IN_DATE, and INVALID_DATES bits of SQL_MODE. (Bug #5906 )
2005-07-18 16:12:44 -07:00
ramil@mysql.com
b11d04e50a
a fix (bug #9881 : ALTER TABLE gives wrong error message with sql-mode TRADITIONAL).
2005-07-15 15:50:57 +05:00
ramil@mysql.com
524b988260
a fix (bug #6961 : Traditional: assignment of string to numeric column should fail).
2005-05-13 13:22:27 +05:00
ramil@mysql.com
152f751831
fix (Bug #8295 and #8296 : varchar and varbinary conversion)
...
select, gis & gis-tree tests fails at the moment, but
I will push this CS because it was tested before and I'm absolutely
sure it's right.
2005-05-12 15:56:04 +05:00
jimw@mysql.com
2f398fc3ae
Update tests after merge of bug fix.
2005-04-05 20:55:06 -07:00
jimw@mysql.com
b95cb4e654
Merge
2005-04-05 19:45:34 -07:00
pem@mysql.comhem.se
b18ca48c47
Additional fix for BUG#5907: Traditional mode: invalid value can be inserted via a stored procedure
...
... make the handler catch too.
2005-04-05 15:49:10 +02:00
monty@mysql.com
1be0a0c82a
Now one gets an error if one tries to insert an invalid value via a stored procedure in STRICT mode. (Bug #5907 )
2005-04-05 00:32:48 +03:00
monty@mysql.com
5ba3f707f7
Don't use -lsupc++ with gcc 3.3 and below as this gives linking problems when linking staticly
...
Fix that mysql.proc works with new VARCHAR fields
Give warnings for wrong zero dates
2005-04-04 16:43:25 +03: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
monty@mysql.com
b43b7dc128
Enabled more tests of STR_TO_DATE()
...
Fixed that datetime gives warning for zero dates in traditional mode
2005-03-30 23:41:42 +03:00
monty@mysql.com
332b7ed4a1
Give warnings if wrong date/time/datetime argument for STR_TO_DATE
...
Small fixes while doing review of new pushed code
More test cases for decimal
2005-03-30 16:00:31 +03:00