Commit graph

13319 commits

Author SHA1 Message Date
unknown
1a74bb1dc2 wl1873 2004-07-06 11:38:11 +02:00
unknown
ca6e7a0ca9 Merge mysql.com:/home/jonas/src/mysql-4.1-ndb
into mysql.com:/home/jonas/src/wl1873


ndb/include/ndbapi/NdbScanOperation.hpp:
  Auto merged
ndb/src/ndbapi/NdbResultSet.cpp:
  Auto merged
ndb/src/ndbapi/NdbScanOperation.cpp:
  Auto merged
ndb/test/ndbapi/testScan.cpp:
  Auto merged
2004-07-06 11:34:26 +02:00
unknown
d0a9676b4a Merge mysql.com:/home/jonas/src/mysql-4.1
into mysql.com:/home/jonas/src/mysql-4.1-ndb


mysql-test/ndb/ndbcluster.sh:
  Auto merged
2004-07-06 10:20:52 +02:00
unknown
1d57e419e9 Fix uninit variable 2004-07-06 10:19:05 +02:00
unknown
913424a8ec merge
ndb/src/mgmapi/mgmapi.cpp:
  Auto merged
2004-07-06 08:56:05 +02:00
unknown
3e73b86d7f missing ; 2004-07-06 08:43:57 +02:00
unknown
1773595494 Fixed memory handling
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  longable when routed
ndb/src/kernel/blocks/dbtup/DbtupBuffer.cpp:
  longable when routed
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Init blob count correctly
ndb/src/ndbapi/NdbIndexOperation.cpp:
  Receiver::init
ndb/src/ndbapi/NdbOperation.cpp:
  Receiver::init
  release memory
2004-07-06 08:36:52 +02:00
unknown
3f3ea3037a Fixed bugs in ordered scan discovered by mysql-test-run
Enabled ordered scan in handler



ndb/include/ndbapi/NdbIndexScanOperation.hpp:
  Moved saveBound to NdbIndexScanOperation
ndb/include/ndbapi/NdbScanOperation.hpp:
  Moved saveBound to NdbIndexScanOperation
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Introduced map for
  index attributes (keys) -> real attr id (and back)
ndb/src/ndbapi/NdbDictionaryImpl.hpp:
  Introduced map for
  index attributes (keys) -> real attr id (and back)
ndb/src/ndbapi/NdbOperationDefine.cpp:
  Moved saveBound to NdbIndexScanOperation
ndb/src/ndbapi/NdbOperationInt.cpp:
  Moved saveBound to NdbIndexScanOperation
ndb/src/ndbapi/NdbScanOperation.cpp:
  Moved saveBound to NdbIndexScanOperation
  Fixed bugs in handling of setBounds w.r.t getValues and index keys
    (use new reverse map)
  Fixed bugs in next_result_ordered
sql/ha_ndbcluster.cc:
  Use sorted scan when requested
2004-07-05 20:41:06 +02:00
unknown
3e3a2e835b Merge mleich@bk-internal.mysql.com:/home/bk/mysql-4.1
into zero.local.lan:/GORDON/MySQL/mysql-4.1/src
2004-07-05 10:08:38 +02:00
unknown
38486b33c6 Merge joreland@bk-internal:/home/bk/mysql-4.1
into melody.local:/home/mysqldev/jonas/mysql-4.1
2004-07-05 07:59:34 +02:00
unknown
1042c0e86b BUG#4384
ndb/src/common/util/ConfigValues.cpp:
  BUG#4384
  Compute pointers manually instead of using ptr[-x]
  Changed return type from "*&" to "**"
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2004-07-05 07:52:20 +02:00
unknown
298ce27e92 - fixed typo in mysql-test/ndb/ndbcluster.sh that caused a
"test: argument expected" error when trying to run the NDB test
   suite on Solaris


mysql-test/ndb/ndbcluster.sh:
   - fixed typo that caused a "test: argument expected" error when trying
     to run the NDB test suite on Solaris
