Commits · 0d366c05f12f59650b196ff070b3dc223b22f655 · Kirill Smelkov / mariadb

04 Aug, 2006 1 commit

unknown authored Aug 04, 2006

  report only once on "all dump 1000"


storage/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
  report DM only once
storage/ndb/src/kernel/blocks/dbtup/DbtupDebug.cpp:
  report DM only once

0d366c05

02 Aug, 2006 4 commits

ndb - · 44c29ca3

unknown authored Aug 02, 2006

  make Dblqh use OM_AUTO_SYNC


storage/ndb/include/kernel/signaldata/FsOpenReq.hpp:
  make Dblqh us OM_AUTO_SYNC
storage/ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
  make Dblqh us OM_AUTO_SYNC
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  make Dblqh us OM_AUTO_SYNC
storage/ndb/src/kernel/vm/pc.hpp:
  remove unused #defines

44c29ca3

ndb - Add possibility to limit disk write speed in backup(lcp) · 5ae954b1

unknown authored Aug 02, 2006

      3 new paramters:
      DiskSyncSize - Outstanding disk writes before sync (default 4M)
      DiskCheckpointSpeed - Write speed of LCP in bytes/sec (default 10M)
      DiskCheckpointSpeedInRestart - As above but during LCP (default 100M)

      Depricated old NoOfDiskPagesToDisk*

    - Change NoOfFragmentLogFiles default to 16 (1Gb)


storage/ndb/include/kernel/signaldata/BackupContinueB.hpp:
  Add possibility to limitat of disk write speed in backup
storage/ndb/include/mgmapi/mgmapi_config_parameters.h:
  Add possibility to limitat of disk write speed in backup
storage/ndb/src/kernel/blocks/backup/Backup.cpp:
  Add possibility to limitat of disk write speed in backup
storage/ndb/src/kernel/blocks/backup/Backup.hpp:
  Add possibility to limitat of disk write speed in backup
storage/ndb/src/kernel/blocks/backup/BackupInit.cpp:
  Add possibility to limitat of disk write speed in backup
storage/ndb/src/mgmsrv/ConfigInfo.cpp:
  Add possibility to limitat of disk write speed in backup
  Change NoOfFragmentLogFiles default to 16 (1Gb)
  DiskSyncSize
  DiskCheckpointSpeed
  DiskCheckpointSpeedInRestart
storage/ndb/src/mgmsrv/InitConfigFileParser.cpp:
  Handle deprication warning also in my.cnf format

5ae954b1

ndb - add OM_AUTO_SYNC ta make sure os-kernel does not buffer too much · f6e3b15d

unknown authored Aug 02, 2006

      add sync-flag to FsAppendReq


storage/ndb/include/kernel/signaldata/FsAppendReq.hpp:
  Add sync flag to FsAppend
storage/ndb/include/kernel/signaldata/FsOpenReq.hpp:
  Add auto sync flag to FSOPEN
storage/ndb/src/kernel/blocks/ndbfs/AsyncFile.cpp:
  Add append_synch and auto sync
storage/ndb/src/kernel/blocks/ndbfs/AsyncFile.hpp:
  Add variables for auto sync
storage/ndb/src/kernel/blocks/ndbfs/Ndbfs.cpp:
  Add append_sync and auto sync

f6e3b15d

Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1 · 9f820cf2
unknown authored Aug 02, 2006
```
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new
```
9f820cf2

01 Aug, 2006 20 commits

Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.1 · 30e11b06
unknown authored Aug 02, 2006
```
into  sunlight.local:/local_work/tmp_merge-5.1-opt-mysql


mysql-test/r/innodb.result:
  Auto merged
```
30e11b06
sql_view.cc: · 84b16f0e
unknown authored Aug 02, 2006
```
  After merge fix


sql/sql_view.cc:
  After merge fix
```
84b16f0e

Merge sunlight.local:/local_work/tmp_merge-5.0-opt-mysql · 8ce7848a

unknown authored Aug 01, 2006

into  sunlight.local:/local_work/tmp_merge-5.1-opt-mysql


client/mysql.cc:
  Auto merged
mysql-test/r/view.result:
  Auto merged
mysql-test/t/view.test:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/table.h:
  Auto merged
sql/sql_view.cc:
  SCCS merged

8ce7848a

Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.1-opt · 10b90c06
unknown authored Aug 01, 2006
```
into  sunlight.local:/local_work/tmp_merge-5.1-opt-mysql
```
10b90c06

Makefile.am: · b3708b7c

unknown authored Aug 01, 2006

  After merge fix


storage/ndb/test/ndbapi/Makefile.am:
  After merge fix

b3708b7c

