Commits · 4b13e338241778aefad46fde158a4cb99db083e1 · nexedi / MariaDB

29 Nov, 2006 29 commits

Merge 192.168.0.10:mysql/work/my51-work · 4b13e338

unknown authored Nov 29, 2006

into  shellback.(none):/home/msvensson/mysql/mysql-5.1-merge-from5.0-maint


BitKeeper/etc/ignore:
  auto-union
client/mysql.cc:
  Auto merged
mysql-test/lib/mtr_process.pl:
  Auto merged
mysql-test/lib/mtr_report.pl:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/func_misc.result:
  Auto merged
mysql-test/r/mysql.result:
  Auto merged
mysql-test/r/rpl_000015.result:
  Auto merged
mysql-test/t/mysql.test:
  Auto merged
mysql-test/t/rpl_000015.test:
  Auto merged
sql-common/my_time.c:
  Auto merged
sql/item_func.h:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged

4b13e338

Merge neptunus.(none):/home/msvensson/mysql/work/my50-work · a763eeff

unknown authored Nov 29, 2006

into  neptunus.(none):/home/msvensson/mysql/work/my51-work


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

a763eeff

Merge neptunus.(none):/home/msvensson/mysql/work/my41-work · 2aac04f9

unknown authored Nov 29, 2006

into  neptunus.(none):/home/msvensson/mysql/work/my50-work


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

2aac04f9

After 5.1.6 just turn on logging, it will be sent to tables by default · 7bc069d1
unknown authored Nov 29, 2006

7bc069d1

Merge shellback.(none):/home/msvensson/mysql/mysql-5.0-maint · babdd153

unknown authored Nov 29, 2006

into  shellback.(none):/home/msvensson/mysql/mysql-5.1-merge-from5.0-maint


BitKeeper/etc/collapsed:
  auto-union
BitKeeper/etc/ignore:
  auto-union
Docs/Makefile.am:
  Auto merged
Makefile.am:
  Auto merged
client/mysqltest.c:
  Auto merged
extra/yassl/src/ssl.cpp:
  Auto merged
include/my_sys.h:
  Auto merged
mysql-test/Makefile.am:
  Auto merged
mysql-test/mysql-test-run-shell.sh:
  Auto merged
mysql-test/extra/rpl_tests/rpl_deadlock.test:
  Auto merged
mysql-test/lib/mtr_process.pl:
  Auto merged
mysql-test/lib/mtr_report.pl:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/func_time.result:
  Auto merged
mysql-test/r/rpl_000015.result:
  Auto merged
mysql-test/r/rpl_deadlock_innodb.result:
  Auto merged
mysql-test/r/udf.result:
  Auto merged
mysql-test/t/func_time.test:
  Auto merged
mysql-test/t/limit.test:
  Auto merged
mysql-test/t/mysql.test:
  Auto merged
mysql-test/t/rpl_000015.test:
  Auto merged
mysql-test/t/udf.test:
  Auto merged
mysql-test/t/view_grant.test:
  Auto merged
sql/item.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_func.h:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql-common/my_time.c:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged

babdd153

Merge shellback.(none):/home/msvensson/mysql/mysql-5.1 · dbe85caf

unknown authored Nov 29, 2006

into  shellback.(none):/home/msvensson/mysql/mysql-5.1-merge-from5.0-maint


client/mysql_upgrade.c:
  Auto merged
configure.in:
  Auto merged
mysql-test/lib/mtr_report.pl:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql-common/my_time.c:
  Auto merged
sql/sql_parse.cc:
  Auto merged
support-files/mysql.spec.sh:
  Auto merged
include/my_sys.h:
  Manual merge - my_getpagesize defined further down separate from HAVE_SYS_MMAN_H

dbe85caf

Many files: · 8f71610f

unknown authored Nov 29, 2006

  Changed paths to ndb include directory to include "storage"
Makefile.am:
  Adjusted path to yaSSL libtool libraries
ssl.m4:
  Use libtool way of specifying yaSSL libraries


config/ac-macros/ssl.m4:
  Use libtool way of specifying yaSSL libraries
libmysqld/Makefile.am:
  Adjusted path to yaSSL libtool libraries
storage/ndb/config/type_kernel.mk.am:
  Changed paths to ndb include directory to include "storage"
storage/ndb/config/type_ndbapi.mk.am:
  Changed paths to ndb include directory to include "storage"
storage/ndb/config/type_ndbapitest.mk.am:
  Changed paths to ndb include directory to include "storage"
storage/ndb/config/type_ndbapitools.mk.am:
  Changed paths to ndb include directory to include "storage"
