Commit graph

40192 commits

Author SHA1 Message Date
unknown
2ff157dbee Bug #24403 valgrind complained on uninited st_table, rbr + innodb
open_table_from_share did not initialize table->record members. that was
  interpreted as the error by valgrind.
  
  Fixed with bzero-ing the members if compilation with -DHAVE_purify.


sql/table.cc:
  zeroing memory allocated for table->record[]
2006-11-17 23:44:14 +02:00
unknown
a0672f0674 Merge romeo.(none):/home/bkroot/mysql-5.1
into  romeo.(none):/home/bk/memcheck-mysql-5.1


sql/sql_class.cc:
  Auto merged
2006-11-16 08:47:47 +01:00
unknown
09ee05568b Changeset to fix a valgrind error in the main tree.
Adding class to handle temporary allocate of memory during write of rows.
Eliminating cut'n-paste error between THD::binlog_{write,update,delete}_row().


sql/sql_class.cc:
  Adding class to handle temporary allocate of memory during write of rows.
  Eliminating cut'n-paste error between THD::binlog_{write,update,delete}_row().
2006-11-15 16:49:03 +01:00
unknown
a24d4aa025 Merge mysql.com:/home/bk/MERGE/mysql-5.0-merge
into  mysql.com:/home/bk/MERGE/mysql-5.1-merge


BitKeeper/deleted/.del-CMakeLists.txt~1:
  Auto merged
BitKeeper/deleted/.del-CMakeLists.txt~2f6eabb2f69cb33d:
  Auto merged
BitKeeper/deleted/.del-make_win_bin_dist:
  Auto merged
client/mysql.cc:
  Auto merged
sql/log.cc:
  Auto merged
configure.in:
  Manual merge, main clone 5.0->5.1
2006-11-15 13:17:43 +01:00
unknown
fe65246581 Merge mysql.com:/home/bkroot/mysql-5.0
into  mysql.com:/home/bk/MERGE/mysql-5.0-merge
2006-11-15 13:11:25 +01:00
unknown
2a9b72568b disabled test case that is still disabled in main 2006-11-15 13:05:13 +01:00
unknown
51cdc31000 Merge mysql.com:/home/bk/MERGE/mysql-5.0-merge
into  mysql.com:/home/bk/MERGE/mysql-5.1-merge
2006-11-15 12:42:45 +01:00
unknown
14b3130143 Merge mysql.com:/home/bk/MERGE/mysql-4.1-merge
into  mysql.com:/home/bk/MERGE/mysql-5.0-merge
2006-11-15 12:41:51 +01:00
unknown
a2a9f074ee Merge mysql.com:/home/bkroot/mysql-5.1-new-rpl
into  mysql.com:/home/bk/MERGE/mysql-5.1-merge
2006-11-15 12:40:48 +01:00
unknown
2c2334f95a Merge mysql.com:/home/bkroot/mysql-5.0-rpl
into  mysql.com:/home/bk/MERGE/mysql-5.0-merge
2006-11-15 12:40:07 +01:00
unknown
6bd194d7ca Merge mysql.com:/home/bkroot/mysql-4.1-rpl
into  mysql.com:/home/bk/MERGE/mysql-4.1-merge
2006-11-15 12:39:21 +01:00
unknown
3cdd683715 Merge dsl-hkibras-fe30f900-107.dhcp.inet.fi:/home/elkin/MySQL/TEAM/BARE/5.0
into  dsl-hkibras-fe30f900-107.dhcp.inet.fi:/home/elkin/MySQL/TEAM/BARE/mysql-5.1-new-rpl
2006-11-15 13:05:37 +02:00
unknown
cb79b92252 Merge dsl-hkibras-fe30f900-107.dhcp.inet.fi:/home/elkin/MySQL/TEAM/BARE/4.1
into  dsl-hkibras-fe30f900-107.dhcp.inet.fi:/home/elkin/MySQL/TEAM/BARE/5.0
2006-11-15 12:55:43 +02:00
unknown
9cde979eb7 bug#19402 SQL close to the size of the max_allowed_packet fails on the slave
mending windows test.


mysql-test/r/rpl_packet.result:
  results changed
mysql-test/t/rpl_packet.test:
  removing because of the connection with windows client can be lost instead of
  the error code back (source: manual).
