Commits · 4525ea4bfbc241cf959ba8a655512f2610616c86 · Kirill Smelkov / mariadb

22 Sep, 2006 2 commits
- Merge trift2.:/MySQL/M50/mysql-5.0 · 4525ea4b
  joerg@trift2. authored Sep 22, 2006
```
into  trift2.:/MySQL/M51/push-5.1
```
  4525ea4b
- Added build rule for mysql_upgrade.exe · ca00ba49
  georg@lmy002.wdf.sap.corp authored Sep 22, 2006
  
  ca00ba49
21 Sep, 2006 10 commits
- Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0 · 17218bd7
  joerg@trift2. authored Sep 21, 2006
```
into  trift2.:/MySQL/M50/push-5.0
```
  17218bd7
- Add a dummy file for "Docs/manual.chm" as we need it for "make dist" to work. · d1f0a57a
  joerg@trift2. authored Sep 21, 2006
  
  d1f0a57a
- Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 64fbabc5
  istruewing@chilla.local authored Sep 21, 2006
```
into  chilla.local:/home/mydev/mysql-5.0-toteam
```
  64fbabc5
- Merge trift2.:/MySQL/M50/extract1-5.0 · 3acb6778
  joerg@trift2. authored Sep 21, 2006
```
into  trift2.:/MySQL/M50/push-5.0
```
  3acb6778
- added udf_example.def for make dist · 8a7875fd
  georg@lmy002.wdf.sap.corp authored Sep 21, 2006
  
  8a7875fd
- Windows 64bit fixes · f4af1d82
  georg@lmy002.wdf.sap.corp authored Sep 21, 2006
```
Fixed udf_example, so tests now can also run udf on win.
```
  f4af1d82
- Merge chilla.local:/home/mydev/mysql-5.0--main · f083782c
  istruewing@chilla.local authored Sep 21, 2006
```
into  chilla.local:/home/mydev/mysql-5.0-toteam
```
  f083782c
- Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 · 7f4cd786
  grichter@bk-internal.mysql.com authored Sep 21, 2006
```
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-win
```
  7f4cd786
- Merge chilla.local:/home/mydev/mysql-5.1--main · 0aaf4837
  istruewing@chilla.local authored Sep 21, 2006
```
into  chilla.local:/home/mydev/mysql-5.1-tomain
```
  0aaf4837
- Deleted old storage directories (introduced by a buggy 5.0 -> 5.1 merge). · b17bbb9d
  georg@lmy002.wdf.sap.corp authored Sep 21, 2006
```
Fix for win/Makefile.am
```
  b17bbb9d
20 Sep, 2006 2 commits
- Merge xiphis.org:/home/antony/work2/p2-bug22417.1 · 9706e6a8
  acurtis/antony@ltamd64.xiphis.org authored Sep 20, 2006
```
into  xiphis.org:/home/antony/work2/p2-bug22417.2
```
  9706e6a8
- Merge chilla.local:/home/mydev/mysql-5.1--team · 77d610c2
  istruewing@chilla.local authored Sep 20, 2006
```
into  chilla.local:/home/mydev/mysql-5.1-tomain
```
  77d610c2
19 Sep, 2006 6 commits
- Merge chilla.local:/home/mydev/mysql-5.0-bug14400-monty · c49c58cb
  istruewing@chilla.local authored Sep 19, 2006
```
into  chilla.local:/home/mydev/mysql-5.1-bug14400-monty
```
  c49c58cb
- After merge fix. · 7419f502
  istruewing@chilla.local authored Sep 19, 2006
  
  7419f502
- Merge chilla.local:/home/mydev/mysql-4.1-bug14400-monty · 5d509b32
  istruewing@chilla.local authored Sep 19, 2006
```
into  chilla.local:/home/mydev/mysql-5.0-bug14400-monty
```
  5d509b32
- Merge bk-internal:/home/bk/mysql-4.0 · 47dc3fbe
  istruewing@chilla.local authored Sep 19, 2006
```
into  chilla.local:/home/mydev/mysql-4.1-bug14400-monty
```
  47dc3fbe
- Merge bk-internal.mysql.com:/home/bk/mysql-5.0-engines · 3307d448
  istruewing@chilla.local authored Sep 19, 2006
```
into  chilla.local:/home/mydev/mysql-5.0--team
```
  3307d448
- Bug#22417 · 98a8537a
  acurtis/antony@xiphis.org/ltamd64.xiphis.org authored Sep 18, 2006
