Commit graph

12873 commits

Author SHA1 Message Date
unknown
506a7bdd28 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
into ndbmaster.mysql.com:/ndb/clone-mysql-4.1-ndb-daily-2004-06-14
2004-06-18 08:49:03 +02:00
unknown
fb89fac462 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into mc05.(none):/space2/tomas/mysql-4.1-ndb-test
2004-06-18 02:16:08 +02:00
unknown
25749c9686 cannot include my_config.h directly, breaks some makes 2004-06-18 00:16:07 +00:00
unknown
99cf349115 mgmapi.cpp:
hpux make fix


ndb/src/mgmapi/mgmapi.cpp:
  hpux make fix
2004-06-17 22:32:49 +00:00
unknown
67b7c20172 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.bredbandsbolaget.se:/home/tomas/mysql-4.1


ndb/src/common/mgmcommon/InitConfigFileParser.cpp:
  Auto merged
2004-06-17 22:19:26 +00:00
unknown
79359964b8 removed need for specifying TCP connections in MySQL Cluster configuration 2004-06-17 22:18:05 +00:00
unknown
41b0444ca8 hpux compile fixes 2004-06-17 21:06:21 +00:00
unknown
6c2e161479 Tru64 fixes 2004-06-17 17:38:05 +00:00
unknown
8979db4182 removed warnings on Tru64 2004-06-17 17:32:03 +00:00
unknown
29987cd0b7 FsReadWriteReq.cpp:
compile error on hpux


ndb/src/common/debugger/signaldata/FsReadWriteReq.cpp:
  compile error on hpux
