Commits · 82ca333994cab61de22a1dd223319948ded4b4da · Kirill Smelkov / mariadb

07 Jul, 2007 3 commits
- Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1 · 82ca3339
  unknown authored Jul 07, 2007
```
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
```
  82ca3339
- Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build · 84c229ff
  unknown authored Jul 07, 2007
```
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build


scripts/make_binary_distribution.sh:
  Auto merged
```
  84c229ff
- revert previous patch · cbbd8905
  unknown authored Jul 07, 2007
  
  cbbd8905
06 Jul, 2007 2 commits
- Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.0-build · ea5439ac
  unknown authored Jul 06, 2007
```
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
```
  ea5439ac
- Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.1-build · 9e137c46
  unknown authored Jul 06, 2007
```
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
```
  9e137c46
05 Jul, 2007 2 commits

Merge chorlton.adsl.perkin.org.uk:/Users/jonathan/mysql/bk/mysql-5.0 · 35475155

unknown authored Jul 05, 2007

into  chorlton.adsl.perkin.org.uk:/Users/jonathan/mysql/bk/mysql-5.1


scripts/make_binary_distribution.sh:
  Auto merged

35475155

make_binary_distribution.sh: · 3cc57ba6

unknown authored Jul 05, 2007

  This script incorrectly generates the mysql_install_db file, causing the
  problems detailed in bug#28585.  The automake infrastructure correctly
  generates the script, so just copy it in place.


scripts/make_binary_distribution.sh:
  This script incorrectly generates the mysql_install_db file, causing the
  problems detailed in bug#28585.  The automake infrastructure correctly
  generates the script, so just copy it in place.

3cc57ba6

03 Jul, 2007 6 commits

Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb · 48782e34

unknown authored Jul 03, 2007

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


storage/ndb/test/run-test/daily-basic-tests.txt:
  Auto merged

48782e34

Merge mysql.com:/home/bar/mysql-work/mysql-5.0.b27345 · c45f8f94

unknown authored Jul 03, 2007

into  mysql.com:/home/bar/mysql-work/mysql-5.1-new-rpl


strings/ctype-uca.c:
  Auto merged
strings/ctype-mb.c:
  After merge fix.
strings/ctype-ucs2.c:
  After merge fix.

c45f8f94

Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0-rpl · 7edcebc9
unknown authored Jul 03, 2007
```
into  mysql.com:/home/bar/mysql-work/mysql-5.0.b27345
```
7edcebc9

Merge perch.ndb.mysql.com:/home/jonas/src/51-telco-gca · b5a61001

unknown authored Jul 03, 2007

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


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

b5a61001

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

unknown authored Jul 03, 2007

into  perch.ndb.mysql.com:/home/jonas/src/51-telco-gca


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

fb349433

ndb - bug#29354 - Incorrect handling of replica REDO during SR (5.0) · d55ca617

unknown authored Jul 03, 2007

  Not very clever fix for DIH incorrect REDO handling
  - Dont report GCP_SAVE_CONF until first LCP has been complete during NR


ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Not very clever fix for DIH incorrect REDO handling
    - Dont report GCP_SAVE_CONF until first LCP has been complete during NR

d55ca617

02 Jul, 2007 13 commits

post-merge fix · 7119687e
unknown authored Jul 02, 2007

7119687e

Merge mysql.com:/nfsdisk1/lars/bk/mysql-5.0-rpl · 70a8f7ab

unknown authored Jul 02, 2007

into  mysql.com:/nfsdisk1/lars/bk/mysql-5.1-new-rpl


sql/item_sum.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged

70a8f7ab

Merge mysql.com:/nfsdisk1/lars/bk/mysql-4.1-rpl · e24a757a
unknown authored Jul 02, 2007
```
into  mysql.com:/nfsdisk1/lars/bk/mysql-5.0-rpl
```
e24a757a
Merge mysql.com:/nfsdisk1/lars/bk/mysql-5.1 · daf74b21
unknown authored Jul 02, 2007
```
into  mysql.com:/nfsdisk1/lars/bk/mysql-5.1-new-rpl


sql/sql_yacc.yy:
  Auto merged
```
daf74b21
Merge lthalmann@bk-internal.mysql.com:/home/bk/mysql-5.0-runtime · c68336b1
unknown authored Jul 02, 2007
```
into  mysql.com:/nfsdisk1/lars/bk/mysql-5.0-rpl


sql/sql_yacc.yy:
  Auto merged
```
c68336b1

Merge perch.ndb.mysql.com:/home/jonas/src/51-telco-gca · 766525d9

unknown authored Jul 02, 2007

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


storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
storage/ndb/test/ndbapi/testNodeRestart.cpp:
  merge
storage/ndb/test/run-test/daily-basic-tests.txt:
  merge

766525d9

ndb - bug#29364 - port merge (5.0 -> 5.1) · 0095218a
unknown authored Jul 02, 2007

0095218a

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

unknown authored Jul 02, 2007

into  perch.ndb.mysql.com:/home/jonas/src/51-telco-gca


storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
storage/ndb/test/ndbapi/testNodeRestart.cpp:
  merge
storage/ndb/test/run-test/daily-basic-tests.txt:
  merge

0b4041f3

ndb - bug#29364 - "SQL queries hang while data node in start phase 5" · f83a63ad

unknown authored Jul 02, 2007

  In TC init node status for already started nodes during node restart
  (not present in 5.1)


ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  on node restart, make sure to init all already started nodes to NF_STARTED
ndb/test/ndbapi/testNodeRestart.cpp:
  test prg
ndb/test/run-test/daily-basic-tests.txt:
  test prg

f83a63ad

Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.1-new-rpl · f00722b9

unknown authored Jul 02, 2007

