Commits · 8b37d8f6bf10701fcd25f15ce28259c8e89ae5a5 · Kirill Smelkov / mariadb

19 Apr, 2006 1 commit

unknown authored Apr 19, 2006


extra/yassl/src/template_instnt.cpp:
  Import patch yassl.diff
extra/yassl/taocrypt/include/misc.hpp:
  Import patch yassl.diff
extra/yassl/taocrypt/src/template_instnt.cpp:
  Import patch yassl.diff
extra/yassl/taocrypt/test/test.cpp:
  Import patch yassl.diff

8b37d8f6

18 Apr, 2006 1 commit

Import from yaSSL upstream · eb196d06

unknown authored Apr 18, 2006


extra/yassl/include/openssl/rsa.h:
  Import patch yassl.diff
extra/yassl/include/openssl/ssl.h:
  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/mySTL/helpers.hpp:
  Import patch yassl.diff
extra/yassl/mySTL/list.hpp:
  Import patch yassl.diff
extra/yassl/mySTL/vector.hpp:
  Import patch yassl.diff
extra/yassl/src/handshake.cpp:
  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_imp.cpp:
  Import patch yassl.diff
extra/yassl/src/yassl_int.cpp:
  Import patch yassl.diff
extra/yassl/taocrypt/benchmark/benchmark.cpp:
  Import patch yassl.diff
extra/yassl/taocrypt/include/integer.hpp:
  Import patch yassl.diff
extra/yassl/taocrypt/include/misc.hpp:
  Import patch yassl.diff
extra/yassl/taocrypt/include/runtime.hpp:
  Import patch yassl.diff
extra/yassl/taocrypt/include/types.hpp:
  Import patch yassl.diff
extra/yassl/taocrypt/src/algebra.cpp:
  Import patch yassl.diff
extra/yassl/taocrypt/src/integer.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/template_instnt.cpp:
  Import patch yassl.diff

eb196d06

11 Apr, 2006 1 commit

Add new yaSSL files · 066431fa

unknown authored Apr 11, 2006

Add benchmark, testsuite and taocrypt/test as places where to 
produce Makfiles and build - very useful for debugging


config/ac-macros/yassl.m4:
  Add Makefiles for yassl testsuite and benchmark
extra/yassl/Makefile.am:
  Add new subdir testsuite
extra/yassl/taocrypt/Makefile.am:
  Add new subdir test for the taocrypt test
extra/yassl/taocrypt/src/Makefile.am:
  Add all new files for yaSSL and organize them alphabetically
extra/yassl/taocrypt/benchmark/Makefile.am:
  New BitKeeper file ``extra/yassl/taocrypt/benchmark/Makefile.am''
extra/yassl/taocrypt/test/Makefile.am:
  New BitKeeper file ``extra/yassl/taocrypt/test/Makefile.am''
extra/yassl/testsuite/Makefile.am:
  New BitKeeper file ``extra/yassl/testsuite/Makefile.am''

066431fa

07 Apr, 2006 2 commits

Fix spelling error · 4a2cd870
unknown authored Apr 07, 2006

4a2cd870

Update yassl to 1.2.2 · 78697215

unknown authored Apr 07, 2006


extra/yassl/examples/client/client.cpp:
  Import patch yassl.diff
extra/yassl/README:
  Import patch yassl.diff
extra/yassl/examples/client/client.dsp:
  Import patch yassl.diff
extra/yassl/examples/echoclient/echoclient.cpp:
  Import patch yassl.diff
extra/yassl/examples/echoclient/echoclient.dsp:
  Import patch yassl.diff
extra/yassl/examples/echoclient/input:
  Import patch yassl.diff
extra/yassl/examples/echoclient/quit:
  Import patch yassl.diff
extra/yassl/examples/echoserver/echoserver.cpp:
  Import patch yassl.diff
extra/yassl/examples/echoserver/echoserver.dsp:
  Import patch yassl.diff
extra/yassl/examples/server/server.cpp:
  Import patch yassl.diff
extra/yassl/examples/server/server.dsp:
  Import patch yassl.diff
extra/yassl/include/cert_wrapper.hpp:
  Import patch yassl.diff
extra/yassl/include/crypto_wrapper.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.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/mySTL/helpers.hpp:
  Import patch yassl.diff
extra/yassl/mySTL/list.hpp:
  Import patch yassl.diff
extra/yassl/mySTL/vector.hpp:
  Import patch yassl.diff
extra/yassl/src/buffer.cpp:
  Import patch yassl.diff
extra/yassl/src/cert_wrapper.cpp:
  Import patch yassl.diff
extra/yassl/src/crypto_wrapper.cpp:
  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.cpp:
  Import patch yassl.diff
extra/yassl/taocrypt/benchmark/benchmark.cpp:
  Import patch yassl.diff
