Commits · 135ea05c480d637a322856c120073918fa9ef560 · Kirill Smelkov / mariadb

08 Feb, 2006 1 commit
- Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 135ea05c
  unknown authored Feb 08, 2006
```
into  mysql.com:/home/cps/mysql/devel/5.1-utf-bug


sql/log.cc:
  Auto merged
```
  135ea05c
07 Feb, 2006 24 commits

Merge neptunus.(none):/home/msvensson/mysql/tmp_merge · 2f370575

unknown authored Feb 07, 2006

into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new


mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/extra/rpl_tests/rpl_stm_000001.test:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
mysql-test/r/mysqltest.result:
  Auto merged
mysql-test/r/query_cache.result:
  Auto merged
mysql-test/r/rpl_loaddata.result:
  Auto merged
mysql-test/r/rpl_loaddata_m.result:
  Auto merged
mysql-test/r/rpl_loaddata_s.result:
  Auto merged
mysql-test/r/rpl_misc_functions.result:
  Auto merged
mysql-test/r/rpl_replicate_do.result:
  Auto merged
mysql-test/r/rpl_stm_000001.result:
  Auto merged
mysql-test/r/sp-security.result:
  Auto merged
mysql-test/r/trigger-compat.result:
  Auto merged
mysql-test/r/trigger.result:
  Auto merged
mysql-test/r/variables.result:
  Auto merged
mysql-test/r/view.result:
  Auto merged
mysql-test/r/view_grant.result:
  Auto merged
mysql-test/t/information_schema.test:
  Auto merged
mysql-test/t/mysqltest.test:
  Auto merged
mysql-test/t/query_cache.test:
  Auto merged
mysql-test/t/rpl_loaddata.test:
  Auto merged
mysql-test/t/rpl_loaddata_m.test:
  Auto merged
mysql-test/t/rpl_loaddata_s.test:
  Auto merged
mysql-test/t/rpl_misc_functions.test:
  Auto merged
mysql-test/t/rpl_replicate_do.test:
  Auto merged
mysql-test/t/sp-security.test:
  Auto merged
mysql-test/t/symlink.test:
  Auto merged
mysql-test/t/trigger-compat.test:
  Auto merged
mysql-test/t/trigger-grant.test:
  Auto merged
mysql-test/t/trigger.test:
  Auto merged
mysql-test/t/type_varchar.test:
  Auto merged
mysql-test/t/view.test:
  Auto merged
sql-common/client.c:
  Auto merged
tests/mysql_client_test.c:
  Auto merged

2f370575

Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new · 42b1cfc5
unknown authored Feb 07, 2006
```
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new
```
42b1cfc5

Removed extra "drop view v1" · 56f138b9

unknown authored Feb 07, 2006


mysql-test/r/sp-prelocking.result:
  Update test result
mysql-test/t/sp-prelocking.test:
  One drop too many

56f138b9

Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 3eb41de8
unknown authored Feb 07, 2006
```
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
```
3eb41de8

Update after merge 5.0 -> 5.1 · 7eefe3da

unknown authored Feb 07, 2006


mysql-test/r/rpl_failed_optimize.result:
  Updates test result
mysql-test/r/rpl_insert_id.result:
  Updates test result
mysql-test/r/rpl_loaddata.result:
  Updates test result
mysql-test/r/rpl_loaddata_s.result:
  Updates test result
mysql-test/r/rpl_multi_update3.result:
  Updates test result

7eefe3da

Bug #17188 CRBR: ignores --binlog_ignore_db= settings · 752b6881

unknown authored Feb 07, 2006


mysql-test/r/ndb_binlog_ignore_db.result:
  New BitKeeper file ``mysql-test/r/ndb_binlog_ignore_db.result''
mysql-test/t/ndb_binlog_ignore_db-master.opt:
  New BitKeeper file ``mysql-test/t/ndb_binlog_ignore_db-master.opt''
mysql-test/t/ndb_binlog_ignore_db.test:
  New BitKeeper file ``mysql-test/t/ndb_binlog_ignore_db.test''

