osku@127.(none)
caf74b7cdd
Merge osalerma@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into 127.(none):/home/osku/mysql-5.0
2005-08-29 09:06:43 +03:00
sergefp@mysql.com
e13f67cd05
Fix for valgrind warning: Check for thd->binlog_evt_union.unioned_events only if
...
we were doing binlog union (i.e. need_binlog_call==TRUE)
2005-08-28 20:25:53 +04:00
igor@rurik.mysql.com
c19d2c1e89
Merge rurik.mysql.com:/home/igor/mysql-5.0
...
into rurik.mysql.com:/home/igor/dev/mysql-5.0-0
2005-08-27 16:30:39 -07:00
hf@deer.(none)
23a51871d2
Merge deer.(none):/home/hf/work/mysql-5.0.11207
...
into deer.(none):/home/hf/work/mysql-5.0.clean
2005-08-27 18:53:54 +05:00
hf@deer.(none)
b2a1a5e7f2
Addition to the fix for #11207 (SET GLOBAL TRANSACTION ISOLATION LEVEL)
2005-08-27 18:51:11 +05:00
hf@deer.(none)
63d6bc34e0
Merge deer.(none):/home/hf/work/mysql-5.0.10499
...
into deer.(none):/home/hf/work/mysql-5.0.clean
2005-08-27 18:13:26 +05:00
andrey@lmy004.
950a277988
retest the fix for bug #10362 (SHOW PROCEDURE always qualifies name with database)
...
(already approved)
2005-08-27 12:29:36 +02:00
andrey@lmy004.
c9d9c74ac6
Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into lmy004.:/work/mysql-5.0-bug11904
2005-08-27 09:09:54 +02:00
acurtis@xiphis.org
bebe182885
Merge acurtis@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into xiphis.org:/usr/home/antony/work2/p3-bug9048.2
2005-08-27 07:28:45 +01:00
acurtis@xiphis.org
23c19b21d6
Bug#9048
...
"Creating a function with char binary IN parameter fails"
Parse BINARY as part of type declaration, not as
a column attribute.
2005-08-27 07:26:14 +01:00
igor@rurik.mysql.com
f93e7cc77a
func_str.result, null.result:
...
Corrected results after the fix for bug #12791 .
func_test.result, func_test.test:
Added test cases for bug #12791 .
item_func.h, item_func.cc:
Fixed bug #12791 .
Made LEAST/GREATES fully Oracle compliant.
LEAST/GREATEST did not return NULL if only some
arguments were NULLs. This did not comply with Oracle.
2005-08-26 22:25:45 -07:00
kent@mysql.com
0c3c6f8003
Merge mysql.com:/Users/kent/mysql/bk/mysql-5.0-release
...
into mysql.com:/Users/kent/mysql/bk/mysql-5.0
2005-08-27 02:05:35 +02:00
kent@mysql.com
057a98af4f
unireg.h:
...
Max index key length increased from 1024 to 3072
for 64 bit builds.
2005-08-27 01:50:38 +02:00
sergefp@mysql.com
5f231a5f49
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/psergey/mysql-5.0-rpl-bug
2005-08-27 02:34:05 +04:00
sergefp@mysql.com
ad9bfc251c
Slightly amended Monty's SP replication code cleanup patch
2005-08-27 02:33:06 +04:00
serg@sergbook.mysql.com
e0a7676757
Merge bk-internal:/home/bk/mysql-5.0
...
into sergbook.mysql.com:/usr/home/serg/Abk/mysql-5.0
2005-08-26 21:37:44 +04:00
serg@sergbook.mysql.com
0a0fc47ce4
bad blind change fixed
2005-08-26 21:33:13 +04:00
kent@mysql.com
7a45cd2dad
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/Users/kent/mysql/bk/mysql-5.0
2005-08-26 18:45:16 +02:00
jani@a193-229-222-105.elisa-laajakaista.fi
7b7188cea6
Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.1
...
into a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0
2005-08-26 15:56:52 +03:00
kent@mysql.com
abfbd9f9ba
Merge mysql.com:/Users/kent/mysql/bk/mysql-5.0-release
...
into mysql.com:/Users/kent/mysql/bk/mysql-5.0
2005-08-26 14:32:38 +02:00
serg@sergbook.mysql.com
78a0585cea
after merge fix
2005-08-26 15:28:08 +04:00
serg@sergbook.mysql.com
d591705e69
merged
2005-08-26 13:24:59 +04:00
serg@sergbook.mysql.com
4da4a66b64
Merge bk-internal:/home/bk/mysql-5.0
...
into sergbook.mysql.com:/usr/home/serg/Abk/mysql-5.0
2005-08-26 11:56:29 +04:00
andrey@lmy004.
7b1b3997a8
fix for bug #11904 (select statement, cursor, grouping wrong results)
2005-08-26 09:45:30 +02:00
patg@radha.local
6b4baf48a5
Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into radha.local:/Users/patg/mysql-build/mysql-4.1
2005-08-26 03:14:56 +02:00
patg@radha.local
efff75ed1a
ha_blackhole changes, same patch as http://lists.mysql.com/internals/27878 , per brian
2005-08-26 02:09:56 +02:00
kent@mysql.com
64c2d24978
libmysqld.vcproj:
...
Changed spelling "Commerical" to "Commercial"
mysqld.vcproj:
Aligned engines with Unix version
sql_class.cc:
VC7 needs my_free() cast of first arg to be (gptr)
my_global.h:
Can't assume macro set_timespec_nsec exists if set_timespec does
2005-08-25 23:24:43 +02:00
sergefp@mysql.com
2af2f47395
Merge mysqldev@production.mysql.com:my/mysql-5.0-release
...
into mysql.com:/home/psergey/mysql-5.0-bug12335-release2
2005-08-26 00:56:36 +04:00
sergefp@mysql.com
ec9768be18
Compiler error fix for ICC 8.1
2005-08-26 00:54:55 +04:00
jani@a193-229-222-105.elisa-laajakaista.fi
ff5d26d777
Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.1
2005-08-25 23:24:16 +03:00
joerg@mysql.com
598d0e7361
Include the new header file in an appropriate macro.
2005-08-25 21:41:50 +02:00
bell@sanja.is.com.ua
e4733cc8b0
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-bug1-5.0
2005-08-25 21:35:58 +03:00
jimw@mysql.com
f006319405
Merge mysql.com:/home/jimw/my/mysql-4.1-11707
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-08-25 09:36:51 -07:00
bell@sanja.is.com.ua
97ad1cba62
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-bug1-5.0
2005-08-25 19:14:43 +03:00
bell@sanja.is.com.ua
5963573c05
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-bug1-5.0
2005-08-25 17:47:18 +03:00
petr@mysql.com
05fe0b2247
Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/cps/mysql/devel/mysql-5.0-sp11333
2005-08-25 18:16:21 +04:00
sergefp@mysql.com
469e413f94
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/psergey/mysql-5.0-bug12335-release2
2005-08-25 18:16:20 +04:00
petr@mysql.com
56882c61bb
Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/cps/mysql/devel/mysql-5.0-sp11333
2005-08-25 18:05:49 +04:00
heikki@hundin.mysql.fi
7ec0b37c3c
ha_innodb.cc:
...
Fix typo
2005-08-25 16:57:13 +03:00
sergefp@mysql.com
c78ce16681
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/psergey/mysql-5.0-bug12335-release2
2005-08-25 17:39:02 +04:00
sergefp@mysql.com
95c3afc5d9
Fix for BUG#12335 (SP replication) : New binlogging strategy for stored PROCEDUREs/FUNCTIONs.
...
"Interleaved SPs execution is now binlogged properly, "SELECT spfunc()" is binlogged too.
The known remaining issue is binlogging/replication of "a routine is deleted while it is executed" scenario.
2005-08-25 17:34:34 +04:00
petr@mysql.com
db5acc18ed
Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/cps/mysql/devel/mysql-5.0-sp11333
2005-08-25 16:06:49 +04:00
petr@mysql.com
8dfa469729
Fix Bug#11333 "Stored Procedure: Memory blow up on repeated SELECT ... INTO query"
2005-08-25 15:34:14 +04:00
osku@127.(none)
ce22788bdd
Merge osalerma@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into 127.(none):/home/osku/mysql-5.0
2005-08-25 14:15:31 +03:00
joerg@mysql.com
fea0745ba8
Merge mysql.com:/M50/clone-5.0 into mysql.com:/M50/push-5.0
2005-08-25 11:46:17 +02:00
jani@a193-229-222-105.elisa-laajakaista.fi
e767eb330e
Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.0
...
into a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.1
2005-08-25 12:08:26 +03:00
monty@mishka.mysql.com
848c936693
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mishka.mysql.com:/home/my/mysql-5.0
2005-08-25 10:44:08 +03:00
andrey@lmy004.
d4a25c1b36
Merge lmy004.:/work/mysql-5.0-clean
...
into lmy004.:/work/mysql-5.0-bug12533-2
2005-08-25 09:38:59 +02:00
andrey@lmy004.
dde57f082b
fix for bug #12533 (crash on DESCRIBE <view> after renaming base table column)
2005-08-25 09:24:21 +02:00
monty@mishka.local
b90d7fe3b6
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mishka.local:/home/my/mysql-5.0
2005-08-25 09:40:40 +03:00