Commits · 9fb5b6d32bb624676c2e77a406ee2b23ddff26c2 · Kirill Smelkov / mariadb

18 May, 2006 10 commits

Merge bk-internal.mysql.com:/data0/bk/mysql-5.1-new · 9fb5b6d3

unknown authored May 18, 2006

into  bk-internal.mysql.com:/data0/bk/mysql-5.1-kt


include/my_sys.h:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/t/mysqltest.test:
  Auto merged
mysys/my_init.c:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/share/errmsg.txt:
  Auto merged

9fb5b6d3

Merge knielsen@10.100.52.19:/usr/local/mysql/tmp-5.1 · a5d9932b
unknown authored May 18, 2006
```
into  mysql.com:/data0/knielsen/tmp-5.1
```
a5d9932b

After-merge fix. · 41200a07

unknown authored May 18, 2006


mysql-test/r/sp.result:
  After-merge fixes
mysql-test/r/trigger-grant.result:
  After-merge fixes
mysql-test/t/trigger-grant.test:
  After-merge fixes
sql/sql_insert.cc:
  After-merge fixes

41200a07

Merge mysql.com:/usr/local/mysql/tmp_merge · 1875f315

unknown authored May 18, 2006

into  mysql.com:/usr/local/mysql/merge-5.1


mysql-test/lib/mtr_process.pl:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/sp-error.result:
  Auto merged
mysql-test/r/sp.result:
  Auto merged
mysql-test/r/trigger-grant.result:
  Auto merged
mysql-test/r/trigger.result:
  Auto merged
mysql-test/t/sp.test:
  Auto merged
mysql-test/t/trigger-grant.test:
  Auto merged
mysql-test/t/trigger.test:
  Auto merged
server-tools/instance-manager/options.h:
  Auto merged
sql/field_conv.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/item_func.h:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/share/errmsg.txt:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
server-tools/instance-manager/options.cc:
  Manual merge
sql/item_func.cc:
  Manual merge
sql/mysql_priv.h:
  Manual merge
sql/sp_head.cc:
  Manual merge
sql/sql_table.cc:
  Manual merge

1875f315

Merge mysql.com:/M50/bug19040-5.0 into mysql.com:/M51/merge-5.1 · e3f1b06c
unknown authored May 18, 2006

e3f1b06c
Merge mysql.com:/home/hf/work/mysql-5.1.14573 · b47b7355
unknown authored May 18, 2006
```
into mysql.com:/home/hf/work/mysql-5.1.mrg
```
b47b7355

Merge bk@192.168.21.1:mysql-5.1-kt · b997eabf

unknown authored May 18, 2006

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


config/ac-macros/ha_ndbcluster.m4:
  Auto merged
sql/log.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged

b997eabf

test result fixed · ea9c282d
unknown authored May 18, 2006
```
mysql-test/r/auto_increment.result:
  result fixed
```
ea9c282d
Merge bk@192.168.21.1:mysql-5.1-kt · 07bb501f
unknown authored May 18, 2006
```
into mysql.com:/home/hf/work/mysql-5.1.14573
```
07bb501f

Merge rurik.mysql.com:/home/igor/tmp_merge · de0e4a9a

unknown authored May 17, 2006

into  rurik.mysql.com:/home/igor/dev/mysql-5.1-0


mysql-test/r/join_outer.result:
  Auto merged
sql/sql_yacc.yy:
  Auto merged

de0e4a9a

17 May, 2006 15 commits

type_newdecimal.result, case.result: · 2a29fbfc

unknown authored May 18, 2006

  Adjusted merge


mysql-test/r/case.result:
  Adjusted merge
mysql-test/r/type_newdecimal.result:
  Adjusted merge

2a29fbfc

Merge mysql.com:/data0/mysqldev/my/tmp_merge · e78b4cca

unknown authored May 17, 2006

into  mysql.com:/tmp/mysql-5.1-new


mysql-test/r/ps_7ndb.result:
  Auto merged
mysql-test/r/type_float.result:
  Auto merged
sql/item.cc:
  Auto merged

e78b4cca

Merge rurik.mysql.com:/home/igor/tmp_merge · 8df5fdb9

