bell@sanja.is.com.ua
45a79c9056
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-union_merge-5.0
2005-04-01 02:15:40 +03:00
bell@sanja.is.com.ua
1029e533df
postmerge 4.1->5.0 fixes
2005-04-01 02:14:30 +03:00
bell@sanja.is.com.ua
05d4ed14e4
merge 4.1->5.0
2005-03-31 10:39:48 +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
serg@serg.mylan
d6bedfa8e0
merged
2005-03-23 09:42:24 +01:00
bell@sanja.is.com.ua
4554b1f263
fixed union types merging and table related metadata (BUG#8824)
2005-03-23 08:36:48 +02:00
serg@mysql.com
f7cbe9a2cc
BUG#9339 - Updating a column does not work if the table has a UTF-8 VARCHAR primary key
...
fixed my_charpos() call in Field_varstring::get_key_image
2005-03-22 20:13:49 +01:00
serg@serg.mylan
f4d4df2ca4
Merge bk-internal:/home/bk/mysql-5.0
...
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2005-03-21 13:43:25 +01: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
serg@serg.mylan
376a4ee03b
Field::quote_data():
...
don't call escape_string_for_mysql() unnecesary
don't overwrite local buffer
escape_string_for_mysql():
take a length of the destination buffer as an argument
2005-03-17 12:27:45 +01:00
monty@mysql.com
594ef41b2d
Cleanup during reviews
...
Removed some optional arguments
Fixed portability problem in federated tests
2005-03-16 16:11:01 +02:00
konstantin@mysql.com
22915b3ad5
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/media/sda1/mysql/mysql-5.0-926
2005-03-13 23:53:30 +03:00
konstantin@mysql.com
983c75f05e
WL#926 "SUM(DISTINCT) and AVG(DISTINCT)": improvement of SUM(DISTINCT) and
...
implementation of AVG(DISTINCT) which utilizes the approach with Fields.
The patch implemented in October is portede to the up-to-date tree
containing DECIMAL type.
Tests for AVG(DISTINCT) (although there is not much to test provided
that SUM(DISTINCT) works), cleanups for COUNT(DISTINCT) and GROUP_CONCAT()
will follow in another changeset.
2005-03-13 23:50:43 +03:00
ramil@mysql.com
ec06f3e762
a fix (bug #9029 Traditional: Wrong SQLSTATE returned for string truncation).
2005-03-10 17:08:45 +04:00
hf@deer.(none)
fbbb58c6ae
Fix for bug #8935 CAST(time AS DECIMAL) crashes
2005-03-07 20:53:51 +04:00
monty@mysql.com
0a6b7aedb2
Remove compiler warnings and remove not used variables
...
(Found during build process)
2005-02-25 16:53:22 +02:00
monty@mysql.com
e2ea35ec67
Merge with 4.1
2005-02-22 15:47:00 +02:00
monty@mysql.com
22a76c1dfb
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/my/mysql-4.1
2005-02-22 12:51:54 +02: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
bar@mysql.com
c709ad87db
field.cc:
...
optimize test_if_minus() when not UCS2 support is compiled.
2005-02-22 08:35:15 +04:00
monty@mysql.com
f3b00a0413
use dbug_print_decimal instead of DBUG_EXECUTE
...
Portability fix
Note: rpl_trunc_binlog fails, but Sergei has promised to fix it, so I will ignore it for now
2005-02-20 00:24:30 +02:00
georg@beethoven.site
26e3685b02
Changes and fixes for windows compilation
2005-02-18 15:17:17 +01:00
monty@mysql.com
71e4859389
After merge fixes
2005-02-15 19:25:42 +02:00
monty@mysql.com
38d1a42481
Merge with 4.1
2005-02-15 17:12:13 +02:00
monty@mysql.com
410e51c854
Fixed failing test cases 'row.test' when running with --ps-protocol
...
Simple optimzations done while reviewing code
2005-02-15 16:45:00 +02:00
bar@mysql.com
9ba7392306
Bug#8235 Connection collation change & table create with default result in crash
2005-02-12 16:27:22 +04:00
monty@mysql.com
ccb2f3381b
Things missing in last changset
...
After merge fixes
Don't give duplicate warnings for some ::store() functions
2005-02-10 15:41:51 +02:00
hf@deer.(none)
b94a482ee9
Precision Math implementation
2005-02-09 02:50:45 +04:00
jimw@mysql.com
8c8553af81
Merge changes
2005-02-04 11:59:02 -08:00
jimw@mysql.com
b509f2b373
Merge mysql.com:/home/jimw/my/mysql-4.1-6067
...
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-02-04 10:39:13 -08:00
gluh@gluh.mysql.r18.ru
34915f7a91
A fix: bug#6931: Date Type column problem when using UNION-Table
...
bug#7833: Wrong datatype of aggregate column is returned
2005-02-04 15:31:36 +03:00
jimw@mysql.com
891e8d076c
Fix value of YEAR field when set from a non-numeric string. (Bug #6067 )
2005-02-01 15:08:31 -08:00
patg@patrick-galbraiths-computer.local
d6727ff70f
Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into patrick-galbraiths-computer.local:/Users/patg/mysql-5.0
2005-01-24 11:31:21 -08:00
patg@pc248.lfp.kcls.org
1da60b9f45
-Added quote_data and needs_quotes (moved from federated handler.
...
-New tests and results
logging_ok:
Logging to logging@openlogging.org accepted
ha_federated.h:
removed quote_data and type_quote (now in the Field class)
ha_federated.cc:
moved quote_data and type_quote to field class
field.h:
new methods quote_data and needs_quotes declared
field.cc:
new field class methods quote_data and needs_quotes (per Monty's request)
federated.test:
more tests, joins, index tests
have_federated_db.require:
new name of federated system var
federated.result:
new test results for federated handler
have_federated_db.inc:
changed name of variable in test due to change in vars
sql_analyse.cc:
over-ridden append_escaped to take (String *, char *, uint) per requirements of 'create_where_from_key' method in federated handler.
mysql_priv.h:
define over-ridden append_escaped to take arguments from 'create_where_from_key' method in federated handler
ha_federated.cc:
implemented "create_where_from_key" to deal properly with two-byte prefix and multi keys. Initial testing shows it works, but I still need to move quoting to field class and also look at changes per Segei's suggestions.
2005-01-20 18:36:40 -08:00
ram@gw.mysql.r18.ru
92545cb3a9
ER_WARN_DATA_TRUNCATED replaced with WARN_DATA_TRUNCATED.
2005-01-19 16:24:06 +04:00
ram@gw.mysql.r18.ru
f131e5a925
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into gw.mysql.r18.ru:/usr/home/ram/work/5.0.b6999
2005-01-19 12:05:59 +04:00
ram@gw.mysql.r18.ru
c24c023e8c
A fix (bug #6999 : Traditional: Wrong SQLSTATE returned for string truncation).
2005-01-19 12:04:35 +04:00
monty@mysql.com
8d616390e9
After merge fixes
...
Fix for BIT(X) field as string
2005-01-15 17:38:43 +02:00
monty@mysql.com
0a1076a25f
Merge with 4.1
2005-01-15 14:09:45 +02: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
jimw@mysql.com
28ee2a67b3
Merge jwinstead2@wwwtst1.mysql.com:mysql-4.1-7774
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-01-13 09:09:10 -08:00
jimw@mysql.com
7639e5afaf
Merge jwinstead2@wwwtst1.mysql.com:mysql-4.1-7774
...
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-01-13 09:07:21 -08:00
konstantin@mysql.com
a676498977
manual merge
2005-01-13 17:31:49 +03:00
bar@mysql.com
e3d6e6736b
bug#7284: strnxfrm returns different results for equal strings
2005-01-13 18:12:04 +04:00
jimw@mysql.com
0a3fba7f18
Small fix for Field_str::store() to avoid trying to read past beginning
...
of log_10 array.
2005-01-13 00:52:19 +01:00
jimw@mysql.com
51781b0bfc
Fix conversion of floating point values to character fields when the
...
absolute value of the float is less than 1, and also fix calculation of
length for negative values. (Bug #7774 )
2005-01-13 00:41:45 +01:00
bar@mysql.com
691b3283d2
If VARCHAR strips only trailing spaces, then produce
...
a note, not a warning or error.
2005-01-11 16:49:45 +04:00
kent@mysql.com
feee6ee30b
field.h, field.cc:
...
Did some more split TABLE to TABLE and TABLE_SHARE
2005-01-11 00:17:21 +01:00
jimw@mysql.com
6db6171494
Merge mysql.com:/home/jwinstead2/mysql-4.1-clean
...
into mysql.com:/home/jwinstead2/mysql-5.0-clean
2005-01-07 19:03:35 +01:00