Commits · f27559edd43fa5ef9806e48fdedc0e9e0e6a6b7d · nexedi / MariaDB

12 Apr, 2007 1 commit
- Update result file to 5.1 format of SHOW CREATE · f27559ed
  unknown authored Apr 12, 2007
  
  f27559ed
11 Apr, 2007 12 commits

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

unknown authored Apr 11, 2007

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


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

d2e1e4c4

Bug#27669 mysqldump: Got error: 2026: SSL connection error when trying to connect · 35c10cca

unknown authored Apr 11, 2007

 - Add testcase for SSL connection from mysqldump to mysqld


mysql-test/r/openssl_1.result:
  Add test result
mysql-test/t/openssl_1.test:
  Add test case for mysqldump with SSL connection to mysqld

35c10cca

Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint · 1772776e
unknown authored Apr 11, 2007
```
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
```
1772776e
Merge pilot.blaudden:/home/msvensson/mysql/yassl_import/my50-yassl_import · 15050080
unknown authored Apr 11, 2007
```
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
```
15050080

Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint · 48098cdd

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

48098cdd

Bug#21765 Illegal Instruction crash on pre-pentium when using YASSL · c6b0cff1

unknown authored Apr 11, 2007

 - Import patch with different method of detecting if machine has
   cpuid instruction


extra/yassl/taocrypt/src/misc.cpp:
  Import patch yassl.diff

c6b0cff1

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

d25a540d

Merge pilot.blaudden:/home/msvensson/mysql/bug21611/my50-bug21611 · 2b6cd457

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

2b6cd457

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

Merge pilot.blaudden:/home/msvensson/mysql/bug22508/my51-bug22508 · 0f299acb

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

0f299acb

Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint · 06f4523d

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

06f4523d

Add replace_result for things that are not tested · 561cd328
unknown authored Apr 11, 2007

561cd328

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


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


mysql-test/r/mysqltest.result:
  Auto merged
```
  bfe25fb2
- Update result(which mysterioulsy got lost) · 247c3a81
  unknown authored Apr 10, 2007
  
  247c3a81
- Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint · 51587c29
  unknown authored Apr 10, 2007
```
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint


client/mysqltest.c:
  Auto merged
```
  51587c29
- Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint · 30606c38
  unknown authored Apr 10, 2007
```
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint


client/mysqltest.c:
  Auto merged
```
  30606c38
- Take into account wether vertical_results are in effect · da43360e
  unknown authored Apr 10, 2007
  
  da43360e
- Init dying to 1 just after passing the guard · 3120134a
  unknown authored Apr 10, 2007
  
  3120134a
- Add OPT_LOG_DIR · 3f96702b
  unknown authored Apr 10, 2007
  
  3f96702b
- Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint · 7122fb33
  unknown authored Apr 10, 2007
```
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
```
  7122fb33
- Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint · 4d324e03
  unknown authored Apr 10, 2007
```
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
```
  4d324e03
- Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint · dc443e49
  unknown authored Apr 10, 2007
```
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
```
  dc443e49
- Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.1 · 86ef70e9
  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
```
  86ef70e9
- Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0 · d76e2592
  unknown authored Apr 10, 2007
```
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
```
  d76e2592
- Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1 · 76f5c73b
  unknown authored Apr 10, 2007
```
into  pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint
```
  76f5c73b
- Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint · a2aa6503
  unknown authored Apr 10, 2007
```
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint


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


client/mysqltest.c:
  Manual merge
```
  06ed2ddc
- Add --logdir option ot mysqltest · 5565d329
  unknown authored Apr 10, 2007
  
  5565d329
- Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint · 334c2cc2
  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
```
  334c2cc2
- Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint · 4788e6df
  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
```
  4788e6df
- Merge 192.168.0.4:mysql/mysql-4.1-maint · 8163d5ec
  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
```
  8163d5ec
- Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint · 4aa3615c
  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
```
  4aa3615c
- Give the "sync_slave_with_master" something to do · 9f5e640d
  unknown authored Apr 10, 2007
  
  9f5e640d
- Merge bk-internal:/home/bk/mysql-5.1-new-maint · d2462ac3
  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
```
  d2462ac3
- Merge bk-internal:/home/bk/mysql-5.0-maint · ca33c667
  unknown authored Apr 10, 2007
```
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
```
  ca33c667
09 Apr, 2007 2 commits

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

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

37feda25

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