Commit graph

33083 commits

Author SHA1 Message Date
unknown
cb721c50ba added missing files 2006-04-21 02:01:13 +02:00
unknown
15fca2ef57 diabled failing tests again 2006-04-21 01:59:22 +02:00
unknown
6e3263b87e Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new


storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Auto merged
2006-04-21 01:56:15 +02:00
unknown
c1b3f8db0f Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
2006-04-21 01:53:44 +02:00
unknown
7d259218f8 Bug#18594 ndb_restore log boken in 5.1
- added compatability with 5.0
- added test case for compatability with 5.0 and 5.1


mysql-test/std_data/ndb_backup50/BACKUP-1-0.1.Data:
  New BitKeeper file ``mysql-test/std_data/ndb_backup50/BACKUP-1-0.1.Data''
mysql-test/std_data/ndb_backup50/BACKUP-1-0.2.Data:
  New BitKeeper file ``mysql-test/std_data/ndb_backup50/BACKUP-1-0.2.Data''
mysql-test/std_data/ndb_backup50/BACKUP-1.1.log:
  New BitKeeper file ``mysql-test/std_data/ndb_backup50/BACKUP-1.1.log''
mysql-test/std_data/ndb_backup50/BACKUP-1.2.log:
  New BitKeeper file ``mysql-test/std_data/ndb_backup50/BACKUP-1.2.log''
mysql-test/std_data/ndb_backup51/BACKUP-1-0.1.Data:
  New BitKeeper file ``mysql-test/std_data/ndb_backup51/BACKUP-1-0.1.Data''
mysql-test/std_data/ndb_backup51/BACKUP-1-0.2.Data:
  New BitKeeper file ``mysql-test/std_data/ndb_backup51/BACKUP-1-0.2.Data''
2006-04-21 01:51:58 +02:00
unknown
dc3e7bdc87 fix for make distcheck 2006-04-20 23:04:55 +02:00
unknown
d9e551672d bug#19220
mi_open() should accept filename w/i extension and with .MYI
2006-04-20 23:03:13 +02:00
unknown
214fcab9e2 BUG#18594 ndb_restore log boken in 5.1
- corrected log read after fragment id addition
2006-04-20 22:04:09 +02:00
unknown
73434916f6 ndb/repl - bug#19004 rpl_ndb_2myisam ok, rpl_ndb_2innodb new bug(number)19227
mysql-test/include/rpl_multi_engine3.inc:
  add some sleep for __slow__ replication
mysql-test/t/disabled.def:
  enable rpl_ndb_2myisam but keep rpl_ndb_2innodb disabled, new bug#19227
2006-04-20 18:53:23 +02:00
unknown
52b0bb6ed4 added missing cleanup in test causing later test to fail 2006-04-20 15:28:31 +02:00
unknown
383925f179 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
2006-04-20 14:47:49 +02:00
unknown
6f5cf392ff Bug #19214 running mysqld without binlog causes 10s timeout to drigger on schema ops
- binlog thread should not wait for apply status share if binlog is not enabled
2006-04-20 14:44:16 +02:00
unknown
526ae03c5a add mysql test run (from shell script) option to skip binlogs 2006-04-20 14:43:06 +02:00
unknown
68bb403c5b Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new
2006-04-20 13:35:31 +02:00
unknown
f9d56ce8ef Fix for bug#19196: Attempt to create index on usupported field type gives wrong error code: updated with new expected error codes 2006-04-20 13:32:41 +02:00
unknown
ae3e853870 Merge mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new


storage/ndb/include/kernel/signaldata/TupFrag.hpp:
  Auto merged
storage/ndb/include/util/NdbSqlUtil.hpp:
  Auto merged
storage/ndb/src/common/util/NdbSqlUtil.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtux/DbtuxMeta.cpp:
  Auto merged
mysql-test/r/ndb_bitfield.result:
  Merge, will generate new result file manually
storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Merge
2006-04-20 12:10:09 +02:00
unknown
316c96fa81 Fix for bug#19196: Attempt to create index on usupported field type gives wrong error code 2006-04-20 12:06:22 +02:00
unknown
c2911e9425 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/mysql-test-run.pl:
  Auto merged
2006-04-20 12:06:14 +02:00
unknown
d4e3ca7862 Fix build of taocrypt. Don't mention /GX or /EHsc as that will turn ON exception handling and not off as we want.
extra/yassl/taocrypt/cmakelists.txt:
  Don't write anything about /GX or /EHsc as cmake will detect that and turn exception handling ON. Since it's off by default, that is what we want.
2006-04-20 11:59:12 +02:00
unknown
a008bb512d Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new
2006-04-20 11:11:21 +02:00
unknown
01aba07c47 Merge mysql.com:/home/bkroot/mysql-5.1-new
into  mysql.com:/home/bk/b17400-mysql-5.1-new
2006-04-20 09:00:49 +02:00
unknown
e0127921c6 Bug#16993 (ALTER TABLE ADD col AUTO_INCREMENT does not replicate):
Removed rpl_ndb_relay_space test since it does not make sense (in
its current form) for NDB.


BitKeeper/deleted/.del-rpl_ndb_relay_space.test~55e5e4b13d3936d0:
  Delete: mysql-test/t/rpl_ndb_relay_space.test
BitKeeper/deleted/.del-rpl_ndb_relay_space.result~a44835cdd2210d18:
  Delete: mysql-test/r/rpl_ndb_relay_space.result
