Commits · 11ba97ebf33731a38f3e7bf7925e0762a3831006 · Kirill Smelkov / mariadb

12 Feb, 2006 5 commits

Merge · 11ba97eb

unknown authored Feb 12, 2006


mysql-test/lib/mtr_cases.pl:
  Auto merged
scripts/make_binary_distribution.sh:
  Auto merged

11ba97eb

Merge · 4e8f2a12

unknown authored Feb 12, 2006


mysql-test/lib/mtr_cases.pl:
  Auto merged
mysql-test/lib/mtr_process.pl:
  Auto merged
mysql-test/lib/mtr_report.pl:
  Auto merged
scripts/make_binary_distribution.sh:
  Auto merged
sql/spatial.cc:
  Auto merged

4e8f2a12

spatial.cc: · 0f3d8813

unknown authored Feb 12, 2006

  Added { ... } around float8get() macro, avoids VC7 error
  message "illegal else without matching if"
mtr_report.pl:
  Parse error logs to create "warnings" file
mtr_cases.pl:
  Added optoion --ignore-disabled-def
  Windows build now let TZ pass, removed
  work around
mysql-test-run.pl, mtr_process.pl:
  Back port of changes from 5.0


mysql-test/lib/mtr_process.pl:
  Back port of changes from 5.0
mysql-test/mysql-test-run.pl:
  Back port of changes from 5.0
mysql-test/lib/mtr_cases.pl:
  Added optoion --ignore-disabled-def
  Windows build now let TZ pass, removed
  work around
mysql-test/lib/mtr_report.pl:
  Parse error logs to create "warnings" file
sql/spatial.cc:
  Added { ... } around float8get() macro, avoids VC7 error
  message "illegal else without matching if"

0f3d8813

Merge mysql.com:/Users/kent/mysql/bk/mysql-4.0 · e1474218

unknown authored Feb 12, 2006

into mysql.com:/Users/kent/mysql/bk/mysql-4.1


scripts/make_binary_distribution.sh:
  Auto merged

e1474218

make_binary_distribution.sh: · cd93a5aa

unknown authored Feb 12, 2006

  print => echo in shell script


scripts/make_binary_distribution.sh:
  print => echo in shell script

cd93a5aa

11 Feb, 2006 8 commits

Merge mysql.com:/usr/local/mysql/mysql-4.1-fixrace · fe9663c7
unknown authored Feb 12, 2006
```
into  mysql.com:/usr/local/mysql/mysql-5.0


mysql-test/lib/mtr_process.pl:
  Auto merged
```
fe9663c7
Merge · 74675c15
unknown authored Feb 11, 2006
```
mysql-test/mysql-test-run.sh:
  Auto merged
```
74675c15
Merge · e1809d1b
unknown authored Feb 11, 2006
```
mysql-test/mysql-test-run.sh:
  Auto merged
```
e1809d1b

mysql-test-run.{pl,sh}: · 18faf002

unknown authored Feb 11, 2006

  Give space for second and third slave port


mysql-test/mysql-test-run.pl:
  Give space for second and third slave port
  Define shell variables for all ports, and
  list these at startup
mysql-test/mysql-test-run.sh:
  Give space for second and third slave port

18faf002

Merge · 8dc654f6

unknown authored Feb 11, 2006


mysql-test/mysql-test-run.sh:
  Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged

8dc654f6

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

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.

50319386

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

Merge lmy004.:/work/mysql-5.0-clean · 1f3aec24

unknown authored Feb 11, 2006

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


tests/mysql_client_test.c:
  Auto merged

1f3aec24

10 Feb, 2006 27 commits

Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.1 · 0ced4fdd
unknown authored Feb 11, 2006
```
into  sanja.is.com.ua:/home/bell/mysql/bk/work-5.1
```
0ced4fdd
Merge mysql.com:/home/mydev/mysql-5.1 · b5236ea7
unknown authored Feb 10, 2006
```
into  mysql.com:/home/mydev/mysql-5.1-wl1563-msg
```
b5236ea7
WL#1563 - Modify MySQL to support fast CREATE/DROP INDEX · 5e68e501
unknown authored Feb 10, 2006
```
After merge fix.
```
5e68e501
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.1 · 0e470acb
unknown authored Feb 10, 2006
```
into  sanja.is.com.ua:/home/bell/mysql/bk/work-5.1
```
0e470acb
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.1 · 9ed7a2f3
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
```
9ed7a2f3

Merge mysql.com:/home/mydev/mysql-5.1 · f6f615b3

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

f6f615b3

mysql-test-run.pl: · 8824fd1c

unknown authored Feb 10, 2006

  Display instance manager port
mysql-test-run.sh:
  Give port space for more than one slave


mysql-test/mysql-test-run.sh:
  Give port space for more than one slave
mysql-test/mysql-test-run.pl:
  Display instance manager port

8824fd1c

Merge · a183a425

unknown authored Feb 10, 2006


mysql-test/mysql-test-run.sh:
  Auto merged
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
mysql-test/mysql-test-run.pl:
  Rearranged the port numbers to fit into the range

a183a425

Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1 · 34d8502a
unknown authored Feb 10, 2006
```
into mysql.com:/Users/kent/mysql/bk/mysql-4.1
```
34d8502a

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

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

2449ef8f

Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 · b2b4e18f
unknown authored Feb 10, 2006
```
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
```
b2b4e18f
Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0 · 3e97cc95
unknown authored Feb 10, 2006
```
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new


sql/ha_ndbcluster.cc:
  Auto merged
```
3e97cc95

Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0 · 36bfd749

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

36bfd749

manual merge · a45c39e7
unknown authored Feb 10, 2006

a45c39e7
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 · 9a68ba18
unknown authored Feb 10, 2006
```
into  poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
```
9a68ba18

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

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

76d98963

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

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

26287714

fix test of bug 12744 on OSX · 2a098077
unknown authored Feb 10, 2006

2a098077
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0 · 553750f6
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
```
553750f6
Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.0 · 0f23bab6
unknown authored Feb 10, 2006
```
into  mysql.com:/home/cps/mysql/devel/5.0-mike
```
0f23bab6
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new · c7766a95
unknown authored Feb 10, 2006
```
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
```
c7766a95
Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.0 · 941c883d
unknown authored Feb 10, 2006
```
into  mysql.com:/home/cps/mysql/devel/5.0-mike
```
941c883d
Merge mysql.com:/usr/local/mysql/mysql-5.1-sp-destruct · ef80ab66
unknown authored Feb 10, 2006
```
into  mysql.com:/usr/local/mysql/mysql-5.1-new
```
ef80ab66
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0 · 9cf0a6c6
unknown authored Feb 10, 2006
```
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0
```
9cf0a6c6
Fix missing test cleanup · 55271ba7
unknown authored Feb 10, 2006

55271ba7

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

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

655ea368

merge · 72a0f506
unknown authored Feb 10, 2006

72a0f506