mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-02-01 03:21:53 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
39325 commits 2791 branches 343 tags 1.7 GiB
Commit graph

830 commits

Author SHA1 Message Date
lars@black.(none)
0b4e65e12b Merge mysql.com:/home/bkroot/mysql-5.1-new-rpl 
into  mysql.com:/home/bk/MERGE/mysql-5.1-merge
 2006-10-10 21:59:23 +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
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
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
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
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
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
jonas@perch.ndb.mysql.com
b0b69bac4a Merge perch.ndb.mysql.com:/home/jonas/src/51-work 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
 2006-09-26 16:14:05 +02:00
jonas@perch.ndb.mysql.com
d6ae4c1748 Merge perch.ndb.mysql.com:/home/jonas/src/50-work 
into  perch.ndb.mysql.com:/home/jonas/src/51-work
 2006-09-26 15:33:03 +02:00
pekka@orca.ndb.mysql.com
c9e53b3f11 ndb - bug#21690: cleanup: set column properties in any order before create 2006-09-26 14:21:52 +02:00
jonas@perch.ndb.mysql.com
ea12fac469 ndb - post merge fixes... 2006-09-26 14:08:20 +02:00
jonas@perch.ndb.mysql.com
e609add790 Merge perch.ndb.mysql.com:/home/jonas/src/50-work 
into  perch.ndb.mysql.com:/home/jonas/src/51-work
 2006-09-26 13:58:34 +02:00
mskold/marty@linux.site
5e60232da9 Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb 
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1
 2006-09-22 21:14:58 +02:00
gni/root@dev3-127.(none)
493e5ddbfa Merge dev3-127.(none):/mnt/mysql/home/ngb/mysql-5.1/mysql-5.1-ndb-bj 
into  dev3-127.(none):/mnt/mysql/home/ngb/mysql-5.1/mysql-5.1-bug21585
 2006-09-22 20:28:12 +08:00
gni/root@dev3-127.(none)
c26952192b BUG@21585 The --help option shows a screen of command options for the ndbd, ndb_mgmd, ndb_mgm 
and other commands related to ndb. For all of these, the help screen contains 
           "Ndb.cfg" string. Now i change the "Ndb.cfg" to "my.cnf" because "Ndb.cfg" is obsolete.
 2006-09-22 20:22:50 +08:00
gni/root@dev3-127.(none)
6991a44d48 Merge dev3-127.(none):/mnt/mysql/home/ngb/mysql-5.0/bug20575 
into  dev3-127.(none):/mnt/mysql/home/ngb/mysql-5.1/mysql-5.1-bug20575
 2006-09-22 19:30:37 +08:00
Justin.He/justin.he@qa3-104.qa.cn.tlan
a479482727 Merge qa3-104.qa.cn.tlan:/mnt/sda7/justin.he/mysql/mysql-5.0/bug21036-mysql-5.0 
into  qa3-104.qa.cn.tlan:/mnt/sda7/justin.he/mysql/mysql-5.1/mysql-5.1-ndb-bj
 2006-09-21 10:22:20 +08:00
dli@dev3-76.dev.cn.tlan
3cf3a9211b Merge dev3-76.dev.cn.tlan:/home/dli/mysql/mysql-5.1/mysql-5.1-ndb-bj 
into  dev3-76.dev.cn.tlan:/home/dli/mysql/mysql-5.1/mysql-5.1-bug-20395
 2006-09-20 18:56:38 +08:00
lzhou/root@dev3-138.dev.cn.tlan
aa6107031b BUG#21799 manual modify variable name. 2006-09-20 10:56:37 +00:00
dli@dev3-76.dev.cn.tlan
2724451f83 Merge dev3-76.dev.cn.tlan:/home/dli/mysql/mysql-5.0/mysql-5.0-bug-20395 
into  dev3-76.dev.cn.tlan:/home/dli/mysql/mysql-5.1/mysql-5.1-bug-20395
 2006-09-20 10:25:31 +08:00
lzhou/root@dev3-138.dev.cn.tlan
6180aada88 Merge dev3-138.dev.cn.tlan:/home/zhl/mysql/mysql-5.0/bug21799 
into  dev3-138.dev.cn.tlan:/home/zhl/mysql/mysql-5.1/bug21799
 2006-09-19 18:08:14 +00:00
acurtis/antony@xiphis.org/ltamd64.xiphis.org
98a8537adf Bug#22417 
"plug.in not included in dist source"
 2006-09-18 19:31:08 -07:00
