Commit graph

20138 commits

Author SHA1 Message Date
unknown
fa1ee8986d Fix for BUG#8579 (failing test case): Allow small differences in #rows estimate in test results 2005-02-22 18:30:44 +03:00
unknown
3d9ee100f7 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/psergey/mysql-5.0-build
2005-02-22 18:22:39 +03:00
unknown
db895ce720 Fix for BUG#8578 "Test case 'index_merge_ror' fails on SGI irix"
Take into account that bitmap_is_set() may return any non-zero zero value when the bit is set.
2005-02-22 18:00:01 +03:00
unknown
3bd16c794e Merge heikki@bk-internal.mysql.com:/home/bk/mysql-5.0
into hundin.mysql.fi:/home/heikki/mysql-5.0
2005-02-22 16:20:47 +02:00
unknown
10ffa887f0 trx0trx.c:
Disable the XA code in InnoDB crash recovery; when Jan and Sergei want to test XA, they should revert this patch


innobase/trx/trx0trx.c:
  Disable the XA code in crash recovery; when Jan and Sergei want to test XA, they should revert this patch
2005-02-22 16:18:34 +02:00
unknown
59554966bb Fixed a bug on InnoDB X/Open XA prepare. 2005-02-22 15:40:13 +02:00
unknown
acaa20e21e Clean up prints in innodb_xa_prepare. 2005-02-22 15:03:17 +02:00
unknown
8b84cb93bb Merge jlindstrom@bk-internal.mysql.com:/home/bk/mysql-5.0
into hundin.mysql.fi:/home/jan/mysql-5.0
2005-02-22 14:40:43 +02:00
unknown
0865c81c09 Copy X/Open XA XID from trx structure to a list in recovery. 2005-02-22 14:39:15 +02:00
unknown
6965e72bd0 Fixed compiler warnings
Fixed failing myisam.test and rpl_rotate_logs.test on some configurations


mysql-test/r/myisam.result:
  Portability fix
mysql-test/r/rpl_rotate_logs.result:
  Portability fix
mysql-test/t/myisam.test:
  Depending on if you compiled with -DHAVE_RAID or not, you could get different errors for this test
mysql-test/t/rpl_rotate_logs.test:
  Portability fix
sql/ha_innodb.cc:
  Fixed compiler warnings
2005-02-22 14:15:50 +02:00
unknown
f7c60b9f03 Fix name of ndb-cache-check-time
sql/mysqld.cc:
  Change _ to - for ndb-cache-check-time variable
2005-02-22 10:59:24 +01:00
unknown
8094ac95d5 Merge mysql.com:/home/jonas/src/fix
into mysql.com:/home/jonas/src/mysql-5.0
2005-02-22 10:23:24 +01:00
unknown
029f10dd85 wl1292 - ndb autotest scripts
split into script/conf for easier deployment
2005-02-22 10:18:38 +01:00
unknown
17cca96ec9 MYSQL_LOG::recover was trying to allocate 0 bytes - bug#8661 2005-02-22 00:43:37 +01:00
unknown
06f3307b45 Merge bk-internal:/home/bk/mysql-5.0
into serg.mylan:/usr/home/serg/Abk/mysql-5.0


sql/log.cc:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
2005-02-22 00:17:56 +01:00
unknown
3ad8d4ba88 bug#8646 - deadlock if long transaction causes binlog rotate
sql/sql_yacc.yy:
  duplicated symbol removed
2005-02-22 00:15:31 +01:00
unknown
8a3c137b5e corrected errors in how ndbcluster handler closes down in case of error 2005-02-21 23:29:07 +01:00
unknown
0c1dc07df0 Merge bk-internal:/home/bk/mysql-5.0
into mysql.com:/home/mysqldev/tulin/mysql-5.0
2005-02-21 23:05:13 +01:00
unknown
9785419d1e Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
2005-02-21 23:05:12 +01:00
unknown
7eefd9d635 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/my/mysql-5.0
2005-02-21 20:42:34 +02:00
unknown
8cb6031dd7 Generate warning in ha_delete_table() if files is missing in handler
mysql-test/r/myisam.result:
  Test of DROP TABLE when .MYI or .MYD is missing
mysql-test/r/ndb_autodiscover.result:
  Update test results
