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

36929 commits

This branch
This branch
All branches
Author SHA1 Message Date
stewart@willster.(none)
f575a1e440 BUG#21650 not_embedded_server fails --with-ndbcluster 
make test ignore NDB injector thread
 2006-08-15 19:10:10 +08:00
stewart@willster.(none)
34d0ac1797 Merge ssmith@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb 
into  willster.(none):/home/stewart/Documents/MySQL/5.1/ndb
 2006-08-15 15:47:03 +08:00
stewart@willster.(none)
c306b4578e BUG#21648 information_schema test fails --with-ndbcluster 
make test work both with and without ndbcluster
 2006-08-15 15:16:21 +08:00
jonas@perch.ndb.mysql.com
10ff2f9564 Merge perch.ndb.mysql.com:/home/jonas/src/51-work 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
 2006-08-15 08:49:38 +02:00
jonas@perch.ndb.mysql.com
47d971621b ndb - 
Fix ndb_condition_pushdown (5.0->5.1 merge error)
 2006-08-15 08:47:49 +02:00
jonas@perch.ndb.mysql.com
7a95208ca0 Merge perch.ndb.mysql.com:/home/jonas/src/51-work 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
 2006-08-15 08:17:43 +02:00
jonas@perch.ndb.mysql.com
2ad21cf976 ndb - bug#21172 
Fix build failure if O_DIRECT is not defined
  Fix stack overflow by making odirect_readbuf global
  Remove soem old debug variables
 2006-08-15 07:52:27 +02:00
stewart@willster.(none)
8089a11cbb Merge willster.(none):/home/stewart/Documents/MySQL/5.0/ndb 
into  willster.(none):/home/stewart/Documents/MySQL/5.1/ndb
 2006-08-15 11:49:40 +08:00
stewart@willster.(none)
0d7beacf31 Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into  willster.(none):/home/stewart/Documents/MySQL/5.1/ndb
 2006-08-15 11:28:27 +08:00
stewart@willster.(none)
052264b359 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  willster.(none):/home/stewart/Documents/MySQL/5.0/ndb
 2006-08-15 11:13:05 +08:00
stewart@willster.(none)
03e297aafa BUG#20823 testBackup FailMaster failing 
few cases not handled properly (NF occurs).
 2006-08-15 11:09:38 +08:00
brian@zim.(none)
16a5d97a5d Merge fixes 2006-08-14 16:50:52 -07:00
brian@zim.(none)
8deb5beb9c Merge zim.(none):/home/brian/mysql/dep-5.0 
into  zim.(none):/home/brian/mysql/dep-5.1
 2006-08-14 15:24:29 -07:00
kostja@bodhi.local
1f80fb0453 Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into  bodhi.local:/opt/local/work/mysql-5.1-runtime-merge
 2006-08-14 22:38:22 +04:00
joerg@trift2.
a560c3ee1f scripts/make_binary_distribution.sh : Drop the "max" server from 5.1 packages. 2006-08-14 19:56:41 +02:00
brian@zim.(none)
c43a332859 Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  zim.(none):/home/brian/mysql/dep-5.0
 2006-08-14 09:45:41 -07:00
kostja@bodhi.local
d03b39aaab Fix a test case (proper clean up). 2006-08-14 19:18:33 +04:00
kostja@bodhi.local
14e237a957 Fix a test suite failure. 2006-08-14 19:05:35 +04:00
jonas@perch.ndb.mysql.com
d3855ce67c ndb - bug#21213 
5.1-fix adopt to changes in node recovery
 2006-08-14 15:54:21 +02:00
svoj@may.pils.ru
91e94d781f Merge may.pils.ru:/home/svoj/devel/mysql/BUG18874/mysql-4.1 
into  may.pils.ru:/home/svoj/devel/mysql/BUG18874/mysql-5.0
 2006-08-14 18:08:33 +05:00
jonas@perch.ndb.mysql.com
3b050ed422 merge 2006-08-14 14:52:45 +02:00
kostja@bodhi.local
9b05865be4 Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into  bodhi.local:/opt/local/work/mysql-5.1-runtime-merge
 2006-08-14 16:30:57 +04:00
kostja@bodhi.local
d4a7b82be9 Windows build fix: declare _db_set_ before it's used. 2006-08-14 16:15:08 +04:00
jonas@perch.ndb.mysql.com
73c58c3234 Merge perch.ndb.mysql.com:/home/jonas/src/50-work 
into  perch.ndb.mysql.com:/home/jonas/src/51-work
 2006-08-14 14:11:51 +02:00
