Commit graph

29435 commits

Author SHA1 Message Date
unknown
14ff02d347 Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  zim.tangent.org:/home/brian/mysql/slap-5.1
2006-01-12 13:31:12 -08:00
unknown
17bd1288fc Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  zim.tangent.org:/home/brian/mysql/slap-5.1
2006-01-12 12:29:02 -08:00
unknown
88ece282f5 Fixed bug #16167
Added --use-threads option for porting to Windows. 


client/mysqlslap.c:
  Addinng thread option for porting to windows (second piece of code)
  Also added flush call to fix one bug
mysql-test/r/mysqlslap.result:
  New results
mysql-test/t/disabled.def:
  Bug 16167 should not be fixed
mysql-test/t/mysqlslap.test:
  Added test for new use-threads option
2006-01-12 12:27:25 -08:00
unknown
684689d1e3 Merge mysql.com:/home/mydev/mysql-5.1
into  mysql.com:/home/mydev/mysql-5.1-wl1563
2006-01-12 20:21:20 +01:00
unknown
5b69775a72 Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into lmy004.:/work/mysql-5.1-tt-copy-works
2006-01-12 19:53:23 +01:00
unknown
6ad7b37339 WL #1034 (Internal CRON) post-push fix
fix problem that gcc4 does not like at all


sql/event.h:
  fix problem that gcc4 does not like at all
2006-01-12 19:51:13 +01:00
unknown
d6b565ef35 Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  zim.tangent.org:/home/brian/mysql/slap-5.1
2006-01-12 10:23:41 -08:00
unknown
a16e5b70bc Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  zim.tangent.org:/home/brian/mysql/slap-5.1
2006-01-12 09:55:22 -08:00
unknown
0f02e1879a Merge bk-internal:/home/bk/mysql-5.1-new
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
2006-01-12 18:47:16 +01:00
unknown
69126afb40 Merge neptunus.(none):/home/msvensson/mysql/wl2930_fixup/my51-wl2930_fixup
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
2006-01-12 18:45:49 +01:00
unknown
adf6fc63a1 Merge neptunus.(none):/home/msvensson/mysql/wl2930_fixup/my50-wl2930_fixup
into  neptunus.(none):/home/msvensson/mysql/wl2930_fixup/my51-wl2930_fixup


mysql-test/t/mysqltest.test:
  Auto merged
2006-01-12 18:21:35 +01:00
unknown
7b77b4c7bb Use "test ! -s" to check that file does not exist 2006-01-12 18:19:57 +01:00
unknown
50ab39f43b Merge mysql.com:/home/mydev/mysql-5.1
into  mysql.com:/home/mydev/mysql-5.1-wl1563
2006-01-12 18:06:12 +01:00
unknown
04ab43c2b9 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 17:50:51 +01:00
unknown
d679b90395 Merge mysql.com:/home/mydev/mysql-5.1
into  mysql.com:/home/mydev/mysql-5.1-wl1563
2006-01-12 17:29:14 +01:00
unknown
678116f8aa rpl_sp.test, disabled.def, rpl_stm_mystery22.test:
Test cleanip per lars
.del-rpl_row_sp000.result~2b24650b123e20a9:
  Delete: mysql-test/r/rpl_row_sp000.result
.del-rpl_row_sp000.test~645e2807516682b6:
  Delete: mysql-test/t/rpl_row_sp000.test
.del-rpl_row_sp000-slave.opt~d84baa1f59616d77:
  Delete: mysql-test/t/rpl_row_sp000-slave.opt
.del-rpl_row_sp000-master.opt~da625c0a51a2f08a:
  Delete: mysql-test/t/rpl_row_sp000-master.opt
rpl_sp.result:
  Rename: mysql-test/r/rpl_stm_sp.result -> mysql-test/r/rpl_sp.result
rpl_sp-master.opt:
  Rename: mysql-test/t/rpl_stm_sp-master.opt -> mysql-test/t/rpl_sp-master.opt
rpl_sp-slave.opt:
  Rename: mysql-test/t/rpl_stm_sp-slave.opt -> mysql-test/t/rpl_sp-slave.opt
rpl_sp.test:
  Rename: mysql-test/t/rpl_stm_sp.test -> mysql-test/t/rpl_sp.test


mysql-test/t/rpl_sp-slave.opt:
  Rename: mysql-test/t/rpl_stm_sp-slave.opt -> mysql-test/t/rpl_sp-slave.opt
mysql-test/t/rpl_sp-master.opt:
  Rename: mysql-test/t/rpl_stm_sp-master.opt -> mysql-test/t/rpl_sp-master.opt
