Commit graph

13341 commits

Author SHA1 Message Date
unknown
eebf8ff512 testScan -n ScanReadError5023
Don't wait for more SCANTAB_CONF when received SCAN_TABREF


ndb/src/ndbapi/NdbScanOperation.cpp:
  Don't wait for more SCANTAB_CONF when received SCAN_TABREF
  More debug
2004-07-06 21:48:04 +02:00
unknown
cb76ceb14f fix for testTransactions -n InsertInsert
- Add sequence to the initial trans id so that create/drop ndb object
  don't generate same transid


ndb/src/ndbapi/NdbConnection.cpp:
  Add sequence to the initial trans id so that create/drop ndb object
  don't generate same transid
ndb/src/ndbapi/Ndbif.cpp:
  Add sequence to the initial trans id so that create/drop ndb object
  don't generate same transid
ndb/src/ndbapi/TransporterFacade.cpp:
  Add sequence to the initial trans id so that create/drop ndb object
  don't generate same transid
ndb/src/ndbapi/TransporterFacade.hpp:
  Add sequence to the initial trans id so that create/drop ndb object
  don't generate same transid
2004-07-06 20:57:59 +02:00
unknown
e75a7add4e Merge mysql.com:/home/jonas/src/mysql-4.1
into mysql.com:/home/jonas/src/mysql-4.1-ndb
2004-07-06 17:50:54 +02:00
unknown
8ce9725e53 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/jonas/src/mysql-4.1
2004-07-06 17:49:34 +02:00
unknown
f1ef636a3d Merge mysql.com:/home/jonas/src/mysql-4.1
into mysql.com:/home/jonas/src/mysql-4.1-ndb


mysql-test/mysql-test-run.sh:
  Auto merged
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Auto merged
2004-07-06 17:47:56 +02:00
unknown
10935692c9 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/jonas/src/mysql-4.1
2004-07-06 17:46:13 +02:00
unknown
f5652ffa15 Fixed typo 2004-07-06 17:45:37 +02:00
unknown
6407a93259 Merge acurtis@bk-internal.mysql.com:/home/bk/mysql-4.1
into ltantony.rdg.cyberkinetica.com:/usr/home/antony/work/bug4407.1
2004-07-06 16:43:39 +01:00
unknown
8da691f38c Bug#4407 - assertion in ha_myisam.cc
Fix assertion failure where ha_myisam::index_next() is called
  without first calling ha_myisam::ha_index_init()


BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2004-07-06 16:30:50 +01:00
unknown
f1b37d3e30 Merge bk-internal.mysql.com:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1


client/mysqltest.c:
  Auto merged
2004-07-06 16:30:04 +02:00
unknown
68aec1e48d mysql_fix_privilege_tables.sh:
various fixes (for mysql-test-run at least):
  * accept --no-defaults
  * 4.0 compatible password handling (only it no other argumensts, only if doesn't start with --)
ps_3innodb.test:
  only run ps_3innodb.test if innodb is present
mysql-test-run.sh:
  it's --verbose, not --verbose=1


mysql-test/mysql-test-run.sh:
  it's --verbose, not --verbose=1
mysql-test/t/ps_3innodb.test:
  only run ps_3innodb.test if innodb is present
scripts/mysql_fix_privilege_tables.sh:
  various fixes (for mysql-test-run at least):
  * accept --no-defaults
  * 4.0 compatible password handling (only it no other argumensts, only if doesn't start with --)
2004-07-06 16:29:26 +02:00
unknown
692f440b42 HAVE_RTREE_KEYS are enabled on windows too 2004-07-06 14:24:44 +02:00
unknown
b5f66b02a4 mysqltest.c:
Bug #4338  	mysql-test-run fails if compiled with non-latin1 character set.


client/mysqltest.c:
  Bug #4338  	mysql-test-run fails if compiled with non-latin1 character set.
2004-07-06 17:18:04 +05:00
unknown
dce5cc109d Bug#4417 binary character set breaks multi-byte table/field name. 2004-07-06 17:15:43 +05:00
unknown
133c244d19 Merge bk-internal.mysql.com:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2004-07-06 14:05:41 +02:00
unknown
6ecb255734 re-enable spatial features for windows
grr
2004-07-06 13:56:50 +02:00
unknown
e1fdd5f639 wl1873 Add ScanRestart to daily-basic-tests
ndb/test/run-test/daily-basic-tests.txt:
  Add ScanRestart to daily-basic-tests
2004-07-06 11:43:48 +02:00
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
82912d989c Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/jonas/src/mysql-4.1
2004-07-06 10:45:53 +02:00
unknown
46f90a6a3e rpl_charset.result, rpl_charset.test:
An addition to 1.2036 04/07/02: armscii8_bin was referenced to as armscii_bin in a mistake.


mysql-test/t/rpl_charset.test:
  An addition to 1.2036 04/07/02: armscii8_bin was referenced to as armscii_bin in a mistake.
mysql-test/r/rpl_charset.result:
  An addition to 1.2036 04/07/02: armscii8_bin was referenced to as armscii_bin in a mistake.
2004-07-06 13:43:15 +05: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
a44942a74b unused (and unnecessary) mysqltest commands removed
client/mysqltest.c:
  unused (and unnecessary) commands removed
2004-07-02 11:02:21 +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