Commits · 913eed1e59b2b2d94ad8f5433eede03877c2acb3 · Kirill Smelkov / mariadb

20 Mar, 2007 39 commits

Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1-ndb · 913eed1e
unknown authored Mar 20, 2007
```
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/mar20/maint/51
```
913eed1e
Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1-build · 8eeb6b9d
unknown authored Mar 20, 2007
```
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/mar20/maint/51
```
8eeb6b9d

Merge qualinost.(none):/home/mtaylor/src/mysql-5.0-maint · 23812db6

unknown authored Mar 20, 2007

into  qualinost.(none):/home/mtaylor/src/mysql-5.1-new-maint


sql/slave.cc:
  Auto merged
support-files/mysql.server.sh:
  Auto merged

23812db6

Merge mysql.com:/home/kent/bk/tmp/mysql-5.0-build · 32744399
unknown authored Mar 20, 2007
```
into  mysql.com:/home/kent/bk/tmp/mysql-5.1-build
```
32744399
Merge qualinost.(none):/home/mtaylor/src/mysql-5.0-init · 971124a7
unknown authored Mar 20, 2007
```
into  qualinost.(none):/home/mtaylor/src/mysql-5.0-maint
```
971124a7

echo.c: · 298cebc1

unknown authored Mar 20, 2007

  Corrected GPL to be version 2 only


client/echo.c:
  Corrected GPL to be version 2 only

298cebc1

Merge mysql.com:/home/kent/bk/tmp/mysql-5.0-build · 55785063

unknown authored Mar 20, 2007

into  mysql.com:/home/kent/bk/tmp/mysql-5.1-build


BitKeeper/etc/ignore:
  auto-union
BitKeeper/deleted/.del-comp_err.vcproj~45c167ae5ddd5a96:
  Auto merged
BitKeeper/deleted/.del-gen_lex_hash.vcproj~544be6b6:
  Auto merged
BitKeeper/deleted/.del-heap.vcproj~4382203ba03f4038:
  Auto merged
BitKeeper/deleted/.del-myTest.vcproj~dba5adc4fad3c06:
  Auto merged
BitKeeper/deleted/.del-my_print_defaults.vcproj~c8aa2bd86e13c3f9:
  Auto merged
BitKeeper/deleted/.del-myisam_ftdump.vcproj~409c19b0274b7f8e:
  Auto merged
BitKeeper/deleted/.del-myisamchk.vcproj~982ebe5673e58fb6:
  Auto merged
BitKeeper/deleted/.del-myisamlog.vcproj~daa6596ea386e5a7:
  Auto merged
BitKeeper/deleted/.del-myisampack.vcproj~3f7d4ec0cb56a9a0:
  Auto merged
BitKeeper/deleted/.del-mysql.vcproj~f7bfe13a8836eea0:
  Auto merged
BitKeeper/deleted/.del-mysql_client_test.vcproj~22188dcd372bc9de:
  Auto merged
BitKeeper/deleted/.del-mysql_upgrade.vcproj~54815b7265120589:
  Auto merged
BitKeeper/deleted/.del-mysqladmin.vcproj~178fa55cba442d50:
  Auto merged
BitKeeper/deleted/.del-mysqlbinlog.vcproj~b2a5b1868f5d6596:
  Auto merged
BitKeeper/deleted/.del-mysqlcheck.vcproj~7022581c8b8a7ea2:
  Auto merged
BitKeeper/deleted/.del-mysqlclient.vcproj~e78a73e31368a44a:
  Auto merged
BitKeeper/deleted/.del-mysqlimport.vcproj~5a30228ef641c081:
  Auto merged
BitKeeper/deleted/.del-mysqlshow.vcproj~797d4fa322faa148:
  Auto merged
BitKeeper/deleted/.del-mysqltest.vcproj~21878840704179ef:
  Auto merged
BitKeeper/deleted/.del-perror.vcproj~86ad9dc660a048ad:
  Auto merged
BitKeeper/deleted/.del-regex.vcproj~9dea9caafa801b26:
  Auto merged
BitKeeper/deleted/.del-replace.vcproj~9620b1ced86e527a:
  Auto merged
BitKeeper/deleted/.del-strings.vcproj~6d1126ae59e4bf82:
  Auto merged
