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

48330 commits

This branch
This branch
All branches
Author SHA1 Message Date
tomas@whalegate.ndb.mysql.com
0a1c65b6e3 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-rpl
 2007-07-03 13:10:07 +02:00
antony@ppcg5.local
76587c48b9 fix bad merge 2007-07-03 03:56:03 -07:00
bar@bar.myoffice.izhnet.ru
14df7c7087 Merge mysql.com:/home/bar/mysql-work/mysql-5.0.b27345 
into  mysql.com:/home/bar/mysql-work/mysql-5.1-new-rpl
 2007-07-03 14:06:57 +05:00
bar@bar.myoffice.izhnet.ru
825570f5a4 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0-rpl 
into  mysql.com:/home/bar/mysql-work/mysql-5.0.b27345
 2007-07-03 13:58:19 +05:00
gkodinov/kgeorge@magare.gmz
248650120c Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  magare.gmz:/home/kgeorge/mysql/autopush/B28983-2-5.0-opt
 2007-07-03 10:40:31 +03:00
gkodinov/kgeorge@magare.gmz
bad7900a5a Bug #28983: 'reset master' in multiple threads and innodb tables 
asserts debug binary

We can't reliably check if the binary log is opened without 
acquiring its mutex. 
Fixed by removing this check.
 2007-07-03 10:36:37 +03:00
jonas@perch.ndb.mysql.com
446e3272c4 Merge perch.ndb.mysql.com:/home/jonas/src/50-work 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-ndb
 2007-07-03 08:46:41 +02:00
jonas@perch.ndb.mysql.com
af76e150c8 Merge perch.ndb.mysql.com:/home/jonas/src/51-telco-gca 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
 2007-07-03 08:41:52 +02:00
jonas@perch.ndb.mysql.com
b940b92ede Merge perch.ndb.mysql.com:/home/jonas/src/50-work 
into  perch.ndb.mysql.com:/home/jonas/src/51-telco-gca
 2007-07-03 08:41:05 +02:00
jonas@perch.ndb.mysql.com
71996bd6f4 ndb - bug#29354 - Incorrect handling of replica REDO during SR (5.0) 
Not very clever fix for DIH incorrect REDO handling
  - Dont report GCP_SAVE_CONF until first LCP has been complete during NR
 2007-07-03 08:39:42 +02:00
iggy@amd64.(none)
8c26615204 Merge amd64.(none):/src/bug24924/my50-bug24924 
into  amd64.(none):/src/bug24924/my51-bug24924
 2007-07-02 14:23:50 -04:00
iggy@amd64.(none)
772c7fc591 Bug#24924 shared-memory-base-name that is too long causes buffer overflow 
- Testcase fixup.
 2007-07-02 14:22:03 -04:00
sergefp@mysql.com
de0cf5d22f Fix testcase to be platform-independent 2007-07-02 22:18:41 +04:00
mikael@dator6.(none)
da7e78cead removed test case no longer supported 2007-07-02 20:11:54 +02:00
lars/lthalmann@mysql.com/dl145k.mysql.com
91ca424640 post-merge fix 2007-07-02 19:33:00 +02:00
mikael@dator6.(none)
8ccd9ee981 Merge dator6.(none):/home/mikael/mysql_clones/mysql-5.1-opt 
into  dator6.(none):/home/mikael/mysql_clones/bug18198
 2007-07-02 18:08:27 +02:00
lars/lthalmann@dl145k.mysql.com
5c811235fb Merge mysql.com:/nfsdisk1/lars/bk/mysql-5.0-rpl 
into  mysql.com:/nfsdisk1/lars/bk/mysql-5.1-new-rpl
 2007-07-02 17:55:24 +02:00
lars/lthalmann@dl145j.mysql.com
4bbac9acfd Merge mysql.com:/nfsdisk1/lars/bk/mysql-4.1-rpl 
into  mysql.com:/nfsdisk1/lars/bk/mysql-5.0-rpl
 2007-07-02 17:46:48 +02:00
lars/lthalmann@dl145k.mysql.com
4be62a8e7f Merge mysql.com:/nfsdisk1/lars/bk/mysql-5.1 
into  mysql.com:/nfsdisk1/lars/bk/mysql-5.1-new-rpl
 2007-07-02 17:45:46 +02:00
lars/lthalmann@dl145k.mysql.com
f969f0000c Merge lthalmann@bk-internal.mysql.com:/home/bk/mysql-5.0-runtime 
into  mysql.com:/nfsdisk1/lars/bk/mysql-5.0-rpl
 2007-07-02 17:02:01 +02:00
jonas@perch.ndb.mysql.com
3c1cfd7631 Merge perch.ndb.mysql.com:/home/jonas/src/50-work 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-ndb
 2007-07-02 14:19:15 +02:00
jonas@perch.ndb.mysql.com
a3c733c395 Merge perch.ndb.mysql.com:/home/jonas/src/51-telco-gca 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
 2007-07-02 14:08:22 +02:00
jonas@perch.ndb.mysql.com
627a56be1e ndb - bug#29364 - port merge (5.0 -> 5.1) 2007-07-02 13:59:17 +02:00
jonas@perch.ndb.mysql.com
b47ee8cec9 Merge perch.ndb.mysql.com:/home/jonas/src/50-work 
into  perch.ndb.mysql.com:/home/jonas/src/51-telco-gca
 2007-07-02 13:54:27 +02:00
jonas@perch.ndb.mysql.com
f6c0acde24 ndb - bug#29364 - "SQL queries hang while data node in start phase 5" 
In TC init node status for already started nodes during node restart
  (not present in 5.1)
 2007-07-02 13:45:24 +02:00