2004-06-17 17:12:45 +00:00
unknown
57ccc47bfb 2004-06-17 13:25:38 +00:00
unknown
6edb8d5bc7 after review fix (BUG#4067)
sql/field.cc:
  method getting maximum display length for fields
sql/field.h:
  method getting maximum display length for fields
sql/item.cc:
  code cleanup
  switch replaced with new method
sql/item.h:
  method getting maximum display length for fields
2004-06-17 13:48:31 +03:00
unknown
b01f938791 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-4.1
2004-06-17 12:03:00 +03:00
unknown
3d2949e5b8 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
into mysql.com:/home/jonas/src/mysql-4.1-ndb
2004-06-17 10:26:25 +02:00
unknown
ef06d62153 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
into mysql.com:/home/jonas/src/mysql-4.1-ndb
2004-06-17 09:56:51 +02:00
unknown
d3b0753da3 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into mc05.(none):/space2/tomas/mysql-4.1-ndb-test
2004-06-17 08:36:17 +02:00
unknown
a9eb4993ea Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.bredbandsbolaget.se:/home/tomas/mysql-4.1
2004-06-17 00:34:50 +00:00
unknown
eb48a074b8 build fixes for ndb 2004-06-17 00:34:05 +00:00
unknown
137eea617b Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/kostja/mysql/mysql-4.1-4030
2004-06-17 02:04:02 +04:00
unknown
74d0f47ec2 - mysql_stmt_send_long_data commented. A few other comments. 2004-06-17 02:03:15 +04:00
unknown
1fbe91f720 fil0fil.c:
Remove the use of mem_realloc in fil0fil.c; mem_realloc() was broken and the patch to remove its definition will propagate from the 4.0 tree; crash recovery with innodb_file_per_table has to be tested after this patch, not tested yet


innobase/fil/fil0fil.c:
  Remove the use of mem_realloc in fil0fil.c; mem_alloc() was broken and the patch to remove its definition will propagate from the 4.0 tree; crash recovery with innodb_file_per_table has to be tested after this patch, not tested yet
2004-06-17 00:21:41 +03:00
unknown
78f975ee76 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/kostja/mysql/mysql-4.1-4030
2004-06-16 23:11:36 +04:00
unknown
340162df2c Comments and cleanups in client library.
include/mysql.h:
  mysql_bind_param -> mysql_stmt_bind_param
libmysql/libmysql.c:
  - more comments
  - trailing spaces stripped
  - update_statement_metadata moved to appropriate section (from 'Statement
  close and error reporting' section)
  - store_param_type moved to store_ functions
2004-06-16 23:11:02 +04:00
unknown
6b099d2c1b Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
into mysql.com:/space/pekka/ndb/version/my41
2004-06-16 18:59:35 +02:00
unknown
52442e983b Error message edits. 2004-06-16 11:59:35 -05:00
unknown
eb5a62a5aa Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/jonas/src/mysql-4.1-ndb
2004-06-16 18:59:34 +02:00
unknown
6e048c1fcb Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into mc05.(none):/space2/tomas/mysql-4.1-ndb-test
2004-06-16 18:59:34 +02:00
unknown
5ebed1893e Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1
into kite-hub.kitebird.com:/src/extern/MySQL/bk/mysql-4.1
2004-06-16 11:59:34 -05:00
unknown
46fbf38467 .del-mysqlclusterd~7ebaf8faea0a1100:
Delete: ndb/bin/mysqlclusterd
.del-mysqlcluster_install_db~f363f803506081a6:
  Delete: ndb/bin/mysqlcluster_install_db
.del-mysqlcluster~26c9c37938503734:
  Delete: ndb/bin/mysqlcluster


BitKeeper/deleted/.del-mysqlcluster~26c9c37938503734:
  Delete: ndb/bin/mysqlcluster
BitKeeper/deleted/.del-mysqlcluster_install_db~f363f803506081a6:
  Delete: ndb/bin/mysqlcluster_install_db
BitKeeper/deleted/.del-mysqlclusterd~7ebaf8faea0a1100:
  Delete: ndb/bin/mysqlclusterd
2004-06-16 16:59:33 +00:00
unknown
75c8744334 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.bredbandsbolaget.se:/home/tomas/mysql-4.1
2004-06-16 16:51:03 +00:00
unknown
f677d4c14a bug fix in ndb make 2004-06-16 16:50:05 +00:00
unknown
cb0486992b tux optim 6 - remove node cache 2004-06-16 18:21:38 +02:00
unknown
becde519f9 tux optim 5 - move node ops to class level (prepare to remove node cache) 2004-06-16 17:54:08 +02:00
unknown
e1179bc7be tux optim 4 - update prefixes at once (prepare to remove node cache) 2004-06-16 17:14:29 +02:00
unknown
f54dc75075 tux optim 3 - use TUP methods instead of TUP_STORE_TH signal 2004-06-16 16:28:17 +02:00
unknown
fe497c0b50 Merge lgrimmer@build.mysql.com:/home/bk/mysql-4.1
into mysql.com:/space/my/mysql-4.1
2004-06-16 16:06:46 +02:00
unknown
1efa7ea50f Critical fixes after review:
- mutex was unlocked before the end of the critical sesion,
- Portability issue: It's better to use (*alloc)(x) instead of alloc(x),
  if alloc is a function passed as an argument.
- Use {} around if() block, to avoid possible problems with some Windows compilers.
2004-06-16 19:06:45 +05:00
unknown
7f7c311b73 cxx compile fix for ndb 2004-06-16 14:06:44 +00:00
unknown
2f77600be5 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
into ndbmaster.mysql.com:/ndb/clone-mysql-4.1-ndb-daily-2004-06-14
2004-06-16 16:04:20 +02:00
unknown
5522ffd35d Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
into mysql.com:/space/pekka/ndb/version/my41
2004-06-16 15:31:37 +02:00
unknown
4e6a71f80c Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into mc05.(none):/space2/tomas/mysql-4.1-ndb-test
2004-06-16 15:31:36 +02:00
unknown
52be66a2c9 Makefile.am:
missing file


ndb/include/Makefile.am:
  missing file
2004-06-16 13:31:35 +00:00
unknown
150ca231eb Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
2004-06-16 13:18:35 +00:00
unknown
eec2835d63 tux optim 2 - use physical TUP address for index nodes 2004-06-16 15:10:13 +02:00
unknown
a9d4556649 new length detection for non-string in UNION (BUG#4067)
mysql-test/r/subselect.result:
  new length in UNION
mysql-test/r/union.result:
  new length in UNION
  test of int with wrong display length
mysql-test/t/union.test:
  test of int with wrong display length
sql/item.cc:
  new length detection for non-string
sql/item.h:
  new length detection for non-string
2004-06-16 16:06:30 +03:00
unknown
0300c89551 tux optim 1 - use physical fragment addresses 2004-06-16 14:30:49 +02:00
unknown
19f865189a - Modified Do-compile to build, package and test NDB cluster, when
enabled


Build-tools/Do-compile:
   - removed redundant option "--without-ndbcluster" (we already have
     "--with-cluster" for that)
   - make sure to add the cluster files in the binary distribution
   - make sure to run mysql-test-run with NDB tests enabled
2004-06-16 13:57:45 +02:00
unknown
cf5d0db657 Another place where Bug#4079 "error checking in prepared statements"
pops up fixed.


libmysql/libmysql.c:
  Another place where Bug#4079 pops up fixed.
2004-06-16 14:06:39 +04:00
unknown
95325f1354 Compilation error on AIX (IBM C Compiler Version 6) fixed. 2004-06-16 11:29:22 +04:00
unknown
0f8194611e packet.result, alter_table.result:
fix up test result.


mysql-test/r/alter_table.result:
  fix up test result.
mysql-test/r/packet.result:
  fix up test result.
2004-06-15 23:50:03 -05:00