Commits · 2608804665a6377139064069a60c4c1825cea24c · Kirill Smelkov / mariadb

21 Mar, 2007 9 commits

Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new-maint · 26088046
unknown authored Mar 21, 2007
```
into  recycle.(none):/src/bug23736/my51-bug23736
```
26088046

Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint · d344d81c

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
scripts/make_binary_distribution.sh:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_acl.h:
  Auto merged
mysql-test/install_test_db.sh:
  Manual merge
mysql-test/mysql-test-run.pl:
  Manual merge
netware/Makefile.am:
  Manual merge

d344d81c

Merge bk-internal:/home/bk/mysql-5.0-maint · 2176fef4

unknown authored Mar 21, 2007

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


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

2176fef4

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

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

ed0badb1

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

Merge... · 6fb9ef87

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

6fb9ef87

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


mysql-test/t/mysqlbinlog-cp932.test:
  merging
```
f397b422

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

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)

98ba309d

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

20 Mar, 2007 31 commits

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


client/mysqltest.c:
  Auto merged
```
4727c00f

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

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

069355c6

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


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


client/mysqltest.c:
  Auto merged
```
971f15f8

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

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

e1eaf2ae

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 trift2.:/MySQL/M50/test-help-5.0 · d1e41531
unknown authored Mar 20, 2007
```
into  trift2.:/MySQL/M51/test-help-5.1
```
d1e41531
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 tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb · 4fed8327
unknown authored Mar 20, 2007
```
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/mar20/maint/50
```
4fed8327
Post Merge Fix. · 4f5582d8
unknown authored Mar 20, 2007

4f5582d8
Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0-build · 6bb78b95
unknown authored Mar 20, 2007
```
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/mar20/maint/50
```
6bb78b95

Merge trift2.:/MySQL/M41/test-help-4.1 · 06c2d5ca

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.

06c2d5ca

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

ec81cfdc

Test "help": · 55e0ff5c

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.

55e0ff5c

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

Test "help": · 53268e1c

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.

53268e1c

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

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

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.

d59272fb

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
my_print_default does not need to be linked with odbc32.lib(and friends) · 26c3e79c
unknown authored Mar 20, 2007

26c3e79c

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 jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1-build · e02d5a0a
unknown authored Mar 20, 2007
```
into  trift2.:/MySQL/M51/push-5.1
```
e02d5a0a

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