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
jani@a193-229-222-105.elisa-laajakaista.fi
8f10662eab
Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1
...
into a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.1
2005-07-23 00:15:53 +03:00
jani@a193-229-222-105.elisa-laajakaista.fi
2657e48c64
Faster alter table code for 5.1.
2005-07-22 23:43:59 +03:00
tulin@dl145b.mysql.com
98a26f0c3f
merge
2005-07-21 00:04:18 +02:00
jimw@mysql.com
93ae805db3
Fix date conversion on 32-bit machines.
2005-07-20 10:16:43 -07:00
tulin@dl145b.mysql.com
6176a4acf6
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1
2005-07-20 14:48:34 +02:00
konstantin@mysql.com
4570ace8fb
Fix warnings/compilation failures reported by Jan Lindstrom
2005-07-20 14:17:06 +04:00
tulin@dl145b.mysql.com
bf6e3f9aa8
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1
2005-07-20 07:53:10 +02: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
mronstrom@mysql.com
67087e2aa7
Patch for push of wl1354 Partitioning
2005-07-18 13:31:02 +02:00
tomas@poseidon.ndb.mysql.com
8b90390ed5
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1
2005-07-15 19:48:18 +02:00
tomas@poseidon.ndb.mysql.com
911d878ca9
Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1
2005-07-15 15:08:38 +02:00
ramil@mysql.com
ffb7421955
NO_DEFAULT_VALUE_FLAG and BLOB_FLAG combined
2005-07-15 16:25:31 +05: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
konstantin@mysql.com
3f28ad8eb7
Merge mysql.com:/opt/local/work/mysql-4.1-root
...
into mysql.com:/opt/local/work/mysql-5.0-root
2005-07-14 20:02:32 +04:00
konstantin@mysql.com
62b8e6fdd1
A fix and a test case for Bug#9735.
...
No separate typecode for MEDIUMTEXT/LONGTEXT is added, as we
have no sound decision yet what typecodes and for what types are
sent by the server (aka what constitutes a distinct type in MySQL).
2005-07-14 15:13:23 +04:00
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