extra/yassl/taocrypt/benchmark/benchmark.dsp:
  Import patch yassl.diff
extra/yassl/taocrypt/benchmark/make.bat:
  Import patch yassl.diff
extra/yassl/taocrypt/include/blowfish.hpp:
  Import patch yassl.diff
extra/yassl/taocrypt/include/kernelc.hpp:
  Import patch yassl.diff
extra/yassl/taocrypt/include/pwdbased.hpp:
  Import patch yassl.diff
extra/yassl/taocrypt/include/twofish.hpp:
  Import patch yassl.diff
extra/yassl/taocrypt/src/bftables.cpp:
  Import patch yassl.diff
extra/yassl/taocrypt/src/blowfish.cpp:
  Import patch yassl.diff
extra/yassl/taocrypt/src/make.bat:
  Import patch yassl.diff
extra/yassl/taocrypt/src/tftables.cpp:
  Import patch yassl.diff
extra/yassl/taocrypt/src/twofish.cpp:
  Import patch yassl.diff
extra/yassl/taocrypt/test.dsp:
  Import patch yassl.diff
extra/yassl/taocrypt/test.dsw:
  Import patch yassl.diff
extra/yassl/taocrypt/test/make.bat:
  Import patch yassl.diff
extra/yassl/taocrypt/test/memory.cpp:
  Import patch yassl.diff
extra/yassl/taocrypt/test/test.cpp:
  Import patch yassl.diff
extra/yassl/testsuite/input:
  Import patch yassl.diff
extra/yassl/src/timer.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/include/aes.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/des.hpp:
  Import patch yassl.diff
extra/yassl/taocrypt/include/dh.hpp:
  Import patch yassl.diff
extra/yassl/taocrypt/include/hash.hpp:
  Import patch yassl.diff
extra/yassl/taocrypt/include/hmac.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/runtime.hpp:
  Import patch yassl.diff
extra/yassl/taocrypt/include/sha.hpp:
  Import patch yassl.diff
extra/yassl/taocrypt/include/types.hpp:
  Import patch yassl.diff
extra/yassl/taocrypt/src/aes.cpp:
  Import patch yassl.diff
extra/yassl/taocrypt/src/aestables.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/asn.cpp:
  Import patch yassl.diff
extra/yassl/taocrypt/src/coding.cpp:
  Import patch yassl.diff
extra/yassl/testsuite/make.bat:
  Import patch yassl.diff
extra/yassl/testsuite/quit:
  Import patch yassl.diff
extra/yassl/testsuite/test.hpp:
  Import patch yassl.diff
extra/yassl/testsuite/testsuite.cpp:
  Import patch yassl.diff
extra/yassl/testsuite/testsuite.dsp:
  Import patch yassl.diff
extra/yassl/taocrypt/src/des.cpp:
  Import patch yassl.diff
extra/yassl/taocrypt/src/dh.cpp:
  Import patch yassl.diff
extra/yassl/taocrypt/src/hash.cpp:
  Import patch yassl.diff
extra/yassl/taocrypt/src/integer.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/taocrypt.dsp:
  Import patch yassl.diff
extra/yassl/yassl.dsp:
  Import patch yassl.diff
extra/yassl/yassl.dsw:
  Import patch yassl.diff

78697215

06 Apr, 2006 10 commits

Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 9a1d80e9
unknown authored Apr 06, 2006
```
into  shellback.(none):/home/msvensson/mysql/mysql-5.0
```
9a1d80e9

Moving mysql_get_server_version() from libmysql.c to client.c, · a0f7e755

unknown authored Apr 06, 2006

as it is now required by mysql_set_character_set()


libmysql/libmysql.c:
  Removing mysql_get_server_version()
sql-common/client.c:
  Adding mysql_get_server_version()

a0f7e755

client.c: · f53c12c8

unknown authored Apr 06, 2006

  Bug#18830 incompatibility new libraries with old server
  Additional 5.0 fix:
  applying the same patch to client.c.


sql-common/client.c:
  Bug#18830 incompatibility new libraries with old server
  Additional 5.0 fix:
  applying the same patch to client.c.

f53c12c8

Merge mysql.com:/usr/home/bar/mysql-4.1 · 4ec04797

unknown authored Apr 06, 2006

into  mysql.com:/usr/home/bar/mysql-5.0


libmysql/libmysql.c:
  Bug#18830 incompatibility new libraries with old server
  Mergeing from 4.1

4ec04797

libmysql.c: · 00cfd1a7

unknown authored Apr 06, 2006

  Bug#18830: incompatibility new libraries with old server
  Don't execute SET NAMES with pre-4.1 server.


libmysql/libmysql.c:
  Bug#18830: incompatibility new libraries with old server
  Don't execute SET NAMES with pre-4.1 server.

00cfd1a7

