Commits · 0f18605a3dcad29d67b70b5bc2724c72e8ba5a41 · nexedi / MariaDB

12 Feb, 2006 2 commits

Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 0f18605a

unknown authored Feb 11, 2006

into  zim.tangent.org:/home/brian/raid/mysql-5.1-new


sql/ha_myisam.cc:
  Auto merged
sql/ha_partition.cc:
  Auto merged
sql/handler.h:
  Auto merged
sql/lex.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/table.cc:
  Auto merged
sql/sql_yacc.yy:
  SCCS merged

0f18605a

This patch is to further remove the RAID code. We removed support for people... · 14b4acc9

unknown authored Feb 11, 2006

This patch is to further remove the RAID code. We removed support for people creating tables with RAID. This patch remove most of the source for this. 


sql/ha_myisam.cc:
  Remove RAID code
sql/ha_partition.cc:
  Remove RAID code.
sql/handler.h:
  Remove RAID code
sql/lex.h:
  Remove RAID code.
sql/mysqld.cc:
  Remove RAID code.
sql/set_var.cc:
  Remove RAID code.
sql/sql_show.cc:
  Remove RAID code
sql/sql_yacc.yy:
  Remove more of the RAID code
sql/table.cc:
  Remove RAID code.

14b4acc9

11 Feb, 2006 4 commits

Merge mysql.com:/usr/local/mysql/mysql-4.1-fixrace · f1e79301
unknown authored Feb 11, 2006
```
into  mysql.com:/usr/local/mysql/mysql-5.1-new


mysql-test/lib/mtr_process.pl:
  Auto merged
```
f1e79301

Fix a race on some platforms in mysql-test-run.pl, where it would sometimes · 544b33c8

unknown authored Feb 11, 2006

errorneously abort reporting failure to kill child processes, where in
reality the problem was merely that the child had become a zombie because
of missing waitpid() call.


mysql-test/lib/mtr_process.pl:
  Fix race (on some platforms) when killing processes.

544b33c8

Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new · a1e9af3f
unknown authored Feb 11, 2006
```
into lmy004.:/work/mysql-5.1-new-clean
```
a1e9af3f

Merge lmy004.:/work/mysql-5.0-clean · 49a1a04a

unknown authored Feb 11, 2006

into lmy004.:/work/mysql-5.1-new-clean


tests/mysql_client_test.c:
  Auto merged

49a1a04a

10 Feb, 2006 34 commits

Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.1 · 99504fbc
unknown authored Feb 11, 2006
```
into  sanja.is.com.ua:/home/bell/mysql/bk/work-5.1
```
99504fbc
Merge mysql.com:/home/mydev/mysql-5.1 · b9b4fe10
unknown authored Feb 10, 2006
```
into  mysql.com:/home/mydev/mysql-5.1-wl1563-msg
```
b9b4fe10
WL#1563 - Modify MySQL to support fast CREATE/DROP INDEX · dfb8ac40
unknown authored Feb 10, 2006
```
After merge fix.
```
dfb8ac40
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.1 · 67c732ee
unknown authored Feb 10, 2006
```
into  sanja.is.com.ua:/home/bell/mysql/bk/work-5.1
```
67c732ee
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.1 · 9673ab14
unknown authored Feb 10, 2006
```
into  sanja.is.com.ua:/home/bell/mysql/bk/work-5.1


mysql-test/mysql-test-run.pl:
  Auto merged
```
9673ab14

Merge mysql.com:/home/mydev/mysql-5.1 · 65e63068

unknown authored Feb 10, 2006

into  mysql.com:/home/mydev/mysql-5.1-wl1563-msg


mysql-test/r/create_select_tmp.result:
  Auto merged
mysql-test/r/heap_hash.result:
  Auto merged
mysql-test/r/innodb.result:
  Auto merged
mysql-test/r/join_outer.result:
  Auto merged
mysql-test/r/myisam.result:
  Auto merged
