timour@mysql.com
e62c877748
Fix for BUG#12672.
2005-08-29 17:13:42 +03:00
hf@deer.(none)
093789aabd
gis.test corrected with Pem's wishes
2005-08-27 20:06:35 +05: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
hf@deer.(none)
418a7bfcde
Merge deer.(none):/home/hf/work/mysql-4.1.clean
...
into deer.(none):/home/hf/work/mysql-5.0.clean
2005-08-27 18:10:46 +05:00
hf@deer.(none)
5b35789d12
Merge deer.(none):/home/hf/work/mysql-4.1.9645
...
into deer.(none):/home/hf/work/mysql-4.1.clean
2005-08-27 18:06:09 +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
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
kent@mysql.com
fb690a5e04
2005-08-27 01:45:50 +02:00
sergefp@mysql.com
3e50dc3c4a
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/psergey/mysql-5.0-rpl-bug
2005-08-27 03:07:13 +04:00
kent@mysql.com
8dd0a47da0
mtr_timer.pl:
...
Simplified and corrected mtr_timer_stop_all()
2005-08-27 00:52:52 +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
patg@radha.local
3514fb4b4f
Merge radha.local:/Users/patg/mysql-build/mysql-4.1
...
into radha.local:/Users/patg/mysql-build/mysql-5.0.clean
2005-08-26 21:08:28 +02:00
patg@radha.local
69114941cd
typo to DBUG_RETURN fixed
2005-08-26 20:29:26 +02: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
kent@mysql.com
207d159845
mysql-test-run.sh, mtr_report.pl:
...
Corrected typo
2005-08-26 12:37:35 +02: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
joerg@mysql.com
a26bfa83de
Revert a change that breaks (at least) all "max" builds.
2005-08-25 20:01:56 +02:00
joerg@mysql.com
2d494220db
Reverted a change that breaks "automake".
2005-08-25 18:48:18 +02: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
joerg@mysql.com
1a4e2ef94b
Reset version number in the build clone.
2005-08-25 16:57:54 +02: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
kent@mysql.com
fd98c4bfc6
Merge mysqldev@production.mysql.com:my/mysql-5.0-release
...
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-release
2005-08-25 16:28:35 +02:00
kent@mysql.com
af2b5f3bae
mtr_process.pl:
...
Call mtr_timer_stop_all() at exit
mtr_report.pl, mysql-test-run.pl:
Added default/ps-protocol/embedded to abort and summary line
mtr_timer.pl:
Added function mtr_timer_stop_all()
2005-08-25 16:25:54 +02: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
sergefp@mysql.com
6d25f56297
BUG#12335: merging: temporarily removed a test case that demonstrates wrong behaviour and does it in non-deterministic way.
2005-08-25 18:13:56 +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