Commits · 27db3786050d813e4b381749c153de185a1bfb43 · nexedi / MariaDB

15 Dec, 2005 10 commits

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

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

27db3786

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

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

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

5e38a5ae

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

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

fe1ed868

Merge mysql.com:/usr/local/mysql/mysql-5.0-merge · 26d2ebda

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

26d2ebda

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

Makefile.am: · 607cb75e

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

607cb75e

Makefile.am: · 4d5f0dc8

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

4d5f0dc8

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


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

14 Dec, 2005 23 commits

Merge joerg@trift2:/M50/part2-ramil · 2e8de64b

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

2e8de64b

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

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

85309919

Fix for bug #15623: Test case rpl000001 and rpl_error_ignored_table failure on MacOSX · 4f0f49bb

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.

4f0f49bb

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

e67b5291

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

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

e6b71cff

bug#15682 - ndb · dc193e52

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

dc193e52

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

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

4a5dc6c3

Merge mysql.com:/usr/local/mysql/mysql-mawk · 363e61e6

unknown authored Dec 14, 2005

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


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

363e61e6

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

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

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

fd0e953c

Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 578e4b5d

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

578e4b5d

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

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

472ad40d

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

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

14e9dc02

bug#15682 - ndb - invalid handling of varchar in position/rnd_pos · 9d707d48

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

9d707d48

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

0913bacc

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

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

0006b011

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

32f9246a
Disabled test. Fails in ps-protocol mode. · 8176b6b9
unknown authored Dec 14, 2005

8176b6b9
Disabled archive db for Netware. · c115743c
unknown authored Dec 14, 2005

c115743c
Datadir variable should not be reset, if it was · 087a4ada
unknown authored Dec 14, 2005
```
set in this script.
```
087a4ada

13 Dec, 2005 7 commits

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

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

e0f91416

Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 51c2a20e

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

51c2a20e

Netware specific changes. · 6ea16156

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.

6ea16156

Fixed test case. · a2626146
unknown authored Dec 14, 2005

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

Merge mysql.com:/home/alexi/innodb-ss/mysql-5.0-ss92 · 294b1315

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

294b1315

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