BitKeeper/deleted/.del-test1.vcproj~c474b4614c67e2d2:
  Auto merged
BitKeeper/deleted/.del-test_libmysqld.vcproj~fb301d42d5c4e6f4:
  Auto merged
BitKeeper/deleted/.del-thr_test.vcproj~fc0e15c1e6880160:
  Auto merged
BitKeeper/deleted/.del-vio.vcproj~b7c21b4e2d6a9b85:
  Auto merged
BitKeeper/deleted/.del-zlib.vcproj~9b1a681d56dae190:
  Auto merged
extra/yassl/taocrypt/taocrypt.vcproj:
  Auto merged
extra/yassl/yassl.vcproj:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/delayed.result:
  Auto merged
mysql-test/r/loaddata.result:
  Auto merged
mysql-test/r/merge.result:
  Auto merged
mysql-test/t/delayed.test:
  Auto merged
mysql-test/t/init_connect.test:
  Auto merged
mysql-test/t/loaddata.test:
  Auto merged
mysql-test/t/merge.test:
  Auto merged
netware/Makefile.am:
  Auto merged
scripts/make_binary_distribution.sh:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
storage/ndb/src/cw/cpcc-win32/C++/CPC_GUI.vcproj:
  Auto merged
mysql-test/install_test_db.sh:
  SCCS merged

55785063

Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1 · efd32593
unknown authored Mar 20, 2007
```
into  mysql.com:/home/kent/bk/tmp/mysql-5.1-build
```
efd32593

Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb · 5e429982

unknown authored Mar 20, 2007

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


storage/ndb/src/mgmsrv/ConfigInfo.cpp:
  Auto merged

5e429982

enabled test case · 4890ea8a

unknown authored Mar 20, 2007

+ some fixes to do the enable


mysql-test/r/rpl_ndb_sync.result:
  enabled test case
mysql-test/t/disabled.def:
  enabled test case
sql/ha_ndbcluster.cc:
  enabled test case
sql/ha_ndbcluster_tables.h:
  add defines for old sys table
storage/ndb/tools/restore/Restore.cpp:
  add check for old sys table

4890ea8a

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

unknown authored Mar 20, 2007

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


storage/ndb/src/kernel/blocks/ERROR_codes.txt:
  Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
storage/ndb/src/mgmsrv/ConfigInfo.cpp:
  Auto merged
storage/ndb/test/ndbapi/testNodeRestart.cpp:
  merge
storage/ndb/test/run-test/daily-basic-tests.txt:
  merge

e6585a2a

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

unknown authored Mar 20, 2007

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


storage/ndb/src/kernel/blocks/ERROR_codes.txt:
  Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
storage/ndb/src/mgmsrv/ConfigInfo.cpp:
  Auto merged
storage/ndb/test/run-test/daily-basic-tests.txt:
  Auto merged
storage/ndb/test/ndbapi/testNodeRestart.cpp:
  merge

d0942af8

ndb - bug#27283 (wl2325-5.0) · 26afc93a

unknown authored Mar 20, 2007

    Handle race condtition between MASTER_GCPCONF and execGCP_NODEFINISH


ndb/src/kernel/blocks/ERROR_codes.txt:
  new error codes
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Handle race condtition between MASTER_GCPCONF and execGCP_NODEFINISH
ndb/test/ndbapi/testNodeRestart.cpp:
  testcase
ndb/test/run-test/daily-basic-tests.txt:
  testcase

26afc93a

ndb - bug#27291 · 54edcb18

unknown authored Mar 20, 2007

  Fix correct min-value for LockPagesInMemory


ndb/src/mgmsrv/ConfigInfo.cpp:
  Fix correct min-value

54edcb18

Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new-maint · 272563d8
unknown authored Mar 20, 2007
```
into  recycle.(none):/src/bug25765/my51-bug25765
```
272563d8
Merge polly.local:/tmp/maint/bug23775/my50-bug23775 · da8e832a
unknown authored Mar 20, 2007
```
into  polly.local:/home/kaa/src/maint/mysql-5.0-maint


sql/slave.cc:
  Auto merged
```
da8e832a
Post Merge Fix. · 0920def3
unknown authored Mar 20, 2007

