Commits · 7e6d47cc84b863ec87b3229d6241ca38a23151fb · nexedi / MariaDB

06 Feb, 2007 40 commits

Fix merge error · 7e6d47cc
unknown authored Feb 06, 2007

7e6d47cc

Merge pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint · 0bcaf5cf

unknown authored Feb 06, 2007

into  pilot.mysql.com:/home/msvensson/mysql/mysql-5.1-new-maint


sql/sql_analyse.cc:
  Auto merged
vio/viosslfactories.c:
  Auto merged

0bcaf5cf

Merge bk-internal:/home/bk/mysql-5.1-maint · a5783ce0

unknown authored Feb 06, 2007

into  pilot.mysql.com:/home/msvensson/mysql/mysql-5.1-new-maint


mysql-test/r/cast.result:
  Auto merged
mysql-test/t/cast.test:
  Auto merged
sql/item_timefunc.cc:
  Auto merged

a5783ce0

Merge bk-internal:/home/bk/mysql-5.0-maint · 30e01d9e
unknown authored Feb 06, 2007
```
into  pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint
```
30e01d9e

Merge 192.168.0.10:mysql/yassL-import/my51-yassL-import · beffcf92

unknown authored Feb 06, 2007

into  pilot.mysql.com:/home/msvensson/mysql/mysql-5.1-new-maint


vio/viosslfactories.c:
  Auto merged
extra/yassl/taocrypt/src/asn.cpp:
  Manual merge of yaSSL import and "fix warnings"

beffcf92

Merge 192.168.0.10:mysql/yassL-import/my50-yassL-import · 0cab1b14
unknown authored Feb 06, 2007
```
into  pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint


vio/viosslfactories.c:
  Auto merged
```
0cab1b14
Merge neptunus.(none):/home/msvensson/mysql/yassL-import/my50-yassL-import · 216be3cd
unknown authored Feb 06, 2007
```
into  neptunus.(none):/home/msvensson/mysql/yassL-import/my51-yassL-import


vio/viosslfactories.c:
  Auto merged
```
216be3cd

Bug#24157 openssl_1 regression test is broken two different ways · 5ccb23ae

unknown authored Feb 06, 2007

 - Send output from 'ERR_print_errors_fp' to DBUG_FILE if --debug is used


vio/viosslfactories.c:
  Send output from 'ERR_print_errors_fp' to DBUG_FILE if --debug is used

5ccb23ae

Update result file for 5.1 · 2904e623
unknown authored Feb 06, 2007

2904e623
Fix merge error · f5ac6edf
unknown authored Feb 06, 2007

f5ac6edf

Merge pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint · 508b3f35

unknown authored Feb 06, 2007

into  pilot.mysql.com:/home/msvensson/mysql/mysql-5.1-new-maint


mysql-test/mysql-test-run.pl:
  Auto merged

508b3f35

Correct the non working check for --skip-log-bin in "extra_opt" · 38ae0976
unknown authored Feb 06, 2007

38ae0976

Bug#25988 openssl_1 Test Case Fails · 2544aa7b

unknown authored Feb 06, 2007

 - Small difference in output from 'X509_NAME_Oneline' between OpenSSL and yaSSL. OpenSSL uses
   an extension that allow's the email adress of the cert holder.   
 - Imported patch for yaSSL "add email to DN output"


extra/yassl/taocrypt/src/asn.cpp:
  Import patch yassl.diff
mysql-test/r/openssl_1.result:
  Update result file
mysql-test/t/openssl_1.test:
  Update test to include "emailAddress=" tag in the required SUBJECT for grant.

2544aa7b

Merge pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint · eb6c1b26

unknown authored Feb 06, 2007

into  pilot.mysql.com:/home/msvensson/mysql/mysql-5.1-new-maint


configure.in:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/range.result:
  Auto merged
mysql-test/t/range.test:
  Auto merged
mysys/default.c:
  Auto merged
scripts/mysqld_multi.sh:
  Auto merged
sql/field.h:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_prepare.cc:
  Auto merged

eb6c1b26

Merge pilot.mysql.com:/home/msvensson/mysql/mysql-4.1-maint · 56e9231f

unknown authored Feb 06, 2007

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


configure.in:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/range.result:
  Auto merged
mysql-test/t/range.test:
  Auto merged
mysys/default.c:
  Auto merged
scripts/mysqld_multi.sh:
  Auto merged
sql/field.h:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_prepare.cc:
  Merfge backport

56e9231f

Merge 192.168.0.10:mysql/mysql-5.1-maint · a2a6839e

unknown authored Feb 06, 2007

into  pilot.mysql.com:/home/msvensson/mysql/mysql-5.1-new-maint


BitKeeper/etc/collapsed:
  auto-union
configure.in:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/range.result:
  Auto merged
mysql-test/r/select.result:
  Auto merged
mysql-test/t/disabled.def:
  Auto merged
mysql-test/t/select.test:
  Auto merged
