Commits · 84463962d6193f218e3a51dec92a66bc823ac48b · nexedi / MariaDB

15 Dec, 2005 1 commit
- 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 13 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

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

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

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 26 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
Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0 · c42f4db0
unknown authored Dec 13, 2005
```
into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0
```
c42f4db0
Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-5.0 · 11b6afd3
unknown authored Dec 13, 2005
```
into  mysql.com:/home/alexi/innodb-ss/mysql-5.0-ss92
```
11b6afd3

Fix BUG#12071: "Windows hang:'Opening tables' or 'Waiting for · 778d212b

unknown authored Dec 13, 2005

 table' lockup".
 Changes from the innodb-5.0-ss92 snapshot.
 Do not call os_file_create_tmpfile() at runtime. Instead, create
 all tempfiles at startup and guard access to them with mutexes.


innobase/btr/btr0sea.c:
  Changes from the innodb-5.0ss92 snapshot.
innobase/include/buf0buf.h:
  Changes from the innodb-5.0ss92 snapshot.
innobase/include/os0file.h:
  Changes from the innodb-5.0ss92 snapshot.
innobase/include/srv0srv.h:
  Changes from the innodb-5.0ss92 snapshot.
innobase/row/row0ins.c:
  Changes from the innodb-5.0ss92 snapshot.
innobase/srv/srv0srv.c:
  Changes from the innodb-5.0ss92 snapshot.
innobase/srv/srv0start.c:
  Changes from the innodb-5.0ss92 snapshot.
mysql-test/r/innodb.result:
  Changes from the innodb-5.0ss92 snapshot.
mysql-test/t/innodb.test:
  Changes from the innodb-5.0ss92 snapshot.
sql/ha_innodb.cc:
  Changes from the innodb-5.0ss92 snapshot.

778d212b

ndb - merge fix · 4e4e347b

unknown authored Dec 13, 2005


storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  merge fix

4e4e347b

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

unknown authored Dec 13, 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
scripts/make_binary_distribution.sh:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/tztime.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
support-files/mysql.spec.sh:
  Auto merged
configure.in:
  Merged from 5.0
storage/ndb/test/run-test/daily-basic-tests.txt:
  Merged from 5.0

33c8e43a

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

unknown authored Dec 13, 2005

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


netware/libmysql.def:
  Auto merged
netware/myisamlog.def:
  Auto merged
netware/myisampack.def:
  Auto merged
netware/mysql.def:
  Auto merged
netware/mysql_install_db.def:
  Auto merged
netware/mysqlbinlog.def:
  Auto merged
netware/mysqlcheck.def:
  Auto merged
netware/mysqld_safe.def:
  Auto merged
netware/mysqldump.def:
  Auto merged
netware/mysqlimport.def:
  Auto merged
netware/perror.def:
  Auto merged
scripts/make_binary_distribution.sh:
  Auto merged
sql/tztime.cc:
  Auto merged
netware/BUILD/compile-linux-tools:
  Merged from 4.1
netware/my_print_defaults.def:
  Merged from 4.1
netware/mysqladmin.def:
  Merged from 4.1

bc72c684

Bug#15675 - ndb - fix read_multi_range.test drop all tables it using · a0a942fb

unknown authored Dec 13, 2005

  NOTE: only changes to test script


mysql-test/t/ndb_read_multi_range.test:
  Bug#15675 - ndb - fix read_multi_range.test drop all tables it using

a0a942fb

Minor Netware specific changes. · 12046696

unknown authored Dec 13, 2005


netware/BUILD/compile-linux-tools:
  Fixed compilation problem with Linux tools.
scripts/make_binary_distribution.sh:
  Netware specific changes. Discard platform
  specific files and added a couple of missing files.
sql/tztime.cc:
  Code not ported to Netware yet.

12046696

Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.0 · 4fc6562f

unknown authored Dec 13, 2005

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


netware/libmysql.def:
  Auto merged
netware/my_print_defaults.def:
  Auto merged
netware/myisamlog.def:
  Auto merged
netware/myisampack.def:
  Auto merged
netware/mysql.def:
  Auto merged
netware/mysql_install_db.def:
  Auto merged
netware/mysqladmin.def:
  Auto merged
netware/mysqlbinlog.def:
  Auto merged
netware/mysqlcheck.def:
  Auto merged
netware/mysqld_safe.def:
  Auto merged
netware/mysqldump.def:
  Auto merged
netware/mysqlimport.def:
  Auto merged
netware/perror.def:
  Auto merged

4fc6562f