Merge perch.ndb.mysql.com:/home/jonas/src/51-work · 46a96105

unknown authored Aug 01, 2006

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


storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbScanOperation.cpp:
  Auto merged

46a96105

Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb · 8029838f

unknown authored Aug 01, 2006

into  perch.ndb.mysql.com:/home/jonas/src/51-work


storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbScanOperation.cpp:
  Auto merged
storage/ndb/test/include/HugoTransactions.hpp:
  Auto merged
storage/ndb/test/src/HugoTransactions.cpp:
  Auto merged

8029838f

ndb - add abort flag to hugoLoad · 785de403

unknown authored Aug 01, 2006


storage/ndb/test/include/HugoTransactions.hpp:
  Add abort flag to hugoLoad
storage/ndb/test/src/HugoTransactions.cpp:
  Add abort flag to hugoLoad
storage/ndb/test/tools/hugoLoad.cpp:
  Add abort flag to hugoLoad

785de403

func_str.result: · a03006eb

unknown authored Aug 01, 2006

  After merge fix


mysql-test/r/func_str.result:
  After merge fix

a03006eb

Merge perch.ndb.mysql.com:/home/jonas/src/51-work · 8a2744da

unknown authored Aug 01, 2006

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


storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbScanOperation.cpp:
  Auto merged

8a2744da

Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1 · adcf382f
unknown authored Aug 01, 2006
```
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new
```
adcf382f
serg's MacOSX-intel portability diff · e80a76d7
unknown authored Aug 01, 2006

e80a76d7
Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · 759027d1
unknown authored Aug 01, 2006
```
into  rakia.(none):/home/kgeorge/mysql/autopush/B20103-5.0-opt
```
759027d1

Bug #20103: Escaping with backslash does not work · ec95bf78

unknown authored Aug 01, 2006

 - make the client to respect the server-side 
   no_backslash_escapes option and disable the 
   special meaning of backslash also at client side.


mysql-test/r/mysql_client.result:
  Bug #20103: Escaping with backslash does not work
   - test case
mysql-test/t/mysql_client.test:
  Bug #20103: Escaping with backslash does not work
   - test case

ec95bf78

Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.1-opt · deee3a30

unknown authored Aug 01, 2006

into  sunlight.local:/local_work/tmp_merge-5.1-opt-mysql


mysql-test/r/auto_increment.result:
  Auto merged
mysql-test/r/binlog_row_blackhole.result:
  Auto merged
mysql-test/r/binlog_stm_blackhole.result:
  Auto merged
mysql-test/r/date_formats.result:
  Auto merged
mysql-test/r/func_compress.result:
  Auto merged
mysql-test/r/func_gconcat.result:
  Auto merged
mysql-test/r/func_group.result:
  Auto merged
mysql-test/r/func_math.result:
  Auto merged
mysql-test/r/func_str.result:
  Auto merged
mysql-test/r/func_system.result:
  Auto merged
mysql-test/r/func_time.result:
  Auto merged
mysql-test/r/gis.result:
  Auto merged
mysql-test/r/group_by.result:
  Auto merged
mysql-test/r/group_min_max.result:
  Auto merged
mysql-test/r/myisam.result:
  Auto merged
mysql-test/r/olap.result:
  Auto merged
mysql-test/r/partition_pruning.result:
  Auto merged
mysql-test/r/query_cache.result:
  Auto merged
mysql-test/r/rpl_get_lock.result:
  Auto merged
mysql-test/r/rpl_master_pos_wait.result:
  Auto merged
mysql-test/r/select.result:
  Auto merged
mysql-test/r/subselect.result:
  Auto merged
mysql-test/r/type_blob.result:
  Auto merged
mysql-test/r/union.result:
  Auto merged
mysql-test/r/variables.result:
  Auto merged
mysql-test/r/view.result:
  Auto merged
mysql-test/t/group_min_max.test:
  Auto merged
mysql-test/t/partition_pruning.test:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/table.h:
  Auto merged

deee3a30

After merge fix · f75e79e0
unknown authored Aug 01, 2006

f75e79e0
Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · 0c0f49bc
unknown authored Aug 01, 2006
```
into  rakia.(none):/home/kgeorge/mysql/autopush/B11551-5.0-opt
```
0c0f49bc
Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · b91f3bac
unknown authored Aug 01, 2006
```
into  sunlight.local:/local_work/tmp_merge-5.0-opt-mysql
```
b91f3bac

Merge mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge · 9cb377f9

unknown authored Aug 01, 2006

into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.1-merge


extra/yassl/src/ssl.cpp:
  Auto merged
mysql-test/t/rpl_openssl.test:
  Auto merged

9cb377f9