mysql-test/r/rpl_sp.result:
  Rename: mysql-test/r/rpl_stm_sp.result -> mysql-test/r/rpl_sp.result
BitKeeper/deleted/.del-rpl_row_sp000-master.opt~da625c0a51a2f08a:
  Delete: mysql-test/t/rpl_row_sp000-master.opt
BitKeeper/deleted/.del-rpl_row_sp000-slave.opt~d84baa1f59616d77:
  Delete: mysql-test/t/rpl_row_sp000-slave.opt
BitKeeper/deleted/.del-rpl_row_sp000.test~645e2807516682b6:
  Delete: mysql-test/t/rpl_row_sp000.test
BitKeeper/deleted/.del-rpl_row_sp000.result~2b24650b123e20a9:
  Delete: mysql-test/r/rpl_row_sp000.result
mysql-test/t/rpl_stm_mystery22.test:
  Test cleanip per lars
mysql-test/t/disabled.def:
  Test cleanip per lars
mysql-test/t/rpl_sp.test:
  Test cleanip per lars
2006-01-12 17:05:25 +01:00
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
d9e3f5380b Merge mysql.com:/home/mydev/mysql-5.1
into  mysql.com:/home/mydev/mysql-5.1-wl1563
2006-01-12 14:29:17 +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
20c072388a Merge mysql.com:/home/mydev/mysql-5.1
into  mysql.com:/home/mydev/mysql-5.1-wl1563
2006-01-12 12:37:54 +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
810576eee2 Merge mysql.com:/home/mydev/mysql-5.1
into  mysql.com:/home/mydev/mysql-5.1-wl1563
2006-01-12 11:48:06 +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
085c97c19e WL#1563 - Modify MySQL to support fast CREATE/DROP INDEX
NDB cluster is not fully supported. This will be added with
WL 1892 (NDB Handler: Add support for CREATE/DROP INDEX).
Some preparatory code for this is already present though.
A change for the "duplicate key" error message is planned
for another changeset.


include/my_base.h:
  WL#1563 - Modify MySQL to support fast CREATE/DROP INDEX
  Defined a mask of flags which must be the same for two indexes
  if they should compare as compatible.
  Added an error number for a new drop index error message.
mysql-test/r/key.result:
  WL#1563 - Modify MySQL to support fast CREATE/DROP INDEX
  The test result.
mysql-test/t/key.test:
  WL#1563 - Modify MySQL to support fast CREATE/DROP INDEX
  The test case.
sql/handler.cc:
  WL#1563 - Modify MySQL to support fast CREATE/DROP INDEX
  Prepared for a later change in an error message:
  Replace index number by index name for "duplicate key" error.
  Added handling for the new drop index error message.
sql/handler.h:
  WL#1563 - Modify MySQL to support fast CREATE/DROP INDEX
  Added new flags and methods.
  Removed old flags and methods (from the last attempt).
sql/share/errmsg.txt:
  WL#1563 - Modify MySQL to support fast CREATE/DROP INDEX
  Added a new error message for drop index.
sql/sql_table.cc:
  WL#1563 - Modify MySQL to support fast CREATE/DROP INDEX
  Moved definitions to the top of the file.
  In mysql_prepare_table() allow an index to have the name
  "PRIMARY" if it has the key type "Key::PRIMARY".
  Added a parenthesis for readability.
  Removed old code from the last attempt.
  Some changes to compare_tables():
  - Input parameter "List<Key> *key_list" is replaced by
    "KEY *key_info_buffer, uint key_count".
  - Output parameters added: "index_drop_buffer/index_drop_count"
    and "index_add_buffer/index_add_count".
  - Key comparison must now find matching keys in changed
    old and new key lists.
  - Key comparison of a key is easier now because both old
    and new keys are of type 'KEY'.
  Call mysql_prepare_table() before compare_tables(). The
  translated KEY structs are needed at some places now.
  Inserted a code segment for checking alter_table_flags().
  Removed mysql_prepare_table() from the 'partition' branches
  (it is done above now).
  Removed a pair of unnecessary braces.
  Inserted a code segment for executing fast add/drop index.
  Made close of table dependent on whether it was opened.
  Prepared for NDB cluster support.
  Fixed commit to be called outside of LOCK_open.
2006-01-12 10:05:07 +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
927c7b262b Adding a --use-threads options which I believe will allow it to be ported to windows.
client/Makefile.am:
  Adding pthread flag
client/client_priv.h:
  New option to use theads.
client/mysqlslap.c:
  Adding support to optionally use threads (which should allow it to work with windows)
2006-01-11 21:30:52 -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