Commits · 092b8f9e9e3aee7af19158fc9eaf3402d9f3ca4e · nexedi / MariaDB

17 Nov, 2006 2 commits

Merge bk@192.168.21.1:mysql-5.1-opt · 092b8f9e

unknown authored Nov 17, 2006

into  mysql.com:/home/hf/work/mysql-5.1-mrg


BitKeeper/deleted/.del-bdb-deadlock.test:
  Auto merged
Makefile.am:
  Auto merged
include/mysql.h:
  Auto merged
libmysqld/lib_sql.cc:
  Auto merged
mysql-test/include/deadlock.inc:
  Auto merged
mysql-test/r/order_by.result:
  Auto merged
mysql-test/r/subselect.result:
  Auto merged
mysql-test/r/type_newdecimal.result:
  Auto merged
mysql-test/t/disabled.def:
  Auto merged
mysql-test/t/flush.test:
  Auto merged
mysql-test/t/flush_block_commit.test:
  Auto merged
mysql-test/t/innodb-lock.test:
  Auto merged
mysql-test/t/lock_multi.test:
  Auto merged
mysql-test/t/rename.test:
  Auto merged
mysql-test/t/show_check.test:
  Auto merged
mysql-test/t/status.test:
  Auto merged
mysql-test/t/subselect.test:
  Auto merged
mysql-test/t/type_newdecimal.test:
  Auto merged
sql/field.cc:
  Auto merged
sql/field.h:
  Auto merged
sql/filesort.cc:
  Auto merged
sql/handler.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_func.h:
  Auto merged
sql/item_subselect.cc:
  Auto merged
sql/item_subselect.h:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/item_sum.h:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/item_timefunc.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql-common/my_time.c:
  Auto merged
sql/table.cc:
  Auto merged
client/mysqltest.c:
  merging
include/my_time.h:
  merging
libmysql/libmysql.c:
  merging
mysql-test/t/order_by.test:
  merging
sql/sql_yacc.yy:
  merging

092b8f9e

Merge mysql.com:/home/hf/work/mysql-5.0-mrg · 45989298

unknown authored Nov 17, 2006

into  mysql.com:/home/hf/work/mysql-5.1-mrg


Makefile.am:
  Auto merged
client/mysqltest.c:
  Auto merged
include/mysql.h:
  Auto merged
BitKeeper/deleted/.del-bdb-deadlock.test:
  Auto merged
libmysql/libmysql.c:
  Auto merged
libmysqld/lib_sql.cc:
  Auto merged
mysql-test/r/order_by.result:
  Auto merged
mysql-test/r/subselect.result:
  Auto merged
mysql-test/t/lock_multi.test:
  Auto merged
mysql-test/t/rename.test:
  Auto merged
mysql-test/t/show_check.test:
  Auto merged
mysql-test/t/status.test:
  Auto merged
mysql-test/t/subselect.test:
  Auto merged
sql/item_subselect.cc:
  Auto merged
sql/item_subselect.h:
  Auto merged
sql/protocol.cc:
  Auto merged
sql-common/client.c:
  Auto merged
sql/protocol.h:
  Auto merged
sql/sql_class.h:
  Auto merged
mysql-test/include/deadlock.inc:
  SCCS merged
mysql-test/t/disabled.def:
  merging
sql/item.cc:
  merging

45989298

16 Nov, 2006 5 commits

Merge mysql.com:/home/hf/work/mysql-4.1-mrg · e971334e

unknown authored Nov 16, 2006

into  mysql.com:/home/hf/work/mysql-5.0-mrg


client/mysqltest.c:
  Auto merged
mysql-test/t/flush.test:
  Auto merged
mysql-test/t/flush_block_commit.test:
  Auto merged
mysql-test/t/innodb-deadlock.test:
  Auto merged
mysql-test/t/innodb-lock.test:
  Auto merged
mysql-test/t/lock_multi.test:
  Auto merged
mysql-test/t/rename.test:
  Auto merged
mysql-test/t/show_check.test:
  Auto merged
mysql-test/t/status.test:
  Auto merged
sql/item.cc:
  Auto merged
sql/protocol.h:
  Auto merged
sql-common/client.c:
  Auto merged
Makefile.am:
  merging
