Commits · 2b9bcb8c81947d375651b3e8a8e5677c11a82e24 · nexedi / MariaDB

21 Mar, 2007 6 commits

Merge bk-internal:/home/bk/mysql-5.1-new-maint · 2b9bcb8c

unknown authored Mar 21, 2007

into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint


BitKeeper/etc/ignore:
  auto-union
BitKeeper/deleted/.del-init_db.sql~e2b8d0c8390e8023:
  Auto merged
BitKeeper/deleted/.del-test_db.sql:
  Auto merged
include/my_pthread.h:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
scripts/make_binary_distribution.sh:
  Auto merged
sql/log.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_acl.h:
  Auto merged
mysql-test/install_test_db.sh:
  Manual merge
mysql-test/r/flush2.result:
  Manual merge
netware/Makefile.am:
  Manual merge

2b9bcb8c

Merge dsl-hkibras1-ff1dc300-249.dhcp.inet.fi:/home/elkin/MySQL/MAIN/mysql-5.1-build · 5352c1ca
unknown authored Mar 21, 2007
```
into  dsl-hkibras1-ff1dc300-249.dhcp.inet.fi:/home/elkin/MySQL/MAIN/mysql-5.1-new-maint
```
5352c1ca

Merge... · 75ca9ccb

unknown authored Mar 21, 2007

Merge dsl-hkibras1-ff1dc300-249.dhcp.inet.fi:/home/elkin/MySQL/TEAM/FIXES/5.1/bug26079_binlog_max_innodb
into  dsl-hkibras1-ff1dc300-249.dhcp.inet.fi:/home/elkin/MySQL/MAIN/mysql-5.1-new-maint


sql/log.cc:
  Auto merged

75ca9ccb

mysqlbinlog-cp932.test: · 386a2148
unknown authored Mar 21, 2007
```
  merging


mysql-test/t/mysqlbinlog-cp932.test:
  merging
```
386a2148

Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/mar20/maint/50 · 130ffea0

unknown authored Mar 21, 2007

into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/mar20/maint/51


BitKeeper/deleted/.del-libmysqld.vcproj~a75d5b9a5967dea0:
  Null merge (use local)
BitKeeper/deleted/.del-make_win_bin_dist:
  Null merge (use local)
BitKeeper/deleted/.del-mysql.sln~76a9ff1e793b3547:
  Null merge (use local)
BitKeeper/deleted/.del-mysqld.vcproj~6aa7b3f9c3e28fcb:
  Null merge (use local)
BitKeeper/deleted/.del-mysqldemb.vcproj~54c64d55ccc51a7c:
  Null merge (use local)
BitKeeper/deleted/.del-mysys.vcproj~40a49d09c4184822:
  Null merge (use local)
BitKeeper/deleted/.del-vio.vcproj~b7c21b4e2d6a9b85:
  Null merge (use local)

130ffea0

Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0-build · 95f3675c
unknown authored Mar 21, 2007
```
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/mar20/maint/50
```
95f3675c

20 Mar, 2007 34 commits

Merge mysql.com:/home/kent/bk/tmp/mysql-5.0-release · f46ed7db
unknown authored Mar 21, 2007
```
into  mysql.com:/home/kent/bk/tmp/mysql-5.0-build
```
f46ed7db
Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint · ec13b998
unknown authored Mar 20, 2007
```
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint


client/mysqltest.c:
  Auto merged
```
ec13b998

Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/mar20/maint/50 · 9f7a37db

unknown authored Mar 20, 2007

into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/mar20/maint/51


sql/sql_class.cc:
  Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupGen.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
  Auto merged
storage/ndb/src/mgmsrv/ConfigInfo.cpp:
  Auto merged
storage/ndb/test/ndbapi/testNodeRestart.cpp:
  Auto merged
storage/ndb/test/run-test/daily-basic-tests.txt:
  Auto merged
storage/ndb/test/src/UtilTransactions.cpp:
  Auto merged

9f7a37db

Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/mar20/maint/41 · 3d4bdb57
unknown authored Mar 20, 2007
```
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/mar20/maint/50


sql/sql_class.cc:
  Auto merged
```
3d4bdb57
Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1-build · 5aeb825d
unknown authored Mar 20, 2007
```
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/mar20/maint/51
```
5aeb825d
Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint · 610943a1
unknown authored Mar 20, 2007
```
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint


client/mysqltest.c:
  Auto merged
```
610943a1

Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1-build · e9ccb1c9

unknown authored Mar 20, 2007

into  trift2.:/MySQL/M51/test-help-5.1


mysql-test/r/loaddata.result:
  Auto merged
mysql-test/t/loaddata.test:
  Auto merged

e9ccb1c9

Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1-ndb · f31dd072
unknown authored Mar 20, 2007
```
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/mar20/maint/51
```
f31dd072
Merge trift2.:/MySQL/M50/test-help-5.0 · 2d485785
unknown authored Mar 20, 2007
```
into  trift2.:/MySQL/M51/test-help-5.1
```
2d485785
Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1-build · 30de858c
unknown authored Mar 20, 2007
```
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/mar20/maint/51
```
30de858c
Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb · 3371b434
unknown authored Mar 20, 2007
```
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/mar20/maint/50
```
3371b434
Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0-build · 545d7f57
unknown authored Mar 20, 2007
```
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/mar20/maint/50
```
545d7f57

