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
39233 commits 2778 branches 343 tags 1.6 GiB
Commit graph

1291 commits

Author SHA1 Message Date
istruewing@chilla.local
bd69350e43 Bug#8283 - OPTIMIZE TABLE causes data loss 
After merge fix. Renamed 'info' -> 'sort_param'.
 2006-10-10 20:01:39 +02:00
jonas@perch.ndb.mysql.com
84e4df338d Merge perch.ndb.mysql.com:/home/jonas/src/51-work 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
 2006-10-10 15:27:47 +02:00
jonas@perch.ndb.mysql.com
94b8e56144 ndb - 
ndb_restore Return OK even if temporary errors
    (otherwise mysql-test-run/ndb_restore can fail on really slow machines)
 2006-10-10 15:26:39 +02:00
jonas@perch.ndb.mysql.com
e600a3d394 Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.1 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
 2006-10-10 11:25:24 +02:00
jonas@perch.ndb.mysql.com
fe61968dc8 Merge perch.ndb.mysql.com:/home/jonas/src/51-work 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
 2006-10-10 11:08:23 +02:00
jonas@perch.ndb.mysql.com
5590e99d2e Merge perch.ndb.mysql.com:/home/jonas/src/50-work 
into  perch.ndb.mysql.com:/home/jonas/src/51-work
 2006-10-10 11:06:51 +02:00
istruewing@chilla.local
b15a23a79e Merge chilla.local:/home/mydev/mysql-5.0-bug8283 
into  chilla.local:/home/mydev/mysql-5.1-bug8283
 2006-10-09 22:24:55 +02:00
pekka@orca.ndb.mysql.com
e524d16707 ndb - tux scan 5.1 post-merge fix 2006-10-09 20:46:29 +02:00
pekka@orca.ndb.mysql.com
b084401165 Merge orca.ndb.mysql.com:/export/home/space/pekka/ndb/version/my50-bug20446 
into  orca.ndb.mysql.com:/export/home/space/pekka/ndb/version/my51-bug20446
 2006-10-09 16:40:57 +02:00
pekka@orca.ndb.mysql.com
ae1b40ba05 Merge orca.ndb.mysql.com:/export/home/space/pekka/ndb/version/my50-bug20446 
into  orca.ndb.mysql.com:/export/home/space/pekka/ndb/version/my51-bug20446
 2006-10-09 14:44:40 +02:00
svoj@april.(none)
cab855cac1 Merge mysql.com:/home/svoj/devel/mysql/engines/mysql-5.0-engines 
into  mysql.com:/home/svoj/devel/mysql/engines/mysql-5.1-engines
 2006-10-08 22:35:27 +05:00
svoj@may.pils.ru
0ea6959d78 Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  may.pils.ru:/home/svoj/devel/bk/mysql-5.1-engines
 2006-10-08 15:32:00 +05:00
mats@romeo.(none)
d4d26ba7d5 Merge romeo.(none):/home/bkroot/mysql-5.1-new-rpl 
into  romeo.(none):/home/bk/b19459-mysql-5.1-new
 2006-10-06 15:31:05 +02:00
svoj@april.(none)
1b5c111cf8 Merge mysql.com:/home/svoj/devel/mysql/BUG22937/mysql-5.0-engines 
into  mysql.com:/home/svoj/devel/mysql/BUG22937/mysql-5.1-engines
 2006-10-06 15:31:11 +05:00
stewart@willster.(none)
3551165c90 Merge willster.(none):/home/stewart/Documents/MySQL/5.0/bug21154 
into  willster.(none):/home/stewart/Documents/MySQL/5.1/bug13987

Merge 5.0-ndb into 5.1-ndb
 2006-10-05 23:13:29 +10:00
jonas@perch.ndb.mysql.com
0b5ad7f38b ndb - bug#17929 
guess which scan type to use in handler
 2006-10-05 14:25:18 +02:00
brian@zim.(none)
faff46eefe Added license information display to output of plugins schema, and tagged all plugins with GPL flag. 2006-10-05 00:41:29 -07:00
jonas@perch.ndb.mysql.com
c3e20d907e 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-10-04 11:42:50 +02:00
knielsen@bk-internal.mysql.com
a96d7250e8 Merge bk-internal.mysql.com:/dev/shm/knielsen/mysql-5.1-ndb-bj 
into  bk-internal.mysql.com:/dev/shm/knielsen/mysql-5.1-new-ndb
 2006-10-04 11:33:28 +02:00
jonas@perch.ndb.mysql.com
c878ff37e2 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-10-04 09:49:11 +02:00
stewart@willster.(none)
838e616413 Merge willster.(none):/home/stewart/Documents/MySQL/5.1/cleanup 
into  willster.(none):/home/stewart/Documents/MySQL/5.1/pending
 2006-10-04 14:37:01 +10:00
acurtis/antony@ltamd64.xiphis.org
52326aba48 Merge xiphis.org:/home/antony/work2/p2-bug22080.2 
into  xiphis.org:/home/antony/work2/p2-bug22080.3
 2006-10-03 16:51:19 -07:00
msvensson@neptunus.(none)
ca21b57992 Merge neptunus.(none):/home/msvensson/mysql/mysql-5.1 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
 2006-10-03 09:28:44 +02:00
mats@romeo.(none)
7b85fb5c13 BUG#19459 (BINLOG RBR command does not lock tables correctly causing 
crash for, e.g., NDB):
Submitting patch to base64_decode() adding extra parameter.
 2006-10-02 15:05:05 +02:00
svoj@april.(none)
115c4fe8dc Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  mysql.com:/home/svoj/devel/mysql/merge/mysql-5.1-engines
 2006-10-02 15:11:08 +05:00
baker@bk-internal.mysql.com
8a5fef1419 Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-arch
 2006-10-01 22:31:04 +02:00
