Commit graph

29414 commits

Author SHA1 Message Date
unknown
5872e5aeb9 Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/space/pekka/ndb/version/my51
2006-01-12 17:01:34 +01:00
unknown
53462e3be3 Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into lmy004.:/work/mysql-5.1-tt-copy-works
2006-01-12 17:01:33 +01:00
unknown
eb2012034c WL #1034 (Internal CRON) post-push update
- fix compile failure on QNX and FreeBSD


sql/event_executor.cc:
  time_t and my_time_t seem have the same length so cast
  in tztime.cc it's already done this way.
  Precautionary check at runtime about the sizes of my_time_t and time_t
sql/event_timed.cc:
  do time_t* cast to satisfy compilers on various platforms
  (QNX, FreeBSD)
2006-01-12 16:51:45 +01:00
unknown
7e1ea97a5a Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/space/pekka/ndb/version/my51
2006-01-12 16:43:51 +01:00
unknown
56842e5e77 Merge bk-internal:/home/bk/mysql-5.1-new
into  mysql.com:/usr/local/mysql/tmpbuild-5.1
2006-01-12 16:43:50 +01:00
unknown
c126958fdc ndb - wl#2972 tiny bugfix
storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp:
  bugfix
storage/ndb/test/ndbapi/test_event_merge.cpp:
  continue
2006-01-12 16:34:57 +01:00
unknown
78711a860b Merge mysql.com:/space/pekka/ndb/version/my51
into  mysql.com:/space/pekka/ndb/version/my51-rbr
2006-01-12 16:17:40 +01:00
unknown
f8d126a059 Sun compiler fixes.
storage/ndb/src/kernel/blocks/dbtup/DbtupBuffer.cpp:
  Fix Sun compiler bug: does not recognize that foo(t *) and foo(t * const)
  are the same function.
storage/ndb/src/kernel/blocks/dbtup/DbtupFixAlloc.cpp:
  Fix Sun compiler bug: does not recognize that foo(t *) and foo(t * const)
  are the same function.
storage/ndb/src/kernel/blocks/dbtup/DbtupPageMap.cpp:
  Fix Sun compiler bug: does not recognize that foo(t *) and foo(t * const)
  are the same function.
storage/ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp:
  Fix Sun compiler bug: does not recognize that foo(t *) and foo(t * const)
  are the same function.
storage/ndb/src/kernel/blocks/dbtup/DbtupTrigger.cpp:
  Fix Sun compiler bug: does not recognize that foo(t *) and foo(t * const)
  are the same function.
storage/ndb/src/kernel/vm/ndbd_malloc_impl.cpp:
  Add missing return value, otherwise Sun compiler complains.
2006-01-12 15:40:38 +01:00
unknown
c6599bfc5f Merge jmiller@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/home/ndbdev/jmiller/clones/mysql-5.1-new
2006-01-12 14:43:59 +01:00
unknown
ed2ecea404 ndb_dd_ddl.test:
Added requested changes to test.


mysql-test/t/ndb_dd_ddl.test:
  Added requested changes to test.
2006-01-12 14:31:42 +01:00
unknown
a80cfc9e1a Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into lmy004.:/work/mysql-5.1-tt-copy-works
2006-01-12 14:20:35 +01:00
unknown
379d71159b WL #1034 (Internal CRON) post-push fixes.
fix INSERT/REPLACE statements so test suite runs again.
The question is why we have 2 parallel universes - 2 different
ways to start the test suite, a shell and perl version. One more case
where redundancy makes life nightmare.


scripts/mysql_create_system_tables.sh:
  fix INSERT/REPLACE statements so test suite runs again.
  The question is why we have 2 parallel universes - 2 different
  ways to start the test suite, a shell and perl version. One more case
  where redundancy makes life nightmare.
2006-01-12 14:17:00 +01:00
unknown
712442f76d Merge jmiller@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/home/ndbdev/jmiller/clones/mysql-5.1-new
2006-01-12 13:34:58 +01:00
unknown
d8753a825e WL #1034 (Internal CRON) post-push fix
- add Event_priv to db and host tables


scripts/mysql_create_system_tables.sh:
  add event_priv to db and host. will fix failing tests too
2006-01-12 12:06:13 +01:00
unknown
5bff97212a Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into lmy004.:/work/tmp/mysql-5.1-new
2006-01-12 11:54:31 +01:00
unknown
4777b9ae49 revert change to SETUP.sh which went through with my push of WL#1034
BUILD/SETUP.sh:
  go back to -01 and reporting usage of uninitialized variables
2006-01-12 11:51:34 +01:00
unknown
45f3e9ec3f Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  perch.ndb.mysql.com:/home/jonas/src/51-new
2006-01-12 11:31:51 +01:00
unknown
a5ac8675b5 ndb_dd_ddl - fix bug
BitKeeper/deleted/.del-ndb_error_reporter~48c84ad377571240:
  Delete: ndb/tools/ndb_error_reporter
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Release file from hash
2006-01-12 11:30:17 +01:00
unknown
9c446eadbe ndb -
fix Suma get buffer ptr, adopt to new page pool in tup