BitKeeper/deleted/.del-mysql_client.test:
  merging
include/mysql.h:
  SCCS merged
libmysql/libmysql.c:
  merging
libmysqld/lib_sql.cc:
  merging
mysql-test/r/order_by.result:
  SCCS merged
mysql-test/r/subselect.result:
  SCCS merged
mysql-test/t/order_by.test:
  merging
mysql-test/t/subselect.test:
  SCCS merged
sql/item_subselect.cc:
  merging
sql/item_subselect.h:
  merging
sql/protocol.cc:
  merging
sql/sql_class.h:
  merging

e971334e

merging · e78fd1d1
unknown authored Nov 16, 2006

e78fd1d1
merging · 83a7bbf7
unknown authored Nov 16, 2006

83a7bbf7

Merge bk@192.168.21.1:mysql-4.1 · 17c238a1

unknown authored Nov 16, 2006

into  mysql.com:/home/hf/work/mysql-4.1-mrg


include/mysql.h:
  Auto merged
mysql-test/r/subselect.result:
  Auto merged
mysql-test/t/rename.test:
  Auto merged
mysql-test/t/subselect.test:
  Auto merged
sql-common/client.c:
  Auto merged
sql/sql_class.h:
  Auto merged
Makefile.am:
  merging
client/mysqltest.c:
  merging
mysql-test/t/mysql_client.test:
  merging

17c238a1

Merge romeo.(none):/home/bkroot/mysql-5.1 · a0672f06
unknown authored Nov 16, 2006
```
into  romeo.(none):/home/bk/memcheck-mysql-5.1


sql/sql_class.cc:
  Auto merged
```
a0672f06

15 Nov, 2006 13 commits

Dummy push to force pushbuild retest · daaddeb6
unknown authored Nov 15, 2006
```
mysql-test/t/disabled.def:
  Dummy push
```
daaddeb6

Changeset to fix a valgrind error in the main tree. · 09ee0556

unknown authored Nov 15, 2006

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().

09ee0556

Merge mysql.com:/home/bk/MERGE/mysql-5.0-merge · a24d4aa0

unknown authored Nov 15, 2006

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

a24d4aa0

Merge mysql.com:/home/bkroot/mysql-5.0 · fe652465
unknown authored Nov 15, 2006
```
into  mysql.com:/home/bk/MERGE/mysql-5.0-merge
```
fe652465
disabled test case that is still disabled in main · 2a9b7256
unknown authored Nov 15, 2006

2a9b7256
Merge mysql.com:/home/bk/MERGE/mysql-5.0-merge · 51cdc310
unknown authored Nov 15, 2006
```
into  mysql.com:/home/bk/MERGE/mysql-5.1-merge
```
51cdc310
Merge mysql.com:/home/bk/MERGE/mysql-4.1-merge · 14b31301
unknown authored Nov 15, 2006
```
into  mysql.com:/home/bk/MERGE/mysql-5.0-merge
```
14b31301
Merge mysql.com:/home/bkroot/mysql-5.1-new-rpl · a2a9f074
unknown authored Nov 15, 2006
```
into  mysql.com:/home/bk/MERGE/mysql-5.1-merge
```
a2a9f074
Merge mysql.com:/home/bkroot/mysql-5.0-rpl · 2c2334f9
unknown authored Nov 15, 2006
```
into  mysql.com:/home/bk/MERGE/mysql-5.0-merge
```
2c2334f9
Merge mysql.com:/home/bkroot/mysql-4.1-rpl · 6bd194d7
unknown authored Nov 15, 2006
```
into  mysql.com:/home/bk/MERGE/mysql-4.1-merge
```
6bd194d7
Merge dsl-hkibras-fe30f900-107.dhcp.inet.fi:/home/elkin/MySQL/TEAM/BARE/5.0 · 3cdd6837
unknown authored Nov 15, 2006
```
into  dsl-hkibras-fe30f900-107.dhcp.inet.fi:/home/elkin/MySQL/TEAM/BARE/mysql-5.1-new-rpl
```
3cdd6837
Merge dsl-hkibras-fe30f900-107.dhcp.inet.fi:/home/elkin/MySQL/TEAM/BARE/4.1 · cb79b922
unknown authored Nov 15, 2006
```
into  dsl-hkibras-fe30f900-107.dhcp.inet.fi:/home/elkin/MySQL/TEAM/BARE/5.0
```
cb79b922

