Commits · 886cd3f9d23f58c8a70057e16285961368ab61ea · nexedi / MariaDB

08 Feb, 2006 15 commits

Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 886cd3f9
unknown authored Feb 08, 2006
```
into  linux.site:/home/reggie/work/mysql-5.1
```
886cd3f9
Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 3a6d3575
unknown authored Feb 08, 2006
```
into  big_geek.:C:/Work/mysql/mysql-5.1
```
3a6d3575

unknown authored Feb 08, 2006


win/cmakefiles/base:
  add flag for diabling insecure crt functions warning
win/cmakefiles/client:
  add dependency to GenError to make sure the error files are made
win/cmakefiles/extra:
  add custom target to run comp_err
win/cmakefiles/sql:
  removed comp_err stuff.

62b97928

Post merge-fixes. · fbfb0a46

unknown authored Feb 08, 2006

Apply a patch by Jonas for NDB diskdata.


mysql-test/r/sp-code.result:
  Fix a test result after merge: 94 and 95 are SQLCOM codes of 
  SQLCOM_CALL. New commands were added in 5.1 so SQLCOM_CALL got
  renumbered.
storage/ndb/src/kernel/blocks/ndbfs/AsyncFile.cpp:
  Apply second patch by Jonas to make NDB diskdata work on systems
  without O_DIRECT support.

fbfb0a46

Merge mysql.com:/home/kostja/mysql/tmp_merge · 78e1d2e3

unknown authored Feb 08, 2006

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


client/mysqltest.c:
  Auto merged
mysql-test/r/date_formats.result:
  Auto merged
mysql-test/r/sp-error.result:
  Auto merged
mysql-test/r/sp-security.result:
  Auto merged
mysql-test/r/sp.result:
  Auto merged
mysql-test/r/type_float.result:
  Auto merged
mysql-test/t/date_formats.test:
  Auto merged
mysql-test/t/sp-error.test:
  Auto merged
mysql-test/t/sp-security.test:
  Auto merged
mysql-test/t/sp.test:
  Auto merged
mysql-test/t/type_float.test:
  Auto merged
mysql-test/t/variables.test:
  Auto merged
sql/item_timefunc.cc:
  Auto merged

78e1d2e3

Merge mysql.com:/home/kostja/mysql/tmp_merge · fb0885de

unknown authored Feb 08, 2006

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


mysql-test/r/innodb.result:
  Manual merge: null merge, use local.
mysql-test/t/innodb.test:
  Manual merge: null merge, use local.
sql/ha_innodb.cc:
  Manual merge: null merge, use local.
sql/ha_innodb.h:
  Manual merge: null merge, use local.
storage/innobase/btr/btr0sea.c:
  Manual merge: null merge, use local.
storage/innobase/dict/dict0dict.c:
  Manual merge: null merge, use local.
storage/innobase/dict/dict0load.c:
  Manual merge: null merge, use local.
storage/innobase/fil/fil0fil.c:
  Manual merge: null merge, use local.
storage/innobase/include/univ.i:
  Manual merge: null merge, use local.
storage/innobase/os/os0sync.c:
  Manual merge: null merge, use local.
storage/innobase/srv/srv0start.c:
  Manual merge: null merge, use local.

fb0885de

Merge mysql.com:/home/kostja/mysql/tmp_merge2 · bfb9a07d

unknown authored Feb 08, 2006

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


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

bfb9a07d

Merge mysql.com:/home/kostja/mysql/tmp_merge · c4b62dec

unknown authored Feb 08, 2006

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


mysql-test/mysql-test-run.sh:
  Auto merged
mysql-test/r/trigger.result:
  Auto merged
mysql-test/t/federated.test:
  Auto merged
mysql-test/t/trigger-grant.test:
  Auto merged
mysql-test/t/trigger.test:
  Auto merged
sql/sp_head.cc:
  Auto merged
sql/sp_head.h:
  Auto merged
sql/sql_yacc.yy:
  Auto merged

c4b62dec

bug# 17082 Client hangs when creating tables with partition · 47d3fb87

unknown authored Feb 08, 2006

This bug was only on Windows but we updated the call to 
create_temporary_file to match what is being done in other
areas of MySQL


sql/sql_partition.cc:
  the O_RDWR mode and MY_WME were used in this code before the switch
  was made to create_temp_file.  The parameters are still there
  so we just plug in the mode and WME so the underlying code will 
  create the temp file with the right mode.  This only affected 
  Windows.  [This comment was from the first changset that I was unable
  to bk fix].  This changeset adds O_BINARY | O_TRUNC | O_TEMPORARY

