Commit graph

33770 commits

Author SHA1 Message Date
unknown
2a89d99da4 Added test for violation of uniqueness constraint at create index 2006-04-26 17:00:59 +02:00
unknown
09999bc21f Corrected include path to work under Windows 2006-04-26 17:00:58 +02:00
unknown
14fd0720e5 Merge mysql.com:/home/mydev/mysql-5.1
into  mysql.com:/home/mydev/mysql-5.1-bug18129
2006-04-26 17:00:58 +02:00
unknown
4b49959d12 Merge mleich@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/home/matthias/Arbeit/mysql-5.1/src-Bug


mysql-test/t/disabled.def:
  Auto merged
2006-04-26 17:00:58 +02:00
unknown
fb0f88aac8 Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/home/alexi/innodb/mysql-5.1-ss492
2006-04-26 19:00:57 +04:00
unknown
2f955d19a6 Bug #18550 ndbd getting "node failure handling not complete..." after graceful restart
- addded more retries to wait for nodefailure to complete
Bug #19039 multi node failure causes node failure handling not to complete
- patch to avoid this scenario when the management server is used to perform the stop
- wait for NF_COMPLETE_REP in management server before returning
ndb: allocate nodeid
- only retry on retryable error
2006-04-26 16:57:45 +02:00
unknown
51ddd6ff31 Bug #19202 Incorrect errorhandling in select count(*) wrt temporary error
- added retry handling of temporary transaction errors
2006-04-26 16:57:44 +02:00
unknown
c0c6461a11 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
2006-04-26 16:57:43 +02:00
unknown
1a11f57a95 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0
2006-04-26 16:57:42 +02:00
unknown
2a04d49e77 ndb: added timeout handling to alloc node id to avoid the usage of purge stale sessions 2006-04-26 16:57:41 +02:00
unknown
101e3703d9 fixed error message text 2006-04-26 17:57:41 +03:00
unknown
e1e3a93f73 Merge perch.ndb.mysql.com:/home/jonas/src/50-work
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0
2006-04-26 16:57:41 +02:00
unknown
2ce6146b77 Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/home/alexi/innodb/mysql-5.0-ss492
2006-04-26 18:57:40 +04:00
unknown
5854f65b29 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into  neptunus.(none):/home/msvensson/mysql/mysql-4.1
2006-04-26 16:53:25 +02:00
unknown
6dd5c29025 Merge perch.ndb.mysql.com:/home/jonas/src/41-work
into  perch.ndb.mysql.com:/home/jonas/src/mysql-4.1
2006-04-26 16:53:25 +02:00
unknown
f3ca0c28e4 Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-4.1
into  mysql.com:/home/alexi/innodb/mysql-4.1-innodb
2006-04-26 18:53:24 +04:00
unknown
9c9399011e Merge perch.ndb.mysql.com:/home/jonas/src/51-work
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
2006-04-26 16:24:46 +02:00
unknown
6e905d066e Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
2006-04-26 16:17:27 +02:00
unknown
bbe7563a64 ndb - backup 5.0->5.1 merge
storage/ndb/src/kernel/blocks/backup/BackupInit.cpp:
  backup 5.0->5.1 merge
2006-04-26 16:11:20 +02:00
unknown
754f1c0e19 Merge perch.ndb.mysql.com:/home/jonas/src/50-work
into  perch.ndb.mysql.com:/home/jonas/src/51-work


storage/ndb/include/mgmapi/mgmapi_config_parameters.h:
  Auto merged
storage/ndb/src/kernel/blocks/backup/BackupInit.cpp:
  Auto merged
storage/ndb/src/mgmsrv/ConfigInfo.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/backup/Backup.cpp:
  merge
2006-04-26 16:07:02 +02:00
unknown
f0b7821a03 ndb - backup 4.1->5.0 merge
ndb/src/kernel/blocks/backup/Backup.cpp:
  merge
2006-04-26 16:02:35 +02:00
unknown
8bc693a9c5 Merge perch.ndb.mysql.com:/home/jonas/src/41-work
into  perch.ndb.mysql.com:/home/jonas/src/50-work


ndb/include/mgmapi/mgmapi_config_parameters.h:
  Auto merged
ndb/src/mgmsrv/ConfigInfo.cpp:
  Auto merged
ndb/src/kernel/blocks/backup/BackupInit.cpp:
  merge
2006-04-26 15:59:44 +02:00
unknown
6087323433 ndb -
Unleash backup to write more than 32k at a time
  Using parameter BackupMaxWriteSize
  (greatly affect LCP time in 5.1, set default value to 256k)


