Commits · 14696a56e2f5fcfe542bb72e4029637f6b6e1ef4 · nexedi / MariaDB

02 Jan, 2007 17 commits
- Merge mysql.com:/d2/hf/common/my50-common · 14696a56
  holyfoot/hf@hfmain.(none) authored Jan 03, 2007
```
into  mysql.com:/d2/hf/common/my51-common
```
  14696a56
- merging · 8c2d34c3
  holyfoot/hf@mysql.com/hfmain.(none) authored Jan 03, 2007
  
  8c2d34c3
- mysql_upgrade disabled in embedded server · 8ff44eae
  holyfoot/hf@mysql.com/hfmain.(none) authored Jan 03, 2007
  
  8ff44eae
- ps_not_windows disabled in embedded server · aad2026c
  holyfoot/hf@mysql.com/hfmain.(none) authored Jan 03, 2007
  
  aad2026c
- Merge mysql.com:/d2/hf/common/my50-common · f95e3872
  holyfoot/hf@hfmain.(none) authored Jan 03, 2007
```
into  mysql.com:/d2/hf/common/my51-common
```
  f95e3872
- Merge mysql.com:/d2/hf/common/my41-common · 988e2e4c
  holyfoot/hf@mysql.com/hfmain.(none) authored Jan 03, 2007
```
into  mysql.com:/d2/hf/common/my50-common
```
  988e2e4c
- warning count for embedded prepared statements added · 12cd7c7b
  holyfoot/hf@mysql.com/hfmain.(none) authored Jan 03, 2007
  
  12cd7c7b
- Merge bk@192.168.21.1:mysql-5.1 · 4c588df2
  holyfoot/hf@hfmain.(none) authored Jan 02, 2007
```
into  mysql.com:/d2/hf/common/my51-common
```
  4c588df2
- Merge bk@192.168.21.1:mysql-5.0 · a44106c0
  holyfoot/hf@mysql.com/hfmain.(none) authored Jan 02, 2007
```
into  mysql.com:/d2/hf/common/my50-common
```
  a44106c0
- Merge mysql.com:/d2/hf/common/my50-common · e6b3a71c
  holyfoot/hf@hfmain.(none) authored Jan 02, 2007
```
into  mysql.com:/d2/hf/common/my51-common
```
  e6b3a71c
- Merge mysql.com:/d2/hf/common/my41-common · 429b82be
  holyfoot/hf@mysql.com/hfmain.(none) authored Jan 02, 2007
```
into  mysql.com:/d2/hf/common/my50-common
```
  429b82be
- merging fix · e7130631
  holyfoot/hf@mysql.com/hfmain.(none) authored Jan 02, 2007
  
  e7130631
- merging fix · 56155d83
  holyfoot/hf@mysql.com/hfmain.(none) authored Jan 02, 2007
  
  56155d83
- Merge mysql.com:/d2/hf/common/my41-common · 726a51bc
  holyfoot/hf@mysql.com/hfmain.(none) authored Jan 02, 2007
```
into  mysql.com:/d2/hf/common/my50-common
```
  726a51bc
- embedded-server related fixes · 998167ac
  holyfoot/hf@mysql.com/hfmain.(none) authored Jan 02, 2007
  
  998167ac
- Merge mysql.com:/home/kent/bk/main/mysql-5.0 · 7281ab80
  kent@kent-amd64.(none) authored Jan 02, 2007
```
into  mysql.com:/home/kent/bk/main/mysql-5.1
```
  7281ab80
- view.result: · 499eb4d8
  kent@mysql.com/kent-amd64.(none) authored Jan 02, 2007
```
  Temporary work around for bug#25359
```
  499eb4d8
31 Dec, 2006 10 commits

Merge mysql.com:/d2/hf/clean/my51-clean · b4c0867d
holyfoot/hf@hfmain.(none) authored Dec 31, 2006
```
into  mysql.com:/d2/hf/common/my51-common
```
b4c0867d
Merge mysql.com:/d2/hf/clean/my50-clean · 874d3665
holyfoot/hf@mysql.com/hfmain.(none) authored Dec 31, 2006
```
into  mysql.com:/d2/hf/common/my50-common
```
874d3665
Merge mysql.com:/d2/hf/clean/my41-clean · 0831699f
holyfoot/hf@mysql.com/hfmain.(none) authored Dec 31, 2006
```
into  mysql.com:/d2/hf/common/my41-common
```
0831699f
Merge mysql.com:/d2/hf/common/my50-common · 4e5b3baf
holyfoot/hf@hfmain.(none) authored Dec 31, 2006
```
into  mysql.com:/d2/hf/common/my51-common
```
4e5b3baf
Merge mysql.com:/d2/hf/common/my41-common · 2ab15de7
holyfoot/hf@mysql.com/hfmain.(none) authored Dec 31, 2006
```
into  mysql.com:/d2/hf/common/my50-common
```
2ab15de7