gni/root@dev3-127.(none)
98941f7f18 Merge dev3-127.(none):/mnt/mysql/home/ngb/mysql-5.0/bug21530 
into  dev3-127.(none):/mnt/mysql/home/ngb/mysql-5.1/mysql-5.1-bug21530
 2006-09-18 14:14:08 +08:00
msvensson@shellback.(none)
f1e91ec7f7 Merge shellback.(none):/home/msvensson/mysql/work/my50-work 
into  shellback.(none):/home/msvensson/mysql/work/my51-work
 2006-09-15 17:00:09 +02:00
jonas@perch.ndb.mysql.com
64bf33836e Merge perch.ndb.mysql.com:/home/jonas/src/50-work 
into  perch.ndb.mysql.com:/home/jonas/src/51-work
 2006-09-15 11:43:49 +02:00
lzhou/root@dev3-138.dev.cn.tlan
3877c091c0 Merge dev3-138.dev.cn.tlan:/home/zhl/mysql/mysql-5.0/bug19787 
into  dev3-138.dev.cn.tlan:/home/zhl/mysql/mysql-5.1/bug19787
 2006-09-14 17:40:01 +00:00
mskold/marty@linux.site
d038e334b4 Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.1 
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
 2006-09-14 09:29:20 +02:00
pekka@orca.ndb.mysql.com
a2928a35d8 Merge orca.ndb.mysql.com:/export/home/space/pekka/ndb/version/my51-ndb 
into  orca.ndb.mysql.com:/export/home/space/pekka/ndb/version/my51-bug20612
 2006-09-11 08:45:22 +02:00
pekka@orca.ndb.mysql.com
8e88d8d54f ndb - bug#20612 ins-del fix in tup 2006-09-10 21:58:51 +02:00
msvensson@shellback.(none)
e03a0617a0 Merge shellback.(none):/home/msvensson/mysql/mysql-5.1 
into  shellback.(none):/home/msvensson/mysql/mysql-5.1-new-maint
 2006-09-08 16:01:51 +02:00
knielsen@ymer.(none)
eac6374a88 Fix compilation errors in gcc -ansi -pedantic. 2006-09-07 21:00:00 +02:00
knielsen@ymer.(none)
273f189971 Merge bk-internal:/home/bk/mysql-5.1-new-ndb 
into  ymer.(none):/usr/local/mysql/mysql-5.1-ndb-pbsu
 2006-09-07 15:25:59 +02:00
knielsen@ymer.(none)
f8f1b203e5 NDB temporary tables. 
Temporary tables are not written to disk by DDL operations. This makes
DDL much faster (useful for tests), but tables are lost after system
restart.

New commit, since this feature will not be available in 5.1.
 2006-09-07 15:09:34 +02:00
pekka@orca.ndb.mysql.com
bf24f687e8 Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.1-ndb 
into  orca.ndb.mysql.com:/export/home/space/pekka/ndb/version/my51-ndb
 2006-09-06 10:21:11 +02:00
cmiller@zippy.cornsilk.net
02b40b04e6 Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
 2006-09-05 17:28:12 -04:00
gni/root@dev3-127.(none)
9438d22c12 Merge dev3-127.(none):/mnt/mysql/home/ngb/mysql-5.1-ndb-bj 
into  dev3-127.(none):/mnt/mysql/home/ngb/mysql-5.1-bug21033
 2006-09-05 16:07:35 +08:00
lzhou/root@dev3-138.dev.cn.tlan
dc2efd51f7 Merge dev3-138.dev.cn.tlan:/home/zhl/mysql/mysql-5.0/bug21128 
into  dev3-138.dev.cn.tlan:/home/zhl/mysql/mysql-5.1/bug21128
 2006-09-04 18:23:32 +00:00
pekka@orca.ndb.mysql.com
2534153973 ndb - bug#21754 ndb api events: fix sizes for blobs + remove expensive loop 2006-09-03 16:13:59 +02:00
jonas@perch.ndb.mysql.com
16a32bc211 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-09-03 11:31:51 +02:00
jonas@perch.ndb.mysql.com
5a78db3ddc ndb - 
fix ndb-violations of strict aliasing found by gcc4.1
  (crashes in ndb_dd_*)
 2006-09-03 11:11:37 +02:00
jonas@perch.ndb.mysql.com
6d715dead0 ndb - 
gcc-4.1.1 work-around for bug in strict-aliasing
 2006-09-03 10:57:34 +02:00
pekka@orca.ndb.mysql.com
454d545473 Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.1-ndb 
into  orca.ndb.mysql.com:/export/home/space/pekka/ndb/version/my51-ndb
 2006-09-02 05:23:04 +02:00