2004-07-05 07:48:09 +02:00
unknown
41b04a9b1e Fix mysql-test-run ndb order by/endian issue 2004-07-05 07:14:45 +02:00
unknown
a7909ab90a Merge mysql.com:/home/jonas/src/mysql-4.1
into mysql.com:/home/jonas/src/gcc34
2004-07-04 21:20:39 +02:00
unknown
d760bfd6b0 Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1
into ice.snake.net:/Volumes/ice2/MySQL/bk/mysql-4.1


configure.in:
  Auto merged
2004-07-02 17:32:47 -05:00
unknown
5b38494800 item_geofunc.cc:
Minor comment tweaks.


sql/item_geofunc.cc:
  Minor comment tweaks.
2004-07-02 16:22:46 -05:00
unknown
3214bf8117 Added comments to the PS test files, to prevent modifications which may destroy the tests .
mysql-test/include/ps_create.inc:
  Added comments
mysql-test/include/ps_modify.inc:
  added comments
mysql-test/include/ps_modify1.inc:
  Added comments
mysql-test/include/ps_query.inc:
  Added and modified comments
mysql-test/t/ps_1general.test:
  Description of the test structure and rules how to extend the tests added and one comment modified .
mysql-test/t/ps_2myisam.test:
  Added comments
mysql-test/t/ps_3innodb.test:
  added comments
mysql-test/t/ps_4heap.test:
  added and altered comments
mysql-test/t/ps_5merge.test:
  added comments
mysql-test/t/ps_6bdb.test:
  added comments
2004-07-02 20:01:34 +02:00
unknown
ef389ca0b2 Fixed ndbcluster_print_error to use table name from failed NdbOperation 2004-07-02 16:14:08 +02:00
unknown
c345fc0f82 Bug #4374 SHOW TABLE STATUS FROM ignores collation_connection 2004-07-02 16:52:02 +05:00
unknown
8ad0e2a2b5 Added support for update of pk 2004-07-02 11:50:28 +02:00
unknown
6b577437b9 configure.in:
armscii8_bin was referenced to as armscii_bin.


configure.in:
  armscii8_bin was referenced to as armscii_bin.
2004-07-02 13:33:26 +05:00
unknown
0fb0143d07 armscii8_bin was referenced to as armscii_bin in a mistake. 2004-07-02 13:27:46 +05:00
unknown
33c7a1fc15 Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1
into ice.snake.net:/Volumes/ice2/MySQL/bk/mysql-4.1
2004-07-01 23:33:44 -05:00
unknown
31a2dc300f Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into here.mwagner.org:/Volumes/BK/mysql-4.1
2004-07-01 14:48:58 -05:00
unknown
215e6848a6 Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1
into ice.snake.net:/Volumes/ice2/MySQL/bk/mysql-4.1


configure.in:
  Auto merged
2004-07-01 12:01:26 -05:00
unknown
9890cd9a9e Merge mleich@bk-internal.mysql.com:/home/bk/mysql-4.1
into zero.local.lan:/GORDON/MySQL/mysql-4.1/src
2004-07-01 16:35:52 +02:00
unknown
f2e036aa5f WL#1564 Intensive test of prepared statements via 'mysqltest'
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2004-07-01 16:30:29 +02:00
unknown
0fc82282cb Portability fixes (For Netware)
mysql-test/r/rpl_delete_all.result:
  Portability fix
mysql-test/t/rpl_delete_all.test:
  Portability fix
netware/BUILD/compile-netware-standard:
  Patch from novell
2004-07-01 17:26:45 +03:00
unknown
904ab369e1 - tagged ChangeSet 1.2023 as "mysql-4.1.3"
- bumped up version number in configure.in: 4.1.3-beta -> 4.1.4-beta


configure.in:
   - bumped up version number: 4.1.3-beta -> 4.1.4-beta