752b6881

Merge neptunus.(none):/home/msvensson/mysql/mysqltest_float_result/my51-mysqltest_float_result · fc45d187

unknown authored Feb 07, 2006

into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new


client/mysqltest.c:
  Auto merged
mysql-test/r/type_float.result:
  Auto merged
mysql-test/t/type_float.test:
  Auto merged
mysql-test/t/variables.test:
  Auto merged

fc45d187

Merge neptunus.(none):/home/msvensson/mysql/bug15302/my51-bug15302 · 137967ea

unknown authored Feb 07, 2006

into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new


client/mysqltest.c:
  Auto merged
sql/sql_db.cc:
  Auto merged

137967ea

Merge neptunus.(none):/home/msvensson/mysql/mysqltest_var/my51-mysqltest_var · d942f408

unknown authored Feb 07, 2006

into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new


mysql-test/extra/rpl_tests/rpl_stm_000001.test:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
mysql-test/r/query_cache.result:
  Auto merged
mysql-test/r/rpl_loaddata.result:
  Auto merged
mysql-test/r/rpl_loaddata_m.result:
  Auto merged
mysql-test/r/rpl_loaddata_s.result:
  Auto merged
mysql-test/r/rpl_misc_functions.result:
  Auto merged
mysql-test/r/rpl_replicate_do.result:
  Auto merged
mysql-test/r/rpl_stm_000001.result:
  Auto merged
mysql-test/t/mysqltest.test:
  Auto merged
mysql-test/t/query_cache.test:
  Auto merged
mysql-test/t/rpl_loaddata.test:
  Auto merged
mysql-test/t/rpl_loaddata_m.test:
  Auto merged
mysql-test/t/rpl_loaddata_s.test:
  Auto merged
mysql-test/t/rpl_misc_functions.test:
  Auto merged
mysql-test/t/rpl_replicate_do.test:
  Auto merged
mysql-test/t/trigger-compat.test:
  Auto merged
mysql-test/t/type_varchar.test:
  Auto merged
mysql-test/r/mysqltest.result:
  Merge 5.0 -> 5.1
mysql-test/t/trigger-grant.test:
  "Use local" when merging 5.0 -> 5.1

d942f408

Merge neptunus.(none):/home/msvensson/mysql/mysqltest_var/my50-mysqltest_var · 6af1dca5
unknown authored Feb 07, 2006
```
into  neptunus.(none):/home/msvensson/mysql/mysqltest_var/my51-mysqltest_var


mysql-test/t/mysqltest.test:
  Auto merged
```
6af1dca5

Merge... · 0522905a

unknown authored Feb 07, 2006

Merge neptunus.(none):/home/msvensson/mysql/mysqltestrun_check_testcases/my51-mysqltestrun_check_testcases
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new


mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/ps_1general.result:
  Auto merged
mysql-test/r/query_cache.result:
  Auto merged
mysql-test/r/rpl_loaddata_m.result:
  Auto merged
mysql-test/r/sp-security.result:
  Auto merged
mysql-test/r/variables.result:
  Auto merged
mysql-test/r/view_grant.result:
  Auto merged
mysql-test/t/query_cache.test:
  Auto merged
mysql-test/t/read_only.test:
  Auto merged
mysql-test/t/sp-security.test:
  Auto merged
mysql-test/t/trigger-compat.test:
  Auto merged
mysql-test/t/view_grant.test:
  Auto merged
mysql-test/r/trigger-compat.result:
  Merge 5.0 -> 5.1

0522905a

Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 915b08fe
unknown authored Feb 07, 2006
```
into  big_geek.:C:/Work/mysql/mysql-5.1
```
915b08fe
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 59bd66d3
unknown authored Feb 07, 2006
```
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
```
59bd66d3

Merge... · 3b800432

unknown authored Feb 07, 2006

Merge neptunus.(none):/home/msvensson/mysql/mysqltestrun_check_testcases/my50-mysqltestrun_check_testcases
into  neptunus.(none):/home/msvensson/mysql/mysqltestrun_check_testcases/my51-mysqltestrun_check_testcases


mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/extra/binlog_tests/ctype_cp932.test:
  Auto merged
mysql-test/extra/rpl_tests/rpl_flsh_tbls.test:
  Auto merged
mysql-test/extra/rpl_tests/rpl_stm_000001.test:
  Auto merged
mysql-test/r/binlog_stm_ctype_cp932.result:
  Auto merged
mysql-test/r/ps_1general.result:
  Auto merged
mysql-test/r/query_cache.result:
  Auto merged
mysql-test/r/rpl000017.result:
  Auto merged
mysql-test/r/rpl_loaddata.result:
  Auto merged
mysql-test/r/rpl_loaddata_s.result:
  Auto merged
mysql-test/r/rpl_replicate_do.result:
  Auto merged
mysql-test/r/rpl_stm_000001.result:
  Auto merged
mysql-test/r/rpl_stm_flsh_tbls.result:
  Auto merged
mysql-test/r/sp-prelocking.result:
  Auto merged
mysql-test/r/type_bit.result:
  Auto merged
mysql-test/r/variables.result:
  Auto merged
mysql-test/r/view_grant.result:
  Auto merged
mysql-test/t/create_select_tmp.test:
  Auto merged
mysql-test/t/ps_1general.test:
  Auto merged
mysql-test/t/query_cache.test:
  Auto merged
mysql-test/t/rpl000017.test:
  Auto merged
mysql-test/t/rpl_replicate_do.test:
  Auto merged
mysql-test/t/sp-prelocking.test:
  Auto merged
mysql-test/t/trigger-compat.test:
  Auto merged
mysql-test/t/variables.test:
  Auto merged
mysql-test/t/view_grant.test:
  Auto merged
mysql-test/r/rpl_loaddata_m.result:
  Merge 5.0->5.1
mysql-test/t/rpl_failed_optimize.test:
  Merge 5.0->5.1
mysql-test/t/rpl_insert_id.test:
  Merge 5.0->5.1
mysql-test/t/rpl_loaddata.test:
  Merge 5.0->5.1
mysql-test/t/rpl_loaddata_m.test:
  Merge 5.0->5.1
mysql-test/t/rpl_loaddata_s.test:
  Merge 5.0->5.1
mysql-test/t/rpl_multi_update3.test:
  Merge 5.0->5.1

3b800432

Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 738338d6
unknown authored Feb 07, 2006
```
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
```
738338d6
cmake corrections to fix compiling on visual 7.1 · 14e5e0b9
unknown authored Feb 07, 2006

14e5e0b9
Bug #17005 Ndb partition handling for create table like is broken · 3e463dda
unknown authored Feb 07, 2006

3e463dda

Merge mysql.com:/home/kostja/mysql/tmp_merge · 02576c95

unknown authored Feb 07, 2006

into  mysql.com:/home/kostja/mysql/mysql-5.1-merge


mysql-test/r/information_schema_db.result:
  Auto merged
sql/ha_archive.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/table.h:
  Auto merged
mysql-test/r/information_schema.result:
  SCCS merged

02576c95

Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 6a9a35c0
unknown authored Feb 07, 2006
```
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new
```
6a9a35c0
Bug #17087 No warning on cluster failure for IS.FILES · 76d8dd3e
unknown authored Feb 07, 2006

76d8dd3e

Bug#17081 LOAD DATA INFILE" may not load all the data · f0e0e5c5

unknown authored Feb 07, 2006

Bug #17154  	load data infile hangs when duplicate key encountered


mysql-test/r/ndb_load.result:
  New BitKeeper file ``mysql-test/r/ndb_load.result''
mysql-test/t/ndb_load.test:
  New BitKeeper file ``mysql-test/t/ndb_load.test''

f0e0e5c5

bug#16924 - ndb - insert wo/ specifying null on varsize attribute · a5170116
unknown authored Feb 07, 2006
```
  init both pos and len


storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp:
  init both pos and len
```
a5170116
MySQL Bugs: #16925: ndb, added additional getters on NdbDictionary::Event · 3449ca1a
unknown authored Feb 07, 2006

