mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-26 00:34:18 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
25695 commits 2777 branches 343 tags 1.6 GiB
Commit graph

25695 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
joerg@mysql.com
1459469d67 Manual merge - no change. 2005-08-25 11:14:48 +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
aa18382680 Make test predictable 2005-08-25 12:03:19 +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.mysql.com
9605c5dba2 Add back changes lost in merge 
(Faster test)
 2005-08-25 10:19:06 +03: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
monty@mishka.local
0c5ca9be62 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into  mishka.local:/home/my/mysql-4.1
 2005-08-25 09:39:09 +03:00
monty@mishka.local
f16c7b3c5c After merge fixes 2005-08-25 09:38:06 +03:00
andrey@lmy004.
f6a9ff90d0 Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.0 
into lmy004.:/work/mysql-5.0-clean
 2005-08-25 08:36:40 +02:00
monty@mishka.local
6773d24704 Remove function that was accidently added back 2005-08-25 09:03:41 +03:00
georg@lmy002.wdf.sap.corp
adc603a930 Merge lmy002.wdf.sap.corp:/home/georg/work/mysql/bugs/mysql-5.0-master 
into lmy002.wdf.sap.corp:/home/georg/work/mysql/bugs/mysql-5.0_5501
 2005-08-25 07:02:37 +02:00
monty@mishka.local
f384e08277 Merge mishka.local:/home/my/mysql-4.1 
into  mishka.local:/home/my/mysql-5.0
 2005-08-25 06:55:48 +03:00
kent@mysql.com
bd2901a250 disabled.def: 
Disabled unstable tests, bugs filed
 2005-08-25 02:27:52 +02:00
jimw@mysql.com
27b6d59db2 Merge bk-internal:/home/bk/mysql-5.0 
into  mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-08-24 17:09:44 -07:00
jimw@mysql.com
e11e73173f Fix for building without --without-server, which was broken by fix 
for building with --without-server.
 2005-08-24 17:08:55 -07:00
kent@mysql.com
96dc373650 ha_tina.cc: 
Some lack madvice()
 2005-08-25 01:02:40 +02:00
jimw@mysql.com
6964b7491e Merge mysql.com:/home/jimw/my/mysql-5.0-11680 
into  mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-08-24 15:54:23 -07:00
jimw@mysql.com
56dfc1bf18 Merge mysql.com:/home/jimw/my/mysql-5.0-12562 
into  mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-08-24 15:52:58 -07:00