Commit graph

42471 commits

Author SHA1 Message Date
unknown
af23ddf6d2 Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-arch
into  zim.(none):/home/brian/mysql/archive-newformat-5.1
2007-01-20 17:21:22 -08:00
unknown
e633d9bab6 1) New dirty state for files (need this for longterm fast recovery)
2) We now store shortest and longest row information.
3) archive_reader can now check and backup files (even if they are hot)
4) We now record longest and shortest row information for stats. 


storage/archive/archive_reader.c:
  Added options for:
  1) Online backup for tables
  2) Check table option.
storage/archive/archive_test.c:
  Additional test, format is now the same as an actual table.
storage/archive/azio.c:
  Fixed issue closing files multiple times.
  Added option for recording longest and shortest rows. 
  Additional "dirty" state added.
storage/archive/azlib.h:
  Added additional space for longest and shortest row information.
storage/archive/ha_archive.cc:
  Cleaned up warming and removed unneeded close.
2007-01-20 17:19:54 -08:00
unknown
10f4f15e83 Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint-topush
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint-topush


mysys/string.c:
  Auto merged
2007-01-20 09:34:01 -05:00
unknown
dc635e5918 Merge perch.ndb.mysql.com:/home/jonas/src/51-work
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb


storage/ndb/src/kernel/blocks/qmgr/Qmgr.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
  Auto merged
2007-01-20 03:02:39 +01:00
unknown
b6c7fb39b2 ndb - Fix bug when sending NODE_VERSION_REP
storage/ndb/src/kernel/blocks/qmgr/Qmgr.hpp:
  Fix bug when sending NODE_VERSION_REP
storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
  Fix bug when sending NODE_VERSION_REP
2007-01-20 03:01:37 +01:00
unknown
644e6c7fdd Merge recycle.(none):/src/bug22807/my50-bug22807
into  recycle.(none):/src/mysql-5.0-maint


mysys/string.c:
  Auto merged
2007-01-19 13:20:52 -05:00
unknown
aa780b882b Merge recycle.(none):/src/bug22807/my51-bug22807
into  recycle.(none):/src/mysql-5.1-maint


mysys/string.c:
  Auto merged
2007-01-19 13:19:12 -05:00
unknown
3de7ec1f2b Merge recycle.(none):/src/bug22807/my50-bug22807
into  recycle.(none):/src/bug22807/my51-bug22807


mysys/string.c:
  Auto merged
2007-01-19 13:11:03 -05:00
unknown
4032c303a9 Bug#22807 mysql_upgrade fails when called with a basedir-path containing spaces
- Corrected compiler warnings and performance problems with new 
dynstr_append_os_quoted function.


mysys/string.c:
  Bug#22807 mysql_upgrade fails when called with a basedir-path containing spaces
  - Fix compiler warnings.
  - Used dynstr_append_mem where string length is known.
2007-01-19 13:09:48 -05:00
unknown
e6bb01b8a5 Merge perch.ndb.mysql.com:/home/jonas/src/51-work
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb


storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/suma/Suma.cpp:
  Auto merged
2007-01-19 19:00:12 +01:00
unknown
4beaf12bb6 Add missing version delimiter. 2007-01-19 11:30:40 -05:00
unknown
3bae85e2f9 Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint


mysql-test/t/ps.test:
  Use local.
2007-01-19 11:10:38 -05:00
unknown
4e055f3f3c ndb - bug#19645
fix some more sp100 hang cases


storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
  let suma know of API_FAILREQ even if not connected, to handle startme/handover 
    problem
storage/ndb/src/kernel/blocks/suma/Suma.cpp:
  some error inserts
  + resend API_FAILREQ during handover
2007-01-19 17:01:52 +01:00
unknown
3271e716b2 Rearrange disable_warnings to enclose the warning emitters properly. 2007-01-19 10:33:07 -05:00
unknown
af05ac763d Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
2007-01-19 15:05:28 +01:00
unknown
f707f71814 Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint


mysql-test/t/ps.test:
  Manual merge.
2007-01-19 09:03:32 -05:00
unknown
b8d02a2b8b Merge perch.ndb.mysql.com:/home/jonas/src/51-work
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb


storage/ndb/src/common/util/ConfigValues.cpp:
  Auto merged