storage/ndb/config/type_util.mk.am:
  Changed paths to ndb include directory to include "storage"

8f71610f

Merge fixes for new test cases · 74ff94ec
unknown authored Nov 29, 2006

74ff94ec

Merge shellback.(none):/home/msvensson/mysql/mysql-5.1 · d9885766

unknown authored Nov 29, 2006

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


BitKeeper/etc/ignore:
  auto-union
Makefile.am:
  Auto merged
client/mysql.cc:
  Auto merged
client/mysql_upgrade.c:
  Auto merged
client/mysqltest.c:
  Auto merged
extra/yassl/src/ssl.cpp:
  Auto merged
mysql-test/lib/mtr_report.pl:
  Auto merged
mysql-test/mysql-test-run-shell.sh:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/query_cache.result:
  Auto merged
mysql-test/r/udf.result:
  Auto merged
mysql-test/t/alter_table.test:
  Auto merged
mysql-test/t/disabled.def:
  Auto merged
mysql-test/t/limit.test:
  Auto merged
mysql-test/t/mysql.test:
  Auto merged
mysql-test/t/mysqldump.test:
  Auto merged
mysql-test/t/query_cache.test:
  Auto merged
mysql-test/t/system_mysql_db_fix30020.test:
  Auto merged
mysql-test/t/udf.test:
  Auto merged
mysql-test/t/view_grant.test:
  Auto merged
mysys/Makefile.am:
  Auto merged
scripts/mysql_fix_privilege_tables.sql:
  Auto merged
sql/item.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_func.h:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_handler.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql-common/my_time.c:
  Auto merged
sql/sql_table.cc:
  Auto merged
extra/yassl/taocrypt/include/algebra.hpp:
  Remove fix as it conflicts with "import from yassl" and it's been
  fixed there
sql/ha_ndbcluster.cc:
  Merge fix of warnings
sql/sql_base.cc:
  Merge

d9885766

Merge mysql.com:/home/kent/bk/mysql-5.0-build · d6eb3627

unknown authored Nov 29, 2006

into  mysql.com:/home/kent/bk/mysql-5.1-build


Docs/Makefile.am:
  Auto merged
extra/yassl/taocrypt/benchmark/benchmark.dsp:
  Auto merged
extra/yassl/taocrypt/taocrypt.dsp:
  Auto merged
extra/yassl/taocrypt/taocrypt.vcproj:
  Auto merged
extra/yassl/taocrypt/test.dsp:
  Auto merged
extra/yassl/testsuite/testsuite.dsp:
  Auto merged
extra/yassl/yassl.dsp:
  Auto merged
extra/yassl/yassl.vcproj:
  Auto merged
libmysql/libmysql.c:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/t/subselect.test:
  Auto merged
mysql-test/t/type_newdecimal.test:
  Auto merged
sql/Makefile.am:
  Auto merged
sql/filesort.cc:
  Auto merged
sql/handler.cc:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_subselect.cc:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql-common/client.c:
  Auto merged
sql-common/my_time.c:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/table.cc:
  Auto merged
strings/decimal.c:
  Auto merged

d6eb3627

Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1 · e93a20a5
unknown authored Nov 29, 2006
```
into  mysql.com:/home/kent/bk/mysql-5.1-build


sql-common/my_time.c:
  Auto merged
```
e93a20a5
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1-build · 412d284e
unknown authored Nov 29, 2006
```
into  mysql.com:/home/kent/bk/mysql-5.1-build


mysql-test/mysql-test-run.pl:
  Auto merged
```
412d284e
Merge mysql.com:/home/kent/bk/mysql-4.1-build · ea7559ce
unknown authored Nov 29, 2006
```
into  mysql.com:/home/kent/bk/mysql-5.0-build
```
ea7559ce
Merge shellback.(none):/home/msvensson/mysql/yassl_import/my50-yassl_import · cd69f462
unknown authored Nov 29, 2006
```
into  shellback.(none):/home/msvensson/mysql/yassl_import/mysql-5.0-maint


extra/yassl/src/ssl.cpp:
  Auto merged
```
cd69f462
Merge bk-internal:/home/bk/mysql-5.1-maint · 4f912e04
unknown authored Nov 29, 2006
```
into  shellback.(none):/home/msvensson/mysql/yassl_import/my51-yassl_import
```
4f912e04

Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint · 89d106c1

unknown authored Nov 29, 2006

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


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

89d106c1

Merge kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build · d765ed0c
unknown authored Nov 29, 2006
```
into  kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build-work
```
d765ed0c

Merge kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build · e0bf8da9

