patg@krsna.patg.net
add878e818
Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into krsna.patg.net:/home/patg/mysql-build/mysql-5.0.test2
2005-11-01 09:08:50 -08:00
evgen@moonbone.local
bbe58c7e26
Manually merged
2005-11-01 19:47:53 +03:00
hf@deer.(none)
0ec768c407
Conflicts resolving
2005-11-01 20:37:27 +04:00
evgen@moonbone.local
47059b89f5
Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into moonbone.local:/work/14186-bug-4.1-mysql
2005-11-01 17:34:19 +03:00
jani@ua141d10.elisa.omakaista.fi
46c4e7b6ea
Changed MTR_BUILD_THREAD port reserving policy.
2005-11-01 16:30:55 +02:00
evgen@moonbone.local
2343ff86ca
Fix bug #14466 lost sort order in GROUP_CONCAT() in a view
...
Item_func_group_concat::print() wasn't printing sort order thus creating wrong
view. This results in reported error.
2005-11-01 17:27:10 +03:00
pem@mysql.com
c4c2dc079b
Merge mysql.com:/usr/local/bk/mysql-5.0
...
into mysql.com:/usr/home/pem/bug14376/mysql-5.0
2005-11-01 15:03:41 +01:00
pem@mysql.com
4e9e038ff9
Fixed BUG#14376: MySQL crash on scoped variable (re)initialization
...
Added finer scope control for default clauses of local variable
declarations.
2005-11-01 14:58:52 +01:00
monty@mysql.com
e5f48e13bf
Reverting patch for BUG #14009 (use of abs() on null value causes problems with filesort
...
Fix for bug #14536 : SELECT @a,@a:=... fails with prepared statements
2005-11-01 15:54:30 +02:00
hf@deer.(none)
f3502cd983
Additional fix for bug #14445 (analyse.test fails)
2005-11-01 16:14:26 +04:00
monty@mysql.com
19502e8eb5
Review of new pushed code
...
Removed wrong fix for bug #14009 (use of abs() on null value causes problems with filesort)
Mark that add_time(), time_diff() and str_to_date() can return null values
2005-11-01 13:00:02 +02:00
hf@deer.(none)
bb17195a1c
Fix for bug #14183 (ctype_cp983.test fails with the embedded server)
2005-11-01 13:18:46 +04:00
hf@deer.(none)
b98c93e0a8
Fix for bug #14445 (analyse.test fails)
2005-11-01 13:08:14 +04:00
hf@deer.(none)
69cd4c1ebf
gis.test fixed
2005-11-01 11:43:34 +04:00
patg@krsna.patg.net
35a0ac6aea
Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into krsna.patg.net:/home/patg/mysql-build/mysql-5.0.test2
2005-10-31 17:28:11 -08:00
patg@krsna.patg.net
d5b252e630
BUG# 14532
...
Post-review fixes
2005-10-31 17:26:45 -08:00
kent@mysql.com
2c6902a093
mysql-test-run.pl:
...
Make IM ports change with MTR_BUILD_THREAD
2005-11-01 02:19:06 +01:00
patg@krsna.patg.net
7b611b33f2
BUG #14532
...
Added FIELD_TYPE_BIT to field method 'needs_quotes' to make BIT columns
work.
2005-10-31 17:17:16 -08:00
msvensson@neptunus.(none)
de07ac0c5a
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/wl2930/my50-wl2930
2005-10-31 13:36:03 +01:00
msvensson@neptunus.(none)
e5eb7cbf29
WL#2930 Adding view and cursor 'protocols' to mysqltest
...
- Cleanup of mysqltest.c before extending it
2005-10-31 12:25:08 +01:00
jani@ua141d10.elisa.omakaista.fi
da64397b69
Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0-tmp
2005-10-31 12:20:54 +02:00
jani@ua141d10.elisa.omakaista.fi
44aea416f9
Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1
...
into ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0-tmp
2005-10-31 11:54:36 +02:00
hf@deer.(none)
5150bd8f9f
Merge bk@192.168.21.1:/usr/home/bk/mysql-4.1
...
into deer.(none):/home/hf/work/mysql-4.1.12839
2005-10-31 12:24:43 +04:00
msvensson@neptunus.(none)
531b847f23
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2005-10-31 09:14:58 +01:00
sergefp@mysql.com
4ad3313cd7
BUG#14139 - Merge to 5.0
2005-10-31 09:22:33 +03:00
igor@rurik.mysql.com
6a1c8d48f6
Merge rurik.mysql.com:/home/igor/mysql-5.0
...
into rurik.mysql.com:/home/igor/dev/mysql-5.0-2
2005-10-29 09:41:18 -07:00
jimw@mysql.com
b919b29da6
Merge bk-internal:/home/bk/mysql-4.1
...
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-10-28 18:52:10 -07:00
patg@krsna.patg.net
22fe31e4d4
Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into krsna.patg.net:/home/patg/mysql-build/mysql-4.1
2005-10-28 18:23:23 -07:00
jimw@mysql.com
0e572ff475
Merge mysql.com:/home/jimw/my/mysql-4.1-13796
...
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-10-28 18:19:19 -07:00
jimw@mysql.com
e55f906130
Fix bug in handling of decimal fields in UNION statements that could
...
cause a crash or write to an incorrect memory location. (Bug #14216 )
2005-10-28 18:12:57 -07:00
sergefp@mysql.com
09a4d0c7a7
4.1->5.0 merge
2005-10-29 02:36:57 +04:00
sergefp@mysql.com
3e76aa38fa
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/psergey/mysql-5.0-oct25-test
2005-10-29 02:19:38 +04:00
sergefp@mysql.com
8b9bab2763
Fix for BUG#13814: in mi_pack_key(), when processing NULL value for TINYBLOB key segment,
...
do advance the source pointer over 2 bytes that specify value length.
2005-10-28 23:31:32 +04:00
evgen@moonbone.local
ddea0b44e3
Manually merged
2005-10-28 23:17:51 +04:00
sergefp@mysql.com
7be7912135
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/psergey/mysql-5.0-oct25-test
2005-10-28 22:55:02 +04:00
sergefp@mysql.com
eb57f520ba
Merge
2005-10-28 22:31:41 +04:00
sergefp@mysql.com
f220d87476
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/psergey/mysql-4.1-bug14139
2005-10-28 21:42:01 +04:00
jimw@mysql.com
f6995841b3
Merge bk-internal:/home/bk/mysql-5.0
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-10-28 10:17:37 -07:00
jimw@mysql.com
552c208bfe
Update test with changed result after merge
2005-10-28 10:16:44 -07:00
msvensson@neptunus.(none)
06c17bac2a
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2005-10-28 19:10:05 +02:00
pem@mysql.com
1111b5cd02
Merge mysql.com:/usr/local/bk/mysql-5.0
...
into mysql.com:/usr/home/pem/bug14233/mysql-5.0
2005-10-28 16:58:41 +02:00
pem@mysql.com
1eaf95d5ca
Merge mysql.com:/usr/local/bk/mysql-5.0
...
into mysql.com:/usr/home/pem/bug14256/mysql-5.0
2005-10-28 14:55:01 +02:00
msvensson@neptunus.(none)
1be4e65794
Use replace_result to mask portnumber printed from failing connect
2005-10-28 14:03:24 +02:00
bell@sanja.is.com.ua
186017b468
disabling archive_gis
2005-10-28 14:56:55 +03:00
evgen@moonbone.local
cc5d7c0715
Fix bug #14138 ROLLUP and PROCEDURE ANALYSE() hang server
...
Procedure analyse() redefines select's fields_list. setup_copy_fields() assumes
that fields_list is a part of all_fields_list. Because select have only
3 columns and analyse() redefines it to have 10 columns, int overrun in
setup_copy_fields() occurs and server goes to almost infinite loop.
Because fields_list used not only to send data ad fields types, it's wrong
to allow procedure redefine it. This patch separates select's fileds_list
and procedure's one. Now if procedure is present, copy of fields_list is
created in procedure_fields_list and it is used for sending data and fields.
2005-10-28 15:24:46 +04:00
pem@mysql.com
d201f2443d
Fixed BUG#14256: definer in view definition is not fully qualified
...
Changed the parser test for wildcards in hostname to checking for empty
strings instead (analogous with the test in default_view_definer()),
since wildcards do appear in the definer's host-part sometimes.
2005-10-28 12:11:32 +02:00
msvensson@neptunus.(none)
be6f7a3f82
Merge neptunus.(none):/home/msvensson/mysql/ssl_test/my50-ssl_test
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2005-10-28 11:00:54 +02:00
bell@sanja.is.com.ua
b5d2e34572
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-owner7-5.0
2005-10-28 10:12:36 +03:00
igor@rurik.mysql.com
30a7c28603
Merge rurik.mysql.com:/home/igor/mysql-5.0
...
into rurik.mysql.com:/home/igor/dev/mysql-5.0-2
2005-10-27 21:37:52 -07:00
jimw@mysql.com
009bcc7442
Merge mysql.com:/home/jimw/my/mysql-4.1-clean
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-10-27 18:46:00 -07:00