unknown authored May 17, 2006

into  rurik.mysql.com:/home/igor/dev/mysql-5.1-0


mysql-test/r/view.result:
  Auto merged
mysql-test/t/view.test:
  Auto merged
sql/item_timefunc.cc:
  Auto merged

8df5fdb9

Include "config.h" (if it exists) in all yaSSL files via their "runtime.hpp". · 8d4cbe39

unknown authored May 17, 2006

Fixes bug#19040 "yaSSL does not compile on AIX".


extra/yassl/taocrypt/include/runtime.hpp:
  Include "config.h" (if it exists) in all yaSSL files. This is needed to ensure the same 
  configure settings are used for yaSSL as for the other modules linked together.
  Example: the settings for "large file" on AIX.
  Fixes bug#19040 "yaSSL does not compile on AIX".

8d4cbe39

Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 2d0297f0
unknown authored May 17, 2006
```
into mysql.com:/M51/merge-5.1
```
2d0297f0

Merge bk-internal:/home/bk/mysql-5.1-new · 15e4938b

unknown authored May 17, 2006

into  mysql.com:/usr/local/mysql/tmp-5.1


libmysql/libmysql.c:
  Auto merged
sql/mysqld.cc:
  Auto merged
mysql-test/valgrind.supp:
  Manual merge.

15e4938b

Merge mysql.com:/M50/tmp_merge into mysql.com:/M51/merge-5.1 · 4b35cdcb

unknown authored May 17, 2006


configure.in:
  Auto merged
BitKeeper/deleted/.del-ctype_ucs_binlog.result~280d136b1a0bcf17:
  Auto merged
BitKeeper/deleted/.del-mysql_prepare_privilege_tables_for_5.sql~76ea3c82bdbbead4:
  Auto merged
mysql-test/extra/binlog_tests/binlog.test:
  Auto merged
mysql-test/extra/rpl_tests/rpl_ddl.test:
  Auto merged
mysql-test/extra/rpl_tests/rpl_multi_query.test:
  Auto merged
mysql-test/r/archive_gis.result:
  Auto merged
mysql-test/r/bdb_gis.result:
  Auto merged
mysql-test/r/binlog_stm_binlog.result:
  Auto merged
mysql-test/r/binlog_stm_blackhole.result:
  Auto merged
mysql-test/r/binlog_stm_ctype_ucs.result:
  Auto merged
mysql-test/r/grant2.result:
  Auto merged
mysql-test/r/im_life_cycle.result:
  Auto merged
mysql-test/r/im_utils.result:
  Auto merged
mysql-test/r/insert_update.result:
  Auto merged
mysql-test/r/innodb_gis.result:
  Auto merged
mysql-test/r/mysqldump-max.result:
  Auto merged
mysql-test/r/ndb_bitfield.result:
  Auto merged
mysql-test/r/ndb_condition_pushdown.result:
  Auto merged
mysql-test/r/ndb_database.result:
  Auto merged
mysql-test/r/ndb_gis.result:
  Auto merged
mysql-test/r/ndb_update.result:
  Auto merged
mysql-test/r/rpl_create_database.result:
  Auto merged
mysql-test/r/query_cache_notembedded.result:
  Auto merged
mysql-test/r/rpl_drop_db.result:
  Auto merged
mysql-test/r/rpl_multi_update3.result:
  Auto merged
mysql-test/r/rpl_slave_status.result:
  Auto merged
mysql-test/r/rpl_trigger.result:
  Auto merged
mysql-test/r/rpl_view.result:
  Auto merged
mysql-test/r/sp-code.result:
  Auto merged
mysql-test/r/sp-vars.result:
  Auto merged
mysql-test/r/sp_trans.result:
  Auto merged
mysql-test/r/timezone_grant.result:
  Auto merged
mysql-test/r/trigger-compat.result:
  Auto merged
mysql-test/r/trigger-grant.result:
  Auto merged
mysql-test/r/type_bit_innodb.result:
  Auto merged
mysql-test/r/type_newdecimal.result:
  Auto merged
mysql-test/r/view_grant.result:
  Auto merged
mysql-test/t/binlog_row_binlog-master.opt:
  Auto merged
