tomas@poseidon.ndb.mysql.com
674b6bb151
Merge
2005-07-12 20:01:22 +02:00
monty@mysql.com
fe30ec9032
manual merge
2005-07-04 03:50:04 +03:00
monty@mysql.com
ec420bfb43
Fixes during review of new code
...
- Mostly indentation fixes
- Added missing test
- Ensure that Item_func_case() checks for stack overruns
- Use real_item() instead of (Item_ref*) item
- Fixed wrong error handling
2005-07-04 03:42:33 +03:00
monty@mysql.com
86d7b02199
Merge with 4.1
2005-07-03 14:17:52 +03:00
monty@mysql.com
e4bb8377c7
Simple optimization
...
nsure that delete works not only on table->record[0] for federated tables
2005-06-29 12:44:40 +03:00
igor@rurik.mysql.com
42bb0eaf9f
Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into rurik.mysql.com:/home/igor/mysql-4.1
2005-06-28 03:20:00 -07:00
igor@rurik.mysql.com
c3aa161c28
field.cc:
...
Correction after manula merge.
2005-06-24 01:21:18 -07: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
ndbdev@dl145b.mysql.com
dcef1c7532
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1
2005-06-22 19:07:29 +02:00
svoj@mysql.com
74373e7d54
WL#2286 - Compile MySQL w/YASSL support
...
Fix GCC 4.0 link failure.
Better CXX_VERSION guessing.
2005-06-22 14:08:28 +05:00
monty@mishka.local
1524cd001d
Cleanup during review of new code
...
Fixed wrong allocation that could cause buffer overrun when using join cache
2005-06-21 18:18:58 +03:00
tulin@dl145b.mysql.com
b217fc0692
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1
2005-06-20 12:42:39 +02:00
svoj@mysql.com
7660f609e6
WL#2286 - Compile MySQL w/YASSL support
...
Fix for yaSSL link failures with Forte Developer 7, MIPSpro Compilers, Compaq C++.
These compilers have problem with implicit template instantiation in archives
(libyassl.a, libtaocrypt.a). Instantiate templates explicitly.
Fix for yaSSL link failure on powermacg5 (gcc 3.3). When -O3 is specified gcc inlines
__cxa_pure_virtual. This is wrong behavior, __cxa_pure_virtual must never be inlined.
2005-06-19 21:46:44 +05:00
ndbdev@dl145b.mysql.com
be7c5c1900
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1
2005-06-15 20:07:31 +02:00
igor@rurik.mysql.com
ff0b7e4d73
Manual merge
2005-06-15 08:39:00 -07:00
igor@rurik.mysql.com
316815f44e
cast.result, cast.test:
...
Added test case for bug #11283 .
field.h, field.cc:
Fixed bug #11283 : wrong conversion from varchar to decimal.
Added methods Field_string::val_decimal,
Field_varstring::val_decimal, Field_blob::val_decimal.
They are not inherited from the base class Field_longstr
anymore.
2005-06-15 08:27:33 -07:00
georg@lmy002.wdf.sap.corp
b64e6db5a4
fixes for windows 64-bit compiler warnings
2005-06-13 12:41:15 +02:00
ndbdev@dl145b.mysql.com
8d44b54295
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1
2005-06-10 07:22:27 +02:00
jimw@mysql.com
1055c36000
Merge mysql.com:/home/jimw/my/mysql-5.0-10543
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-06-09 19:29:55 -07:00
tulin@dl145b.mysql.com
6a0a577335
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
...
into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1
2005-06-08 17:12:09 +02:00
hf@deer.(none)
935b5ec4b4
Fix for bug #9894 (Negative numbers are allowed to 'unsigned' column)
2005-06-08 12:25:57 +05:00
ndbdev@dl145b.mysql.com
2fb1fb5877
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1
2005-06-07 06:50:50 +02:00
ndbdev@dl145b.mysql.com
161a58ab4b
merge
2005-06-06 23:39:19 +02:00
monty@mysql.com
775f17667b
Merge with 4.1
2005-06-07 00:31:53 +03:00
ramil@mysql.com
592d8f8d41
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/usr/home/ram/work/5.0.b10539
2005-06-06 11:30:15 +05:00
serg@serg.mylan
6a5349028c
a compiler must see '#pragma implementation' *before*
...
'#pragma interface' (that comes with the #include'd header file)
2005-06-05 19:38:52 +02:00
tomas@poseidon.ndb.mysql.com
f6d51a44f4
Merge
2005-06-04 19:26:35 +02:00
monty@mysql.com
29fd1f2fd9
Move USE_PRAGMA_IMPLEMENTATION to proper place
...
Ensure that 'null_value' is not accessed before val() is called in FIELD() functions
Fixed initialization of key maps. This fixes some problems with keys when you have more than 64 keys
Fixed that ROLLUP don't always create a temporary table. This fix ensures that func_gconcat.test results are now predictable
2005-06-03 23:46:03 +03:00
bar@mysql.com
618934fe5f
Merge
2005-06-03 09:44:13 +05:00
bar@mysql.com
1002a9416b
ctype_utf8.result, ctype_utf8.test:
...
adding test
field.cc:
bug#10714 Inserting double value into utf8 column crashes server:
sprintf was executed with too big length, which caused
crash on some Windows platforms.
2005-06-03 09:37:53 +05:00
tomas@poseidon.ndb.mysql.com
bef102ec90
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1
2005-06-02 09:50:47 +02:00
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
tomas@poseidon.ndb.mysql.com
5088b28d09
Merge
2005-05-31 14:37:47 +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
jimw@mysql.com
ef9ef1f958
Fix partial keys when converting VARCHAR to TEXT. (Bug #10543 )
2005-05-25 18:11:47 -07:00
ndbdev@dl145c.mysql.com
4b47828478
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into dl145c.mysql.com:/home/ndbdev/tomas/mysql-5.1
2005-05-19 18:37:33 +02:00
ramil@mysql.com
44a2007111
a fix (bug #10539 : When inserting out of range value in BIT, different engines behaves differently).
2005-05-18 17:30:11 +05:00
tulin@dl145c.mysql.com
23f79bd1f2
merge
2005-05-17 10:17:53 +02: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
jani@a193-229-222-105.elisa-laajakaista.fi
187ee4712b
Fixed bug 10465.
2005-05-12 17:37:38 +03:00
mronstrom@mysql.com
c33a0673a6
Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.1
...
into mysql.com:/Users/mikron/wl1682
2005-05-12 12:01:01 +02:00
mronstrom@mysql.com
c18a302577
Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.1
...
into mysql.com:/Users/mikron/wl1682
2005-05-07 11:23:09 +02:00
holyfoot@hf-ibm.(none)
2c8e9df232
A lot of fixes to Precision math
...
Mostly about precision/decimals of the results of the operations
2005-05-05 20:06:49 +05:00
hf@deer.(none)
054463f975
Fix for #6553 and #8776 (no errors on bad spatial data)
2005-04-29 20:23:02 +05:00
mronstrom@mysql.com
21347433cf
WL 1682: Use bitvector instead of query_id to tell handler which fields
...
to read and write
Changed Server code, added new interface to handler and changed the
NDB handler, InnoDB handler and Federated handler that previously used
query_id
Bug#10202 fix (one-liner fix for memory leak)
2005-04-28 14:45:27 +02:00
ramil@mysql.com
b2dbaea394
Bit type: fix for create_field::create_field().
2005-04-14 14:32:25 +05:00
ramil@mysql.com
eae4d9c073
Bit type: code cleanup.
2005-04-12 19:36:21 +05:00