0920def3
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-maint · 5c6ed629
unknown authored Mar 20, 2007
```
into  polly.local:/tmp/maint/mysql-5.1-maint
```
5c6ed629
Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.0-build · e5f2e263
unknown authored Mar 20, 2007
```
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
```
e5f2e263

Merge recycle.(none):/src/bug25765/my50-bug25765 · feb2be20

unknown authored Mar 20, 2007

into  recycle.(none):/src/bug25765/my51-bug25765


BitKeeper/deleted/.del-CMakeLists.txt~2f6eabb2f69cb33d:
  Auto merged

feb2be20

Bug#25765 too many dbg heap assertions on windows · 996843e5

unknown authored Mar 20, 2007

- SAFEMALLOC should be defined for each project in debug Windows builds.
SAFEMALLOC was not defined for the innodb project. Debug asserts caused 
due to mixed SAFEMALLOC defines.


innobase/CMakeLists.txt:
  Bug#25765 too many dbg heap assertions on windows
  - Make sure that *_DEBUG defaults are not overwritten.
  - Define SAFEMALLOC and SAFE_MUTEX for debug innodb builds.

996843e5

tests fixed to work in embedded server · 089fca6b

unknown authored Mar 20, 2007


mysql-test/r/delayed.result:
  result fixed
mysql-test/r/merge.result:
  result fixed
mysql-test/t/delayed.test:
  moved here from merge.test
mysql-test/t/init_connect.test:
  test fixed as it created users, then stopped without deletion, what caused
  problems in consequent tests
mysql-test/t/merge.test:
  moved to delayed.test
mysql-test/t/mysqlbinlog-cp932.test:
  disabled in embedded server

089fca6b

Merge polly.local:/tmp/maint/bug23775/my51-bug23775 · ffb3b096
unknown authored Mar 20, 2007
```
into  polly.local:/tmp/maint/mysql-5.1-maint


sql/slave.cc:
  Auto merged
```
ffb3b096
Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work · 43b55816
unknown authored Mar 20, 2007
```
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build


netware/Makefile.am:
  Auto merged
```
43b55816
Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work · e02c142a
unknown authored Mar 20, 2007
```
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build-work


netware/Makefile.am:
  Auto merged
```
e02c142a

small build fix · 4945860b

unknown authored Mar 20, 2007


netware/Makefile.am:
  use detected awk variant instead of using awk directly

4945860b

build fix for netware · a85e2905

unknown authored Mar 20, 2007


include/my_global.h:
  netware does not have <new>, so we define placement versions of operator new and delete ourselves

a85e2905

BUG#24363 If the table structure has been changed, the default action about the restore will fail. · a842253e
unknown authored Mar 20, 2007
```
 - correction of patch, original patch will segfault for print option
```
a842253e

Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb · 52773743

unknown authored Mar 20, 2007

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


storage/ndb/src/mgmclient/CommandInterpreter.cpp:
  Auto merged
storage/ndb/src/mgmsrv/ConfigInfo.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbScanFilter.cpp:
  Auto merged

52773743

Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 · 1dd19f0c
unknown authored Mar 20, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
```
1dd19f0c
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb · 3676e864
unknown authored Mar 20, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
```
3676e864
Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build · 2e6a3242
unknown authored Mar 20, 2007
```
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work
```
2e6a3242
Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.0-build · 9bd5720a
unknown authored Mar 20, 2007
```
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
```
9bd5720a
Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/50 · d25d949a
unknown authored Mar 20, 2007
```
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/51
```
d25d949a
Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/51 · 509433d6
unknown authored Mar 20, 2007
```
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/51
```
509433d6
Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/50 · a491b2c1
unknown authored Mar 20, 2007
```
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/50
```
a491b2c1
Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.1-build · a9f06b2f
unknown authored Mar 20, 2007
```
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
```
a9f06b2f
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1 · 30e25a9e
unknown authored Mar 20, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
```
30e25a9e
Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 · c2426620
unknown authored Mar 20, 2007
```
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-opt


sql/sql_insert.cc:
  Auto merged
```
c2426620

19 Mar, 2007 1 commit
- Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/50 · 7c111c20
  unknown authored Mar 19, 2007
```
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/51


include/my_pthread.h:
  Auto merged
```
  7c111c20