Merge mysql.com:/usr/home/bar/mysql-4.1 · f1633f04
unknown authored Apr 06, 2006
```
into  mysql.com:/usr/home/bar/mysql-5.0
```
f1633f04

This problem has already been fixed by one of the previous changes. · 5475703b

unknown authored Apr 06, 2006

Adding test case to cover queries which worked incorrectly earlier:
Bug#18321: Can't store EuroSign with latin1_german1_ci and latin1_general_ci

mysql-test/r/ctype_latin1.result:
Adding test case for Bug#18321: Can't store EuroSign with latin1_german1_ci and latin1_general_ci
mysql-test/t/ctype_latin1.test:
Adding test case for Bug#18321: Can't store EuroSign with latin1_german1_ci and latin1_general_ci

5475703b

ctype-extra.c: · b17b89fb
unknown authored Apr 06, 2006
```
  Using local.


strings/ctype-extra.c:
  Using local.
```
b17b89fb
Merge mysql.com:/usr/home/bar/mysql-4.1 · 8dbc6b1f
unknown authored Apr 06, 2006
```
into  mysql.com:/usr/home/bar/mysql-5.0


strings/conf_to_src.c:
  Auto merged
```
8dbc6b1f

conf_to_src.c: · fafa4c5a

unknown authored Apr 06, 2006

  Backporting a 5.0 change:
  MAX_BUF was too small for Index.xml
  Changeing MAX_BUF and adding assert to easier
  catch the same problem in the future.
ctype-extra.c:
  Regenerating ctype-extra.c with the fixed conf_to_src.


strings/ctype-extra.c:
  Regenerating ctype-extra.c with the fixed conf_to_src.
strings/conf_to_src.c:
  Backporting a 5.0 change:
  MAX_BUF was too small for Index.xml
  Changeing MAX_BUF and adding assert to easier
  catch the same problem in the future.

fafa4c5a

05 Apr, 2006 5 commits

Merge rurik.mysql.com:/home/igor/mysql-5.0 · cabe2859
unknown authored Apr 05, 2006
```
into  rurik.mysql.com:/home/igor/dev/mysql-5.0-0
```
cabe2859

conf_to_src.c: · 6ef757e4

unknown authored Apr 05, 2006

  Buffer was too small to load Index.xml.
  So some charsets were not gerenrated.
  Making the buffer bigger, and adding an DBUG_ASSERT,
  to easier catch the problem in the future.
ctype-extra.c:
  Additional charsets were generated.


strings/ctype-extra.c:
  Additional charsets were generated.
strings/conf_to_src.c:
  Buffer was too small to load Index.xml.
  So some charsets were not gerenrated.
  Making the buffer bigger, and adding an DBUG_ASSERT,
  to easier catch the problem in the future.

6ef757e4

Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0 · af5e4098
unknown authored Apr 05, 2006
```
into sunlight.local:/local_work/16281-bug-5.0-mysql


sql/field.h:
  Auto merged
```
af5e4098

Fixed bug #16281: Multi-table update broken in 5.0 on tables imported from 4.1 · 0f8c1175

unknown authored Apr 05, 2006

Mutli-table uses temporary table to store new values for fields. With the
new values the rowid of the record to be updated is stored in a Field_string
field. Table to be updated is set as source table of the rowid field.
But when the temporary table creates the tmp field for the rowid field it
converts it to a varstring field because the table to be updated was created by
the v4.1. Due to this the stored rowids were broken and no records for 
update were found.

The flag can_alter_field_type is added to Field_string class. When it is set to
0 the field won't be converted to varstring. The Field_string::type() function 
now always returns MYSQL_TYPE_STRING if can_alter_field_type is set to 0.
The multi_update::initialize_tables() function now sets can_alter_field_type
flag to 0 for the rowid fields denying conversion of the field to a varstring
field.



sql/field.h:
  Fixed bug #16281: Multi-table update broken in 5.0 on tables imported from 4.1
  The flag can_alter_field_type is added to Field_string class. When it is set to
  0 the field won't be converted to varstring.
  The Field_string::type() function now always returns MYSQL_TYPE_STRING if 
  can_alter_field_type is set to 0.
sql/sql_update.cc:
  Fixed bug #16281: Multi-table update broken in 5.0 on tables imported from 4.1
  The multi_update::initialize_tables() function now sets can_alter_field_type
  flag to 0 for the rowid fields denying conversion of the field to a varstring
  field.

0f8c1175

Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 0e97b724

unknown authored Apr 05, 2006

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


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

0e97b724

04 Apr, 2006 10 commits

Fixed bug #18237. · e77888f5

unknown authored Apr 04, 2006

