Commits · 5394708ee1ee34ac00b38e656a25d162da3ba07e · nexedi / MariaDB

11 Apr, 2007 7 commits

Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint · 5394708e

unknown authored Apr 11, 2007

into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint


sql/mysqld.cc:
  Auto merged
vio/viosslfactories.c:
  Auto merged
mysql-test/r/openssl_1.result:
  Manual merge
mysql-test/t/openssl_1.test:
  Manual merge

5394708e

Print warning to log when SSL setup fails · 2d07a11d
unknown authored Apr 11, 2007

2d07a11d

Merge pilot.blaudden:/home/msvensson/mysql/bug21611/my50-bug21611 · 896012d4

unknown authored Apr 11, 2007

into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint


vio/viosslfactories.c:
  Auto merged
mysql-test/r/openssl_1.result:
  Manual merge
mysql-test/t/openssl_1.test:
  Manual merge

896012d4

Add test for connect using different ssl ciphers · f90898ab
unknown authored Apr 11, 2007
```
mysql-test/r/openssl_1.result:
  Update result
```
f90898ab

Merge pilot.blaudden:/home/msvensson/mysql/bug22508/my51-bug22508 · 6848d4f1

unknown authored Apr 11, 2007

into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint


BitKeeper/etc/ignore:
  auto-union
Makefile.am:
  Auto merged
configure.in:
  Auto merged
include/Makefile.am:
  Auto merged
libmysqld/Makefile.am:
  Auto merged
client/Makefile.am:
  Merge
netware/Makefile.am:
  Merge
sql/Makefile.am:
  Merge

6848d4f1

Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint · 08cffb7c

unknown authored Apr 11, 2007

into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint


mysql-test/r/rpl_ssl.result:
  Auto merged
mysql-test/t/rpl_ssl.test:
  Auto merged

08cffb7c

Add replace_result for things that are not tested · 1cc9d90c
unknown authored Apr 11, 2007

1cc9d90c

10 Apr, 2007 25 commits
- Merge pilot.blaudden:/home/msvensson/mysql/bug25337/my51-bug25337 · 9c7d78a1
  unknown authored Apr 10, 2007
```
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
```
  9c7d78a1
- Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint · 598a2db9
  unknown authored Apr 10, 2007
```
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint


mysql-test/r/mysqltest.result:
  Auto merged
```
  598a2db9
- Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint · d5c68d28
  unknown authored Apr 10, 2007
```
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint


mysql-test/r/mysqltest.result:
  Auto merged
```
  d5c68d28
- Update result(which mysterioulsy got lost) · b7069c27
  unknown authored Apr 10, 2007
  
  b7069c27
- Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint · 2f5245b3
  unknown authored Apr 10, 2007
```
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint


client/mysqltest.c:
  Auto merged
```
  2f5245b3
- Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint · f5039e1f
  unknown authored Apr 10, 2007
```
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint


client/mysqltest.c:
  Auto merged
```
  f5039e1f
- Take into account wether vertical_results are in effect · a18fcdbf
  unknown authored Apr 10, 2007
  
  a18fcdbf
- Init dying to 1 just after passing the guard · c7abe519
  unknown authored Apr 10, 2007
  
  c7abe519
- Add OPT_LOG_DIR · 6a7c5b71
  unknown authored Apr 10, 2007
  
  6a7c5b71
- Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint · 97974b6a
  unknown authored Apr 10, 2007
```
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
```
  97974b6a
- Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint · 09eb82b5
  unknown authored Apr 10, 2007
```
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
```
  09eb82b5
- Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint · cf6f5039
  unknown authored Apr 10, 2007
```
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
```
  cf6f5039
- Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.1 · 31fd5807
  unknown authored Apr 10, 2007
```
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint


mysql-test/r/create.result:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
```
  31fd5807
- Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0 · 3d432c99
  unknown authored Apr 10, 2007
```
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
```
  3d432c99
- Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1 · d69bca68
  unknown authored Apr 10, 2007
```
into  pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint
```
  d69bca68
- Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint · cb880b45
  unknown authored Apr 10, 2007
```
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint


client/mysqltest.c:
  Auto merged
```
  cb880b45
- Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint · 067e644f
  unknown authored Apr 10, 2007