mysql-test/r/rpl_EE_error.result:
  Change test to conform with new handling of drop table when handler file is missing
mysql-test/t/myisam.test:
  Test of DROP TABLE when .MYI or .MYD is missing
mysql-test/t/rpl_EE_error.test:
  Change test to conform with new handling of drop table when handler file is missing
sql/handler.cc:
  Generate a warning in ha_delete_table() if we get an error from 'delete_table()'
sql/handler.h:
  More parameters to ha_delete_table() so that we can generate better error messages
sql/sql_table.cc:
  Generate warning in ha_delete_table()
2005-02-21 20:41:48 +02:00
unknown
5eaa8cef88 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0


sql/item.h:
  Auto merged
sql/sql_select.cc:
  Auto merged
2005-02-21 19:11:11 +01:00
unknown
7a43b4c665 ha_innodb.cc:
Fix crash reported by Pekka Nousiainen if skip-innodb: do not try to release InnoDB's temporary latches if InnoDB has not been inited


sql/ha_innodb.cc:
  Fix crash reported by Pekka Nousiainen if skip-innodb: do not try to release InnoDB's temporary latches if InnoDB has not been inited
2005-02-21 18:54:06 +02:00
unknown
9cba39cab4 Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0
into deer.(none):/home/hf/work/mysql-5.0.clean
2005-02-21 20:54:05 +04:00
unknown
9c1130e27b Fix for bug #8651 (cast(sum(distinct) as decimal) crashes the server)
sql/item_sum.cc:
  curr_dec_buff should be set to 0 here
2005-02-21 20:50:56 +04:00
unknown
0baf8fabee show automatic commits in general log 2005-02-21 16:28:05 +01:00
unknown
ce793fbf1d Merge bk-internal:/home/bk/mysql-5.0
into mysql.com:/home/mysqldev/tulin/mysql-5.0
2005-02-21 16:23:05 +01:00
unknown
ac1852b403 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/my/mysql-5.0
2005-02-21 17:23:05 +02:00
unknown
80ddfccfa7 Merge bk-internal:/home/bk/mysql-5.0
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2005-02-21 16:23:04 +01:00
unknown
9a1482739e Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0
into deer.(none):/home/hf/work/mysql-5.0.clean
2005-02-21 19:23:03 +04:00
unknown
cd32f96095 Tests modified to coved decimal-related code
mysql-test/r/analyse.result:
  test result extended
mysql-test/r/cast.result:
  test result extended
mysql-test/r/func_group.result:
  test result extended
mysql-test/r/subselect.result:
  test result extended
mysql-test/t/analyse.test:
  test extended
mysql-test/t/cast.test:
  test extended
mysql-test/t/func_group.test:
  test extended
mysql-test/t/subselect.test:
  test extended
