Commits · 437a124e5886a8788ba2ff2a97732b7e90c5aa80 · nexedi / MariaDB

28 Mar, 2007 2 commits

Merge pilot.blaudden:/home/msvensson/mysql/bug25197/my50-bug25197 · 437a124e

unknown authored Mar 28, 2007

into  pilot.blaudden:/home/msvensson/mysql/bug25197/my51-bug25197


mysql-test/r/func_str.result:
  Auto merged
mysql-test/t/func_str.test:
  Auto merged
sql/item_strfunc.cc:
  Auto merged

437a124e

Bug#25197 repeat function returns null when using table field directly as count · 7cf339ff

unknown authored Mar 28, 2007

 - Add extra test case from bug#27073
 - Change "if" to be optimized for count > 0


mysql-test/r/func_str.result:
  Add test case from bug#27073
mysql-test/t/func_str.test:
  Add test case from bug#27073
sql/item_strfunc.cc:
  Change the if statemnet to be optimized for the normal case where count > 0

7cf339ff

23 Feb, 2007 1 commit

Bug#25197 repeat function returns null when using table field directly as count · fa68200c

unknown authored Feb 23, 2007

 - Return empty string also if count is unsigned and value is 0


mysql-test/r/func_str.result:
  Update test result
mysql-test/t/func_str.test:
  Add test case for using an unsigned value as count parameter
  for REPEAT
sql/item_strfunc.cc:
  The repeat function should return the emptystring if
  count is unsigned and equal to zero or
  count is signed and less than or equal to zero

fa68200c

06 Feb, 2007 37 commits

Merge pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint · 337d9b88
unknown authored Feb 06, 2007
```
into  pilot.mysql.com:/home/msvensson/mysql/mysql-5.1-new-maint


extra/perror.c:
  Auto merged
```
337d9b88
Merge pilot.mysql.com:/home/msvensson/mysql/mysql-4.1-maint · 4005b1c4
unknown authored Feb 06, 2007
```
into  pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint


extra/perror.c:
  Auto merged
```
4005b1c4
Merge 192.168.0.10:mysql/mysql-4.1-maint · d9f9e41f
unknown authored Feb 06, 2007
```
into  pilot.mysql.com:/home/msvensson/mysql/mysql-4.1-maint
```
d9f9e41f
Bug#25344 Segmentation violation when try to run the perror utility · 51932362
unknown authored Feb 06, 2007
```
 - strerror might return NULL on some platforms


extra/perror.c:
  Backport fix from 5.0
```
51932362

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

unknown authored Feb 06, 2007

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


mysql-test/t/rpl_openssl.test:
  Auto merged
vio/vio.c:
  Auto merged
vio/viossl.c:
  Auto merged

57c012e1

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

7f4be1e4

Merge 192.168.0.5:mysql/bug25203/my50-bug25203 · 5cc1cb88

unknown authored Feb 06, 2007

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


vio/vio.c:
  Auto merged
vio/viossl.c:
  Auto merged

5cc1cb88

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

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

49c26cfd

Merge bk-internal:/home/bk/mysql-5.1-maint · 6b7aee7b

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

6b7aee7b

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

Merge 192.168.0.10:mysql/yassL-import/my51-yassL-import · 65e8f44b

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"

65e8f44b

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


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


vio/viosslfactories.c:
  Auto merged
```
5a4e074c

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

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

c6968d49

Update result file for 5.1 · 146a76b0
unknown authored Feb 06, 2007

146a76b0
Fix merge error · 04e51556
unknown authored Feb 06, 2007

04e51556

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

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

ca48df6e

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

0a9fee76

Bug#25988 openssl_1 Test Case Fails · 118c50b7

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.

118c50b7

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

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

e6d84b8a

Merge pilot.mysql.com:/home/msvensson/mysql/mysql-4.1-maint · 48f233c3

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

48f233c3

Merge 192.168.0.10:mysql/mysql-5.1-maint · 08145c06

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

08145c06

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

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

dba4554f

Merge neptunus.(none):/home/msvensson/mysql/mysql-5.1 · 42942d4c

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

42942d4c

Fix windows build · 9c4ea7aa
unknown authored Feb 06, 2007

9c4ea7aa

Merge 192.168.0.10:mysql/mysql-5.0-maint · 92285ad7

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

92285ad7

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

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

f236ccef

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

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

e34793eb

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


sql/sql_prepare.cc:
  Auto merged
```
260571d4

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

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

9ba9379f

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

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

ce054bd0

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

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

unknown authored Feb 06, 2007

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


sql/sql_prepare.cc:
  Auto merged

f4363d92

Merge pilot.mysql.com:/home/msvensson/mysql/bug24805/my50-bug24805 · 117c8b23

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

117c8b23

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

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

be60eb34

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


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