Merge mysql.com:/users/lthalmann/bk/MERGE/mysql-4.1-merge · f3099ba3
unknown authored Aug 01, 2006
```
into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge
```
f3099ba3

31 Jul, 2006 10 commits

Merge sunlight.local:/local_work/tmp_merge-5.0-opt-mysql · 749091a9

unknown authored Jul 31, 2006

into  sunlight.local:/local_work/tmp_merge-5.1-opt-mysql


mysql-test/r/func_group.result:
  Auto merged
sql/sql_select.cc:
  Auto merged
mysql-test/r/select.result:
  SCCS merged

749091a9

Merge mysql.com:/users/lthalmann/bkroot/mysql-5.1-new-rpl · 0a6f3aad

unknown authored Jul 31, 2006

into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.1-merge


extra/yassl/src/ssl.cpp:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged

0a6f3aad

Merge mysql.com:/users/lthalmann/bkroot/mysql-5.0-rpl · 03206fd7
unknown authored Jul 31, 2006
```
into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge


extra/yassl/src/ssl.cpp:
  Auto merged
```
03206fd7
Merge mysql.com:/users/lthalmann/bkroot/mysql-4.1-rpl · 76f65b3f
unknown authored Jul 31, 2006
```
into  mysql.com:/users/lthalmann/bk/MERGE/mysql-4.1-merge
```
76f65b3f

select.result, func_group.result, sql_select.cc: · 45871dbf

unknown authored Jul 31, 2006

  After merge fix


mysql-test/r/select.result:
  After merge fix
mysql-test/r/func_group.result:
  After merge fix
sql/sql_select.cc:
  After merge fix

45871dbf

BUG#14940: Post-merge fixes: update test results · 9f90d4c2
unknown authored Jul 31, 2006

9f90d4c2

Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · 464cb603

unknown authored Jul 31, 2006

into  rakia.(none):/home/kgeorge/mysql/autopush/B11551-5.0-opt


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

464cb603

Bug #11551: Asymmetric + undocumented behaviour of DROP VIEW and DROP TABLE · b74cb623

unknown authored Jul 31, 2006

 
made DROP VIEW to continue on error and report an aggregated error 
 at its end. This makes it similar to DROP TABLE.


mysql-test/r/view.result:
  Bug #11551: Asymmetric + undocumented behaviour of DROP VIEW and DROP TABLE
   - test case
   - changed error message
mysql-test/t/view.test:
  Bug #11551: Asymmetric + undocumented behaviour of DROP VIEW and DROP TABLE
   - test case
sql/sql_view.cc:
  Bug #11551: Asymmetric + undocumented behaviour of DROP VIEW and DROP TABLE
   - made DROP VIEW to continue on error and report an aggregated error

b74cb623

Merge bk-internal:/home/bk/mysql-5.0-opt · 4acf6de8

unknown authored Jul 31, 2006

into  macbook.gmz:/Users/kgeorge/mysql/work/B21080-5.0-opt


mysql-test/r/view.result:
  merge
mysql-test/t/view.test:
  merge

4acf6de8

Bug #21080: ALTER VIEW makes user restate SQL SECURITY mode, and ALGORITHM · c8673b09

unknown authored Jul 31, 2006

  When executing ALTER TABLE all the attributes of the view were overwritten.
  This is contrary to the user's expectations.
  So some of the view attributes are preserved now : namely security and 
  algorithm. This means that if they are not specified in ALTER VIEW
  their values are preserved from CREATE VIEW instead of being defaulted.


mysql-test/r/view.result:
  Bug #21080: ALTER VIEW makes user restate SQL SECURITY mode, and ALGORITHM
   - test suite
mysql-test/t/view.test:
  Bug #21080: ALTER VIEW makes user restate SQL SECURITY mode, and ALGORITHM
   - test suite
sql/sql_lex.h:
  Bug #21080: ALTER VIEW makes user restate SQL SECURITY mode, and ALGORITHM
   - must make create_view_suid a tristate : on/off/unspecified
sql/sql_view.cc:
  Bug #21080: ALTER VIEW makes user restate SQL SECURITY mode, and ALGORITHM
   - open the view to get it's attributes and put then as defaults 
     for ALTER VIEW
sql/sql_yacc.yy:
  Bug #21080: ALTER VIEW makes user restate SQL SECURITY mode, and ALGORITHM
   - must make create_view_suid a tristate : on/off/unspecified
sql/table.h:
  Bug #21080: ALTER VIEW makes user restate SQL SECURITY mode, and ALGORITHM
   - must make create_view_suid a tristate : on/off/unspecified

c8673b09

