Commits · a848d91ea34fdc2da3b939f8633839d63ce29c9b · Kirill Smelkov / mariadb

15 Dec, 2005 10 commits

Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-release · a848d91e

unknown authored Dec 15, 2005

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


mysql-test/r/ndb_basic.result:
  Auto merged
mysql-test/t/ndb_basic.test:
  Auto merged
sql/sql_class.cc:
  Auto merged
mysql-test/r/ndb_multi.result:
  merge
mysql-test/t/ndb_multi.test:
  merge
sql/ha_ndbcluster.cc:
  merge

a848d91e

Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 4ede1ed3
unknown authored Dec 15, 2005
```
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new
```
4ede1ed3

Merge trift-lap.fambruehe:/MySQL/M51/mysql-5.1 · cb179dd3

unknown authored Dec 15, 2005

into trift-lap.fambruehe:/MySQL/M51/work-5.1


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

cb179dd3

Merge joerg@trift2:/M50/part3-kent-joerg · ed1efa7c

unknown authored Dec 15, 2005

into trift-lap.fambruehe:/MySQL/M51/merge-5.1


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

ed1efa7c

Merge mysql.com:/usr/local/mysql/mysql-5.0-merge · 36ceef6a

unknown authored Dec 15, 2005

into  mysql.com:/usr/local/mysql/mysql-5.1-new


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

36ceef6a

Merge bk-internal:/home/bk/mysql-5.1-new · 6901d789
unknown authored Dec 15, 2005
```
into  mysql.com:/usr/local/mysql/mysql-5.1-new
```
6901d789
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 409fbaa6
unknown authored Dec 15, 2005
```
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new
```
409fbaa6

Makefile.am: · bb233703

unknown authored Dec 15, 2005

  - libtool wants spaces on parameters for its command line options


zlib/Makefile.am:
  - libtool wants spaces on parameters for its command line options

bb233703

Makefile.am: · 5b775244

unknown authored Dec 15, 2005

  - Modified zlib/Makefile.am to generate libz.so.1.2.3 instead of libz.so.0.0.0


zlib/Makefile.am:
  - Modified zlib/Makefile.am to generate libz.so.1.2.3 instead of libz.so.0.0.0

5b775244

Merge rparranovo@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 84463962
unknown authored Dec 15, 2005
```
into  mysql.com:/home/novo/MySQL/mysql-5.1


support-files/mysql.spec.sh:
  Auto merged
```
84463962

14 Dec, 2005 23 commits

Merge joerg@trift2:/M50/part2-ramil · 487d56b0

unknown authored Dec 14, 2005

into trift-lap.fambruehe:/MySQL/M51/merge-5.1


sql/sp_head.cc:
  Auto merged
sql/table.cc:
  Auto merged

487d56b0

Merge trift-lap.fambruehe:/MySQL/M51/part1-kent-knielsen · 59789c7f

unknown authored Dec 14, 2005

into trift-lap.fambruehe:/MySQL/M51/merge-5.1


mysql-test/t/symlink.test:
  Auto merged
mysql-test/t/trigger-compat.test:
  Auto merged
mysql-test/t/trigger-grant.test:
  Auto merged
scripts/make_win_src_distribution.sh:
  Auto merged
sql/mysqld.cc:
  Auto merged

59789c7f

Fix for bug #15623: Test case rpl000001 and rpl_error_ignored_table failure on MacOSX · 348efa52

unknown authored Dec 14, 2005

and bug #15668: Test 'sp-error' crashes server on Mac OS X.


mysql-test/r/rpl000001.result:
  Fix for bug #15623: Test case rpl000001 and rpl_error_ignored_table failure on MacOSX 
  and bug #15668: Test 'sp-error' crashes server on Mac OS X.
  - accept 2013 error as well.
mysql-test/t/flush_read_lock_kill.test:
  Fix for bug #15623: Test case rpl000001 and rpl_error_ignored_table failure on MacOSX 
  and bug #15668: Test 'sp-error' crashes server on Mac OS X.
  - accept 2013 error as well.
mysql-test/t/rpl000001.test:
  Fix for bug #15623: Test case rpl000001 and rpl_error_ignored_table failure on MacOSX 
  and bug #15668: Test 'sp-error' crashes server on Mac OS X.
  - accept 2013 error as well.
mysql-test/t/rpl_error_ignored_table.test:
  Fix for bug #15623: Test case rpl000001 and rpl_error_ignored_table failure on MacOSX 
  and bug #15668: Test 'sp-error' crashes server on Mac OS X.
  - accept 2013 error as well.