unknown authored Nov 29, 2006

into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-work


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

e0bf8da9

Merge kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-work · b58adf2f
unknown authored Nov 29, 2006
```
into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.1-build


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

Merge kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build-work · abb3dfc4

unknown authored Nov 29, 2006

into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-work


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

abb3dfc4

minor fix · 3344298d

unknown authored Nov 29, 2006


mysql-test/mysql-test-run.pl:
  remove dependency on Data::Dumper, it's not used anywhere

3344298d

Merge bk-internal:/home/bk/mysql-5.1 · b51cf266

unknown authored Nov 29, 2006

into  dl145s.mysql.com:/data0/bk/team_tree_merge/MERGE/mysql-5.1-opt


sql/sql_parse.cc:
  Auto merged

b51cf266

Update result file for func_misc to 5.1 version format · 7c2c9ed7
unknown authored Nov 29, 2006

7c2c9ed7

Merge shellback.(none):/home/msvensson/mysql/yassl_import/my50-yassl_import · 5f4a5b6e

unknown authored Nov 29, 2006

into  shellback.(none):/home/msvensson/mysql/yassl_import/my51-yassl_import


extra/yassl/include/openssl/ssl.h:
  Auto merged
extra/yassl/include/yassl_int.hpp:
  Auto merged
extra/yassl/src/ssl.cpp:
  Auto merged
extra/yassl/src/yassl_imp.cpp:
  Auto merged
extra/yassl/src/yassl_int.cpp:
  Auto merged

5f4a5b6e

Import version 1.50 of yaSSL · eb6ab467

unknown authored Nov 29, 2006


extra/yassl/README:
  Import patch yassl.diff
extra/yassl/examples/client/client.cpp:
  Import patch yassl.diff
extra/yassl/examples/echoclient/echoclient.cpp:
  Import patch yassl.diff
extra/yassl/examples/echoserver/echoserver.cpp:
  Import patch yassl.diff
extra/yassl/examples/server/server.cpp:
  Import patch yassl.diff
extra/yassl/include/factory.hpp:
  Import patch yassl.diff
extra/yassl/include/openssl/ssl.h:
  Import patch yassl.diff
extra/yassl/include/socket_wrapper.hpp:
  Import patch yassl.diff
extra/yassl/include/yassl_error.hpp:
  Import patch yassl.diff
extra/yassl/include/yassl_imp.hpp:
  Import patch yassl.diff
extra/yassl/include/yassl_int.hpp:
  Import patch yassl.diff
extra/yassl/include/yassl_types.hpp:
  Import patch yassl.diff
extra/yassl/src/handshake.cpp:
  Import patch yassl.diff
extra/yassl/src/make.bat:
  Import patch yassl.diff
extra/yassl/src/socket_wrapper.cpp:
  Import patch yassl.diff
extra/yassl/src/ssl.cpp:
  Import patch yassl.diff
extra/yassl/src/yassl_error.cpp:
  Import patch yassl.diff
extra/yassl/src/yassl_imp.cpp:
  Import patch yassl.diff
extra/yassl/src/yassl_int.cpp:
  Import patch yassl.diff
extra/yassl/taocrypt/benchmark/make.bat:
  Import patch yassl.diff
extra/yassl/taocrypt/include/aes.hpp:
  Import patch yassl.diff
extra/yassl/taocrypt/include/algebra.hpp:
  Import patch yassl.diff
extra/yassl/taocrypt/include/arc4.hpp:
  Import patch yassl.diff
extra/yassl/taocrypt/include/asn.hpp:
  Import patch yassl.diff
extra/yassl/taocrypt/include/block.hpp:
  Import patch yassl.diff
extra/yassl/taocrypt/include/blowfish.hpp:
  Import patch yassl.diff
extra/yassl/taocrypt/include/des.hpp:
  Import patch yassl.diff
extra/yassl/taocrypt/include/integer.hpp:
  Import patch yassl.diff
extra/yassl/taocrypt/include/md5.hpp:
  Import patch yassl.diff
extra/yassl/taocrypt/include/misc.hpp:
  Import patch yassl.diff
extra/yassl/taocrypt/include/modes.hpp:
  Import patch yassl.diff
extra/yassl/taocrypt/include/ripemd.hpp:
  Import patch yassl.diff
extra/yassl/taocrypt/include/rsa.hpp:
  Import patch yassl.diff
extra/yassl/taocrypt/include/sha.hpp:
  Import patch yassl.diff
extra/yassl/taocrypt/include/twofish.hpp:
  Import patch yassl.diff
extra/yassl/taocrypt/src/aes.cpp:
  Import patch yassl.diff
extra/yassl/taocrypt/src/algebra.cpp:
  Import patch yassl.diff
extra/yassl/taocrypt/src/arc4.cpp:
  Import patch yassl.diff
extra/yassl/taocrypt/src/blowfish.cpp:
  Import patch yassl.diff
extra/yassl/taocrypt/src/des.cpp:
  Import patch yassl.diff
extra/yassl/taocrypt/src/integer.cpp:
  Import patch yassl.diff
extra/yassl/taocrypt/src/make.bat:
  Import patch yassl.diff
extra/yassl/taocrypt/src/md4.cpp:
  Import patch yassl.diff
extra/yassl/taocrypt/src/md5.cpp:
  Import patch yassl.diff
extra/yassl/taocrypt/src/misc.cpp:
  Import patch yassl.diff
extra/yassl/taocrypt/src/random.cpp:
  Import patch yassl.diff
extra/yassl/taocrypt/src/ripemd.cpp:
  Import patch yassl.diff
extra/yassl/taocrypt/src/sha.cpp:
  Import patch yassl.diff
extra/yassl/taocrypt/src/twofish.cpp:
  Import patch yassl.diff
extra/yassl/taocrypt/test/make.bat:
  Import patch yassl.diff
extra/yassl/taocrypt/test/test.cpp:
  Import patch yassl.diff
extra/yassl/testsuite/make.bat:
  Import patch yassl.diff
extra/yassl/testsuite/test.hpp:
  Import patch yassl.diff
extra/yassl/include/openssl/prefix_ssl.h:
  New prefic file for ssl.h generated

eb6ab467

Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.1 · 84d5733b
unknown authored Nov 29, 2006
```
into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.1-build
```
84d5733b

Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.1-maint · 81391758

unknown authored Nov 29, 2006

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


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

81391758

Merge bk-internal:/home/bk/mysql-5.1-maint · 0c676d7a

unknown authored Nov 29, 2006

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


configure.in:
  Auto merged
sql/sql_parse.cc:
  Auto merged

0c676d7a

Merge mysql.com:/usr/home/ram/work/bug22229/my50-bug22229 · b15425ad

unknown authored Nov 29, 2006

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


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

b15425ad

28 Nov, 2006 11 commits

rpl_init_slave.result: · 3aca00e1

unknown authored Nov 28, 2006

  Update test result due to fix for bug 23883.


mysql-test/r/rpl_init_slave.result:
  Update test result due to fix for bug 23883.

3aca00e1

Merge neptunus.(none):/home/msvensson/mysql/work/my50-work · a5aa9f64

unknown authored Nov 28, 2006

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


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

a5aa9f64

Merge neptunus.(none):/home/msvensson/mysql/work/my50-work · 89135f34

unknown authored Nov 28, 2006

into  neptunus.(none):/home/msvensson/mysql/work/my51-work


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

89135f34

Remove the moved check a second time. · 3cd30397
unknown authored Nov 28, 2006
```
mysql-test/mysql-test-run.pl:
  Remove the moved check