mysql-test/r/ndb_index_unique.result:
  Auto merged
mysql-test/r/rpl_loaddata.result:
  Auto merged
mysql-test/r/sp-error.result:
  Auto merged
mysql-test/r/sp.result:
  Auto merged
mysql-test/r/sp_trans.result:
  Auto merged
mysql-test/r/type_bit.result:
  Auto merged
mysql-test/r/type_varchar.result:
  Auto merged
sql/handler.cc:
  Auto merged
sql/share/errmsg.txt:
  Auto merged
mysql-test/r/heap.result:
  WL#1563 - Modify MySQL to support fast CREATE/DROP INDEX
  Manual merge
mysql-test/r/rpl_err_ignoredtable.result:
  WL#1563 - Modify MySQL to support fast CREATE/DROP INDEX
  Manual merge
mysql-test/r/rpl_insert_id.result:
  WL#1563 - Modify MySQL to support fast CREATE/DROP INDEX
  Manual merge

65e63068

Merge mysql.com:/home/cps/mysql/devel/5.0-mike · b6cb3541

unknown authored Feb 10, 2006

into  mysql.com:/home/cps/mysql/devel/5.1-merge


mysql-test/r/im_life_cycle.result:
  Auto merged
mysql-test/t/im_life_cycle.imtest:
  Auto merged
server-tools/instance-manager/commands.cc:
  Auto merged

b6cb3541

Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0 · bcd7684d
unknown authored Feb 10, 2006
```
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new


sql/ha_ndbcluster.cc:
  Auto merged
```
bcd7684d

Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0 · 59937a52

unknown authored Feb 10, 2006

into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new


mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/ndb_basic.result:
  Auto merged
mysql-test/t/ndb_basic.test:
  Auto merged
sql/sql_prepare.cc:
  Auto merged
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdih/Dbdih.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
sql/ha_ndbcluster.cc:
  SCCS merged
sql/ha_ndbcluster.h:
  SCCS merged

59937a52

manual merge · c4f6b802
unknown authored Feb 10, 2006

c4f6b802

Merge poseidon.ndb.mysql.com:/home/tomas/mysql-4.1 · a30863e6

unknown authored Feb 10, 2006

into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0


sql/ha_ndbcluster.h:
  Auto merged
mysql-test/r/ndb_basic.result:
  manual merge
mysql-test/t/ndb_basic.test:
  manual merge
sql/ha_ndbcluster.cc:
  manual merge

a30863e6

Bug #17249 ndb, delete statement with join where clause fails when table do not have pk · 6feda7fa

unknown authored Feb 10, 2006

Bug #17257 ndb, update fails for inner joins if tables do not have Primary Key

change: the allocated area by setValue may not be around for later, store hidden key in special member variable instead

mysql-test/r/ndb_basic.result:
Bug #17249 delete statement with join where clause fails when table do not have pk
Bug #17257 update fails for inner joins if tables do not have Primary Key
mysql-test/t/ndb_basic.test:
Bug #17249 delete statement with join where clause fails when table do not have pk
Bug #17257 update fails for inner joins if tables do not have Primary Key
sql/ha_ndbcluster.cc:
Bug #17249 delete statement with join where clause fails when table do not have pk
Bug #17257 update fails for inner joins if tables do not have Primary Key

change: the allocated area by setValue may not be around for later, store hidden key in special member variable instead
sql/ha_ndbcluster.h:
Bug #17249 delete statement with join where clause fails when table do not have pk
Bug #17257 update fails for inner joins if tables do not have Primary Key

change: the allocated area by setValue may not be around for later, store hidden key in special member variable instead

6feda7fa

fix test of bug 12744 on OSX · 2975141f
unknown authored Feb 10, 2006