lars/lthalmann@dl145j.mysql.com
a4c81471e8 Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.1-new-rpl 
into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.1-merge
 2007-07-02 13:42:39 +02:00
lars/lthalmann@dl145j.mysql.com
6f6492b715 Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.0-rpl 
into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.0-merge
 2007-07-02 13:22:23 +02:00
lars/lthalmann@mysql.com/dl145j.mysql.com
a464b1ab3b Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-4.1-rpl 
into  mysql.com:/nfsdisk1/lars/MERGE/mysql-4.1-merge
 2007-07-02 13:21:13 +02:00
tnurnberg@sin.intern.azundris.com
5230ed7a42 Merge sin.intern.azundris.com:/home/tnurnberg/22540/50-22540 
into  sin.intern.azundris.com:/home/tnurnberg/22540/51-22540
 2007-07-02 09:37:37 +02:00
svoj@june.mysql.com
717a04774b Merge mysql.com:/home/svoj/devel/mysql/BUG29299/mysql-5.0-engines 
into  mysql.com:/home/svoj/devel/mysql/BUG29299/mysql-5.1-engines
 2007-07-02 12:36:31 +05:00
svoj@june.mysql.com
0539080296 Merge mysql.com:/home/svoj/devel/bk/mysql-5.0-engines 
into  mysql.com:/home/svoj/devel/mysql/BUG29299/mysql-5.0-engines
 2007-07-02 12:31:34 +05:00
kostja@bodhi.(none)
1550a5ddee A post-merge fix. 2007-07-02 11:29:07 +04:00
tnurnberg@sin.intern.azundris.com
a403815e3d Bug#22540: Incorrect value in column End_log_pos of SHOW BINLOG EVENTS using InnoDB 
minor fixes to appease pushbuild.
---
Merge sin.intern.azundris.com:/home/tnurnberg/22540/50-22540
into  sin.intern.azundris.com:/home/tnurnberg/22540/51-22540
 2007-07-02 07:34:42 +02:00
tnurnberg@sin.intern.azundris.com
2fbd3a2eca Bug#22540: Incorrect value in column End_log_pos of SHOW BINLOG EVENTS using InnoDB 
minor fixes to appease pushbuild.
 2007-07-02 07:13:40 +02:00
antony@anubis.xiphis.org
673a8708d1 Merge anubis.xiphis.org:/usr/home/antony/work/mysql-5.1-engines 
into  anubis.xiphis.org:/usr/home/antony/work/mysql-5.1-merge
 2007-07-01 20:56:47 -07:00
igor@olga.mysql.com
f8683bfb44 Fixed bug #25798. 
This bug may manifest itself not only with the queries for which
the index-merge access method is chosen. It also may display
itself for queries with DISTINCT.

The bug was in how the Unique::get method used the merge_buffers
function. To compare elements in the the queue employed by
merge_buffers() it must use the buffpek_compare function rather
than the function for binary comparison.
 2007-07-01 15:33:28 -07:00
kostja@bodhi.(none)
aea880dda8 Merge bodhi.(none):/opt/local/work/mysql-5.0-runtime 
into  bodhi.(none):/opt/local/work/mysql-5.1-runtime
 2007-07-02 02:03:26 +04:00
kostja@bodhi.(none)
674d10270c Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  bodhi.(none):/opt/local/work/mysql-5.0-runtime
 2007-07-02 02:01:05 +04:00
kostja@bodhi.(none)
7ce3cada45 Merge bodhi.(none):/opt/local/work/mysql-5.0-runtime 
into  bodhi.(none):/opt/local/work/mysql-5.1-runtime
 2007-07-02 01:55:01 +04:00
kostja@bodhi.(none)
6a5ce49d09 Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into  bodhi.(none):/opt/local/work/mysql-5.1-runtime
 2007-07-02 01:35:52 +04:00
kostja@bodhi.(none)
2d8decabd4 Update a missed test result. 2007-07-02 01:28:20 +04:00
igor@olga.mysql.com
2efac22463 Corrected a test case. 2007-07-01 11:00:29 -07:00
istruewing@synthia.local
754f66cf56 Post.merge fixes 
Fixed warnings
Fixed error numbers
 2007-07-01 11:56:01 +02:00
igor@olga.mysql.com
eea7dd0a77 Made test case platform independent. 2007-07-01 01:59:05 -07:00
igor@olga.mysql.com
f93f44e739 Post-merge fix. 2007-06-30 22:50:14 -07:00
igor@olga.mysql.com
259fdbf9ca Merge olga.mysql.com:/home/igor/mysql-5.0-opt 
into  olga.mysql.com:/home/igor/dev-opt/mysql-5.1-opt
 2007-06-30 20:49:28 -07:00
igor@olga.mysql.com
38deea2496 Merge olga.mysql.com:/home/igor/mysql-4.1-opt 
into  olga.mysql.com:/home/igor/mysql-5.0-opt
 2007-06-30 16:24:09 -07:00
istruewing@synthia.local
fd58622757 Post-merge fixes. 2007-06-30 18:17:20 +02:00
gkodinov/kgeorge@magare.gmz
fdf2d7c24f Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.1-opt 
into  magare.gmz:/home/kgeorge/mysql/autopush/B29157-5.1-opt
 2007-06-30 17:16:20 +03:00
istruewing@synthia.local
bc3e18cd39 Merge synthia.local:/home/mydev/mysql-5.0-axmrg 
into  synthia.local:/home/mydev/mysql-5.1-axmrg
 2007-06-30 13:17:49 +02:00