The code in opt_sum_query that prevented the COUNT/MIN/MAX 
optimization from being applied to outer joins  was not adjusted 
after introducing nested joins. As a result if an outer join
contained a reference to a view as an inner table the code of
opt_sum_query missed the presence of an on expressions and
erroneously applied the mentioned optimization.


mysql-test/r/view.result:
  Added a test case for bug #18237.
mysql-test/t/view.test:
  Added a test case for bug #18237.

e77888f5

Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0 · 0a2cd4bb
unknown authored Apr 04, 2006
```
into  mysql.com:/usr/home/bar/mysql-5.0
```
0a2cd4bb

After merge fix for Bug#12076 --with-extra-charsets has no effect · ff3495c4

unknown authored Apr 04, 2006


mysql-test/r/information_schema.result:
  IS_COMPILED is not determenistic
mysql-test/t/information_schema.test:
  IS_COMPILED is not determenistic
strings/conf_to_src.c:
  Adding dumping of extra 5.0 fields
strings/ctype-extra.c:
  Recreating sources according to 5.0 XML files using conf_to_src.

ff3495c4

Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.0 · 8eb2b474
unknown authored Apr 04, 2006
```
into  rurik.mysql.com:/home/igor/mysql-5.0
```
8eb2b474

Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 · 8422e484

unknown authored Apr 04, 2006

into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0


ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged

8422e484

Bug #18349 Wrong error message "Array index out of bounds... · 9cc49085
unknown authored Apr 04, 2006

9cc49085
Add option --debugger=NAME and --client-debugger=NAME. · a1c46189
unknown authored Apr 04, 2006
```
Add support for "--debugger=windbg" and "--debugger=vcexpress"
```
a1c46189
Merge rurik.mysql.com:/home/igor/mysql-5.0 · 9353bb32
unknown authored Apr 03, 2006
```
into  rurik.mysql.com:/home/igor/dev/mysql-5.0-0
```
9353bb32
Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.0 · 9bef795e
unknown authored Apr 03, 2006
```
into  rurik.mysql.com:/home/igor/mysql-5.0


sql/item.cc:
  Auto merged
```
9bef795e
Post review changes for the fix of bug #16504. · f545817e
unknown authored Apr 03, 2006

f545817e

03 Apr, 2006 8 commits

.libs is no longer used when compiling netware · 57cfa4d1
unknown authored Apr 03, 2006
```
netware/BUILD/compile-linux-tools:
  .libs/sql is no longer used when compiling netware
```
57cfa4d1

Merge mysql.com:/usr/home/bar/mysql-4.1.12076 · d6d7213d

unknown authored Apr 03, 2006

into  mysql.com:/usr/home/bar/mysql-5.0


sql/share/charsets/Index.xml:
  Auto merged
strings/ctype-extra.c:
  SCCS merged

d6d7213d

Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1 · a47bba1f
unknown authored Apr 03, 2006
```
into  mysql.com:/usr/home/bar/mysql-4.1.12076
```
a47bba1f

yassl link problem fixed · 70f4dbaa

unknown authored Apr 03, 2006


config/ac-macros/yassl.m4:
  typo
libmysql/Makefile.am:
  move common code to Makefile.shared
libmysql/Makefile.shared:
  move common code to Makefile.shared
libmysql_r/Makefile.am:
  move common code to Makefile.shared

70f4dbaa

Merge · b5ca7236
unknown authored Apr 03, 2006
```
scripts/mysql_install_db.sh:
  Auto merged
```
b5ca7236

Makefile.am: · 2574445e

unknown authored Apr 03, 2006

  Distribute mysql-test-run.pl


mysql-test/Makefile.am:
  Distribute mysql-test-run.pl

2574445e

Merge mysql.com:/Users/kent/mysql/bk/mysql-4.0 · d2744ebc

unknown authored Apr 03, 2006

into mysql.com:/Users/kent/mysql/bk/mysql-4.1-new


scripts/mysql_install_db.sh:
  Auto merged

d2744ebc

mysql_install_db.sh, MySQLEULA.txt, mysql_install_db.c: · e2b19a59

unknown authored Apr 03, 2006

  Changed web address order.mysql.com to shop.mysql.com


netware/mysql_install_db.c:
  Changed web address order.mysql.com to shop.mysql.com
Docs/MySQLEULA.txt:
  Changed web address order.mysql.com to shop.mysql.com
scripts/mysql_install_db.sh:
  Changed web address order.mysql.com to shop.mysql.com

e2b19a59

02 Apr, 2006 1 commit

Makefile.am: · 6de1d9d3

unknown authored Apr 02, 2006

  Install Perl mysql-test-run into test directory


mysql-test/Makefile.am:
  Install Perl mysql-test-run into test directory

6de1d9d3

01 Apr, 2006 1 commit
- Added a test case for bug #16504. · f0bfea2b
  unknown authored Mar 31, 2006
```
Results changed after the bug fix.
```
  f0bfea2b