2004-07-01 14:41:51 +02:00
unknown
18ee3ae493 Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1
into ice.snake.net:/Volumes/ice2/MySQL/bk/mysql-4.1
2004-07-01 07:40:32 -05:00
unknown
007b18d9da Merge here.mwagner.org:/Volumes/BK/mysql-4.1
into here.mwagner.org:/Volumes/BK/mysql-4.1-work
2004-06-30 23:31:33 -05:00
unknown
208b362de8 mysql-copyright:
Fix for the condition when "the_fat" doesn't end with 'dnl\n', but ')\n'.


Build-tools/mysql-copyright:
  Fix for the condition when "the_fat" doesn't end with 'dnl\n', but ')\n'.
2004-06-30 23:29:47 -05:00
unknown
b694101fce client.c, libmysql.c:
Symbol spelling change.
errmsg.c:
  Client error message edits.
errmsg.h:
  Two symbol spelling changes.


include/errmsg.h:
  Two symbol spelling changes.
libmysql/errmsg.c:
  Client error message edits.
libmysql/libmysql.c:
  Symbol spelling change.
sql-common/client.c:
  Symbol spelling change.
2004-06-30 22:18:41 -05:00
unknown
f22e1c5b56 Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1
into ice.snake.net:/Volumes/ice2/MySQL/bk/mysql-4.1
2004-06-30 14:18:34 -05:00
unknown
0426c065c1 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-30 10:38:56 -05:00
unknown
1ed75f5679 Added flexibility for connecting and retrieving config from mgmtsrvr 2004-06-30 14:56:16 +00:00
unknown
426b2ac2b4 fix not to have to set TCP DEFAULT 2004-06-30 13:26:31 +00:00
unknown
12e9f0103a Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-ndb
2004-06-30 13:12:24 +00:00
unknown
e28b793213 see respective file
ndb/src/common/mgmcommon/ConfigInfo.cpp:
  fix SHM config + cosmetics
ndb/src/common/mgmcommon/LocalConfig.cpp:
  use autoptr
ndb/src/common/transporter/SHM_Transporter.cpp:
  fixed SHM transporter setup
ndb/src/common/transporter/SHM_Transporter.hpp:
  fixed SHM transporter setup
ndb/src/common/transporter/SHM_Transporter.unix.cpp:
  fixed SHM transporter setup
ndb/src/kernel/vm/Configuration.cpp:
  removed check of connectstring
2004-06-30 12:29:53 +00:00
unknown
79f7645b5b Merge lgrimmer@build.mysql.com:/home/bk/mysql-4.1
into mysql.com:/space/my/mysql-4.1
2004-06-30 14:19:31 +02:00
unknown
667c74144b Merge mysql.com:/space/my/mysql-4.1
into mysql.com:/space/my/mysql-4.1-build
2004-06-30 14:02:32 +02:00
unknown
c2668e106b - fixed server RPM postinstall (mysql_install_db was called with the
wrong parameter)
2004-06-30 14:01:31 +02:00
unknown
ee88811146 ctype-uca.c:
mbminlen was wrong for UTF8.


strings/ctype-uca.c:
  mbminlen was wrong for UTF8.
2004-06-30 14:45:08 +05:00
unknown
f671a1339b Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1
into ice.snake.net:/Volumes/ice2/MySQL/bk/mysql-4.1
2004-06-29 21:33:05 -05:00
unknown
0193768acd Reword some client error messages. 2004-06-29 12:28:45 -05:00
unknown
c46e4aca66 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/my/mysql-4.1
2004-06-29 18:20:06 +03:00
unknown
d90a88a55b Apply patch from Novell
netware/init_db.sql:
  Add time_zone tables
netware/mysql_test_run.c:
  Portability fix (log -> log_msg)
2004-06-29 18:19:35 +03:00
unknown
64c81b9dfd fixed compile of shm transporter
ndb/src/mgmsrv/Services.cpp:
  changed getsockname to getpeername
2004-06-29 14:56:02 +00:00
unknown
a1ef616c32 Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
into mysql.com:/space/pekka/ndb/version/my41
2004-06-29 14:57:31 +02:00
unknown
ac5a2ead92 wl1822: verify locks are flushed 2004-06-29 14:53:15 +02:00