into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.1-merge


mysql-test/t/disabled.def:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
include/my_base.h:
  Manual merge main->rpl 5.1
mysql-test/t/innodb.test:
  Manual merge main->rpl 5.1

f00722b9

Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.0-rpl · 2b09b6c5

unknown authored Jul 02, 2007

into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.0-merge


sql/item_sum.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged

2b09b6c5

Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-4.1-rpl · a00a7e80
unknown authored Jul 02, 2007
```
into  mysql.com:/nfsdisk1/lars/MERGE/mysql-4.1-merge
```
a00a7e80

A post-merge fix. · 3fcaacea

unknown authored Jul 02, 2007


mysql-test/r/show_check.result:
  A post-merge fix (Bug#10491)

3fcaacea

01 Jul, 2007 9 commits

Merge bodhi.(none):/opt/local/work/mysql-5.0-runtime · 418996f3

unknown authored Jul 02, 2007

into  bodhi.(none):/opt/local/work/mysql-5.1-runtime


sql/sql_class.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged

418996f3

Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · c182dfa2

unknown authored Jul 02, 2007

into  bodhi.(none):/opt/local/work/mysql-5.0-runtime


sql/sql_class.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged

c182dfa2

Merge bodhi.(none):/opt/local/work/mysql-5.0-runtime · 58935a31

unknown authored Jul 02, 2007

into  bodhi.(none):/opt/local/work/mysql-5.1-runtime


mysql-test/r/ps_1general.result:
  Auto merged
mysql-test/r/ps_2myisam.result:
  Auto merged
mysql-test/r/ps_3innodb.result:
  Auto merged
mysql-test/r/ps_4heap.result:
  Auto merged
mysql-test/r/ps_5merge.result:
  Auto merged
BitKeeper/deleted/.del-ps_6bdb.result:
  Auto merged
mysql-test/r/ps_7ndb.result:
  Auto merged
sql/handler.cc:
  Auto merged
sql/sp_head.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_error.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_prepare.cc:
  Auto merged
sql/sql_view.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
mysql-test/r/show_check.result:
  Manual merge.
mysql-test/t/show_check.test:
  Manual merge.
sql/item.h:
  Manual merge.
sql/sp.cc:
  Manual merge.
sql/sql_trigger.cc:
  Manual merge.
tests/mysql_client_test.c:
  Manual merge.

58935a31

Merge bk-internal.mysql.com:/home/bk/mysql-5.1 · 0852b369

unknown authored Jul 02, 2007

into  bodhi.(none):/opt/local/work/mysql-5.1-runtime


mysql-test/r/create.result:
  Auto merged
mysql-test/r/events_bugs.result:
  Auto merged
sql/event_data_objects.cc:
  Auto merged
sql/sp.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/table.cc:
  Auto merged

0852b369

Update a missed test result. · 2e81ee13

unknown authored Jul 02, 2007


mysql-test/r/ps_6bdb.result:
  Update test results (character sets patch).

2e81ee13

Corrected a test case. · de0ba5c8
unknown authored Jul 01, 2007

de0ba5c8
Made test case platform independent. · e63f6f32
unknown authored Jul 01, 2007

e63f6f32
Post-merge fix. · f9d36194
unknown authored Jun 30, 2007

f9d36194

Merge olga.mysql.com:/home/igor/mysql-5.0-opt · 26a2b004

unknown authored Jun 30, 2007

into  olga.mysql.com:/home/igor/dev-opt/mysql-5.1-opt


mysql-test/r/binary.result:
  Auto merged
mysql-test/r/ctype_collate.result:
  Auto merged
mysql-test/r/ctype_utf8.result:
  Auto merged
mysql-test/t/binary.test:
  Auto merged
mysql-test/t/create.test:
  Auto merged
mysql-test/t/ctype_utf8.test:
  Auto merged
sql/field_conv.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/item_subselect.cc:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/item_sum.h:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql-common/client.c:
  Auto merged
sql/sql_select.h:
  Auto merged
sql/table.cc:
  Auto merged
storage/myisam/mi_open.c:
  Auto merged
strings/ctype-simple.c:
  Auto merged
mysql-test/r/create.result:
  Manual merge.
mysql-test/r/subselect.result:
  Manual merge.
mysql-test/r/type_enum.result:
  Manual merge.
mysql-test/t/type_enum.test:
  Manual merge.
mysql-test/include/mix1.inc:
  Manual merge.
mysql-test/r/innodb_mysql.result:
  Manual merge.
mysql-test/t/subselect.test:
  Manual merge.
sql/sql_parse.cc:
  Manual merge.
storage/myisam/mi_key.c:
  Manual merge.

26a2b004

30 Jun, 2007 5 commits
- Merge olga.mysql.com:/home/igor/mysql-4.1-opt · 8dcd5fca
  unknown authored Jun 30, 2007
```
into  olga.mysql.com:/home/igor/mysql-5.0-opt


mysql-test/r/type_enum.result:
  Auto merged
mysql-test/t/type_enum.test:
  Auto merged
sql/field_conv.cc:
  SCCS merged
```
  8dcd5fca
- Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.1-opt · 2ca2b232
  unknown authored Jun 30, 2007
```
into  magare.gmz:/home/kgeorge/mysql/autopush/B29157-5.1-opt
```
  2ca2b232
- Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb · e3a6b29b
  unknown authored Jun 30, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-rpl


mysql-test/t/disabled.def:
  SCCS merged
```
  e3a6b29b
- disable with bug no · 0b079d97
  unknown authored Jun 30, 2007
  
  0b079d97
- disabled test with bug number · 39cc5ca2
  unknown authored Jun 30, 2007
  
  39cc5ca2