svoj@may.pils.ru
d4bdba176f BUG#18874 - Setting myisam_repair_threads > 1, index cardinality always 1 
Fixed by moving update_key_parts() down to be after write_index().
 2006-08-14 17:05:02 +05:00
jonas@perch.ndb.mysql.com
f6f5f475ea Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb 
into  perch.ndb.mysql.com:/home/jonas/src/51-work
 2006-08-14 13:59:25 +02:00
brian@zim.(none)
7429c871b9 Fix for bug#20648 We introduce a new field method for knowing "real size", and we now in archive null unused bits of a row to null before writing. 2006-08-14 03:29:17 -07:00
jonas@perch.ndb.mysql.com
c22a8afc4b Merge perch.ndb.mysql.com:/home/jonas/src/41-work 
into  perch.ndb.mysql.com:/home/jonas/src/50-work
 2006-08-14 11:55:13 +02:00
kostja@bodhi.local
5dfdc8bfce Manual merge 5.0->5.1. Post-merge fixes. 2006-08-14 13:27:11 +04:00
jonas@perch.ndb.mysql.com
c9a41abb9d Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
 2006-08-14 09:53:38 +02:00
kostja@bodhi.local
04c97488f9 Merge bodhi.local:/opt/local/work/tmp_merge 
into  bodhi.local:/opt/local/work/mysql-5.1-runtime-merge
 2006-08-12 21:06:51 +04:00
svoj@may.pils.ru
07a1ed651f Extended a test case for bug#7391. 2006-08-11 14:41:07 +05:00
svoj@may.pils.ru
827164916c Merge may.pils.ru:/home/svoj/devel/mysql/BUG7391/mysql-4.1 
into  may.pils.ru:/home/svoj/devel/mysql/BUG7391/mysql-5.0
 2006-08-11 14:24:09 +05:00
pgalbraith/patg@govinda.patg.net
b2ce951b81 Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime 
into  govinda.patg.net:/home/patg/mysql-build/mysql-5.1-engines-merge
 2006-08-10 15:31:44 -07:00
patg@govinda.patg.net
4371749996 Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  govinda.patg.net:/home/patg/mysql-build/mysql-5.1-engines-merge
 2006-08-10 14:28:39 -07:00
cmiller@zippy.cornsilk.net
f6f7eb851e Merge updates. 2006-08-10 12:39:18 -04:00
jonas@perch.ndb.mysql.com
5bb4e84a72 ndb - bug#21172 
Handle also open && !OM_INIT wrt non function O_DIRECT
 2006-08-10 16:12:54 +02:00
kroki/tomash@moonlight.intranet
b341356abd Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.1-merge 
into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.1-runtine-merge
 2006-08-10 16:16:16 +04:00
kroki/tomash@moonlight.intranet
aca2c3761a Merge moonlight.intranet:/home/tomash/src/mysql_ab/tmp_merge 
into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.1-merge
 2006-08-10 16:11:55 +04:00
jonas@perch.ndb.mysql.com
0c3127cfbf ndb - bug#21283 - merge disabled.def 2006-08-10 13:49:37 +02:00
jonas@perch.ndb.mysql.com
29eaad6288 Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
 2006-08-10 13:47:20 +02:00
jonas@perch.ndb.mysql.com
69de7d8759 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
 2006-08-10 13:34:34 +02:00
jonas@perch.ndb.mysql.com
732f9f6843 ndb - bug#21283 
this test in its current form depend on binlog format row
 2006-08-10 13:33:49 +02:00
kroki/tomash@moonlight.intranet
ed42379c72 Merge moonlight.intranet:/home/tomash/src/mysql_ab/tmp_merge 
into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.1-merge
 2006-08-10 15:07:27 +04:00
serg@janus.mylan
069131e28a Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtime 
into  janus.mylan:/usr/home/serg/Abk/m51
 2006-08-10 12:39:59 +02:00
andrey@example.com
81efea724e revert part of the code 
how did it get in?!? (it's only in local csets so no other tree is affected)
 2006-08-10 12:26:43 +02:00
andrey@example.com
eba9109225 after merge update 2006-08-10 11:52:34 +02:00
serg@janus.mylan
7d77c53038 Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into janus.mylan:/usr/home/serg/Abk/m51
 2006-08-10 11:04:09 +02:00
kroki/tomash@moonlight.intranet
f6dda7f1e1 Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.1 
into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.1-merge
 2006-08-10 12:10:48 +04:00
cmiller@zippy.cornsilk.net
364dfae629 Removed Iggy's accidentally-added files. 2006-08-10 01:02:31 -04:00