bug#19402 SQL close to the size of the max_allowed_packet fails on the slave · 9cde979e

unknown authored Nov 15, 2006

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).

9cde979e

14 Nov, 2006 12 commits

Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.0 · 27a6d7a7
unknown authored Nov 14, 2006
```
into  kahlann.erinye.com:/home/df/mysql/build/mtr-5.0
```
27a6d7a7
Merge dev:my/mysql-5.0-release · 165a4036
unknown authored Nov 14, 2006
```
into  kahlann.erinye.com:/home/df/mysql/build/mtr-5.0
```
165a4036

Merge kahlann.erinye.com:/home/df/mysql/build/mtr-5.0 · 2eb3dd20

unknown authored Nov 14, 2006

into  kahlann.erinye.com:/home/df/mysql/build/51


scripts/make_binary_distribution.sh:
  Auto merged

2eb3dd20

Merge kahlann.erinye.com:/home/df/mysql/build/mtr-4.1 · d8ff3e7b

unknown authored Nov 14, 2006

into  kahlann.erinye.com:/home/df/mysql/build/mtr-5.0


scripts/make_binary_distribution.sh:
  SCCS merged

d8ff3e7b

make_binary_distribution should of course also copy .test files from mysql-test/include · 3bf9b431
unknown authored Nov 14, 2006

3bf9b431
Merge kahlann.erinye.com:/home/df/mysql/build/mtr-5.0 · 23b7f4b7
unknown authored Nov 14, 2006
```
into  kahlann.erinye.com:/home/df/mysql/build/51


mysql-test/Makefile.am:
  Auto merged
```
23b7f4b7
Merge kahlann.erinye.com:/home/df/mysql/build/mtr-4.1 · 9020035f
unknown authored Nov 14, 2006
```
into  kahlann.erinye.com:/home/df/mysql/build/mtr-5.0


mysql-test/Makefile.am:
  Auto merged
```
9020035f

make dist now copies .test files in mysql-test/include · b2957569

unknown authored Nov 14, 2006


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

b2957569

Raise version number after cloning 5.0.30 · fdec9d86
unknown authored Nov 14, 2006

fdec9d86

Merge trift2.:/MySQL/M50/clone-5.0 · f70497fb

unknown authored Nov 14, 2006

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.

f70497fb

Merge dsl-hkibras-fe30f900-107.dhcp.inet.fi:/home/elkin/MySQL/TEAM/BARE/5.0 · cfe679b3

unknown authored Nov 14, 2006

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

cfe679b3

bug#19402 SQL close to the size of the max_allowed_packet fails on the slave · d149fc30

unknown authored Nov 14, 2006

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.

d149fc30

13 Nov, 2006 8 commits

Modify search path for mysql_client_test to look in "bin" not to look for "bin", · 12e6eca4

unknown authored Nov 13, 2006

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"

12e6eca4

Merge mysql.com:/home/bk/MERGE/mysql-5.0-merge · 739a7613

unknown authored Nov 13, 2006

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

739a7613

Merge mysql.com:/home/bk/MERGE/mysql-4.1-merge · 1613ad2c

unknown authored Nov 13, 2006

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

1613ad2c

Merge romeo.(none):/home/bkroot/mysql-5.1-new-rpl · 173d093a

unknown authored Nov 13, 2006

into  romeo.(none):/home/bk/b18581-mysql-5.1-new-rpl


sql/ha_ndbcluster_binlog.cc:
  Auto merged

173d093a

Fixing problem in injector code making NDB tests fire an assertion. · 8a7db87e

unknown authored Nov 13, 2006


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.

8a7db87e

configure.in: · 8da5141d

unknown authored Nov 13, 2006

  Raise version number after cloning 5.1.13


configure.in:
  Raise version number after cloning 5.1.13

8da5141d

Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-4.1-opt · e56742d7
unknown authored Nov 13, 2006
```
into  rakia.gmz:/home/kgeorge/mysql/autopush/B19216-4.1-opt
```
e56742d7

Merge mysql.com:/home/bk/MERGE/mysql-5.0-merge · ac65eb47

unknown authored Nov 13, 2006

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

ac65eb47