kaa@polly.local
25f2c27a95
Merge polly.local:/tmp/22129/bug22129/my50-bug22129
...
into polly.local:/home/kaa/src/maint/m50-maint--07OGt
2006-09-22 19:46:09 +04:00
kaa@polly.local
10a60b42f6
Merge polly.local:/tmp/22129/bug22129/my41-bug22129
...
into polly.local:/home/kaa/src/maint/m41-maint--07OGk
2006-09-22 19:44:51 +04:00
msvensson@neptunus.(none)
ca81d57ff8
Netware changes for build with yaSSL
...
- Make mwenv automatically adapt the setting to current build dir.
- Fix include paths that mwccnlm does not understand
- Link libmysl with yassl
2006-09-22 17:43:05 +02:00
kaa@polly.local
6fd25f611a
Merge polly.local:/tmp/22129/bug22129/my41-bug22129
...
into polly.local:/tmp/22129/bug22129/my50-bug22129
2006-09-22 19:40:07 +04:00
kaa@polly.local
1530b51d8f
Fixed bug #22129 : A small double precision number becomes zero
...
Better checks for underflow/overflow
2006-09-22 19:23:58 +04:00
georg@lmy002.wdf.sap.corp
67a701003c
Fix for bug #19121 : Windows incompatible udf_example
2006-09-22 14:42:43 +02:00
ramil/ram@mysql.com/myoffice.izhnet.ru
0b28a24861
Fix for bug #22227 : ulong not defined for client library
...
- don't use (ulong) type cast in the include/mysql_com.h as it's not
a standard type and might cause compilation errors on some platforms.
2006-09-22 14:46:18 +05:00
georg@lmy002.wdf.sap.corp
ca00ba4991
Added build rule for mysql_upgrade.exe
2006-09-22 07:38:24 +02:00
knielsen@bk-internal.mysql.com
3491d37b35
After-merge fix (null merge).
2006-09-21 21:45:42 +02:00
knielsen@bk-internal.mysql.com
3c17386d77
Merge knielsen.mysql.internal:/usr/local/mysql/mysql-4.1
...
into bk-internal.mysql.com:/tmp/knielsen/mysql-5.0-maint
2006-09-21 21:40:07 +02:00
knielsen@bk-internal.mysql.com
4412755932
Merge knielsen.mysql.internal:/usr/local/mysql/mysql-4.1
...
into bk-internal.mysql.com:/tmp/knielsen/mysql-4.1-maint
2006-09-21 21:23:38 +02:00
joerg@trift2.
17218bd732
Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into trift2.:/MySQL/M50/push-5.0
2006-09-21 20:03:39 +02:00
joerg@trift2.
d1f0a57a6d
Add a dummy file for "Docs/manual.chm" as we need it for "make dist" to work.
2006-09-21 17:38:42 +02:00
istruewing@chilla.local
64fbabc551
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into chilla.local:/home/mydev/mysql-5.0-toteam
2006-09-21 17:18:20 +02:00
joerg@trift2.
3acb6778dd
Merge trift2.:/MySQL/M50/extract1-5.0
...
into trift2.:/MySQL/M50/push-5.0
2006-09-21 16:48:31 +02:00
lars/lthalmann@mysql.com/dl145j.mysql.com
738cd74b52
After merge fixes
2006-09-21 13:38:01 +02:00
lars/lthalmann@mysql.com/dl145j.mysql.com
2c5dc57e27
Merge mysql.com:/users/lthalmann/bk/MERGE/mysql-4.1-merge
...
into mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge
2006-09-21 13:28:16 +02:00
lars/lthalmann@mysql.com/dl145h.mysql.com
9538acf5dc
Adding proper setup phase for test case rpl_insert_id
2006-09-21 13:19:52 +02:00
ramil/ram@mysql.com/myoffice.izhnet.ru
d3f503a0bd
Fix for bug #20204 : "order by" changes the results returned
...
Item_substr's results are improperly stored in a temporary table due to
wrongly calculated max_length value for multi-byte charsets if two
arguments specified.
2006-09-21 16:05:01 +05:00
msvensson@shellback.(none)
b060fff60a
Merge bk-internal:/home/bk/mysql-5.0-maint
...
into shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-09-21 12:28:14 +02:00
msvensson@shellback.(none)
08cdf195ce
Merge shellback.(none):/home/msvensson/mysql/work/my50-work
...
into shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-09-21 12:25:35 +02:00
tsmith/tim@siva.hindu.god
4d26719172
Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0-maint
...
into siva.hindu.god:/usr/home/tim/m/bk/inno/50
2006-09-21 03:57:44 -06:00
msvensson@shellback.(none)
346730ee6b
Use a direct reference to the yassl and taocrypt libtool libraries to link with
2006-09-21 11:37:08 +02:00
istruewing@chilla.local
f083782c42
Merge chilla.local:/home/mydev/mysql-5.0--main
...
into chilla.local:/home/mydev/mysql-5.0-toteam
2006-09-21 10:55:23 +02:00
ramil/ram@mysql.com/myoffice.izhnet.ru
43194fad43
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/usr/home/ram/work/mysql-4.1-maint
2006-09-21 09:35:17 +05:00
lars/lthalmann@mysql.com/dl145h.mysql.com
fe782f92d6
Vertical printout in test to make easier to read
2006-09-21 03:32:42 +02:00
lars/lthalmann@mysql.com/dl145h.mysql.com
95d0ae96b2
Merge mysql.com:/users/lthalmann/bk/MERGE/mysql-4.1-merge
...
into mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge
2006-09-21 01:01:38 +02:00
lars/lthalmann@mysql.com/dl145h.mysql.com
6aded45614
Fix of result files from merge
2006-09-21 00:59:48 +02:00
lars/lthalmann@mysql.com/dl145j.mysql.com
d20e326504
Merge mysql.com:/users/lthalmann/bkroot/mysql-5.0-rpl
...
into mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge
2006-09-21 00:05:56 +02:00
tsmith/tim@siva.hindu.god
3724c1276b
Applied innodb snapshot ss792 and ss854.
...
This ChangeSet will be null-merged to mysql-5.1.
Bugs fixed:
- Bug #21638 : InnoDB: possible segfault in page_copy_rec_list_end_no_locks
If prefix_len is specified, write it to the insert buffer instead of type->len
- bug #10746 : InnoDB: Error: stored_select_lock_type is 0 inside ::start_stmt()!
INSERT ... SELECT uses LOCK_NONE in innodb_locks_unsafe_for_binlog mode, so do
not check for LOCK_X or LOCK_S in start_stmt()
2006-09-20 13:00:49 -06:00
igor@rurik.mysql.com
2e2c5a20c0
Merge rurik.mysql.com:/home/igor/mysql-4.1-opt
...
into rurik.mysql.com:/home/igor/mysql-5.0-opt
2006-09-20 09:47:36 -07:00
igor@rurik.mysql.com
d957636471
Fixed bug #20108 .
...
Any default value for a enum fields over UCS2 charsets was corrupted
when we put it into the frm file, as it had been overwritten by its
HEX representation.
To fix it now we save a copy of structure that represents the enum
type and when putting the default values we use this copy.
2006-09-20 09:46:12 -07:00
msvensson@shellback.(none)
c74ebcc176
Merge shellback.(none):/home/msvensson/mysql/work/my50-work
...
into shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-09-20 18:02:42 +02:00
igor@rurik.mysql.com
20b3e8a2f8
Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
...
into rurik.mysql.com:/home/igor/mysql-5.0-opt
2006-09-20 08:10:21 -07:00
igor@rurik.mysql.com
f2225cab27
Fixed bug #22015 : crash with GROUP_CONCAT over a derived table
...
that returns the results of aggregation by GROUP_CONCAT.
The crash was due to an overflow happened for the field
sortoder->length.
The fix prevents this overflow exploiting the fact that the
value of sortoder->length cannot be greater than the value of
thd->variables.max_sort_length.
2006-09-20 08:08:57 -07:00
lars/lthalmann@mysql.com/dl145j.mysql.com
0c03f9348d
Merge mysql.com:/users/lthalmann/bkroot/mysql-4.1-rpl
...
into mysql.com:/users/lthalmann/bk/MERGE/mysql-4.1-merge
2006-09-20 16:17:30 +02:00
msvensson@shellback.(none)
339cd91a98
Fix problem with testcase timeouts not working. The timeout value was always multiplied with 10
...
since the $opt_valgrind variable was initialised to 0, thus being "defined"
2006-09-20 15:41:46 +02:00
Kristofer.Pettersson@naruto.
90ea39b6b8
Merge kpettersson@bk-internal:/home/bk/mysql-5.0-maint
...
into naruto.:C:/cpp/mysql-5.0-maint
2006-09-20 12:51:08 +02:00
gkodinov/kgeorge@rakia.(none)
8618353374
Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
...
into rakia.(none):/home/kgeorge/mysql/autopush/B21540-5.0-opt
2006-09-20 12:03:56 +03:00
gkodinov/kgeorge@rakia.(none)
8577d7913e
fixed merge
2006-09-20 12:02:58 +03:00
msvensson@shellback.(none)
36c39504d0
Merge shellback.(none):/home/msvensson/mysql/bug19738/my50-bug19738
...
into shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-09-20 08:57:51 +02:00
msvensson@shellback.(none)
42989bb6c2
Bug#19738 "make install" tries to build files that "make" should already have built
...
- Move gen_lex_hash to EXTRA_PROGRAMS
2006-09-20 08:56:57 +02:00
istruewing@chilla.local
1782889d35
Merge bk-internal.mysql.com:/home/bk/mysql-4.1-engines
...
into chilla.local:/home/mydev/mysql-4.1-bug14400-monty
2006-09-20 08:33:46 +02:00
Kristofer.Pettersson@naruto.
374e5e8a7e
Merge naruto.:C:/cpp/bug20789/my50-bug20789
...
into naruto.:C:/cpp/mysql-5.0-maint
2006-09-20 07:46:33 +02:00
igor@rurik.mysql.com
0279c91d99
Post-merge corrections.
2006-09-19 12:18:24 -07:00
msvensson@shellback.(none)
21892f4161
Merge bk-internal:/home/bk/mysql-5.0-maint
...
into shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-09-19 20:06:18 +02:00
msvensson@shellback.(none)
9cb40c6e91
Merge shellback.(none):/home/msvensson/mysql/work/my50-work
...
into shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-09-19 20:00:01 +02:00
msvensson@shellback.(none)
5a912955d5
Increase suite timeout even more - 6 times - when running with valgrind
2006-09-19 19:41:41 +02:00
msvensson@shellback.(none)
d3d7c74954
Merge shellback.(none):/home/msvensson/mysql/work/my50-work
...
into shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-09-19 19:11:41 +02:00
igor@rurik.mysql.com
25368c359e
Merge rurik.mysql.com:/home/igor/mysql-4.1-opt
...
into rurik.mysql.com:/home/igor/mysql-5.0-opt
2006-09-19 10:09:02 -07:00