```
  "plug.in not included in dist source"
```
  98a8537a
18 Sep, 2006 20 commits
- post merge fixes · 844df8f0
  acurtis/antony@xiphis.org/ltamd64.xiphis.org authored Sep 18, 2006
  
  844df8f0
- Merge acurtis@bk-internal.mysql.com:/home/bk/mysql-5.0-engines · 424857e0
  acurtis/antony@ltamd64.xiphis.org authored Sep 18, 2006
```
into  xiphis.org:/home/antony/work2/engines-merge
```
  424857e0
- Merge bk-internal.mysql.com:/home/bk/mysql-5.0-engines · 418c1f30
  istruewing@chilla.local authored Sep 18, 2006
```
into  chilla.local:/home/mydev/mysql-5.0--team
```
  418c1f30
- Merge bk-internal:/home/bk/mysql-5.1 · ba7a8731
  gkodinov@dl145s.mysql.com authored Sep 18, 2006
```
into  dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.1
```
  ba7a8731
- Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.1 · bb859ecd
  svoj@april.(none) authored Sep 18, 2006
```
into  april.(none):/home/svoj/devel/mysql/merge/mysql-5.1-engines
```
  bb859ecd
- Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.1-engines · 36be4318
  svoj@april.(none) authored Sep 18, 2006
```
into  april.(none):/home/svoj/devel/mysql/merge/mysql-5.1-engines
```
  36be4318
- In current 5.1 build we don't build embedded server for windows (this will be · df606b28
  georg@lmy002.wdf.sap.corp authored Sep 18, 2006
```
fixed when 5.1-win will be pushed into main tree).
Commenting the libmysqld and libmysqld/example subdirectories will allow us 
to upgrade from cmake 2.2 to 2.4.
```
  df606b28
- Merge dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.0-opt · 809d1cfe
  gkodinov@dl145s.mysql.com authored Sep 18, 2006
```
into  dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.1
```
  809d1cfe
- Merge bk-internal:/home/bk/mysql-5.0 · cf9d1c91
  gkodinov@dl145s.mysql.com authored Sep 18, 2006
```
into  dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.0-opt
```
  cf9d1c91
- 1. Cumulated fix for Bug#22398, #22404 and #22405 · 5f5d1507
  mleich@three.local.lan authored Sep 18, 2006
```
2. Correct some logical bugs within the tests, which were caused by
   automatic resolve of BitKeeper
```
  5f5d1507
- Merge april.(none):/home/svoj/devel/bk/mysql-5.1 · 419a51c5
  svoj@april.(none) authored Sep 18, 2006
```
into  april.(none):/home/svoj/devel/mysql/merge/mysql-5.1-engines
```
  419a51c5
- Merge bk-internal:/home/bk/mysql-5.1-opt · c1035c21
  gkodinov@dl145s.mysql.com authored Sep 18, 2006
```
into  dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.1
```
  c1035c21
- merge fixes · f1100c00
  gkodinov@dl145s.mysql.com authored Sep 18, 2006
  
  f1100c00
- Merge april.(none):/home/svoj/devel/bk/mysql-4.1-engines · f53f015b
  svoj@april.(none) authored Sep 18, 2006
```
into  april.(none):/home/svoj/devel/mysql/merge/mysql-5.0-engines
```
  f53f015b
- Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.0 · f21eadfc
  svoj@april.(none) authored Sep 18, 2006
```
into  april.(none):/home/svoj/devel/mysql/merge/mysql-5.0-engines
```
  f21eadfc
- Merge dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.0-opt · ce8ed889
  gkodinov@dl145s.mysql.com authored Sep 18, 2006
```
into  dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.1
```
  ce8ed889
- Merge bk-internal:/home/bk/mysql-5.0-opt · 2ec485f0
  gkodinov@dl145s.mysql.com authored Sep 18, 2006
```
into  dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.0-opt
```
  2ec485f0
- merge fixes · fae596aa
  gkodinov@dl145s.mysql.com authored Sep 18, 2006
  
  fae596aa
- disabled.def: · f42385e0
  evgen@moonbone.local authored Sep 18, 2006
```
  Enabled rpl_sp_effects test due to fixed bug.
```
  f42385e0
- Merge dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-4.1-opt · 522823b5
  gkodinov@dl145s.mysql.com authored Sep 18, 2006
```
into  dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.0-opt
```
  522823b5