30 Jul, 2006 2 commits
- BUG#14940: Post-merge fixes · 63c4889b
  unknown authored Jul 30, 2006
  
  63c4889b
- Make innodb_thread_concurrency 0 by default. · dce2086a
  unknown authored Jul 30, 2006
```
 Fixing test result.
```
  dce2086a
29 Jul, 2006 3 commits

Merge sunlight.local:/local_work/tmp_merge-5.0-opt-mysql · ddb91478

unknown authored Jul 30, 2006

into  sunlight.local:/local_work/tmp_merge-5.1-opt-mysql


client/mysql.cc:
  Auto merged
mysql-test/r/date_formats.result:
  Auto merged
mysql-test/r/func_gconcat.result:
  Auto merged
mysql-test/r/func_group.result:
  Auto merged
mysql-test/r/func_str.result:
  Auto merged
mysql-test/r/group_min_max.result:
  Auto merged
BitKeeper/deleted/.del-make_win_src_distribution.sh~f80d8fca44e4e5f1:
  Auto merged
BitKeeper/deleted/.del-mysqld.dsp~ffdbf2d234e23e56:
  Auto merged
BitKeeper/deleted/.del-mysqld_ia64.dsp~7f8cf84d81ee04e2:
  Auto merged
BitKeeper/deleted/.del-mysqldump.dsp~a8bd23547d3fc27e:
  Auto merged
BitKeeper/deleted/.del-mysqldump_ia64.dsp~a2aabe898be35b31:
  Auto merged
mysql-test/r/innodb.result:
  Auto merged
mysql-test/r/innodb_mysql.result:
  Auto merged
mysql-test/r/ps_7ndb.result:
  Auto merged
mysql-test/r/type_ranges.result:
  Auto merged
mysql-test/r/udf.result:
  Auto merged
mysql-test/r/union.result:
  Auto merged
mysql-test/r/view.result:
  Auto merged
mysql-test/t/date_formats.test:
  Auto merged
mysql-test/t/func_gconcat.test:
  Auto merged
mysql-test/t/func_group.test:
  Auto merged
mysql-test/t/group_min_max.test:
  Auto merged
mysql-test/t/innodb.test:
  Auto merged
mysql-test/t/innodb_mysql.test:
  Auto merged
mysql-test/t/mysql.test:
  Auto merged
mysql-test/t/select.test:
  Auto merged
mysql-test/t/sp.test:
  Auto merged
mysql-test/t/view.test:
  Auto merged
sql/field.cc:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_cmpfunc.h:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_func.h:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/item_subselect.cc:
  Auto merged
sql/item_subselect.h:
  Auto merged
sql/opt_range.h:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/time.cc:
  Auto merged
storage/ndb/test/ndbapi/Makefile.am:
  Auto merged
strings/decimal.c:
  Auto merged
mysql-test/r/analyse.result:
  Manual merge
mysql-test/r/bigint.result:
  Manual merge
mysql-test/r/create.result:
  Manual merge
mysql-test/r/information_schema.result:
  Manual merge
mysql-test/r/ps_2myisam.result:
  Manual merge
mysql-test/r/ps_3innodb.result:
  Manual merge
mysql-test/r/ps_4heap.result:
  Manual merge
mysql-test/r/ps_5merge.result:
  Manual merge
mysql-test/r/ps_6bdb.result:
  Manual merge
mysql-test/r/rpl_insert_id.result:
  Manual merge
mysql-test/r/select.result:
  Manual merge
mysql-test/r/sp.result:
  Manual merge
mysql-test/r/subselect.result:
  Manual merge
mysql-test/t/information_schema.test:
  Manual merge
mysql-test/t/rpl_insert_id.test:
  Manual merge
sql/field.h:
  Manual merge
sql/item.cc:
  Manual merge
sql/item.h:
  Manual merge
sql/item_strfunc.h:
  Manual merge
sql/item_sum.cc:
  Manual merge
sql/mysql_priv.h:
  Manual merge
sql/share/errmsg.txt:
  Manual merge
sql/sql_class.h:
  Manual merge
sql/sql_select.cc:
  Manual merge

ddb91478

Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.1-opt · 283e41d6

unknown authored Jul 30, 2006

into  mysql.com:/home/psergey/mysql-5.1-bug14940-r4


mysql-test/r/partition_pruning.result:
  Auto merged
mysql-test/t/partition_pruning.test:
  Auto merged
sql/sql_select.cc:
  Auto merged

283e41d6

BUG#14940: post-review fixes · 3e2af0b8

unknown authored Jul 30, 2006


sql/opt_range.cc:
  BUG#14940: post-review fixes:
   - fix comments
   - use set_if_smaller

3e2af0b8