Commits · d0a8a6285dd7eb9b6d28761f05bfe0546981de93 · nexedi / MariaDB

15 Sep, 2006 40 commits
- Merge bk-internal:/home/bk/mysql-5.1-maint · d0a8a628
  unknown authored Sep 15, 2006
```
into  shellback.(none):/home/msvensson/mysql/mysql-5.1-maint
```
  d0a8a628
- Merge shellback.(none):/home/msvensson/mysql/work/my51-work · b6790974
  unknown authored Sep 15, 2006
```
into  shellback.(none):/home/msvensson/mysql/mysql-5.1-maint
```
  b6790974
- Merge shellback.(none):/home/msvensson/mysql/work/my50-work · 0731f83e
  unknown authored Sep 15, 2006
```
into  shellback.(none):/home/msvensson/mysql/work/my51-work


include/my_net.h:
  Auto merged
```
  0731f83e
- Removing disabling of func_group · 843d7e44
  unknown authored Sep 15, 2006
  
  843d7e44
- Remove disabling of func_in · 0959f711
  unknown authored Sep 15, 2006
  
  0959f711
- Add definition of SHUT_RDWR for compiling on windows · 1e5685bd
  unknown authored Sep 15, 2006
  
  1e5685bd
- Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint · 39f28ab6
  unknown authored Sep 15, 2006
```
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint


BitKeeper/etc/ignore:
  auto-union
BitKeeper/etc/config:
  Auto merged
client/mysql.cc:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/mysql.result:
  Auto merged
mysql-test/r/user_var.result:
  Auto merged
mysql-test/t/mysql.test:
  Auto merged
mysql-test/t/user_var.test:
  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/log_event.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
tests/Makefile.am:
  Auto merged
vio/viosocket.c:
  Auto merged
```
  39f28ab6
- Merge bk-internal:/home/bk/mysql-5.0-maint · 9e1a6b0e
  unknown authored Sep 15, 2006
```
into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
```
  9e1a6b0e
- Merge shellback.(none):/home/msvensson/mysql/work/my51-work · 91a1db9d
  unknown authored Sep 15, 2006
```
into  shellback.(none):/home/msvensson/mysql/mysql-5.1-maint
```
  91a1db9d
- Merge shellback.(none):/home/msvensson/mysql/work/my50-work · 66b6357e
  unknown authored Sep 15, 2006
```
into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
```
  66b6357e
- Merge shellback.(none):/home/msvensson/mysql/work/my50-work · 607e99d0
  unknown authored Sep 15, 2006
```
into  shellback.(none):/home/msvensson/mysql/work/my51-work


configure.in:
  Auto merged
storage/ndb/include/ndb_global.h.in:
  SCCS merged
```
  607e99d0
- Merge shellback.(none):/home/msvensson/mysql/bug20602/my50-bug20602 · 6373941a
  unknown authored Sep 15, 2006
```
into  shellback.(none):/home/msvensson/mysql/work/my50-work


configure.in:
  Auto merged
```
  6373941a
- Merge msvensson.mysql.internal:mysql/my50-m-bug16574 · 05b14821
  unknown authored Sep 15, 2006
```
into  shellback.(none):/home/msvensson/mysql/work/my50-work
```
  05b14821
- Merge shellback.(none):/home/msvensson/mysql/work/my50-work · 507edfc2
  unknown authored Sep 15, 2006
```
into  shellback.(none):/home/msvensson/mysql/work/my51-work


configure.in:
  Auto merged
```
  507edfc2
- Merge shellback.(none):/home/msvensson/mysql/work/my50-work · 0fa2995d
  unknown authored Sep 15, 2006
```
into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
```
  0fa2995d
- Merge msvensson.mysql.internal:mysql/my50-m-bug16576 · e15148ad
  unknown authored Sep 15, 2006
```
into  shellback.(none):/home/msvensson/mysql/work/my50-work


configure.in:
  Auto merged
```
  e15148ad
- Merge shellback.(none):/home/msvensson/mysql/work/my51-work · 8e76d8e8
  unknown authored Sep 15, 2006
```
into  shellback.(none):/home/msvensson/mysql/mysql-5.1-maint
```
  8e76d8e8
- Merge shellback.(none):/home/msvensson/mysql/work/my50-work · 2d755a34
  unknown authored Sep 15, 2006
```
into  shellback.(none):/home/msvensson/mysql/work/my51-work


include/my_global.h:
  Auto merged
```
  2d755a34
- Merge shellback.(none):/home/msvensson/mysql/work/my50-work · 860ae722
  unknown authored Sep 15, 2006
```
into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
```
  860ae722
- Merge msvensson.mysql.internal:mysql/my50-m-bug21222 · 040c9378
  unknown authored Sep 15, 2006
```
into  shellback.(none):/home/msvensson/mysql/work/my50-work
```
  040c9378