2975141f
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0 · 9f477658
unknown authored Feb 10, 2006
```
into  sanja.is.com.ua:/home/bell/mysql/bk/work-5.1


mysql-test/mysql-test-run.pl:
  Auto merged
```
9f477658
Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.0 · 7f7cb76d
unknown authored Feb 10, 2006
```
into  mysql.com:/home/cps/mysql/devel/5.0-mike
```
7f7cb76d
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new · c24380e1
unknown authored Feb 10, 2006
```
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
```
c24380e1
Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.0 · 6419446b
unknown authored Feb 10, 2006
```
into  mysql.com:/home/cps/mysql/devel/5.0-mike
```
6419446b
Merge mysql.com:/usr/local/mysql/mysql-5.1-sp-destruct · 2183b97f
unknown authored Feb 10, 2006
```
into  mysql.com:/usr/local/mysql/mysql-5.1-new
```
2183b97f
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0 · fbbd981b
unknown authored Feb 10, 2006
```
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0
```
fbbd981b
Fix missing test cleanup · 808262d6
unknown authored Feb 10, 2006

808262d6

Merge perch.ndb.mysql.com:/home/jonas/src/50-work · 9c449d84

unknown authored Feb 10, 2006

into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0


ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged

9c449d84

merge · 93112293
unknown authored Feb 10, 2006

93112293
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0 · f4708228
unknown authored Feb 10, 2006
```
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0
```
f4708228

Merge perch.ndb.mysql.com:/home/jonas/src/50-work · be83af79

unknown authored Feb 10, 2006

into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0


ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged

be83af79

Merge perch.ndb.mysql.com:/home/jonas/src/41-work · 0206dd7e

unknown authored Feb 10, 2006

into  perch.ndb.mysql.com:/home/jonas/src/50-work


ndb/src/kernel/blocks/dbdih/Dbdih.hpp:
  Auto merged
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged

0206dd7e

bug#10987 - ndb - unable to find restorable replica · b8d47d78

unknown authored Feb 10, 2006

  Introduce new variable c_newest_restorable_gci
    which is set _after_ both GCP_SAVE and COPY_GCI
    
  This variable is used when cutting redo (calcKeepGci)
  
  Also make sure complete GCI is run inbetween LCP's


ndb/src/kernel/blocks/dbdih/Dbdih.hpp:
  Introduce new variable c_newest_restorable_gci
    which is set _after_ both GCP_SAVE and COPY_GCI
  
  This variable is used when cutting redo (calcKeepGci)
  Also make sure complete GCI is run inbetween LCP's
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Introduce new variable c_newest_restorable_gci
    which is set _after_ both GCP_SAVE and COPY_GCI
  
  This variable is used when cutting redo (calcKeepGci)
  Also make sure complete GCI is run inbetween LCP's

b8d47d78

Merge perch.ndb.mysql.com:/home/jonas/src/41-work · c2b4e1d3

unknown authored Feb 10, 2006

into  perch.ndb.mysql.com:/home/jonas/src/50-work


ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged

c2b4e1d3

bug#17295 - ndb - error while reading REDO log · 7894098e

unknown authored Feb 10, 2006

  fix corruption due to page 0, file 0 gets released


ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Make sure that page 0, file 0 isnt released

7894098e

Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new · 1f6ff19d
unknown authored Feb 10, 2006
```
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
```
1f6ff19d
Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.0 · 7617983c
unknown authored Feb 10, 2006
```
into  mysql.com:/home/cps/mysql/devel/5.0-mike
```
7617983c
Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 98dd1328
unknown authored Feb 10, 2006
```
into  mysql.com:/home/cps/mysql/devel/5.1-utf-bug
```
98dd1328
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0 · f253c01c
unknown authored Feb 10, 2006
```
into  mysql.com:/usr/home/ram/work/5.0.b16511
```
f253c01c
Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 0f8f0b44
unknown authored Feb 10, 2006
```
into  mysql.com:/home/cps/mysql/devel/5.1-im-fixes
```
0f8f0b44
Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.1-new · c467e94a
unknown authored Feb 10, 2006
```
into  mysql.com:/home/cps/mysql/devel/5.1-utf-bug
```
c467e94a