mysql-test/t/binlog_stm_mix_innodb_myisam-master.opt:
  Auto merged
mysql-test/t/create_select_tmp.test:
  Auto merged
mysql-test/t/grant2.test:
  Auto merged
mysql-test/t/handler.test:
  Auto merged
mysql-test/t/mysqltest.test:
  Auto merged
mysql-test/t/rpl_commit_after_flush.test:
  Auto merged
mysql-test/t/rpl_insert_ignore.test:
  Auto merged
mysql-test/t/rpl_rewrt_db-slave.opt:
  Auto merged
mysql-test/t/rpl_rewrt_db.test:
  Auto merged
mysys/mf_tempdir.c:
  Auto merged
mysys/my_mmap.c:
  Auto merged
sql/sql_bitmap.h:
  Auto merged
sql/sql_handler.cc:
  Auto merged
storage/bdb/dist/s_dir:
  Auto merged
storage/myisam/ftbench/Ecompare.pl:
  Auto merged
storage/myisam/ftbench/Ecreate.pl:
  Auto merged
storage/myisam/ftbench/Ereport.pl:
  Auto merged
storage/myisam/ftbench/README:
  Auto merged
storage/myisammrg/myrg_range.c:
  Auto merged
storage/myisammrg/myrg_rnext_same.c:
  Auto merged
strings/decimal.c:
  Auto merged
zlib/Makefile.am:
  Auto merged

4b35cdcb

Merge bk-internal.mysql.com:/data0/bk/mysql-5.1-new · 7fb42f47
unknown authored May 17, 2006
```
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-kt
```
7fb42f47
After-merge fixes. · 316f967d
unknown authored May 17, 2006

316f967d

Merge mysql.com:/home/hf/work/mysql-5.1.14573 · 25b99945

unknown authored May 17, 2006

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


sql/handler.h:
  Auto merged
sql/share/errmsg.txt:
  Auto merged
sql/sql_table.cc:
  Auto merged

25b99945

Merge bk@192.168.21.1:mysql-5.1-kt · 9cdaf9c7

unknown authored May 17, 2006

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


mysql-test/mysql-test-run.pl:
  Auto merged
sql/ha_myisam.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged

9cdaf9c7

Merge bk@192.168.21.1:mysql-5.1-kt · df5d50aa

unknown authored May 17, 2006

into mysql.com:/home/hf/work/mysql-5.1.14573


mysql-test/r/auto_increment.result:
  Auto merged

df5d50aa

Merge mysql.com:/home/kgeorge/mysql/5.0/tmp_merge · c4e26cb0

unknown authored May 17, 2006

into  mysql.com:/home/kgeorge/mysql/5.1/merge


mysql-test/r/subselect.result:
  Auto merged
mysql-test/r/view.result:
  Auto merged
sql/item_subselect.cc:
  Auto merged

c4e26cb0

Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new · ea7cc4af

unknown authored May 17, 2006

into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb


client/mysql.cc:
  Auto merged
mysql-test/r/func_str.result:
  Auto merged
mysql-test/r/rpl_temporary.result:
  Auto merged
mysql-test/r/select.result:
  Auto merged
mysql-test/t/rpl_temporary.test:
  Auto merged
sql/item_strfunc.cc:
  Auto merged

ea7cc4af

Bug #16875 Using stale MySQLD FRM files can cause restored cluster to fail · 1d83b61b

unknown authored May 17, 2006


sql/ha_ndbcluster_binlog.cc:
  Bug #16875 Using stale MySQLD FRM files can cause restored cluster to fail
  - small correction of previous patch
storage/ndb/src/ndbapi/DictCache.cpp:
  Bug #16875 Using stale MySQLD FRM files can cause restored cluster to fail
  - cache not released properly
storage/ndb/tools/desc.cpp:
  Bug #16875 Using stale MySQLD FRM files can cause restored cluster to fail
  - added retry option so that ndb_desc can be used to wait for a table to be created

1d83b61b

16 May, 2006 15 commits

Merge zippy.(none):/home/cmiller/work/mysql/merge/tmp_merge · 4d861dad

unknown authored May 16, 2006

into  zippy.(none):/home/cmiller/work/mysql/merge/mysql-5.1-new