2007-01-19 15:02:29 +01:00
unknown
6d7c9d8641 Merge perch.ndb.mysql.com:/home/jonas/src/50-work
into  perch.ndb.mysql.com:/home/jonas/src/51-work


storage/ndb/src/common/util/ConfigValues.cpp:
  Auto merged
2007-01-19 15:00:49 +01:00
unknown
636a5b3fa4 Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
2007-01-19 08:56:33 -05:00
unknown
df1b824262 The rpl tree added a test case, and another source added a warning,
and combined, they add a platform-specific warning.  The warnings 
are not the goal of the test, in any case.


mysql-test/t/ps.test:
  Quash platform-specific warnings.
2007-01-19 08:56:06 -05:00
unknown
9134c4eb32 Merge chilla.local:/home/mydev/mysql-5.0-bug24607
into  chilla.local:/home/mydev/mysql-5.1-bug24607


storage/myisam/mi_create.c:
  Auto merged
mysql-test/r/myisam.result:
  SCCS merged
mysql-test/t/myisam.test:
  SCCS merged
2007-01-19 13:08:09 +01:00
unknown
848a663b43 After merge fix 2007-01-19 13:06:22 +01:00
unknown
d65ae804cd Merge polly.local:/tmp/maint/bug23814/my51-bug23814
into  polly.local:/home/kaa/src/maint/mysql-5.1-maint
2007-01-19 14:29:18 +03:00
unknown
ea042b9330 Update result file to 5.1 format 2007-01-19 12:18:18 +01:00
unknown
c9dce3b61a Fix for the bug #23814 "mysqlimport crashes"
mysqlimport.c declared the opt_use_threads variable as my_bool, but the corresponding option was defined as GET_UINT. The problem only occured on architectures with strict alignment rules.


client/mysqlimport.c:
  Changed the opt_use_threads variable type to uint.
2007-01-19 14:14:11 +03:00
unknown
df7842a44e Merge pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-engines
into  pilot.mysql.com:/home/msvensson/mysql/mysql-5.1-engines


mysql-test/r/myisam.result:
  Auto merged
mysql-test/r/symlink.result:
  Auto merged
mysql-test/t/myisam.test:
  Auto merged
mysql-test/t/symlink.test:
  Auto merged
2007-01-19 12:04:55 +01:00
unknown
ca2aa14312 Use $MYSQLTESTVARDIR 2007-01-19 12:03:03 +01:00
unknown
87a569f3c0 cmd-line-utils/readline/undo.c : Replace an "uint" cast by the expanded "unsigned int" (compile problem on QNX).
cmd-line-utils/readline/undo.c:
  Replace an "uint" cast by the expanded "unsigned int",
  because there are platforms (QNX) on which "uint" is not defined in the "readline" library
  (and so building it failed, version 5.0.34).
2007-01-19 11:58:29 +01:00
unknown
ed0c295595 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb
into  poseidon.mysql.com:/home/tomas/mysql-5.1-new-ndb
2007-01-19 11:36:39 +01:00
unknown
867e6dc674 Bug#25387 ndb: dbug assert in reference counting for event operations
- on blob part execute failure, must leave in state executin, and await dropEventOperation
2007-01-19 11:35:00 +01:00
unknown
82d169b06c Merge pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint
into  pilot.mysql.com:/home/msvensson/mysql/mysql-5.1-new-maint


mysql-test/r/select.result:
  Auto merged
mysql-test/r/type_bit.result:
  Auto merged
mysql-test/t/select.test:
  Auto merged
sql/field.cc:
  Auto merged
sql/item.cc:
  Auto merged
tests/mysql_client_test.c:
  Auto merged
2007-01-19 11:12:24 +01:00
unknown
0c10457ec4 Merge bk-internal:/home/bk/mysql-5.0-maint
into  pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint
2007-01-19 11:11:34 +01:00
unknown
beb6d8fa5b Merge bk-internal:/home/bk/mysql-5.1-maint
into  pilot.mysql.com:/home/msvensson/mysql/mysql-5.1-new-maint


client/mysqltest.c:
  Auto merged
libmysql/libmysql.c:
  Auto merged
mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test:
  Auto merged
tests/mysql_client_test.c:
  Auto merged
2007-01-19 11:10:16 +01:00
unknown
d6e4472f89 Bug #15518 Reusing a stmt that has failed during prepare does not clear error
- Additional patch removing check for mysql_errno on already closed
   mysql1