2006-11-15 12:53:07 +02:00
unknown
27a6d7a7f9 Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.0
into  kahlann.erinye.com:/home/df/mysql/build/mtr-5.0
2006-11-14 15:27:55 +01:00
unknown
165a4036e8 Merge dev:my/mysql-5.0-release
into  kahlann.erinye.com:/home/df/mysql/build/mtr-5.0
2006-11-14 14:58:59 +01:00
unknown
2eb3dd200e Merge kahlann.erinye.com:/home/df/mysql/build/mtr-5.0
into  kahlann.erinye.com:/home/df/mysql/build/51


scripts/make_binary_distribution.sh:
  Auto merged
2006-11-14 14:49:45 +01:00
unknown
d8ff3e7baf Merge kahlann.erinye.com:/home/df/mysql/build/mtr-4.1
into  kahlann.erinye.com:/home/df/mysql/build/mtr-5.0


scripts/make_binary_distribution.sh:
  SCCS merged
2006-11-14 14:48:29 +01:00
unknown
3bf9b43182 make_binary_distribution should of course also copy .test files from mysql-test/include 2006-11-14 14:44:20 +01:00
unknown
23b7f4b782 Merge kahlann.erinye.com:/home/df/mysql/build/mtr-5.0
into  kahlann.erinye.com:/home/df/mysql/build/51


mysql-test/Makefile.am:
  Auto merged
2006-11-14 14:31:36 +01:00
unknown
9020035fa2 Merge kahlann.erinye.com:/home/df/mysql/build/mtr-4.1
into  kahlann.erinye.com:/home/df/mysql/build/mtr-5.0


mysql-test/Makefile.am:
  Auto merged