Increased stack size for clients on Netware. · 2e8dc5ff
unknown authored Dec 13, 2005
```
New libc suggests doing this.
```
2e8dc5ff
Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-5.0 · 3bef0071
unknown authored Dec 13, 2005
```
into  mysql.com:/home/alexi/innodb-ss/mysql-5.0-ss11
```
3bef0071

Changes from the innodb-5.1-ss28 snapshot. · ad4d8773

unknown authored Dec 13, 2005

 Removed include/Makefile.am and the reference to it.
 Deleted db/db0err.h and db directory.
 Check index column sizes in a better way (bug 13315).
 Fixed comments for memory allocation functions and added
 some extra checks. Adapted callers.


BitKeeper/deleted/.del-Makefile.am~ab5c84d46412dc2e:
  Delete: storage/innobase/include/Makefile.am
BitKeeper/deleted/.del-db0err.h~bfeec2efe86ac48b:
  Delete: storage/innobase/db/db0err.h
mysql-test/r/innodb.result:
  Changes from the innodb-5.1-ss28 snapshot.
mysql-test/t/innodb.test:
  Changes from the innodb-5.1-ss28 snapshot.
sql/ha_innodb.cc:
  Changes from the innodb-5.1-ss28 snapshot.
sql/ha_innodb.h:
  Changes from the innodb-5.1-ss28 snapshot.
storage/innobase/Makefile.am:
  Changes from the innodb-5.1-ss28 snapshot.
storage/innobase/configure.in:
  Changes from the innodb-5.1-ss28 snapshot.
storage/innobase/ha/ha0ha.c:
  Changes from the innodb-5.1-ss28 snapshot.
storage/innobase/include/ha0ha.h:
  Changes from the innodb-5.1-ss28 snapshot.
storage/innobase/include/ha0ha.ic:
  Changes from the innodb-5.1-ss28 snapshot.
storage/innobase/include/mem0mem.h:
  Changes from the innodb-5.1-ss28 snapshot.
storage/innobase/include/mem0mem.ic:
  Changes from the innodb-5.1-ss28 snapshot.
storage/innobase/lock/lock0lock.c:
  Changes from the innodb-5.1-ss28 snapshot.
storage/innobase/mem/mem0mem.c:
  Changes from the innodb-5.1-ss28 snapshot.

ad4d8773

ndb - merge error · 2bec1f7e

unknown authored Dec 13, 2005

note bug#15629 has been fixed in release clone (sp on 64 bit platform), but not merged here yet


ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  merge error

2bec1f7e

Null-merge from 4.1 · d6373a22
unknown authored Dec 13, 2005

d6373a22

Merge mysql.com:/home/alexi/mysql-4.1 · 8e239a27

unknown authored Dec 13, 2005

into  mysql.com:/home/alexi/innodb-ss/mysql-5.0-ss11
Null merge


BitKeeper/deleted/.del-ha_blackhole.cc~727c69ef7846623a:
  Auto merged
innobase/include/dict0load.h:
  Auto merged
innobase/dict/dict0dict.c:
  Null-merge from 4.1
innobase/include/dict0dict.h:
  Null-merge from 4.1
innobase/include/os0file.h:
  Null-merge from 4.1
innobase/include/rem0cmp.h:
  Null-merge from 4.1
innobase/include/srv0srv.h:
  Null-merge from 4.1
innobase/rem/rem0cmp.c:
  Null-merge from 4.1
innobase/row/row0ins.c:
  Null-merge from 4.1
innobase/row/row0mysql.c:
  Null-merge from 4.1
innobase/srv/srv0srv.c:
  Null-merge from 4.1
innobase/srv/srv0start.c:
  Null-merge from 4.1
mysql-test/r/innodb.result:
  Null-merge from 4.1
mysql-test/t/innodb.test:
  Null-merge from 4.1
sql/ha_innodb.cc:
  Null-merge from 4.1

8e239a27

Update ndb version in configure.in · 88b65dd2
unknown authored Dec 13, 2005

88b65dd2

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

unknown authored Dec 13, 2005

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


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:
  merge

ad01aed8

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

unknown authored Dec 13, 2005

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


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

1df94c92

Merge perch.ndb.mysql.com:/home/jonas/src/mysql-4.1 · 01c7bd20

unknown authored Dec 13, 2005

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


ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
  Auto merged
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
ndb/test/ndbapi/testNodeRestart.cpp:
  Auto merged
ndb/src/kernel/blocks/ERROR_codes.txt:
  merge
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  merge
ndb/test/run-test/daily-basic-tests.txt:
  merge

01c7bd20