sql/sql_class.cc:
  Fix for bug #15623: Test case rpl000001 and rpl_error_ignored_table failure on MacOSX 
  and bug #15668: Test 'sp-error' crashes server on Mac OS X.
  - don't call the close_active_vio() in case of KILL_QUERY.

348efa52

Fix to make ndb_multi.test (Bug #15401 NDB lock problems) more predictable · e1a25cb9
unknown authored Dec 14, 2005

e1a25cb9

Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-5.1-new · c99f3d41

unknown authored Dec 14, 2005

into  mysql.com:/home/alexi/innodb-ss/mysql-5.1-ss28


mysql-test/r/innodb.result:
  Auto merged
mysql-test/t/innodb.test:
  Auto merged
sql/ha_innodb.cc:
  Auto merged

c99f3d41

bug#15682 - ndb · f8f2d51a

unknown authored Dec 14, 2005

  incorrect handling of varchar in position/rnd_pos

  Commit for 5.0.17 release clone


mysql-test/r/ndb_basic.result:
  bug#15682
mysql-test/t/ndb_basic.test:
  bug#15682
sql/ha_ndbcluster.cc:
  bug#15682

f8f2d51a

Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-push · ed7eaa4c

unknown authored Dec 14, 2005

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


mysql-test/r/ndb_basic.result:
  Auto merged
mysql-test/t/ndb_basic.test:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
storage/ndb/src/kernel/vm/SimulatedBlock.cpp:
  merge

ed7eaa4c

Merge mysql.com:/usr/local/mysql/mysql-mawk · 952af0ac

unknown authored Dec 14, 2005

into  mysql.com:/usr/local/mysql/mysql-5.1-new


storage/bdb/dist/gen_rec.awk:
  Auto merged

952af0ac

Merge bk-internal:/home/bk/mysql-5.1-new · 4b76283e
unknown authored Dec 14, 2005
```
into  mysql.com:/usr/local/mysql/mysql-5.1-new
```
4b76283e
BUG#15734: Fix undefined awk behaviour breaking compilation on Debian. · ce52a6b2
unknown authored Dec 14, 2005
```
bdb/dist/gen_rec.awk:
  Fix undefined behaviour.
```
ce52a6b2
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0 · 57722e13
unknown authored Dec 14, 2005
```
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-push
```
57722e13

Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.0 · ed5f4d69

unknown authored Dec 14, 2005

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


mysql-test/r/ndb_basic.result:
  Auto merged
mysql-test/t/ndb_basic.test:
  Auto merged
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
ndb/src/kernel/vm/SimulatedBlock.cpp:
  merge

ed5f4d69

Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 2d40e252

unknown authored Dec 14, 2005

into  hundin.mysql.fi:/home/jani/mysql-5.1-new


storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged

2d40e252

Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-new · c5ebeb79

unknown authored Dec 14, 2005

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


storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged

c5ebeb79

Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.0 · 4e98c2e8

unknown authored Dec 14, 2005

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


mysql-test/r/ndb_basic.result:
  Auto merged
mysql-test/t/ndb_basic.test:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
storage/ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
storage/ndb/src/kernel/vm/SimulatedBlock.cpp:
  merge
storage/ndb/src/ndbapi/ndberror.c:
  merge

4e98c2e8

bug#15682 - ndb - invalid handling of varchar in position/rnd_pos · 2c808bed

unknown authored Dec 14, 2005


mysql-test/r/ndb_basic.result:
  bug#15682 - invalid handling of varchar in position/rnd_pos
mysql-test/t/ndb_basic.test:
  bug#15682 - invalid handling of varchar in position/rnd_pos
ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
  New error code for invalid key
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Handle invalid key gracefully
ndb/src/kernel/vm/SimulatedBlock.cpp:
  Handle invalid key gracefully
ndb/src/ndbapi/ndberror.c:
  New error code
sql/ha_ndbcluster.cc:
  Fix varchar keys in position/rnd_pos

2c808bed

Removed wrong merge from 5.0 - 5.1 · f150f86d
unknown authored Dec 14, 2005

f150f86d

Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0 · c108939d

unknown authored Dec 14, 2005

into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-new


extra/Makefile.am:
  Auto merged
mysql-test/t/disabled.def:
  Merged from 5.0
sql/handler.cc:
  Merged from 5.0
sql/mysqld.cc:
  Merged from 5.0

c108939d

Merge knielsen@bk-internal.mysql.com:/home/bk/mysql-5.0 · 97746386
unknown authored Dec 14, 2005
```
into  production.mysql.com:/usersnfs/knielsen/mysql-5.0
```
97746386
Patch for Bug#13640 · 700e6cbd
unknown authored Dec 14, 2005

700e6cbd
Disabled test. Fails in ps-protocol mode. · 06042b36
unknown authored Dec 14, 2005

06042b36
Disabled archive db for Netware. · 81df509f
unknown authored Dec 14, 2005

81df509f
Datadir variable should not be reset, if it was · 910052c1
unknown authored Dec 14, 2005
```
set in this script.
```
910052c1

13 Dec, 2005 7 commits

Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0 · b141917a

unknown authored Dec 14, 2005

into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-new


mysql-test/r/ndb_read_multi_range.result:
  Auto merged
sql/ha_archive.cc:
  SCCS merged

b141917a

Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 73b9175c

unknown authored Dec 14, 2005

into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-new


mysql-test/r/innodb.result:
  Auto merged
mysql-test/t/innodb.test:
  Auto merged
mysql-test/t/ndb_read_multi_range.test:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
storage/innobase/dict/dict0dict.c:
  Auto merged
storage/innobase/dict/dict0load.c:
  Auto merged
storage/innobase/include/dict0dict.h:
  Auto merged
storage/innobase/include/dict0load.h:
  Auto merged
storage/innobase/include/os0file.h:
  Auto merged
storage/innobase/include/rem0cmp.h:
  Auto merged
storage/innobase/include/srv0srv.h:
  Auto merged
storage/innobase/rem/rem0cmp.c:
  Auto merged
storage/innobase/row/row0ins.c:
  Auto merged
storage/innobase/row/row0mysql.c:
  Auto merged
storage/innobase/srv/srv0srv.c:
  Auto merged
storage/innobase/srv/srv0start.c:
  Auto merged
storage/ndb/include/kernel/signaldata/DumpStateOrd.hpp:
  Auto merged
storage/ndb/include/ndb_version.h.in:
  Auto merged
storage/ndb/src/kernel/blocks/ERROR_codes.txt:
  Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
storage/ndb/test/ndbapi/testNodeRestart.cpp:
  Auto merged
storage/ndb/test/run-test/daily-basic-tests.txt:
  Auto merged
support-files/mysql.spec.sh:
  Auto merged
configure.in:
  Merged from 4.1

73b9175c

Netware specific changes. · 4e1d88af

unknown authored Dec 14, 2005


sql/ha_archive.cc:
  Disabled archive db for Netware until
  zlibCompileFlags() is available for this platform.
sql/sql_string.h:
  Added casts. Won't work with Metrowerks compiler without.

4e1d88af

Fixed test case. · 67183a7b
unknown authored Dec 14, 2005

67183a7b
Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0 · 99892b64
unknown authored Dec 14, 2005
```
into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0
```
99892b64

Merge mysql.com:/home/alexi/innodb-ss/mysql-5.0-ss92 · 2d35684e

unknown authored Dec 13, 2005

into  mysql.com:/home/alexi/innodb-ss/mysql-5.1-ss92


mysql-test/t/ndb_read_multi_range.test:
  Auto merged
configure.in:
  Merged
mysql-test/r/innodb.result:
  Null merge
mysql-test/t/innodb.test:
  Null merge
sql/ha_innodb.cc:
  Null merge
storage/innobase/btr/btr0sea.c:
  Null merge
storage/innobase/dict/dict0dict.c:
  Null merge
storage/innobase/dict/dict0load.c:
  Null merge
storage/innobase/include/buf0buf.h:
  Null merge
storage/innobase/include/dict0dict.h:
  Null merge
storage/innobase/include/dict0load.h:
  Null merge
storage/innobase/include/os0file.h:
  Null merge
storage/innobase/include/rem0cmp.h:
  Null merge
storage/innobase/include/srv0srv.h:
  Null merge
storage/innobase/rem/rem0cmp.c:
  Null merge
storage/innobase/row/row0ins.c:
  Null merge
storage/innobase/row/row0mysql.c:
  Null merge
storage/innobase/srv/srv0srv.c:
  Null merge
storage/innobase/srv/srv0start.c:
  Null merge
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto-merge
storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto-merge
support-files/mysql.spec.sh:
  Auto-merge

2d35684e

Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0 · 27970ee7
unknown authored Dec 13, 2005
```
into moonbone.local:/work/15268-bug-5.0-mysql
```
27970ee7