storage/ndb/src/kernel/blocks/suma/Suma.cpp:
  Fix new page pool usage
    previously it accepted page = base + RNIL, since it didnt use page anyway, sort of a prefetch...
2006-01-12 10:48:36 +01:00
unknown
558d08518f Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/space/pekka/ndb/version/my51
2006-01-12 10:36:05 +01:00
unknown
b398198be8 Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new
into  perch.ndb.mysql.com:/home/jonas/src/51-new


storage/ndb/src/kernel/blocks/ERROR_codes.txt:
  Auto merged
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
storage/ndb/src/ndbapi/ndb_cluster_connection.cpp:
  Auto merged
2006-01-12 10:11:58 +01:00
unknown
69f4b6a92b Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/usr/home/bar/mysql-5.1-new.fscs3
2006-01-12 11:48:48 +04:00
unknown
4ab53435d6 sql_table.cc:
Typo fix.
  Thanks Serg for noticing this.


sql/sql_table.cc:
  Typo fix.
  Thanks Serg for noticing this.
2006-01-12 11:41:57 +04:00
unknown
41315876ee Fixed typo.
Really dumb typo....


sql/ha_archive.h:
  Fix typo
2006-01-11 22:59:08 -08:00
unknown
a549befb6d Added bitfield support and a test for it.
Archive uses native row format, so honestly this is just the change in a flag. 


sql/ha_archive.h:
  Added bit field support (and dropped the ha_not_exact_count since we always have this).
mysql-test/r/archive_bitfield.result:
  New BitKeeper file ``mysql-test/r/archive_bitfield.result''
mysql-test/t/archive_bitfield.test:
  New BitKeeper file ``mysql-test/t/archive_bitfield.test''
2006-01-11 21:16:51 -08:00
unknown
db35f19d39 Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/space/pekka/ndb/version/my51
2006-01-12 05:16:23 +01:00
unknown
3c5c5c3775 Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  zim.(none):/home/brian/mysql/archive-5.1
2006-01-11 19:16:56 -08:00
unknown
4ee6e77f4c delete the stale file and this should fix the build
after my push of WL#1034 (Internal CRON) into 5.1


BitKeeper/deleted/.del-event.h~2c9fb599ae4e39e7:
  Delete: libmysqld/event.h
2006-01-12 01:22:52 +01:00
unknown
264df6d02a Merge mysql.com:/space/pekka/ndb/version/my51
into  mysql.com:/space/pekka/ndb/version/my51-rbr


storage/ndb/include/ndbapi/NdbDictionary.hpp:
  Auto merged
storage/ndb/test/ndbapi/test_event.cpp:
  Auto merged
2006-01-12 00:17:11 +01:00
unknown
35c2846c5c ndb - wl#2972 (5.1, related) detached trigger fixes for multiops
storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
  detached trigger fixes for multiops
storage/ndb/src/kernel/blocks/dbtup/DbtupCommit.cpp:
  detached trigger fixes for multiops
storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp:
  detached trigger fixes for multiops
storage/ndb/src/kernel/blocks/dbtup/DbtupTrigger.cpp:
  detached trigger fixes for multiops
storage/ndb/test/ndbapi/test_event_merge.cpp:
  detached trigger fixes for multiops
2006-01-11 23:51:18 +01:00
unknown
09d2e055bc Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  zim.(none):/home/brian/mysql/archive-5.1
2006-01-11 12:06:30 -08:00
unknown
6c2c8482bf RBR test updates per lars request
mysql-test/extra/rpl_tests/rpl_EE_err.test:
  Splitting tests case per Lars review
mysql-test/t/rpl_EE_err.test:
  Splitting tests case per Lars review
mysql-test/r/rpl_EE_err.result:
  Splitting tests case per Lars review
mysql-test/t/rpl_stm_EE_err2.test:
  New test case file from splitting out the test cases from the orginal rpl_EE_error.test per lars
mysql-test/extra/rpl_tests/rpl_stm_EE_err2.test:
  New test case file from splitting out the test cases from the orginal rpl_EE_error.test per lars
mysql-test/r/rpl_stm_EE_err2.result:
  New test case file from splitting out the test cases from the orginal rpl_EE_error.test per lars
BitKeeper/deleted/.del-rpl_row_EE_err.test~b3d8db3eacbb7af5:
  Delete: mysql-test/extra/rpl_tests/rpl_row_EE_err.test
BitKeeper/deleted/.del-rpl_row_EE_err.test~6cd033708a4535db:
  Delete: mysql-test/t/rpl_row_EE_err.test
BitKeeper/deleted/.del-rpl_row_EE_err.result~5ad217703f686c4d:
  Delete: mysql-test/r/rpl_row_EE_err.result
