Commits · 807797e2b1cca63803e43ad9fb892f4b4927493a · Kirill Smelkov / mariadb

03 Jan, 2007 3 commits
- Merge chilla.local:/home/mydev/mysql-5.0-axmrg · 807797e2
  istruewing@chilla.local authored Jan 03, 2007
```
into  chilla.local:/home/mydev/mysql-5.1-axmrg
```
  807797e2
- Merge bk-internal.mysql.com:/home/bk/mysql-5.1 · 54c147a1
  istruewing@chilla.local authored Jan 03, 2007
```
into  chilla.local:/home/mydev/mysql-5.1-axmrg
```
  54c147a1
- Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · d37ff7d7
  istruewing@chilla.local authored Jan 03, 2007
```
into  chilla.local:/home/mydev/mysql-5.0-axmrg
```
  d37ff7d7
02 Jan, 2007 4 commits
- Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1 · 60a3f102
  joerg@trift2. authored Jan 02, 2007
```
into  trift2.:/MySQL/M51/mysql-5.1
```
  60a3f102
- server-tools/instance-manager/Makefile.am · c445abef
  joerg@trift2. authored Jan 02, 2007
```
    Delete compiler-specific flag setting - it makes builds break.
```
  c445abef
- 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 5 commits

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

30 Dec, 2006 1 commit
- Merge mysql.com:/home/svoj/devel/mysql/merge/mysql-5.0-engines · de87e317
  svoj@april.(none) authored Dec 30, 2006
```
into  mysql.com:/home/svoj/devel/mysql/merge/mysql-5.1-engines
```
  de87e317
29 Dec, 2006 7 commits
- Merge mysql.com:/home/svoj/devel/mysql/BUG23526/mysql-5.0-engines2 · bcbb50c1
  svoj@mysql.com/april.(none) authored Dec 30, 2006
```
into  mysql.com:/home/svoj/devel/mysql/merge/mysql-5.0-engines
```
  bcbb50c1
- Merge mysql.com:/home/svoj/devel/bk/mysql-4.1-engines · 5344932e
  svoj@mysql.com/april.(none) authored Dec 30, 2006
```
into  mysql.com:/home/svoj/devel/mysql/merge/mysql-5.0-engines
```
  5344932e
- Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-4.1-engines · 45aeb7f0
  svoj@mysql.com/april.(none) authored Dec 30, 2006
```
into  mysql.com:/home/svoj/devel/mysql/BUG23196/mysql-4.1-engines
```
  45aeb7f0
- Merge mysql.com:/home/svoj/devel/mysql/BUG21310/mysql-5.0-engines · 9d106f7a
  svoj@june.mysql.com authored Dec 29, 2006
```
into  mysql.com:/home/svoj/devel/mysql/BUG21310/mysql-5.1-engines
```
  9d106f7a
- Merge mysql.com:/home/svoj/devel/mysql/BUG21310/mysql-4.1-engines · a86ee0c1
  svoj@mysql.com/june.mysql.com authored Dec 29, 2006
```
into  mysql.com:/home/svoj/devel/mysql/BUG21310/mysql-5.0-engines
```
  a86ee0c1
- Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.0-engines · 441f5069
  svoj@mysql.com/june.mysql.com authored Dec 29, 2006
```
into  mysql.com:/home/svoj/devel/mysql/BUG21310/mysql-5.0-engines
```
  441f5069
- Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-4.1-engines · 63670828
  svoj@mysql.com/june.mysql.com authored Dec 29, 2006
```
into  mysql.com:/home/svoj/devel/mysql/BUG21310/mysql-4.1-engines
```
  63670828
28 Dec, 2006 1 commit
- 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
27 Dec, 2006 17 commits
- Merge chilla.local:/home/mydev/mysql-5.0-axmrg · c8ed519a
  istruewing@chilla.local authored Dec 27, 2006
```
into  chilla.local:/home/mydev/mysql-5.1-axmrg
```
  c8ed519a
- Merge bk-internal.mysql.com:/home/bk/mysql-5.1 · 249f799d
  istruewing@chilla.local authored Dec 27, 2006
```
into  chilla.local:/home/mydev/mysql-5.1-axmrg
```
  249f799d
- Merge bk-internal.mysql.com:/home/bk/mysql-5.1-engines · d63fa843
  istruewing@chilla.local authored Dec 27, 2006
```
into  chilla.local:/home/mydev/mysql-5.1-axmrg
```
  d63fa843
- 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
- Merge bk-internal.mysql.com:/home/bk/mysql-5.0-engines · 3765d8a0
  istruewing@chilla.local authored Dec 27, 2006
```
into  chilla.local:/home/mydev/mysql-5.0-axmrg
```
  3765d8a0
- After merge fix. · fb01230a
  svoj@mysql.com/april.(none) authored Dec 27, 2006
  
  fb01230a
- Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.0-engines · 2fc0bca6
  svoj@mysql.com/april.(none) authored Dec 27, 2006
```
into  mysql.com:/home/svoj/devel/mysql/BUG21310/mysql-5.0-engines
```
  2fc0bca6
- ndb: remove compiler warnings · 7b9a5f6d
  tomas@poseidon. authored Dec 27, 2006
  
  7b9a5f6d
- Merge mysql.com:/home/svoj/devel/mysql/BUG24358/mysql-5.0-engines · e0a433e1
  svoj@june.mysql.com authored Dec 27, 2006
```
into  mysql.com:/home/svoj/devel/mysql/BUG24358/mysql-5.1-engines
```
  e0a433e1
- Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-4.1-engines · 19ba64de
  svoj@mysql.com/april.(none) authored Dec 27, 2006
```
into  mysql.com:/home/svoj/devel/mysql/BUG21310/mysql-4.1-engines
```
  19ba64de
- Merge chilla.local:/home/mydev/mysql-5.0-axmrg · 23ae7792
  istruewing@chilla.local authored Dec 27, 2006
```
into  chilla.local:/home/mydev/mysql-5.1-axmrg
```
  23ae7792
- Merge mysql.com:/home/svoj/devel/mysql/BUG24358/mysql-4.1-engines · c72d93b0
  svoj@mysql.com/june.mysql.com authored Dec 27, 2006
```
into  mysql.com:/home/svoj/devel/mysql/BUG24358/mysql-5.0-engines
```
  c72d93b0
- Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-4.1-engines · 28b1bb36
  svoj@mysql.com/june.mysql.com authored Dec 27, 2006
```
into  mysql.com:/home/svoj/devel/mysql/BUG24358/mysql-4.1-engines
```
  28b1bb36
- 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 2 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