3449ca1a

MySQL Bugs: #16925: ndb, added additional getters on NdbDictionary::Event · ad97790a

unknown authored Feb 07, 2006


storage/ndb/include/ndbapi/NdbDictionary.hpp:
  ndb, added additional getters on NdbDictionary::Event
storage/ndb/src/ndbapi/NdbDictionary.cpp:
  ndb, added additional getters on NdbDictionary::Event
storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  ndb, added additional getters on NdbDictionary::Event
storage/ndb/src/ndbapi/NdbDictionaryImpl.hpp:
  ndb, added additional getters on NdbDictionary::Event

ad97790a

06 Feb, 2006 15 commits

merge · e379b87e
unknown authored Feb 06, 2006

e379b87e
merge · 568f7cd2
unknown authored Feb 06, 2006

568f7cd2

Merge perch.ndb.mysql.com:/home/jonas/src/51-new · 756e8015

unknown authored Feb 06, 2006

into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new


sql/ha_ndbcluster.cc:
  Auto merged
sql/share/errmsg.txt:
  Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupScan.cpp:
  Auto merged
storage/ndb/test/ndbapi/test_event.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  SCCS merged

756e8015

Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 9023ebf5
unknown authored Feb 06, 2006
```
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new
```
9023ebf5
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 50e8f3a3
unknown authored Feb 06, 2006
```
into mysql.com:/home/psergey/mysql-5.1-wl2985-postfixes
```
50e8f3a3
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new · dc5b10d3
unknown authored Feb 06, 2006
```
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
```
dc5b10d3
Bug #17160 test case ndb_restore leaves a core file · 5bcd374c
unknown authored Feb 06, 2006

5bcd374c
WL#2985 "Partition pruning", "do pruning for UPDATE/DELETE": Post-merge fixes · 4f9e66da
unknown authored Feb 06, 2006

4f9e66da

harmonized mysql-test-run.sh and .pl · 456d7b3c

unknown authored Feb 06, 2006

+ added current test printout to error file


mysql-test/lib/mtr_cases.pl:
  harmonized mysql-test-run.sh and .pl

456d7b3c

Fix merge (5.0 -> 5.1) of the patch for BUG#15166/15196. · 642e222c

unknown authored Feb 06, 2006


mysql-test/r/trigger-grant.result:
  Updated result file: use TRIGGER instead of SUPER for BUG#15166/15196 tests.
sql/item.cc:
  Updated according to the 5.1 data structures.

642e222c

bug#16767, bug#16768 - ndb missleading names of error codes · 4c77c3dd

unknown authored Feb 06, 2006

  rename error codes


mysql-test/t/ndb_dd_ddl.test:
  rename error code
sql/ha_ndbcluster.cc:
  rename error code
sql/share/errmsg.txt:
  rename error code

4c77c3dd

Merge mysql.com:/home/alik/Documents/AllProgs/MySQL/devel/5.0-rev-1.2004.2.1 · 18f4a81d

unknown authored Feb 06, 2006

into  mysql.com:/home/alik/Documents/AllProgs/MySQL/devel/5.1-tree


mysql-test/r/trigger-grant.result:
  Auto merged
sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
mysql-test/t/trigger-grant.test:
  Merged.
sql/sql_trigger.cc:
  Merged.

18f4a81d

Merge mysql.com:/M50/tmp-5.0 into mysql.com:/M51/bug16730-5.1 · e1fc02ef
unknown authored Feb 06, 2006
```
mysql-test/t/ctype_ucs.test:
  Auto merged
```
e1fc02ef

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

unknown authored Feb 06, 2006

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


sql/ha_ndbcluster.cc:
  Auto merged
sql/ha_ndbcluster_binlog.cc:
  Auto merged

d59a2fc4

Merge perch.ndb.mysql.com:/home/jonas/src/50-work · 7922443e

unknown authored Feb 06, 2006

into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new


storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged

7922443e