47d3fb87

Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 6afc34a3
unknown authored Feb 08, 2006
```
into  linux.site:/home/reggie/work/mysql-5.1
```
6afc34a3

Apply the diskdata patch by Jonas. · af725e57

unknown authored Feb 08, 2006


storage/ndb/src/kernel/blocks/ndbfs/AsyncFile.cpp:
  Apply the diskdata patch by Jonas: the patch adds a fallback to 
  the standard I/O if O_DIRECT does not work.

af725e57

Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new · 7e30da39
unknown authored Feb 08, 2006
```
into  mysql.com:/home/kostja/mysql/mysql-5.1-merge
```
7e30da39

Fix for BUG#17180: Failure in trigger-grant on Solaris. · bb37a75f

unknown authored Feb 08, 2006

The problem is that LEX_STRING was used instead of LEX_STRING::str.


sql/sql_trigger.cc:
  Fix typo: we should have used LEX_STRING::str instead of LEX_STRING.

bb37a75f

Fix compilation failure. · 54307a46
unknown authored Feb 08, 2006

54307a46

Update test results · 4de1c46d

unknown authored Feb 08, 2006


mysql-test/r/binlog_row_blackhole.result:
  Update test results to reflect use of std_data_ln
mysql-test/r/rpl_row_flsh_tbls.result:
  Update test results, drop tables to clean up
mysql-test/r/rpl_row_log.result:
  Update test results to reflect use of std_data_ln

4de1c46d

07 Feb, 2006 25 commits

Merge mysql.com:/home/kostja/mysql/tmp_merge · 36d00575

unknown authored Feb 08, 2006

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


mysql-test/t/federated.test:
  Auto merged
sql/ha_federated.cc:
  Auto merged
sql/ha_federated.h:
  Auto merged

36d00575

Merge mysql.com:/home/kostja/mysql/tmp_merge · a81059f0

unknown authored Feb 08, 2006

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


storage/innobase/btr/btr0sea.c:
  SCCS merged
storage/innobase/fil/fil0fil.c:
  Auto merged
storage/innobase/include/btr0sea.ic:
  Manual merge: use local.

a81059f0

Merge mysql.com:/home/kostja/mysql/tmp_merge · b2397adb
unknown authored Feb 08, 2006
```
into  mysql.com:/home/kostja/mysql/mysql-5.1-merge


sql/field.cc:
  Auto merged
```
b2397adb

Merge mysql.com:/home/kostja/mysql/tmp_merge · 70a27f4b

unknown authored Feb 07, 2006

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


mysql-test/r/innodb.result:
  SCCS merged
mysql-test/t/innodb.test:
  SCCS merged
storage/innobase/dict/dict0dict.c:
  SCCS merged

70a27f4b

Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 36a5feb4
unknown authored Feb 07, 2006
```
into  linux.site:/home/reggie/work/mysql-5.1
```
36a5feb4

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

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

f43fa49b

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

Removed extra "drop view v1" · 4d20ff9c

unknown authored Feb 07, 2006


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

4d20ff9c

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

Update after merge 5.0 -> 5.1 · 69d1ef9f

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

69d1ef9f

Bug #17188 CRBR: ignores --binlog_ignore_db= settings · 097cee5f

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''

097cee5f

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

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

ec647b7f

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

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

ccd5fb28

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

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

dbfaa760

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


mysql-test/t/mysqltest.test:
  Auto merged
```
197e2f5e

Merge... · 68575c0a

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

68575c0a

BUG# 17082 - Client hangs when creating tables with partition · ba59c335

unknown authored Feb 07, 2006

no test case needed since simply creating a partitioned table 
reproduces it.


sql/sql_partition.cc:
  the O_RDWR mode and MY_WME were used in this code before the switch
  was made to create_temp_file.  The parameters are still there
  so we just plug in the mode and WME so the underlying code will 
  create the temp file with the right mode.  This only affected 
  Windows.

ba59c335

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

Merge... · 6d4946fc

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

6d4946fc

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

5dcc958c
Bug #17005 Ndb partition handling for create table like is broken · cfb10ef0
unknown authored Feb 07, 2006

cfb10ef0

Merge mysql.com:/home/kostja/mysql/tmp_merge · e4518ee3

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

e4518ee3

Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 742671f7
unknown authored Feb 07, 2006
```
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new
```
742671f7