2006-01-11 20:02:11 +01:00
unknown
9dc0942ac1 Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into lmy004.:/work/mysql-5.1-tt-copy-works
2006-01-11 19:50:59 +01:00
unknown
0966a18915 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
2006-01-11 19:50:58 +01:00
unknown
45a4daa43f bug: replication of table spaces to work
bug: check if storage engine is enabled to avoif code dump


BitKeeper/etc/ignore:
  Added storage/ndb/test/ndbapi/DbAsyncGenerator storage/ndb/test/ndbapi/DbCreate storage/ndb/test/ndbapi/ndbapi_slow_select storage/ndb/test/ndbapi/testBitfield storage/ndb/test/ndbapi/testLcp storage/ndb/test/ndbapi/testPartitioning storage/ndb/test/ndbapi/testReadPerf storage/ndb/test/ndbapi/test_event_merge storage/ndb/test/tools/listen_event to the ignore list
2006-01-11 19:49:38 +01:00
unknown
af6d402627 WL #1034
- add a bit more debug messages
- disable events.test for now due to a bug


mysql-test/r/events.result:
  fix result
mysql-test/t/disabled.def:
  make it disabled
mysql-test/t/events.test:
  disable show processlist
sql/event_executor.cc:
  a bit more debug messages
2006-01-11 19:31:21 +01:00
unknown
7355e7d58f Merge jmiller@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/home/ndbdev/jmiller/clones/mysql-5.1-new
2006-01-11 18:50:53 +01:00
unknown
bbed1ba99f Changes done from Jonas's review of pervious commit
mysql-test/t/ndb_dd_basic.test:
  Changed test.t1 back to t1 per Jonas's review
mysql-test/r/ndb_dd_basic.result:
  Changed test.t1 back to t1 per Jonas's review
2006-01-11 18:50:04 +01:00
unknown
21d71ab514 Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  zim.(none):/home/brian/mysql/archive-5.1
2006-01-11 09:37:48 -08:00
unknown
1e3dfe04f6 Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into lmy004.:/work/mysql-5.1-tt-copy-works
2006-01-11 18:10:27 +01:00
unknown
2fc956fae9 WL #1034 (Internal CRON) pre-push updates
- various fixes of test cases
(hopefully the last pre-push update before the push)


mysql-test/include/system_db_struct.inc:
  extend test case to include testing for event system table
mysql-test/r/events.result:
  results of events test
mysql-test/r/system_mysql_db.result:
  more testing - add structure of event system table
mysql-test/t/events.test:
  test case for events (internal CRON)
mysql-test/t/system_mysql_db_fix.test:
  drop event table and leave the test database empty
scripts/mysql_create_system_tables.sh:
  add missing create table statement
scripts/mysql_fix_privilege_tables.sql:
  don't specify the database. this fixes a failing test case which creates the
  tables not on mysql but on a test database and then tests again mysql.
sql/event_executor.cc:
  if asked to stop -> stop.
2006-01-11 18:09:05 +01:00
unknown
0c64879d8c Test clean up and moving over from old clone.
mysql-test/t/ndb_dd_basic.test:
  Rename: mysql-test/t/ndb_basic_disk.test -> mysql-test/t/ndb_dd_basic.test
mysql-test/r/ndb_dd_basic.result:
  Rename: mysql-test/r/ndb_basic_disk.result -> mysql-test/r/ndb_dd_basic.result
mysql-test/t/ndb_dd_ddl.test:
  New Disk Data DDL Test case. Formally know as ndb_dd_dupcase.test
mysql-test/r/ndb_dd_ddl.result:
  New Disk Data DDL Test case. Formally know as ndb_dd_dupcase.test
2006-01-11 17:06:14 +01:00
unknown
db122ce4bf Merge msvensson@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  devsrv-b.mysql.com:/space/magnus/my51-wl2930_fixup
2006-01-11 16:16:50 +01:00
unknown
8d1ea9e259 Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into lmy004.:/work/mysql-5.1-tt-copy-works
2006-01-11 16:06:05 +01:00
unknown
f59bbb4f56 Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  april.(none):/home/svoj/devel/mysql/warnings/mysql-5.1-new
2006-01-11 17:20:44 +04:00
unknown
012cd81b03 Merge bk-internal:/home/bk/mysql-5.1-new
into  mysql.com:/usr/local/mysql/tmpbuild2
2006-01-11 14:04:44 +01:00
unknown
bfa1100074 Merge mkindahl@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/home/bkroot/mysql-5.1-new
2006-01-11 13:53:35 +01:00
unknown
ca5f559464 Merge bk-internal:/home/bk/mysql-5.1-new
into  mysql.com:/usr/local/mysql/mysql-5.1-new
2006-01-11 13:06:20 +01:00
unknown
51b3a1d178 Merge msvensson@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  devsrv-b.mysql.com:/space/magnus/my51-wl2930_fixup
2006-01-11 13:03:09 +01:00
unknown
a66eafd671 Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into lmy004.:/work/mysql-5.1-tt-copy-works


sql/sql_show.cc:
  Auto merged
2006-01-11 12:51:17 +01:00