scripts/mysqld_multi.sh:
  Auto merged
sql/field.h:
  Auto merged
sql/item.cc:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_cmpfunc.h:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged

a2a6839e

Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint · 7bba59bb

unknown authored Feb 06, 2007

into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-maint


configure.in:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/select.result:
  Auto merged
mysql-test/t/select.test:
  Auto merged
mysys/default.c:
  Auto merged
sql/item.cc:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_cmpfunc.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
Makefile.am:
  SCCS merged

7bba59bb

Merge neptunus.(none):/home/msvensson/mysql/mysql-5.1 · 8c6fe358

unknown authored Feb 06, 2007

into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-maint


BitKeeper/etc/ignore:
  auto-union
Makefile.am:
  Auto merged
cmd-line-utils/readline/display.c:
  Auto merged
configure.in:
  Auto merged
extra/yassl/include/buffer.hpp:
  Auto merged
extra/yassl/include/crypto_wrapper.hpp:
  Auto merged
extra/yassl/include/yassl_imp.hpp:
  Auto merged
extra/yassl/include/yassl_int.hpp:
  Auto merged
extra/yassl/src/crypto_wrapper.cpp:
  Auto merged
extra/yassl/taocrypt/include/algebra.hpp:
  Auto merged
extra/yassl/taocrypt/include/des.hpp:
  Auto merged
extra/yassl/taocrypt/include/hash.hpp:
  Auto merged
extra/yassl/taocrypt/include/hmac.hpp:
  Auto merged
extra/yassl/taocrypt/include/modarith.hpp:
  Auto merged
extra/yassl/taocrypt/include/modes.hpp:
  Auto merged
extra/yassl/taocrypt/include/rsa.hpp:
  Auto merged
extra/yassl/taocrypt/include/type_traits.hpp:
  Auto merged
extra/yassl/taocrypt/mySTL/list.hpp:
  Auto merged
extra/yassl/taocrypt/src/aes.cpp:
  Auto merged
extra/yassl/taocrypt/src/algebra.cpp:
  Auto merged
extra/yassl/taocrypt/src/asn.cpp:
  Auto merged
extra/yassl/testsuite/testsuite.cpp:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/mysqltest.result:
  Auto merged
mysql-test/t/mysqltest.test:
  Auto merged
mysys/default.c:
  Auto merged
sql/field.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_cmpfunc.h:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/net_serv.cc:
  Auto merged
sql/repl_failsafe.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/set_var.h:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql-common/client.c:
  Auto merged
sql/sql_select.cc:
  Auto merged
extra/yassl/taocrypt/test/test.cpp:
  Manual merge
mysql-test/r/grant.result:
  Manual merge
mysql-test/r/select.result:
  Manual merge
mysql-test/t/grant.test:
  Manual merge
mysql-test/t/select.test:
  Manual merge
sql/field.h:
  Manual merge
sql/mysqld.cc:
  Manual merge

8c6fe358

Fix windows build · 2470806f
unknown authored Feb 06, 2007

2470806f

Merge 192.168.0.10:mysql/mysql-5.0-maint · dcafc4c4

unknown authored Feb 06, 2007

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


mysql-test/mysql-test-run.pl:
  Auto merged
sql/item_timefunc.cc:
  Auto merged

dcafc4c4

Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0 · 56820e1c

unknown authored Feb 06, 2007

into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint


Makefile.am:
  Auto merged
configure.in:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysys/default.c:
  Auto merged
sql/item.cc:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_cmpfunc.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
mysql-test/r/select.result:
  Manual merge
mysql-test/t/select.test:
  Manual merge

56820e1c

Merge 192.168.0.10:mysql/mysql-4.1-maint · 31aee856

unknown authored Feb 06, 2007

into  pilot.mysql.com:/home/msvensson/mysql/mysql-4.1-maint


mysys/default.c:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_prepare.cc:
  Auto merged

31aee856

Merge neptunus.(none):/home/msvensson/mysql/my41-nmj · b93d81a8
unknown authored Feb 06, 2007
```
into  neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint


sql/sql_prepare.cc:
  Auto merged
```
b93d81a8

Merge pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint · 4c8f6078

unknown authored Feb 06, 2007

into  pilot.mysql.com:/home/msvensson/mysql/mysql-5.1-new-maint


BitKeeper/etc/collapsed:
  auto-union
configure.in:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/cast.result:
  Auto merged
mysql-test/r/range.result:
  Auto merged
mysql-test/r/select.result:
  Auto merged
mysql-test/t/cast.test:
  Auto merged
mysql-test/t/disabled.def:
  Auto merged
mysql-test/t/select.test:
  Auto merged
scripts/mysqld_multi.sh:
  Auto merged
sql/field.h:
  Auto merged
sql/item.cc:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_cmpfunc.h:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged

4c8f6078

Merge pilot.mysql.com:/home/msvensson/mysql/bug24805/my50-bug24805 · 14e7f52f