2005-02-21 19:20:05 +04:00
unknown
4dc49b956a Merge bk-internal:/home/bk/mysql-5.0
into mysql.com:/home/mysqldev/tulin/mysql-5.0
2005-02-21 15:07:27 +01:00
unknown
f3d2090efb Merge mysql.com:/usr/local/bk/mysql-5.0
into mysql.com:/home/pem/work/mysql-5.0
2005-02-21 15:04:41 +01:00
unknown
2be9619682 Cleanup.
mysql-test/t/type_bit.test:
  Cleanup (we don't need to have include/have_innodb.inc here).
2005-02-21 18:03:06 +04:00
unknown
3c2e7f1e97 A minor adjustment of the previous bug fix in sp_head.cc.
(Which btw also fixed BUG#7295: Server crash when executing stored procedure,
 I just forgot to include that before.)


sql/sp_head.cc:
  A minor adjustment of the previous bug fix; moved the rollback of item changes
  to a better place which will not miss some cases.
2005-02-21 14:57:43 +01:00
unknown
926826f5da Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/usr/home/ram/work/5.0
2005-02-21 17:38:37 +04:00
unknown
f36c4a9378 workaround for sun compiler on sol9x86 2005-02-21 14:04:35 +01:00
unknown
453809f3a4 Fix compiler warning/crash(ds20)
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Moved ndbrequire and break down one line, to avoid warnings and compiler crash
2005-02-21 14:01:36 +01:00
unknown
ecc4d85066 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/usr/home/ram/work/5.0
2005-02-21 16:53:00 +04:00
unknown
32895fe37b Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/my/mysql-5.0


sql/handler.cc:
  Auto merged
sql/handler.h:
  Auto merged
sql/log.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
2005-02-21 14:48:44 +02:00
unknown
d50af8aece Review of new pushed code (XA & other)
Portability fixes and cleanups
Fixed setting of 'res' in mysql_execute_command()


sql/handler.cc:
  delete_table() will not return error for not found files if one handler file was found and deleted
sql/handler.h:
  Incremented MAX_HA so that ndb works again
  Don't convert char pointer to (my_xid*) as we don't know if the address is aligned on 8
sql/log.cc:
  Indentation fixes
  Simplified loop to find next log
  Fixed race condition in reset_logs that caused mix_innodb_myisam_binlog to fail
sql/log_event.cc:
  Don't convert char pointer to (my_xid*) as we don't know if the address is aligned on 8
sql/sql_acl.cc:
  Convert db name directly to avoid extra strmov
sql/sql_base.cc:
  Added comment
  Removed not needed code
sql/sql_db.cc:
  Added comment
  Remove not needed code
sql/sql_parse.cc:
  Always call mysql_rm_db() with lower case db name
  Ensure that 'res' is set correctly in mysql_execute_command()
  (One don't have to set res if one calls my_error() and res should be = 0 for correct commands)
sql/sql_repl.cc:
  Indentation fixes
  use packet->ptr() instead of packet->c_ptr()
sql/sql_table.cc:
  Join similar code when table didn't exist in engine
2005-02-21 14:47:57 +02:00
unknown
3f0fedc483 Merge bk-internal:/home/bk/mysql-5.0
into mysql.com:/home/mysqldev/tulin/mysql-5.0
2005-02-21 13:39:29 +01:00
unknown
07f2634e2c A fix (bug #7661: 'classic' shows different test effects which must be cared for)
"create table ta(a bit...) engine=innodb" moved to innodb.test


mysql-test/r/innodb.result:
  A fix (bug #7661: 'classic' shows different test effects which must be cared for)
mysql-test/r/type_bit.result:
  A fix (bug #7661: 'classic' shows different test effects which must be cared for)
mysql-test/t/innodb.test:
  A fix (bug #7661: 'classic' shows different test effects which must be cared for)
mysql-test/t/type_bit.test:
  A fix (bug #7661: 'classic' shows different test effects which must be cared for)
2005-02-21 16:39:13 +04:00
unknown
573ba7e209 Merge bk-internal:/home/bk/mysql-5.0
into mysql.com:/home/mysqldev/tulin/mysql-5.0
2005-02-21 12:24:28 +01:00
unknown
0fc34660bb Merge bk-internal:/home/bk/mysql-5.0
into serg.mylan:/usr/home/serg/Abk/mysql-5.0


sql/handler.cc:
  Auto merged
sql/log.cc:
  Auto merged
2005-02-21 11:57:06 +01:00
unknown
2d044701a9 xa assert fixes
sql/handler.cc:
  more DBUG
sql/handler.h:
  increase MAX_HA (ha_archive has its handlerton too)
sql/log.cc:
  fix assert
2005-02-21 11:51:50 +01:00
unknown
b526f43411 ndb - ndb_multi - reset query cache at end of test
mysql-test/r/ndb_cache_multi2.result:
  reset query cache settings on end of test
mysql-test/t/ndb_cache_multi2.test:
  reset query cache settings on end of test
2005-02-21 11:45:51 +01:00
unknown
f4966976bd Merge bk-internal:/home/bk/mysql-5.0
into mysql.com:/home/mysqldev/tulin/mysql-5.0
2005-02-21 10:55:21 +01:00
unknown
493911bdde ndb - fix problems introduced/discovered by XA
sql/ha_ndbcluster.cc:
  Respect "all" flag so that correct transaction is released
sql/handler.cc:
  Make sure innodb temporary latches are only released if innodb is used
2005-02-21 10:53:19 +01:00
unknown
ca61f67ce9 Merge mysql.com:/home/mysqldev/tulin/mysql-4.1
into mysql.com:/home/mysqldev/tulin/mysql-5.0


scripts/make_binary_distribution.sh:
  Auto merged
2005-02-21 10:53:01 +01:00