ndb/include/mgmapi/mgmapi_config_parameters.h:
  Add config fro max write size in backup
ndb/src/kernel/blocks/backup/BackupInit.cpp:
  Unleash backup to write more than 32k at a time
ndb/src/mgmsrv/ConfigInfo.cpp:
  Add config fro max write size in backup
2006-04-26 15:57:48 +02:00
unknown
60abfb1f4e Merge perch.ndb.mysql.com:/home/jonas/src/51-work
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb


storage/ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
2006-04-26 15:22:22 +02:00
unknown
2d3209a072 Merge perch.ndb.mysql.com:/home/jonas/src/50-work
into  perch.ndb.mysql.com:/home/jonas/src/51-work


support-files/mysql.spec.sh:
  Auto merged
storage/ndb/include/util/SocketServer.hpp:
  Auto merged
storage/ndb/src/common/transporter/Transporter.cpp:
  Auto merged
storage/ndb/src/common/util/SocketServer.cpp:
  Auto merged
storage/ndb/src/mgmsrv/Services.cpp:
  Auto merged
2006-04-26 15:16:21 +02:00
unknown
1c74bfd85c ndb dd -
fix dirty page handling during opt.nr


storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp:
  fix dirty page handling during opt.nr
2006-04-26 15:15:30 +02:00
unknown
1030d5c804 Merge perch.ndb.mysql.com:/home/jonas/src/41-work
into  perch.ndb.mysql.com:/home/jonas/src/50-work


ndb/include/util/SocketServer.hpp:
  Auto merged
ndb/src/common/transporter/Transporter.cpp:
  Auto merged
ndb/src/common/util/SocketServer.cpp:
  Auto merged
ndb/src/mgmsrv/Services.cpp:
  Auto merged
support-files/mysql.spec.sh:
  Auto merged
2006-04-26 15:13:43 +02:00
unknown
a4e32d4e84 ndb - backport from 5.1
Fix alignment of sockaddr(_in)


ndb/src/common/transporter/Transporter.cpp:
  Fix alignment of sockaddr(_in)
ndb/src/mgmsrv/Services.cpp:
  Fix alignment of sockaddr(_in)
2006-04-26 15:12:32 +02:00
unknown
4191b8a39f Add ndb_config to rpm spec 2006-04-26 14:54:20 +02:00
unknown
96b42ea0ed ndb - bug#17150
ndb_mgmd limited no of api nodes, by restricting no of mgmsessions
  (these are used for dynamic port allocation)


ndb/include/util/SocketServer.hpp:
  Increase default max session to ~0
ndb/src/common/util/SocketServer.cpp:
  Increase default max session to ~0
2006-04-26 14:53:43 +02:00
unknown
2f4f68be53 Change sleep_until_file_created to sleep 100 millisecond instead of sleeping 1 seconds between each iteration. 2006-04-26 13:22:18 +02:00
unknown
82e938f681 bug #18455 (embedded server Win32 build)
VC++Files/libmysqld/libmysqld.dsp:
  my_user.c file added
VC++Files/libmysqld/libmysqld.vcproj:
  my_user.c file added
VC++Files/libmysqld/libmysqld_ia64.dsp:
  my_user.c added
2006-04-26 15:58:27 +05:00
unknown
1b24bab882 Bug#19362 im_daemon_lifecycle fails when built from source distribution
- Add function "mysqld_real_path" which is needed if the mysqld_path is a symlink or a script(like libtool) that executes the real mysqld.
- Add new variable mysqld_real_path
- Use mysqld_real_path from fill_instance_version


server-tools/instance-manager/instance_options.cc:
  Add function "mysqld_real_path" which is needed if the mysqld_path is a symlink or a script(like libtool) that executes the real mysqld.
  Add new variable mysqld_real_path
  Use mysqld_real_path from fill_instance_version
server-tools/instance-manager/instance_options.h:
  Add new variable "mysqld_real_path"
2006-04-26 12:45:22 +02:00
unknown
d35e083d75 Remove hacks for building shared libs on aix and qnx 2006-04-26 12:16:57 +02:00
unknown
074cdd6277 Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/home/alexi/innodb/mysql-5.1-ss492
2006-04-26 12:48:12 +04:00
unknown
115100c743 Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/home/alexi/innodb/mysql-5.0-ss492
2006-04-26 12:45:29 +04:00
unknown
c2e1ba6405 Merge mysql.com:/home/alexi/mysql-5.0
into  mysql.com:/home/alexi/innodb/mysql-5.0-ss492
2006-04-26 12:43:38 +04:00
unknown
966658fa48 Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-4.1
into  mysql.com:/home/alexi/innodb/mysql-4.1-innodb
2006-04-26 12:39:47 +04:00
unknown
173f164bfc Merge mysql.com:/home/alexi/innodb/mysql-5.0-ss492
into  mysql.com:/home/alexi/innodb/mysql-5.1-ss492
2006-04-26 11:27:15 +04:00
unknown
0fc093fa19 Merge mysql.com:/home/alexi/innodb/mysql-4.1-innodb-work
into  mysql.com:/home/alexi/innodb/mysql-5.0-ss492-work
2006-04-26 11:23:43 +04:00
unknown
c2e6c898ac Make innodb_mysql produce a non-empty output.
mysql-test/r/innodb_mysql.result:
  Fix result.