unknown authored Feb 06, 2007

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


mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/t/disabled.def:
  Auto merged

14e7f52f

Merge bk-internal:/home/bk/mysql-4.1-maint · 4660f6d5
unknown authored Feb 06, 2007
```
into  pilot.mysql.com:/home/msvensson/mysql/mysql-4.1-maint
```
4660f6d5

Merge 192.168.0.10:mysql/mysql-4.1-maint · f58351c1

unknown authored Feb 06, 2007

into  pilot.mysql.com:/home/msvensson/mysql/mysql-4.1-maint


sql/sql_prepare.cc:
  Auto merged

f58351c1

Merge pilot.mysql.com:/home/msvensson/mysql/bug24805/my50-bug24805 · 618c8c87

unknown authored Feb 06, 2007

into  pilot.mysql.com:/home/msvensson/mysql/bug24805/my51-bug24805


mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/t/disabled.def:
  Manual merge

618c8c87

Bug#24805 mtr.pl can't handle test with --disable-log-bin · 04b52251

unknown authored Feb 06, 2007

- Don't give mysqld the --log-bin argument if .opt file
  contains --skip-log-bin
- Enable flush2 test


mysql-test/mysql-test-run.pl:
  Don't give mysqld the --log-bin argument if .opt file contains --skip-log-bin 
  Don't pass mysqld --binlog-format=s if --skip-log-bin
mysql-test/t/disabled.def:
  Enable flush2
mysql-test/t/flush2-master.opt:
  Use --skip-log-bin in flush2 to test flush without bin logging

04b52251

Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint · ffde1cf0
unknown authored Feb 06, 2007
```
into  mysql.com:/home/ram/work/b23782/b23782.5.0


sql/sql_analyse.cc:
  Auto merged
```
ffde1cf0
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.1-maint · 2b8920cd
unknown authored Feb 06, 2007
```
into  mysql.com:/home/ram/work/b23782/b23782.5.1
```
2b8920cd

Bug#8983 one place that isn't strict-aliasing-safe · 1d2d9a03

unknown authored Feb 06, 2007

 - Backport fix from 5.0


sql/sql_prepare.cc:
  Avoid problems with -no-strict-aliasing in gcc 4.0+

1d2d9a03

Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.1-maint · 278eb555
unknown authored Feb 06, 2007
```
into  mysql.com:/usr/home/ram/work/bug23938/my51-bug23938


sql/item_timefunc.cc:
  Auto merged
```
278eb555

Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint · aff6c2e7

unknown authored Feb 06, 2007

into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-maint


BitKeeper/etc/collapsed:
  auto-union
configure.in:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/range.result:
  Auto merged
mysql-test/r/select.result:
  Auto merged
mysql-test/t/select.test:
  Auto merged
scripts/mysqld_multi.sh:
  Auto merged
sql/field.h:
  Auto merged
sql/item.cc:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_cmpfunc.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged

aff6c2e7

Merge mysql.com:/home/ram/work/b23782/b23782.5.0 · c406b25e
unknown authored Feb 06, 2007
```
into  mysql.com:/home/ram/work/b23782/b23782.5.1


sql/sql_analyse.cc:
  Auto merged
```
c406b25e

Fix for bug #23782: Stored procedures: crash if variable in procedure · 07efbe8c

unknown authored Feb 06, 2007

analyse

We have to call fix_fields() for procedure analyse' arguments as they may   
not be
fixed in some circumstances.

(as the crash appears when mysqld starts skipping binlog, a test case
will be added when we can --skip-bin-log in -master.opt)


sql/sql_analyse.cc:
  Fix for bug #23782: Stored procedures: crash if variable in procedure
  analyse
    - call fix_fields() if arguments are not fixed.

07efbe8c

Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1-maint · 70323365
unknown authored Feb 06, 2007
```
into  mysql.com:/usr/home/ram/work/bug23938/my41-bug23938


sql/item_timefunc.cc:
  Auto merged
```
70323365
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint · e976ea37
unknown authored Feb 06, 2007
```
into  mysql.com:/usr/home/ram/work/bug23938/my50-bug23938


sql/item_timefunc.cc:
  Auto merged
```
e976ea37

Merge mysql.com:/usr/home/ram/work/bug23938/my50-bug23938 · c970941d

unknown authored Feb 06, 2007

into  mysql.com:/usr/home/ram/work/bug23938/my51-bug23938


mysql-test/r/cast.result:
  Auto merged
mysql-test/t/cast.test:
  Auto merged
sql/item_timefunc.cc:
  Auto merged

c970941d

Merge mysql.com:/usr/home/ram/work/bug23938/my41-bug23938 · 61b286e4

unknown authored Feb 06, 2007

into  mysql.com:/usr/home/ram/work/bug23938/my50-bug23938


sql/item_timefunc.cc:
  Auto merged
mysql-test/r/cast.result:
  SCCS merged
mysql-test/t/cast.test:
  SCCS merged

61b286e4