Commits · 0c7025dad4455d4fa4240ee5ec53acea5787289b · Kirill Smelkov / mariadb

04 Aug, 2006 3 commits

Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new · 0c7025da
unknown authored Aug 04, 2006
```
into  perch.ndb.mysql.com:/home/jonas/src/51-work
```
0c7025da
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1 · 50487062
unknown authored Aug 04, 2006
```
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new
```
50487062

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

03 Aug, 2006 13 commits
- Merge bk-internal:/home/bk/mysql-5.1-new-maint · 5e2babfe
  unknown authored Aug 04, 2006
```
into  maint1.mysql.com:/data/localhome/tsmith/bk/mrg51-c
```
  5e2babfe
- Merge bk-internal:/home/bk/mysql-5.1-new-maint · f87df4cc
  unknown authored Aug 03, 2006
```
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
```
  f87df4cc
- Merge rama.(none):/home/jimw/my/mysql-5.1-17122 · 551f9ded
  unknown authored Aug 03, 2006
```
into  rama.(none):/home/jimw/my/mysql-5.1-clean
```
  551f9ded
- Manual merge resolve, part 6 of 6+ · a4f66037
  unknown authored Aug 03, 2006
  
  a4f66037
- Use "--source" command instead of "source", makes mysql-test-run.pl dtecte... · 5f61f026
  unknown authored Aug 03, 2006
```
Use "--source" command instead of "source", makes mysql-test-run.pl dtecte this as test case that need binlog format row.
```
  5f61f026
- Merge maint1.mysql.com:/data/localhome/tsmith/bk/mrg51-a · 177c0623
  unknown authored Aug 03, 2006
```
into  maint1.mysql.com:/data/localhome/tsmith/bk/mrg51-c
```
  177c0623
- 5.0 -> 5.1 manual merge, part 5 of 5 (or more?) · 9f0f8458
  unknown authored Aug 03, 2006
  
  9f0f8458
- Replace FEDERATED_EQ with STRING_WITH_LEN("=") · 358400a8
  unknown authored Aug 03, 2006
```
sql/ha_federated.cc:
  After merge fix
```
  358400a8
- Merge neptunus.(none):/home/msvensson/mysql/my51-m-bug20942 · b58c7551
  unknown authored Aug 03, 2006
```
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint


sql/ha_federated.cc:
  Manual merge
```
  b58c7551
- 5.0 -> 5.1 manual merge, part 4 of 4 (or more?) · 71076932
  unknown authored Aug 03, 2006
  
  71076932
- Merge maint1.mysql.com:/data/localhome/tsmith/bk/mrg50-c · 15e27e48
  unknown authored Aug 03, 2006
```
into  maint1.mysql.com:/data/localhome/tsmith/bk/mrg51-c


mysql-test/t/warnings.test:
  5.0 -> 5.1 manual merge, part 3 of 3 (or more?)
sql/handler.cc:
  5.0 -> 5.1 manual merge, part 3 of 3 (or more?)
sql/mysql_priv.h:
  5.0 -> 5.1 manual merge, part 3 of 3 (or more?)
sql/mysqld.cc:
  5.0 -> 5.1 manual merge, part 3 of 3 (or more?)
sql/set_var.cc:
  5.0 -> 5.1 manual merge, part 3 of 3 (or more?)
mysql-test/r/warnings.result:
  5.0 -> 5.1 manual merge, part 3 of 3 (or more?)
```
  15e27e48
- Merge maint1.mysql.com:/data/localhome/tsmith/bk/mrg50-b · eafb7605
  unknown authored Aug 03, 2006
```
into  maint1.mysql.com:/data/localhome/tsmith/bk/mrg51-b


mysql-test/r/insert_select.result:
  SCCS merged
sql/sql_insert.cc:
  SCCS merged
```
  eafb7605
- 5.0 -> 5.1 manual merge, part 1 of 3 (or more?) · 0901cb0b
  unknown authored Aug 03, 2006
  
  0901cb0b
02 Aug, 2006 8 commits

Merge neptunus.(none):/home/msvensson/mysql/mysql-5.1 · 237d867f

unknown authored Aug 02, 2006

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


mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/t/disabled.def:
  SCCS merged

237d867f

Disable crash_commit_before waiting for a "crash()" function that won't generate a core. · 8a5db944
unknown authored Aug 02, 2006

8a5db944

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 trift2.:/M50/back241-5.0 · 95dcd768

unknown authored Aug 02, 2006

into  trift2.:/M51/merge-5.0-to-5.1


support-files/mysql.spec.sh:
  Null-merge, as 5.1 uses a different approach to testing.

95dcd768

Bug#20942 ha_federated uses String::append(const char *s), strlen() on every call · ee155777

unknown authored Aug 02, 2006

 - Remove the defines for strings and uses STRING_WITH_LEN directly when calling 'append'


sql/ha_federated.cc:
  Remove the defines for strings and their lengths and use STRING_WITH_LEN directly when calling append().
sql/ha_federated.h:
  Remove the defines for strings and their lengths and use STRING_WITH_LEN directly when calling append().

ee155777

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

Bug#20439 mysqltest: remove unused options · 97712780

unknown authored Aug 01, 2006

 -Remove leftovers of server_stop and server_start commands 


client/mysqltest.c:
  Remove leftovers  of "server_start" and "server_stop" commands

97712780

Merge neptunus.(none):/home/msvensson/mysql/my51-m-bug19535 · 63076970

unknown authored Aug 01, 2006

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


client/mysqltest.c:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/lib/mtr_process.pl:
  Auto merged

63076970