- Merge shellback.(none):/home/msvensson/mysql/bug22139/my51-bug22139 · 018d0b9f
  unknown authored Sep 15, 2006
```
into  shellback.(none):/home/msvensson/mysql/mysql-5.1-maint


sql/share/errmsg.txt:
  Auto merged
storage/innobase/Makefile.am:
  Auto merged
tests/Makefile.am:
  Auto merged
storage/innobase/handler/ha_innodb.cc:
  SCCS merged
```
  018d0b9f
- Merge shellback.(none):/home/msvensson/mysql/bug22139/my50-bug22139 · cb92ed64
  unknown authored Sep 15, 2006
```
into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint


tests/Makefile.am:
  Auto merged
```
  cb92ed64
- Merge shellback.(none):/home/msvensson/mysql/bug22139/my50-bug22139 · 9ae1145d
  unknown authored Sep 15, 2006
```
into  shellback.(none):/home/msvensson/mysql/bug22139/my51-bug22139


tests/Makefile.am:
  Auto merged
```
  9ae1145d
- Merge hholzgraefe@bk-internal.mysql.com:/home/bk/mysql-5.0-maint · 1878b9f6
  unknown authored Sep 15, 2006
```
into  mysql.com:/home/hartmut/projects/mysql/dev/teamtrees/mysql-5.0-maint
```
  1878b9f6
- Add SSL specific linker flags to --libmysqld-libs (Bug #21239) · 7974ef2c
  unknown authored Sep 15, 2006
  
  7974ef2c
- Merge shellback.(none):/home/msvensson/mysql/work/my51-work · fe966fca
  unknown authored Sep 15, 2006
```
into  shellback.(none):/home/msvensson/mysql/mysql-5.1-maint
```
  fe966fca
- Merge shellback.(none):/home/msvensson/mysql/work/my50-work · 581e2fd1
  unknown authored Sep 15, 2006
```
into  shellback.(none):/home/msvensson/mysql/work/my51-work
```
  581e2fd1
- Merge bk-internal:/home/bk/mysql-5.0-maint · 1c0c90bd
  unknown authored Sep 15, 2006
```
into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
```
  1c0c90bd
- Merge shellback.(none):/home/msvensson/mysql/work/my50-work · a55a105b
  unknown authored Sep 15, 2006
```
into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
```
  a55a105b
- Bug#22326 Build problems on hurd-i386: conflicting declaration of socklen_t · 6653bfb3
  unknown authored Sep 15, 2006
```
extra/yassl/testsuite/test.hpp:
  Remove define for __MACH__
  http://bugs.debian.org/387369
```
  6653bfb3
- Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 3e3d97ea
  unknown authored Sep 15, 2006
```
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
```
  3e3d97ea
- Merge shellback.(none):/home/msvensson/mysql/work/my51-work · 9d65cd5b
  unknown authored Sep 15, 2006
```
into  shellback.(none):/home/msvensson/mysql/mysql-5.1-maint
```
  9d65cd5b
- Merge msvensson.mysql.internal:mysql/mysql-5.1-maint · f3c2cc13
  unknown authored Sep 15, 2006
```
into  shellback.(none):/home/msvensson/mysql/mysql-5.1-maint
```
  f3c2cc13
- Merge msvensson.mysql.internal:mysql/mysql-5.0-maint · 0dae6897
  unknown authored Sep 15, 2006
```
into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
```
  0dae6897
- Merge shellback.(none):/home/msvensson/mysql/work/my50-work · 0deefdd3
  unknown authored Sep 15, 2006
```
into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint


vio/viosocket.c:
  Auto merged
```
  0deefdd3
- Merge shellback.(none):/home/msvensson/mysql/work/my50-work · cdc2c4e9
  unknown authored Sep 15, 2006
```
into  shellback.(none):/home/msvensson/mysql/work/my51-work


sql/mysqld.cc:
  Auto merged
vio/viosocket.c:
  Auto merged
```
  cdc2c4e9
- Use the enum/define SHUT_RDWR instead of heardcoded "2" to shutdown · 3860571e
  unknown authored Sep 15, 2006
  
  3860571e
- Merge bk-internal:/home/bk/mysql-5.0-maint · 39d888cc
  unknown authored Sep 15, 2006
```
into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
```
  39d888cc
- Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1 · 549c922b
  unknown authored Sep 14, 2006
```
into  siva.hindu.god:/usr/home/tim/m/bk/51


sql/sql_parse.cc:
  Auto merged
```
  549c922b
- Merge ted.mysql.internal:/home/ted/src/mysql/mysql-5.0-maint · 38d2f595
  unknown authored Sep 15, 2006
```
into  ted.mysql.internal:/home/ted/src/mysql/mysql-5.0-5.1-gca
```
  38d2f595