2006-04-20 08:56:47 +02:00
unknown
eabd990341 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
2006-04-20 03:20:03 +02:00
unknown
c8171434ae ndb uncomitted row count cont'd, applying new fix since last one was no good 2006-04-20 03:05:50 +02:00
unknown
c5363887e7 cluster: letting first mysql server startup properly before tstarting next 2006-04-19 23:50:51 +02:00
unknown
9a1a9ecc00 small correction in thd_ndb hash_init 2006-04-19 23:49:51 +02:00
unknown
2ff336e27a BUG#17400 enabled rpl_ndb_dd_partitions 2006-04-19 23:46:40 +02:00
unknown
1f4dd29c00 Turn on test timing in mysql-test-run.pl by default, and clean up usage docs.
mysql-test/mysql-test-run.pl:
  Turn on test timing by default, but make it so it can be turned off with
  --notimer. Also clean up the mysql-test-run.pl usage information a little
  bit, and add --benchdir to it.
2006-04-19 14:09:49 -07:00
unknown
8d3e92e320 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-19 22:46:01 +02:00
unknown
271cf5ed5c Merge mysql.com:/home/jimw/my/mysql-5.1-old-scripts
into  mysql.com:/home/jimw/my/mysql-5.1-clean
2006-04-19 13:11:58 -07:00
unknown
2fd747a5da Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
2006-04-19 21:31:58 +02:00
unknown
47ba0146ec corrected wrong usage of hash 2006-04-19 21:30:22 +02:00
unknown
213a6d1031 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-19 19:56:52 +02:00
unknown
b538c3522a Disabling test that fails. There is already a bug for the failure.
mysql-test/t/disabled.def:
  Disabling failing test.
2006-04-19 19:53:17 +02:00
unknown
43b1977f4c BUG#19198 mysqld failure during DBT2
crash of mysqld due to null tOp in
NdbTransaction::getNdbIndexScanOperation(NdbIndexImpl*,NdbTableImpl*)


storage/ndb/src/ndbapi/NdbTransaction.cpp:
  tOp could be null, don't fiddle with it if it is.
2006-04-20 02:29:26 +10:00
unknown
8f2c82b383 removed use of local data in local cache in preparation for removing local cache usage all together 2006-04-19 18:29:25 +02:00
unknown
24c005cf2b Merge mysql.com:/home/bkroot/mysql-5.1-new
into  mysql.com:/home/bk/b17400-mysql-5.1-new
2006-04-19 15:33:31 +02:00
unknown
d77cfdc756 Bug#16993 (ALTER TABLE ZEROFILL AUTO_INCREMENT not replicated correctly):
This is not a bug. Enabling disabled test and adding comment.


mysql-test/extra/rpl_tests/rpl_sv_relay_space.test:
  Adding comment about test.
mysql-test/r/rpl_ndb_relay_space.result:
  Result change.
mysql-test/r/rpl_relay_space_innodb.result:
  Result change.
mysql-test/r/rpl_relay_space_myisam.result:
  Result change.
mysql-test/t/disabled.def:
  Enabling test
2006-04-19 15:29:49 +02:00
unknown
db37c0d615 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
2006-04-19 14:58:42 +02:00
unknown
37fdc23672 BUG#18094 Slave caches invalid table definition after atlters causes select failure
- return correct object status from ndb dictionary
- check for validity of index retrieved from index, and retry if invalid
2006-04-19 14:54:39 +02:00
unknown
cbdc730ae5 Fixed timeing problem by ignoring failures and results from first select after table definition change
mysql-test/r/ndb_alter_table2.result:
  Fixed timeing problem by ignoring failures and results from first select after table definition changethe
mysql-test/r/ndb_alter_table_stm.result:
  Fixed timeing problem by ignoring failures and results from first select after table definition changethe
2006-04-19 12:21:33 +03:00
unknown
1fa3cdd006 Merge mysql.com:/home/bkroot/mysql-5.1-new
into  mysql.com:/home/bk/b17400-mysql-5.1-new


mysql-test/t/disabled.def:
  Merge with mysql-5.1-new
2006-04-19 10:58:44 +02:00
unknown
97cddd4a30 Only run test with row based logging 2006-04-19 11:20:11 +03:00
unknown
2ae7db326d Fix wrong auto merge 2006-04-19 11:17:32 +03:00
unknown
030945969f Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/home/my/mysql-5.1


mysys/my_access.c:
  Auto merged
2006-04-19 11:09:33 +03:00
unknown
c44eff55ba Fixed compilation error
ensure check_if_legal_table_name is also defined on unix
2006-04-19 11:08:22 +03:00
unknown
b965209489 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/usr/home/bar/mysql-5.1-new
2006-04-19 12:52:54 +05:00
unknown
1b373a400c my_access.c:
After merge fix.


mysys/my_access.c:
  After merge fix.
2006-04-19 12:51:30 +05:00
unknown
55668cb435 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/home/my/mysql-5.1
2006-04-19 10:41:33 +03:00
unknown
31024b7c4a Fix compilation failure when compiling with BUILD/compile-pentium-debug-max
(Problem with embedded server and ndb)
Fix broken mysql-test-run.sh
Removed memory leak in ha_example.cc


libmysqld/Makefile.am:
  Fix compiler failure (libmysqld.a was empty)
  Reason was that 'cd' did an echo that confused 'ar'
mysql-test/mysql-test-run.pl:
  Make the port number in a nice range
mysql-test/mysql-test-run.sh:
  Remove deprication message until speed of mysql-test-run.pl is comparable to mysql-test-run.sh
  Fix code that jimw broke in his last change
storage/example/ha_example.cc:
  Removed memory leak
  (example_done_func was not called)
2006-04-19 10:39:57 +03:00