Commit graph

25660 commits

Author SHA1 Message Date
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
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
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
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
joerg@mysql.com
7e0784fd30 Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/M50/mysql-5.0
2005-08-25 15:19:51 +02:00
joerg@mysql.com
099a226ad8 Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/M50/mysql-5.0
2005-08-25 15:16:51 +02: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
jonas@eel.(none)
a8519309dd Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0
into  eel.(none):/home/jonas/src/mysql-5.0-push
2005-08-25 13:39:01 +02:00
jonas@eel.(none)
c2b8f4ada3 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
into  eel.(none):/home/jonas/src/mysql-4.1-push
2005-08-25 13:37:55 +02:00
jonas@eel.(none)
3c67bccce4 Merge eel.(none):/home/jonas/src/mysql-5.0
into  eel.(none):/home/jonas/src/mysql-5.0-push
2005-08-25 13:34:40 +02:00
jonas@eel.(none)
ded7670e5a Merge eel.(none):/home/jonas/src/mysql-4.1
into  eel.(none):/home/jonas/src/mysql-4.1-push
2005-08-25 13:34:20 +02: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
jonas@eel.(none)
8afea954d9 Merge eel.(none):/home/jonas/src/mysql-4.1
into  eel.(none):/home/jonas/src/mysql-5.0
2005-08-25 13:21:58 +02:00
jonas@eel.(none)
7fe87018b4 bug#12027 - ndb
When detecting corrupt schema file.
  Make sure to close it (as it will be opened later when rewriting a clean copy)
2005-08-25 13:16:29 +02:00
osku@127.(none)
1863a480b2 Merge osalerma@bk-internal.mysql.com:/home/bk/mysql-5.0
into  127.(none):/home/osku/mysql-5.0-2
2005-08-25 14:15:30 +03:00
tomas@poseidon.ndb.mysql.com
0c859d6651 config:
updated tomas default checkout
2005-08-25 13:15:29 +02:00
tomas@poseidon.ndb.mysql.com
f0b27795e4 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
2005-08-25 13:05:32 +02:00
tomas@poseidon.ndb.mysql.com
90778fc857 config:
changed tomas default checkout
2005-08-25 13:04:53 +02: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
joerg@mysql.com
c8bfd8c2d2 Manual merge - no change. 2005-08-25 11:33:45 +02:00
joerg@mysql.com
d8a1c90597 Correct a typing error: Missing ".pl" suffix is essential. 2005-08-25 11:17:54 +02:00