Many files: · 67868597

kent@mysql.com/kent-amd64.(none) authored Dec 31, 2006

  Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
  Adjusted year(s) in copyright header 
  Added GPL copyright text
my_vle.h, rpl_utility.h, my_vle.c, base64-t.c, rpl_utility.cc:
  Changed copyright header formatting some
plugin_example.c, daemon_example.c:
  Added "Copyright (C) 2006 MySQL AB" to GPL header

67868597

Merge mysql.com:/home/kent/bk/main/mysql-5.0 · 58763e38
kent@kent-amd64.(none) authored Dec 31, 2006
```
into  mysql.com:/home/kent/bk/main/mysql-5.1
```
58763e38
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1 · 895e442d
kent@kent-amd64.(none) authored Dec 31, 2006
```
into  mysql.com:/home/kent/bk/main/mysql-5.1
```
895e442d
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0 · 1b8bd0d2
kent@mysql.com/kent-amd64.(none) authored Dec 31, 2006
```
into  mysql.com:/home/kent/bk/main/mysql-5.0
```
1b8bd0d2

my_strtoll10-x86.s: · 6523aca7

kent@mysql.com/kent-amd64.(none) authored Dec 31, 2006

  Corrected spelling in copyright text
Makefile.am:
  Don't update the files from BitKeeper
Many files:
  Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
  Adjusted year(s) in copyright header 
Many files:
  Added GPL copyright text
Removed files:
  Docs/Support/colspec-fix.pl
  Docs/Support/docbook-fixup.pl
  Docs/Support/docbook-prefix.pl
  Docs/Support/docbook-split
  Docs/Support/make-docbook
  Docs/Support/make-makefile
  Docs/Support/test-make-manual
  Docs/Support/test-make-manual-de
  Docs/Support/xwf

6523aca7

28 Dec, 2006 4 commits
- Merge willster.(none):/home/stewart/Documents/MySQL/5.0/ndb · 344d78a5
  stewart@willster.(none) authored Dec 28, 2006
```
into  willster.(none):/home/stewart/Documents/MySQL/5.0/ndb-mgm-work
```
  344d78a5
- bdb_notembedded.test gone · feff4a5e
  holyfoot/hf@mysql.com/hfmain.(none) authored Dec 28, 2006
  
  feff4a5e
- WL #3630 (add embedded server to pushbuild) · c90a4269
  holyfoot/hf@mysql.com/hfmain.(none) authored Dec 28, 2006
```
innodb.test fix
```
  c90a4269
- WL#3630 (add embedded server to pushbuild) · 842b23a8
  holyfoot/hf@mysql.com/hfmain.(none) authored Dec 28, 2006
```
5.1-related fixes
libmysqld/Makefile.am fixed to recompile and link ha_*.cc files that
keep dependance on THD structure.
Minor fixes to make tests working.
```
  842b23a8
27 Dec, 2006 6 commits
- Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 · 4333bcab
  tomas@poseidon.mysql.com authored Dec 27, 2006
```
into  poseidon.mysql.com:/home/tomas/mysql-5.0-ndb
```
  4333bcab
- ndb: remove compiler warnings · 7b9a5f6d
  tomas@poseidon. authored Dec 27, 2006
  
  7b9a5f6d
- Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1 · 044c4109
  tomas@poseidon. authored Dec 27, 2006
```
into  poseidon.:/home/tomas/mysql-5.1-new-ndb
```
  044c4109
- Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1 · 2a10b999
  kent@kent-amd64.(none) authored Dec 27, 2006
```
into  mysql.com:/home/kent/bk/main/mysql-5.1
```
  2a10b999
- Many files: · 1e3237fe
  kent@mysql.com/kent-amd64.(none) authored Dec 27, 2006
```
  Changed header to GPL version 2 only
```
  1e3237fe
- Merge xiphis.org:/home/antony/work2/mysql-5.0-engines · 82b03f29
  acurtis/antony@xiphis.org/ltamd64.xiphis.org authored Dec 26, 2006
```
into  xiphis.org:/home/antony/work2/mysql-5.0-engines-merge
```
  82b03f29
26 Dec, 2006 3 commits
- Merge xiphis.org:/home/antony/work2/mysql-5.1-engines · 54133c7e
  acurtis/antony@ltamd64.xiphis.org authored Dec 26, 2006
```
into  xiphis.org:/home/antony/work2/mysql-5.1-engines-merge
```
  54133c7e
- After merge fix. · 28d3ee65
  svoj@mysql.com/june.mysql.com authored Dec 26, 2006
  
  28d3ee65
- Merge hf@192.168.21.12:work/embt/my50-embt · 52e71697
  holyfoot/hf@hfmain.(none) authored Dec 26, 2006
```
into  mysql.com:/d2/hf/my51-embt
```
  52e71697