tests/mysql_client_test.c:
  No need to check mysql_errno of mysql1 which has already been closed.
2007-01-19 11:07:20 +01:00
unknown
9f7e041188 after merge fix. 2007-01-19 12:15:44 +04:00
unknown
fd534e03a6 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint
into  mysql.com:/usr/home/ram/work/bug22533/my50-bug22533


mysql-test/r/select.result:
  Auto merged
mysql-test/t/select.test:
  Auto merged
2007-01-19 08:56:03 +04:00
unknown
79abf2be44 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.1-maint
into  mysql.com:/usr/home/ram/work/bug22533/my51-bug22533


mysql-test/r/select.result:
  Auto merged
mysql-test/t/select.test:
  Auto merged
sql/field.cc:
  Auto merged
sql/item.cc:
  Auto merged
2007-01-19 08:54:10 +04:00
unknown
030e5f9225 Merge perch.ndb.mysql.com:/home/jonas/src/50-work
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-ndb


ndb/src/common/util/ConfigValues.cpp:
  Auto merged
2007-01-19 04:37:23 +01:00
unknown
3c09c1c327 ndb - bug#25711
fix cpu peak in big clusters during unpack of config


ndb/src/common/util/ConfigValues.cpp:
  use bin-search instead of hash (as keys collide too much)
2007-01-19 04:36:33 +01:00
unknown
0a665ab072 Fix merge problem. 2007-01-18 18:02:58 -05:00
unknown
5306a21131 Merge siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/maint/50
into  siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/maint/51


Makefile.am:
  Use local
2007-01-18 13:27:51 -07:00
unknown
b8ae113892 Merge siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/maint/41
into  siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/maint/50


mysql-test/r/ndb_types.result:
  Auto merged
mysql-test/t/ndb_types.test:
  Auto merged
2007-01-18 13:26:48 -07:00
unknown
4fda992bff ndb_types.test: sleep a bit longer, to ensure that timestamp > @now
mysql-test/r/ndb_types.result:
  update results
mysql-test/t/ndb_types.test:
  Sleep a bit longer, to ensure that timestamp changes between:
  set @now = now();
  and:
  insert into/update t1
  
  Test case failed (select timestamp>@now from t1 ==> 0, should be 1), and passed when run again.  This should(?) avoid that fluke.
  
  Clean up test file a bit while I'm here.
2007-01-18 13:26:26 -07:00
unknown
d0cfcce458 Makefile.am: Fix previous bad merge. Re-enable the test-ps target.
Makefile.am:
  Fix previous bad merge.  Re-enable the test-ps target.
2007-01-18 13:15:16 -07:00
unknown
aff1113b08 Merge siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/maint/50
into  siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/maint/51


client/mysql_upgrade.c:
  Auto merged
client/mysqlbinlog.cc:
  Auto merged
include/my_pthread.h:
  Auto merged
include/my_sys.h:
  Auto merged
mysql-test/r/sp.result:
  Auto merged
mysql-test/t/sp.test:
  Auto merged
mysys/string.c:
  Auto merged
sql/mysqld.cc:
  Auto merged
mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
2007-01-18 10:38:49 -07:00
unknown
377fc51a25 Merge siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/maint/41
into  siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/maint/50


sql/sql_parse.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
2007-01-18 10:37:45 -07:00
unknown
d1824f12f4 Merge siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/maint/40
into  siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/maint/41
2007-01-18 10:36:46 -07:00
unknown
c7b6685f9f Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1-maint
into  siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/maint/51


client/mysql_upgrade.c:
  Auto merged
storage/myisam/mi_packrec.c:
  Use local
2007-01-18 10:34:51 -07:00
unknown
c90839bbcd Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0-maint
into  siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/maint/50
2007-01-18 10:33:28 -07:00
unknown
73dcec7678 Merge siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/51
into  siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/maint/51


client/mysqlbinlog.cc:
  Auto merged
configure.in:
  Auto merged
include/config-win.h:
  Auto merged
include/my_global.h:
  Auto merged
include/my_pthread.h:
  Auto merged
mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/t/disabled.def:
  Auto merged
sql/field.cc:
  Auto merged
sql/field.h:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/table.cc:
  Auto merged
storage/myisam/mi_packrec.c:
  Use local
2007-01-18 10:30:39 -07:00