client/mysql.cc:
  Auto merged
mysql-test/r/func_str.result:
  Auto merged
mysql-test/r/rpl_temporary.result:
  Auto merged
mysql-test/r/select.result:
  Auto merged
mysql-test/t/rpl_temporary.test:
  Auto merged
sql/item_strfunc.cc:
  Auto merged

4d861dad

Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0 · 39ad30a4

unknown authored May 17, 2006

into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb


storage/ndb/src/mgmapi/mgmapi.cpp:
  Auto merged
storage/ndb/tools/waiter.cpp:
  Auto merged

39ad30a4

Merge poseidon.ndb.mysql.com:/home/tomas/mysql-4.1 · 6ee68c82

unknown authored May 17, 2006

into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0


ndb/src/mgmapi/mgmapi.cpp:
  Auto merged
ndb/tools/waiter.cpp:
  Auto merged

6ee68c82

ndb: added some missing error codes to mgmapi · a2f26487

unknown authored May 17, 2006

    ndb: ndb_waiter disconnect/reconnect on get status error


ndb/src/mgmapi/mgmapi.cpp:
  ndb: added some missing error codes to mgmapi
ndb/tools/waiter.cpp:
  ndb: ndb_waiter disconnect/reconnect on get status error

a2f26487

Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 5fca6059
unknown authored May 16, 2006
```
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb


mysql-test/t/disabled.def:
  Auto merged
```
5fca6059
Bug #16875 Using stale MySQLD FRM files can cause restored cluster to fail · 597d84fa
unknown authored May 16, 2006
```
- adoptions to handle binlog
```
597d84fa
Merge bk-internal.mysql.com:/data0/bk/mysql-5.1-new · ac9124ed
unknown authored May 16, 2006
```
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-kt
```
ac9124ed
Merge jmiller@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 6a278824
unknown authored May 16, 2006
```
into  mysql.com:/home/ndbdev/jmiller/clones/mysql-5.1-new
```
6a278824

Updated to fix bug in AIX · fdedc069

unknown authored May 16, 2006


mysql-test/extra/rpl_tests/rpl_log.test:
  Remove disable log per lars
mysql-test/r/rpl_stm_log.result:
  New results file
mysql-test/r/rpl_row_log.result:
  New results file
mysql-test/r/rpl_row_log_innodb.result:
  New results file

fdedc069

rpl_log.test: · c3e4f43d

unknown authored May 16, 2006

  Fix for failure in aix52 failure during push build


mysql-test/extra/rpl_tests/rpl_log.test:
  Fix for failure in aix52 failure during push build

c3e4f43d

Merge mysql.com:/usr/local/mysql/mysql-5.0-vgfix · 771d3d82

unknown authored May 16, 2006

into  mysql.com:/usr/local/mysql/tmp-5.1


client/mysqlbinlog.cc:
  Auto merged
include/my_sys.h:
  Auto merged
libmysql/libmysql.c:
  Auto merged
mysys/my_init.c:
  Auto merged
sql/mysqld.cc:
  Auto merged
dbug/dbug.c:
  Manual merge
include/my_dbug.h:
  Manual merge

771d3d82

disable events_logs_tests · 5be20e1c
unknown authored May 16, 2006

5be20e1c

information_schema.result: · 72232c69

unknown authored May 16, 2006

  corrected merge


mysql-test/r/information_schema.result:
  corrected merge

72232c69

Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0 · 0f404366

unknown authored May 16, 2006

into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb


storage/ndb/src/mgmsrv/MgmtSrvr.cpp:
  Auto merged
storage/ndb/src/ndbapi/SignalSender.cpp:
  Auto merged
support-files/mysql.spec.sh:
  Auto merged
storage/ndb/src/mgmsrv/Services.cpp:
  manual merge

0f404366

Merge poseidon.ndb.mysql.com:/home/tomas/mysql-4.1 · f5afd233

unknown authored May 16, 2006

into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0


ndb/src/mgmsrv/MgmtSrvr.cpp:
  Auto merged
ndb/src/ndbapi/SignalSender.cpp:
  Auto merged
support-files/mysql.spec.sh:
  Auto merged

f5afd233