```
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint


client/mysqltest.c:
  Manual merge
```
  067e644f
- Add --logdir option ot mysqltest · faac6d79
  unknown authored Apr 10, 2007
  
  faac6d79
- Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint · 42aa2b1b
  unknown authored Apr 10, 2007
```
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint


mysql-test/r/mysqltest.result:
  Auto merged
mysql-test/t/mysqltest.test:
  Auto merged
client/mysqltest.c:
  Use remote
```
  42aa2b1b
- Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint · 1a14b0ad
  unknown authored Apr 10, 2007
```
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint


client/mysqltest.c:
  Auto merged
mysql-test/r/mysqltest.result:
  Auto merged
mysql-test/t/mysqltest.test:
  SCCS merged
```
  1a14b0ad
- Merge 192.168.0.4:mysql/mysql-4.1-maint · d9534ea8
  unknown authored Apr 10, 2007
```
into  pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint


client/mysqltest.c:
  Auto merged
mysql-test/r/mysqltest.result:
  Auto merged
mysql-test/t/mysqltest.test:
  Auto merged
```
  d9534ea8
- Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint · b911b447
  unknown authored Apr 10, 2007
```
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint


mysql-test/r/rpl_ssl.result:
  Auto merged
mysql-test/t/rpl_ssl.test:
  Auto merged
```
  b911b447
- Give the "sync_slave_with_master" something to do · 4cf5fb97
  unknown authored Apr 10, 2007
  
  4cf5fb97
- Merge bk-internal:/home/bk/mysql-5.1-new-maint · be31ea63
  unknown authored Apr 10, 2007
```
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint


mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/create.result:
  Auto merged
mysql-test/r/gis.result:
  Auto merged
mysql-test/r/type_datetime.result:
  Auto merged
mysql-test/t/gis.test:
  Auto merged
sql/field.h:
  Auto merged
sql/item.h:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
```
  be31ea63
- Merge bk-internal:/home/bk/mysql-5.0-maint · 0f039ff2
  unknown authored Apr 10, 2007
```
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
```
  0f039ff2
09 Apr, 2007 5 commits

Merge mysql.com:/d2/hf/mrg/mysql-5.0-opt · d202216d

unknown authored Apr 09, 2007

into  mysql.com:/d2/hf/mrg/mysql-5.1-opt


mysql-test/t/loaddata.test:
  Auto merged
sql/sql_load.cc:
  Auto merged
mysql-test/r/loaddata.result:
  SCCS merged

d202216d

Merge bk@192.168.21.1:mysql-5.0-opt · 2501c71a
unknown authored Apr 09, 2007
```
into  mysql.com:/d2/hf/mrg/mysql-5.0-opt
```
2501c71a

Merge mysql.com:/d2/hf/mrg/mysql-5.0-opt · 89723d3d

unknown authored Apr 09, 2007

into  mysql.com:/d2/hf/mrg/mysql-5.1-opt


sql/item_func.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged

89723d3d

Merge bk@192.168.21.1:mysql-5.1 · 4ed7139d
unknown authored Apr 09, 2007
```
into  mysql.com:/d2/hf/mrg/mysql-5.1-opt


sql/sql_table.cc:
  Auto merged
```
4ed7139d
Merge bk@192.168.21.1:mysql-5.0 · 3b7d3230
unknown authored Apr 09, 2007
```
into  mysql.com:/d2/hf/mrg/mysql-5.0-opt


sql/sql_table.cc:
  Auto merged
```
3b7d3230

08 Apr, 2007 2 commits

Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1 · c407e28b

unknown authored Apr 08, 2007

into  mysql.com:/home/kent/bk/tmp4/mysql-5.1-engines


sql/item_func.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged

c407e28b

Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0 · 74c6bf3e

unknown authored Apr 08, 2007

into  mysql.com:/home/kent/bk/tmp4/mysql-5.0-engines


sql/item_func.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged

74c6bf3e

07 Apr, 2007 1 commit
- Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · be15f0c8
  unknown authored Apr 07, 2007
```
into  moonbone.local:/mnt/gentoo64/work/27586-bug-5.0-opt-mysql


sql/sql_load.cc:
  Auto merged
```
  be15f0c8