Merge trift2.:/MySQL/M41/test-help-4.1 · 86afa6e9

unknown authored Mar 20, 2007

into  trift2.:/MySQL/M50/test-help-5.0


mysql-test/t/help.test:
  Auto merged
mysql-test/r/help.result:
  Manual merge:
  5.0 has warnings "Field 'url' doesn't have a default value" which 4.1 doesn't have.

86afa6e9

Remove the variables for long gone disable_ps_warnings · a22c23e2
unknown authored Mar 20, 2007

a22c23e2

Test "help": · 922b25b8

unknown authored Mar 20, 2007

Shift the ID values up into a range where they will not collide with those
which we use for real data, when we fill the system tables.

Will be merged up to 5.0 where it is needed for 5.0.38.


mysql-test/r/help.result:
  Fix the result file according to the changed ID values in "help.test".
mysql-test/t/help.test:
  Now that (at least in 5.0) the system tables are filled with real data,
  inserting rows vith ID values 1 .. 5 will fail in release build tests (it did in 5.0.38)
  like it should already have done in customer installations.
  
  Shift the ID values up into a high area where they will not conflict,
  also make the distinct for the different kinds of values (= unique throughout the test).
  
  No change to the logic.

922b25b8

Merge trift2.:/MySQL/M41/test-help-4.1 · 8ba7dad4
unknown authored Mar 20, 2007
```
into  trift2.:/MySQL/M50/test-help-5.0
```
8ba7dad4
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0 · ab345b4b
unknown authored Mar 20, 2007
```
into  mysql.com:/home/kent/bk/tmp/mysql-5.0-build
```
ab345b4b

Test "help": · 0238ce2a

unknown authored Mar 20, 2007

Shift the ID values up into a range where they will not collide with those
which we use for real data, when we fill the system tables.

Will be merged up to 5.0 where it is needed for 5.0.38.

mysql-test/t/help.test:
Now that (at least in 5.0) the system tables are filled with real data,
inserting rows vith ID values 1 .. 5 will fail in release build tests (it did in 5.0.38)
like it should already have done in customer installations.

Shift the ID values up into a high area where they will not conflict,
also make the distinct for the different kinds of values (= unique throughout the test).

No change to the logic.

0238ce2a

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

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

dadf01b6

Bug #27231: Server crash when dumping into outfile with long FIELDS ENCLOSED BY option · d7e4ad63

unknown authored Mar 20, 2007

- Problem: data separators were copied to a fixed-size buffer
  on the stack; memcpy was used, without bounds checking; a
  server crash could result if long FIELDS ENCLOSED BY, etc.,
  was given
- Fix: write the separators directly, instead of copying to
  a buffer first (in select_export::send_data())


sql/sql_class.cc:
  In select_export::send_data(), write data separators
  directly, instead of copying into a fixed-size memory
  buffer before writing.  This avoids a buffer overflow
  when very large separators are specified.

d7e4ad63

Merge mysql.com:/home/kent/bk/tmp/mysql-5.0-build · 04cc09a3
unknown authored Mar 20, 2007
```
into  mysql.com:/home/kent/bk/tmp/mysql-5.1-build
```
04cc09a3
Merge qualinost.(none):/home/mtaylor/src/mysql-5.0-init · 5887de11
unknown authored Mar 20, 2007
```
into  qualinost.(none):/home/mtaylor/src/mysql-5.0-maint
```
5887de11
my_print_default does not need to be linked with odbc32.lib(and friends) · c28934c5
unknown authored Mar 20, 2007

c28934c5

echo.c: · c2502d04

unknown authored Mar 20, 2007

  Corrected GPL to be version 2 only


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

c2502d04

Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1-build · feecf322
unknown authored Mar 20, 2007
```
into  trift2.:/MySQL/M51/push-5.1
```
feecf322

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

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

72ef6315

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

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

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

096a80db

enabled test case · c401965e

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

c401965e

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

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

368d8325

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

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

d6ad5ece

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

unknown authored Mar 20, 2007

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


ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp:
  Auto merged
ndb/src/kernel/blocks/dbtup/DbtupGen.cpp:
  Auto merged
ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
  Auto merged
ndb/src/mgmsrv/ConfigInfo.cpp:
  Auto merged
ndb/test/ndbapi/testNodeRestart.cpp:
  Auto merged
ndb/test/run-test/daily-basic-tests.txt:
  Auto merged
ndb/test/src/UtilTransactions.cpp:
  Auto merged

ab8b535d

ndb - bug#27283 (wl2325-5.0) · 51c28fe1

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

51c28fe1

ndb - bug#27291 · 8f5cf0f1

unknown authored Mar 20, 2007

  Fix correct min-value for LockPagesInMemory


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

8f5cf0f1