```
3cd30397

Merge neptunus.(none):/home/msvensson/mysql/work/my41-work · 1e875747

unknown authored Nov 28, 2006

into  neptunus.(none):/home/msvensson/mysql/work/my50-work


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

1e875747

Move the check that $opt_vardir could be created and was writable to the function · b3273629
unknown authored Nov 28, 2006
```
where we know how to creat the vardir 
Remove unused variable
```
b3273629

Merge bk-internal:/home/bk/mysql-5.0-maint · 38da90cc

unknown authored Nov 28, 2006

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


mysql-test/t/mysql.test:
  Auto merged

38da90cc

Merge neptunus.(none):/home/msvensson/mysql/work/my50-work · f3aec87e

unknown authored Nov 28, 2006

into  neptunus.(none):/home/msvensson/mysql/work/my51-work


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

f3aec87e

Merge neptunus.(none):/home/msvensson/mysql/work/my41-work · a7bad254

unknown authored Nov 28, 2006

into  neptunus.(none):/home/msvensson/mysql/work/my50-work


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

a7bad254

Bug#24335 mysql-test-run.pl fails with ActiveState Perl on Windows · e789cdaa

unknown authored Nov 28, 2006

 - Avoid use of mtr_run when executing "mysqld --verbose --help" to find
   version and supported features


mysql-test/mysql-test-run.pl:
  Don't use mtr_run when executing "mysqld --verbose --help" to find
  version and supported features.

e789cdaa

Fix missing parameter declaration · 27f9c2c1
unknown authored Nov 28, 2006

27f9c2c1