2006-11-14 14:29:58 +01:00
unknown
b295756927 make dist now copies .test files in mysql-test/include
mysql-test/Makefile.am:
  add include/*.test to dist-hook and install-data-local targets to include the three .test files in mysql-test/include with make dist
2006-11-14 14:29:05 +01:00
unknown
fdec9d86a9 Raise version number after cloning 5.0.30 2006-11-14 13:37:10 +01:00
unknown
f70497fb93 Merge trift2.:/MySQL/M50/clone-5.0
into  trift2.:/MySQL/M50/mysql-5.0


CMakeLists.txt:
  Auto merged
client/mysql.cc:
  Auto merged
sql/log.cc:
  Auto merged
configure.in:
  Late merge of 5.0.28, no change here.
2006-11-14 12:47:53 +01:00
unknown
cfe679b318 Merge dsl-hkibras-fe30f900-107.dhcp.inet.fi:/home/elkin/MySQL/TEAM/BARE/5.0
into  dsl-hkibras-fe30f900-107.dhcp.inet.fi:/home/elkin/MySQL/TEAM/FIXES/merge_50_1


sql/log_event.cc:
  Auto merged
sql/log_event.h:
  Auto merged
2006-11-14 13:04:40 +02:00
unknown
d149fc30d0 bug#19402 SQL close to the size of the max_allowed_packet fails on the slave
ver 5.0 and 5.1 refinement.
adding to the MAX_SIZE_LOG_EVENT_STATUS estimation status vars and 
EXECUTE_LOAD_QUERY_EXTRA_HEADER_LEN


sql/log_event.cc:
  assertion on size of status vars
sql/log_event.h:
  MAX_SIZE_LOG_EVENT_STATUS as the max bytes of contribution of status vars into repl
  message; MAX_SIZE_LOG_EVENT_STATUS is getting more wrt to 4.1 version.
2006-11-14 12:48:17 +02:00
unknown
12e6eca40c Modify search path for mysql_client_test to look in "bin" not to look for "bin",
this caused mysql_client_test to fail when running from binary dist 


mysql-test/mysql-test-run.pl:
  Modify search path for mysql_client_test to look in "bin" not to look for "bin"
2006-11-13 20:44:22 +01:00
unknown
739a761399 Merge mysql.com:/home/bk/MERGE/mysql-5.0-merge
into  mysql.com:/home/bk/MERGE/mysql-5.1-merge


BitKeeper/triggers/post-commit:
  Auto merged
mysql-test/t/func_gconcat.test:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/log_event.h:
  Auto merged
sql/sql_repl.cc:
  Auto merged
sql/slave.cc:
  Manual merge
2006-11-13 17:59:51 +01:00
unknown
1613ad2c98 Merge mysql.com:/home/bk/MERGE/mysql-4.1-merge
into  mysql.com:/home/bk/MERGE/mysql-5.0-merge


BitKeeper/triggers/post-commit:
  Auto merged
mysql-test/t/func_gconcat.test:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/sql_repl.cc:
  Auto merged
sql/log_event.h:
  Manual merge
sql/slave.cc:
  Manual merge
2006-11-13 17:54:01 +01:00
unknown
173d093a2b Merge romeo.(none):/home/bkroot/mysql-5.1-new-rpl
into  romeo.(none):/home/bk/b18581-mysql-5.1-new-rpl


sql/ha_ndbcluster_binlog.cc:
  Auto merged
2006-11-13 15:48:39 +01:00
unknown
8a7db87e4b Fixing problem in injector code making NDB tests fire an assertion.
sql/ha_ndbcluster_binlog.cc:
  Removing extreneous setting of current_stmt_binlog_row_based.
sql/rpl_injector.cc:
  Since current_stmt_binlog_row_based is reset as the end of a transaction
  it needs to be set at the beginning of a transaction.
2006-11-13 15:42:01 +01:00
unknown
8da5141d93 configure.in:
Raise version number after cloning 5.1.13


configure.in:
  Raise version number after cloning 5.1.13
2006-11-13 14:50:38 +01:00
unknown
ac65eb473e Merge mysql.com:/home/bk/MERGE/mysql-5.0-merge
into  mysql.com:/home/bk/MERGE/mysql-5.1-merge


BitKeeper/etc/collapsed:
  auto-union
sql/mysql_priv.h:
  Auto merged
sql/slave.cc:
  Auto merged
2006-11-13 13:10:03 +01:00
unknown
36dfa434cc Merge mysql.com:/home/bkroot/mysql-5.1-new-rpl
into  mysql.com:/home/bk/MERGE/mysql-5.1-merge


BitKeeper/etc/collapsed:
  auto-union
mysql-test/r/view.result:
  Auto merged
mysql-test/t/view.test:
  Auto merged
sql/Makefile.am:
  Auto merged
sql/handler.cc:
  Auto merged
sql/log.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_view.cc:
  Auto merged
2006-11-13 12:45:31 +01:00
unknown
181c9b4dd4 Merge mysql.com:/home/bkroot/mysql-5.0-rpl
into  mysql.com:/home/bk/MERGE/mysql-5.0-merge


BitKeeper/etc/collapsed:
  auto-union
sql/mysql_priv.h:
  Auto merged
sql/slave.cc:
  Auto merged
2006-11-13 12:44:53 +01:00
unknown
8fd48ccec0 Merge mysql.com:/home/bkroot/mysql-4.1-rpl
into  mysql.com:/home/bk/MERGE/mysql-4.1-merge
2006-11-13 12:44:24 +01:00
unknown
421f4c0907 WL#3368 mixed binlog_format default
An amendment for parsing argument in case NDB is compiled and active.
  NDB switches from mixed to row-based and back per each query. The previous patch
  was not aware of such behaviour and made exceptional assingment to row-based when
  no command line arg --binlog-format provided.
  
  Removing #if HAVE_NDB_BINLOG block alltogether: ndb supports mixed and if server 
  was build without NDB using binlog nothing to care.
  Test for this piece of code is rather specific. While there is active bug23110
  ndb_alter_table and some other should fail if no explict --binlog-format is given:
  mysql-test-run ndb_alter_table


sql/mysqld.cc:
  ndb accepts mixed binlog_format switching to row internally via calling
  thd->set_binlog_format_row_if_mixed at the beginning and careful
  the->reset_current_stmt_binlog_row_based(). There is 
  bug#23110 to implement it all carefully for DDL.
2006-11-13 13:20:35 +02:00
unknown
f2f9404114 support-files/mysql.spec.sh : Make the server report its features in the first test run.
support-files/mysql.spec.sh:
  1) Ensure that the features of each server built are reported in the first test run it takes.
  2) Add "--with-partition" to the change log (missing on previous push).
2006-11-13 12:10:12 +01:00
unknown
9b50b66219 Merge aelkin@bk-internal.mysql.com:/home/bk/mysql-5.1-rpl
into  dsl-hkibras-fe30f900-107.dhcp.inet.fi:/home/elkin/MySQL/TEAM/FIXES/merge_50


sql/log_event.cc:
  Auto merged
2006-11-13 12:45:47 +02:00
unknown
b09ae0ab10 Build the generic RPMs including the "partition" feature. bug#23949
support-files/mysql.spec.sh:
  Add the "partition" feature to the server configuration, whether debugging or not.
  (bug#23949)
2006-11-13 11:10:27 +01:00
unknown
ce963d0c8e Merge bk-internal.mysql.com:/home/bk/mysql-5.0-runtime
into  bodhi.local:/opt/local/work/mysql-5.1-runtime
2006-11-12 23:48:59 +03:00
unknown
57ba34ff8a bug#19402 SQL close to the size of the max_allowed_packet fails on the slave
comments are fixed as was suggested in reviews.


sql/log_event.h:
  fixing comments
sql/slave.cc:
  fixing comments
sql/sql_repl.cc:
  fixing comments
2006-11-12 20:01:58 +02:00
unknown
b5d6a629c9 Merge aelkin@bk-internal.mysql.com:/home/bk/mysql-5.1-rpl
into  dsl-hkibras-fe30f900-107.dhcp.inet.fi:/home/elkin/MySQL/TEAM/FIXES/5.1/bug24190_many_field_in_rec_is_0


storage/federated/ha_federated.cc:
  Auto merged
storage/innobase/handler/ha_innodb.cc:
  Auto merged
2006-11-12 18:04:19 +02:00
unknown
a403c2f925 Correcting BUG/WL identifier extraction to allow multiple references to auxilary
bugs/wls in cset's comments. The targetted BUG's or WL's identifier must be specified
the first in the comments. The referred bugs wls can be typed in same as the targeted
clickable format.
If the the target of the fix is a WL and there are some references to bugs
then the first found reference is regarded as "co-target" so that the bug's identifier
comes up on the subject line along with the WL's and commit mail will update
the bug page. The latter feature can be disarmed (if there is no need to update
the referred bug's page) with typing the first a pseudo-bug pattern (bug#0).

This paticular cset will generate subject line containing bug#0 (as it was the first
referred) whereas the old version would put in the subject line the last referred
pattern (e.g bug#2147483648).


BitKeeper/triggers/post-commit:
  fixing greedyness of old extraction
2006-11-12 13:38:13 +02:00
unknown
d1f5f590da Merge bk-internal.mysql.com:/home/bk/mysql-5.1
into  bodhi.local:/opt/local/work/mysql-5.1-runtime
2006-11-12 10:56:10 +03:00
unknown
383fbde532 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  bodhi.local:/opt/local/work/mysql-5.0-runtime
2006-11-12 10:55:33 +03:00
unknown
47bdda0b9d Merge mysql.com:/Users/kent/mysql/bk/mysql-5.0
into  mysql.com:/Users/kent/mysql/bk/mysql-5.1


mysql-test/mysql-test-run.pl:
  Auto merged
2006-11-11 14:46:06 +01:00
unknown
3af223ed9b Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1
into  mysql.com:/Users/kent/mysql/bk/mysql-5.0
2006-11-11 14:32:10 +01:00
unknown
c6d317831a mysql-test-run.pl:
Test for base directory when a RPM install corrected


mysql-test/mysql-test-run.pl:
  Test for base directory when a RPM install corrected
2006-11-11 14:12:30 +01:00
unknown
c3d9588eaf Merge bodhi.local:/opt/local/work/mysql-5.0-runtime
into  bodhi.local:/opt/local/work/mysql-5.1-runtime


configure.in:
  Auto merged
include/my_time.h:
  Auto merged
mysql-test/r/func_time.result:
  Auto merged
mysql-test/r/rename.result:
  Auto merged
mysql-test/t/func_time.test:
  Auto merged
mysql-test/t/im_daemon_life_cycle.imtest:
  Auto merged
mysql-test/t/rename.test:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/time.cc:
  Auto merged
sql-common/my_time.c:
  Auto merged
2006-11-11 14:59:14 +03:00