2006-04-26 11:15:09 +04:00
unknown
65d9e36fa6 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new


mysql-test/t/disabled.def:
  Auto merged
2006-04-26 08:38:50 +02:00
unknown
23e98e0783 configure.in:
clone-off for 5.0.21


configure.in:
  clone-off for 5.0.21
2006-04-26 08:26:33 +02:00
unknown
8ea292209f Merge mysql.com:/home/alexi/innodb/mysql-5.0-ss492-work
into  mysql.com:/home/alexi/innodb/mysql-5.1-ss492-work


mysql-test/t/innodb.test:
  Auto merged
2006-04-26 09:59:05 +04:00
unknown
47a0479811 Merge mysql.com:/home/alexi/innodb/mysql-4.1-innodb-work
into  mysql.com:/home/alexi/innodb/mysql-5.0-ss492-work


mysql-test/t/innodb.test:
  Auto merged
2006-04-26 09:56:06 +04:00
unknown
a4c62dbb8a Files innodb.[test|result] are to be used by Innobase only.
Use files innodb_mysql.[test|result] instead.


mysql-test/t/innodb.test:
  This file is to be used by Innobase only.
mysql-test/r/innodb_mysql.result:
  New BitKeeper file ``mysql-test/r/innodb_mysql.result''
   Use this file instead of innodb.result.
mysql-test/t/innodb_mysql.test:
  New BitKeeper file ``mysql-test/t/innodb_mysql.test''
   Use this file instead of innodb.test.
2006-04-26 09:51:57 +04:00
unknown
36a87d0c0c after merge 2006-04-25 22:39:59 -07:00
unknown
4836c27d47 Merge sergbook.mysql.com:/usr/home/serg/Abk/mysql-4.1
into sergbook.mysql.com:/usr/home/serg/Abk/mysql-5.0


sql/sql_parse.cc:
  Auto merged
2006-04-25 21:32:30 -07:00
unknown
67d23360d7 Applied innodb-5.1-ss492 snapshot.
* Fix BUG#19217 "dict_load_indexes() may read the delete-mark incorrectly".
 * Remove obsolete and unused variables from srv0srv.c.
 * Remove srv_sys->operational since it is unused.
 * Make thread_id parameter in os_thread_create() optional.
 * Add platform-specific os_thread_ret_t and OS_THREAD_DUMMY_RETURN,
   and convert thread start functions to use them.


storage/innobase/dict/dict0dict.c:
  Applied innodb-5.1-ss492 snapshot.
storage/innobase/dict/dict0load.c:
  Applied innodb-5.1-ss492 snapshot.
   dict_load_indexes(): pass comp=0 to rec_get_deleted_flag(), because
   SYS_INDEXES always is in ROW_FORMAT=REDUNDANT (Bug #19217).
storage/innobase/include/os0thread.h:
  Applied innodb-5.1-ss492 snapshot.
storage/innobase/include/srv0srv.h:
  Applied innodb-5.1-ss492 snapshot.
storage/innobase/include/trx0roll.h:
  Applied innodb-5.1-ss492 snapshot.
storage/innobase/include/univ.i:
  Applied innodb-5.1-ss492 snapshot.
storage/innobase/log/log0recv.c:
  Applied innodb-5.1-ss492 snapshot.
storage/innobase/os/os0thread.c:
  Applied innodb-5.1-ss492 snapshot.
storage/innobase/que/que0que.c:
  Applied innodb-5.1-ss492 snapshot.
storage/innobase/srv/srv0srv.c:
  Applied innodb-5.1-ss492 snapshot.
storage/innobase/srv/srv0start.c:
  Applied innodb-5.1-ss492 snapshot.
storage/innobase/trx/trx0roll.c:
  Applied innodb-5.1-ss492 snapshot.
2006-04-26 08:30:37 +04:00
unknown
34f1f0b5fd disable before investigation why test case for 19170 is failing on
some platforms.
2006-04-26 07:29:26 +03:00