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

25617 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
joerg@mysql.com
1a4e2ef94b Reset version number in the build clone. 2005-08-25 16:57:54 +02: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
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
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
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)
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)
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
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
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.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
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
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
jimw@mysql.com
9e4a9e23c6 Make SYSDATE() behave as in Oracle: always the current datetime, not the 
datetime of when the current statement began. This also makes SYSDATE()
not safe in replication. (Bug #12562)
 2005-08-24 15:50:58 -07:00
monty@mishka.local
05ee47a80d Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mishka.local:/home/my/mysql-5.0
 2005-08-25 00:22:59 +03:00
monty@mishka.local
bb7289b7d2 Cleanups during review of new code 
Removed ASSERT that can obviously never be wrong
 2005-08-25 00:21:47 +03:00
dlenev@mysql.com
dc1df41b3f Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/dlenev/src/mysql-5.0.12
 2005-08-24 23:54:53 +04:00
dlenev@mysql.com
2a880905c4 Correction of fix for bug #12280 "Triggers: crash if flush tables". 
We should not assume that "thd" argument of reload_acl_and_cache() is
non-zero. Failure to do so will cause server to crash when one sends
SIGHUP to it.
 2005-08-24 23:44:42 +04:00
monty@mishka.local
17654cd7af Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into  mishka.local:/home/my/mysql-4.1
 2005-08-24 20:55:54 +03:00
monty@mishka.local
842de6ea45 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into  mishka.local:/home/my/mysql-4.1
 2005-08-24 19:53:40 +03:00
monty@mishka.local
8e6aa0e7ea Review fixes 2005-08-24 19:37:27 +03:00
jimw@mysql.com
006e5b770b Merge mysql.com:/home/jimw/my/mysql-4.1-12302 
into  mysql.com:/home/jimw/my/mysql-4.1-clean
 2005-08-24 08:50:12 -07:00
igor@rurik.mysql.com
b610c0972f Merge rurik.mysql.com:/home/igor/mysql-5.0 
into rurik.mysql.com:/home/igor/dev/mysql-5.0-0
 2005-08-24 08:19:02 -07:00
igor@rurik.mysql.com
17d6c734f4 Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.0 
into rurik.mysql.com:/home/igor/mysql-5.0
 2005-08-24 08:15:46 -07:00
heikki@hundin.mysql.fi
10adc6b562 Merge heikki@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  hundin.mysql.fi:/home/heikki/mysql-4.1
 2005-08-24 18:07:52 +03:00
heikki@hundin.mysql.fi
4bedb3091c subselect2.result: 
Update test result to reflect the fix of Bug #12779 : EXPLAIN SELECT of a subquery is now different
 2005-08-24 18:05:54 +03:00