pekka@orca.ndb.mysql.com
7edad61c8a ndb - bug#21191: test pgm: testIndexStat 2006-10-01 16:05:53 +02:00
holyfoot/hf@deer.(none)
5edde5a859 Merge bk@192.168.21.1:mysql-5.1-opt 
into  mysql.com:/home/hf/work/21888/my51-21888
 2006-10-01 15:21:06 +05:00
brian@zim.(none)
4117860ec6 Merge zim.(none):/home/brian/mysql/merge-5.1 
into  zim.(none):/home/brian/mysql/arch-5.1
 2006-09-30 18:44:42 -07:00
brian@zim.(none)
46ae2113ba This patch adds handlerton passing to functions. NDB and Innodb still require a global hanlderton in the main code due to the nature of the sql_cache call back function (should be solveable... another patch). 
Partitioning now has a flag to allow disabling of engines from being compatible with partitioning. Cleaned up heap naming convention on panic call.
 2006-09-30 12:49:46 -07:00
gkodinov@dl145s.mysql.com
869d1a6a1d Merge bk-internal:/home/bk/mysql-5.1 
into  dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.1-opt
 2006-09-30 09:35:11 +02:00
brian@zim.(none)
a756fd36ef This removes the passing of global hton to engine instance. 2006-09-29 17:19:02 -07:00
tsmith/tim@siva.hindu.god
44f0e55ca4 Merge siva.hindu.god:/usr/home/tim/m/bk/50 
into  siva.hindu.god:/usr/home/tim/m/bk/mrg/51
 2006-09-29 18:04:34 -06:00
tsmith/tim@siva.hindu.god
ca1f99bdb8 Merge siva.hindu.god:/usr/home/tim/m/bk/g51 
into  siva.hindu.god:/usr/home/tim/m/bk/mrg/51
 2006-09-29 17:01:16 -06:00
holyfoot/hf@deer.(none)
7392296414 Merge mysql.com:/home/hf/work/21888/my50-21888 
into  mysql.com:/home/hf/work/21888/my51-21888
 2006-09-29 17:58:36 +05:00
istruewing@chilla.local
8655a80cda Merge bk-internal.mysql.com:/home/bk/mysql-5.1-engines 
into  chilla.local:/home/mydev/mysql-5.1-bug22384
 2006-09-29 09:29:37 +02:00
istruewing@chilla.local
d56f3c3398 Merge chilla.local:/home/mydev/mysql-5.0-bug22384 
into  chilla.local:/home/mydev/mysql-5.1-bug22384
 2006-09-28 21:55:03 +02:00
svoj@april.(none)
7ed413d17b Merge mysql.com:/home/svoj/devel/mysql/BUG21617/mysql-5.0-engines 
into  mysql.com:/home/svoj/devel/mysql/BUG21617/mysql-5.1-engines
 2006-09-29 00:23:43 +05:00
brian@zim.(none)
bb09a2a940 Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-arch 
into  zim.(none):/home/brian/mysql/merge-5.1
 2006-09-28 11:25:02 -07:00
brian@zim.(none)
542cf080a4 Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  zim.(none):/home/brian/mysql/merge-5.1
 2006-09-28 10:51:56 -07:00
cmiller@zippy.cornsilk.net
e72bc63906 Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
 2006-09-28 10:15:32 -04:00
gkodinov@dl145s.mysql.com
41a2631cb3 Merge bk-internal:/home/bk/mysql-5.1 
into  dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.1-opt
 2006-09-28 14:53:31 +02:00
dli@dev3-76.dev.cn.tlan
273de17cce Merge dev3-76.dev.cn.tlan:/home/dli/mysql/mysql-5.0/mysql-5.0-bug-19651 
into  dev3-76.dev.cn.tlan:/home/dli/mysql/mysql-5.1/mysql-5.1-bug-19651
 2006-09-28 20:52:28 +08:00
gbichot@dl145h.mysql.com
7493331fa4 Merge gbichot@bk-internal:/home/bk/mysql-5.1-arch 
into  dl145h.mysql.com:/users/gbichot/mysql-5.1-arch
 2006-09-28 13:22:56 +02:00
gbichot@dl145h.mysql.com
041dedfcfb In the handlerton, cursor creation function don't have an argument 
and so the engine calls current_thd to derive transaction information;
instead we now pass THD to those functions, it looks more logical
(it makes the implicit current_thd parameter more visible).
Approved by Brian and Monty.
 2006-09-28 13:19:43 +02:00
gkodinov@dl145s.mysql.com
3abb604333 Merge dl145s.mysql.com:/data/bk/team_tree_merge/mysql-5.1 
into  dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.1-opt
 2006-09-28 10:41:42 +02:00
petr/cps@owlet.local
64c2c0cb19 Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  mysql.com:/home/cps/mysql/trees/5.1-runtime-new
 2006-09-28 04:44:55 +04:00
elliot/emurphy@lost.local
d5c98585da Merge mysql.com:/Users/emurphy/src/mysql/clean/mysql-5.0-maint-gca 
into  mysql.com:/Users/emurphy/src/mysql/clean/mysql-5.1-new-maint
 2006-09-27 17:20:45 -04:00
svoj@april.(none)
9353e3cf73 Merge mysql.com:/home/svoj/devel/mysql/merge/mysql-5.0-engines 
into  mysql.com:/home/svoj/devel/mysql/merge/mysql-5.1-engines
 2006-09-27 18:58:23 +05:00
svoj@april.(none)
92d7d668df Merge mysql.com:/home/svoj/devel/mysql/merge/mysql-5.0-engines 
into  mysql.com:/home/svoj/devel/mysql/merge/mysql-5.1-engines
 2006-09-27 15:29:04 +05:00