Commit graph

44408 commits

Author SHA1 Message Date
unknown
677b29cc49 Merge pilot.blaudden:/home/msvensson/mysql/bug25309/my51-bug25309
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint


mysql-test/t/openssl_1.test:
  Auto merged
vio/viosslfactories.c:
  Auto merged
2007-03-29 11:48:05 +02:00
unknown
8cdaf6ef1c Merge pilot.blaudden:/home/msvensson/mysql/bug25309/my50-bug25309
into  pilot.blaudden:/home/msvensson/mysql/bug25309/my51-bug25309


vio/viosslfactories.c:
  Auto merged
2007-03-29 11:38:48 +02:00
unknown
e4f4827454 Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint


mysql-test/lib/mtr_cases.pl:
  Auto merged
mysql-test/mysql-test-run.pl:
  Merge 5.0->5.1
2007-03-29 11:37:21 +02:00
unknown
8b873c3f64 Make the script detect --default-storage-engine=x and
mark the test as requiring that storage engine(if we need to do that)
Make --ndb and --with-ndbcluster and alias for
--mysqld=--default-storage-engine=ndbcluster
2007-03-29 11:31:50 +02:00
unknown
ab773fcf81 Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint


extra/yassl/src/ssl.cpp:
  Auto merged
sql/log.cc:
  Auto merged
2007-03-28 19:11:44 +02:00
unknown
9bda2b2b88 Merge pilot.blaudden:/home/msvensson/mysql/yassl_import/my50-yassl_import
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
2007-03-28 19:10:44 +02:00
unknown
05853ab055 Import yaSSL
extra/yassl/src/ssl.cpp:
  Import patch yassl.diff
2007-03-28 19:10:18 +02:00
unknown
339ae7c743 Merge pilot.blaudden:/home/msvensson/mysql/yassl_import/my51-yassl_import2
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
2007-03-28 18:48:36 +02:00
unknown
94b6ec6b1e Import yaSSL
extra/yassl/include/lock.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/src/ssl.cpp:
  Import patch yassl.diff
extra/yassl/taocrypt/mySTL/algorithm.hpp:
  Import patch yassl.diff
2007-03-28 18:47:51 +02:00
unknown
c6638c4278 Merge pilot.blaudden:/home/msvensson/mysql/bug27490/my51-bug27490
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
2007-03-28 18:43:49 +02:00
unknown
4037871255 Merge pilot.blaudden:/home/msvensson/mysql/bug27490/my50-bug27490
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint


sql/log.cc:
  Auto merged
2007-03-28 18:43:39 +02:00
unknown
c6b0bceefd Merge pilot.blaudden:/home/msvensson/mysql/bug27490/my50-bug27490
into  pilot.blaudden:/home/msvensson/mysql/bug27490/my51-bug27490


sql/log.cc:
  Manual merge, the -5 hack is not needed anymore
2007-03-28 18:37:27 +02:00
unknown
70ae657cc2 Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint


extra/yassl/include/openssl/ssl.h:
  Auto merged
extra/yassl/src/ssl.cpp:
  Auto merged
include/violite.h:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
2007-03-28 15:57:27 +02:00
unknown
1778d177be Add back the look for exe_mysql 2007-03-28 15:56:57 +02:00
unknown
ff7db598a2 Set yaSSL to use same type as MySQL do for socket handles
extra/yassl/include/openssl/ssl.h:
  Import patch yassl.diff
extra/yassl/src/ssl.cpp:
  Import patch yassl.diff
2007-03-28 15:34:52 +02:00
unknown
40df5f68b5 Bug#25309 SSL connections without CA certificate broken since MySQL 5.0.23
- Turn off verification of peer if both ca_path and ca_file is null
   i.e from only passing --ssl-key=<client_key> and --ssl-cert=<client_cert>
   to the mysql utility programs.
   The server will authenticate the client accoring to GRANT tables
   but the client won't authenticate the server 


mysql-test/r/openssl_1.result:
  Update result file
mysql-test/t/openssl_1.test:
  Test that it's possible to connect with --ssl-ca set to /dev/null
vio/viosslfactories.c:
  Turn off verification of peer if both ca_file and ca_path is NULL
2007-03-28 12:23:55 +02:00
unknown
f86a489f76 Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint


mysql-test/mysql-test-run.pl:
  Auto merged
2007-03-28 11:17:08 +02:00
unknown
230a116ed2 Turn off im if extern
Remove strange comment
Add run_query function
2007-03-28 11:16:50 +02:00
unknown
3c902fb971 Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint


mysql-test/lib/mtr_process.pl:
  Auto merged
2007-03-28 10:24:47 +02:00
unknown
2bc57a692c Dont' redirect stderr in ActiveState perl
Improve comments
2007-03-28 10:24:33 +02:00
unknown
9cfc25f2cd Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint


mysql-test/r/func_str.result:
  Auto merged
mysql-test/t/func_str.test:
  Auto merged
sql-common/my_time.c:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/sql_show.cc:
  SCCS merged
2007-03-28 10:18:35 +02:00
unknown
1747a6b60c Bug#27490 Function to log to NT event log could allocate memory
- Change 'print_buffer_to_nt_event_log' to overwrite the string
if the buffer is not long enough to hold the ending CR/LF's
- Make functions static
- Remove the "hack" intended to force 'print_buffer_to_nt_event_log'
 never to use "new"


sql/log.cc:
  -Change 'print_buffer_to_nt_event_log' to overwrite the string
  if the buffer is not long enough to hold the ending CR/LF's
  - Make functions static
  - Remove the "hack" intended to force 'print_buffer_to_nt_event_log'
   never to use "new"
2007-03-28 10:12:33 +02:00
unknown
e0f5f280a7 Use mtr_verbose instead of "if ($opt_verbose)" 2007-03-28 10:08:26 +02:00
unknown
55883e9628 Merge pilot.blaudden:/home/msvensson/mysql/bug25197/my51-bug25197
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint


mysql-test/r/func_str.result:
  Auto merged
mysql-test/t/func_str.test:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
2007-03-28 09:35:03 +02:00
unknown
2473c35960 Merge pilot.blaudden:/home/msvensson/mysql/bug25197/my50-bug25197
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint


mysql-test/r/func_str.result:
  Auto merged
mysql-test/t/func_str.test:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
2007-03-28 09:34:04 +02:00
unknown
cce2cb5733 Merge pilot.blaudden:/home/msvensson/mysql/bug25197/my50-bug25197
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
2007-03-28 09:33:16 +02:00
unknown
e9b606bf3e Bug#25197 repeat function returns null when using table field directly as count
- 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
2007-03-28 09:32:49 +02:00
unknown
563a50770e Remove remnants of ssl_des.test
BitKeeper/deleted/.del-ssl_des-master.opt:
  Delete: mysql-test/t/ssl_des-master.opt
2007-03-27 21:29:45 +02:00
unknown
d8ddc1aa83 Merge pilot.blaudden:/home/msvensson/mysql/bug27022/my51-bug27022
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
2007-03-27 21:12:59 +02:00
unknown
0477ba92e5 Merge pilot.blaudden:/home/msvensson/mysql/bug27022/my50-bug27022
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
2007-03-27 21:12:32 +02:00
unknown
f933ae5d88 Merge pilot.blaudden:/home/msvensson/mysql/bug27022/my50-bug27022
into  pilot.blaudden:/home/msvensson/mysql/bug27022/my51-bug27022


scripts/mysql_install_db.sh:
  Auto merged
2007-03-27 21:11:22 +02:00
unknown
a2eb8b8336 Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
2007-03-27 12:16:16 -04:00
unknown
3b0c6e65e1 Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug27047/my50-prece-bug27047
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint


sql/sql_show.cc:
  Auto merged
2007-03-27 11:34:16 -04:00
unknown
60fb9a03a4 Bug#26600: table PROFILING in INFORMATION SCHEMA has wrong data type
Bug#27047[partial]: INFORMATION_SCHEMA table cannot have BIGINT \
	fields

No Information_schema table has ever needed floating-point data 
before.  Transforming all floating point to a string and back to a
number causes a real data problem on Windows, where the libc may 
pad the exponent with more leading zeroes than we expect and the
significant digits are truncated away.

This also makes interpreting an unimplemented type as a string into
a fatal error in debug builds.  Thus, we will catch problems when we
try to use those types in new I_S tables.


sql/sql_show.cc:
  Add floating-point types to information_schema output.
2007-03-27 11:30:53 -04:00
unknown
9dfe413a15 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint
into  mysql.com:/home/ram/work/b25301/b25301.5.0


sql-common/my_time.c:
  Auto merged
2007-03-26 13:43:20 +05:00
unknown
87bc0da719 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.1-maint
into  mysql.com:/home/ram/work/b25301/b25301.5.1


sql-common/my_time.c:
  Auto merged
2007-03-26 13:40:20 +05:00
unknown
27c1d3e76d after-merge fix: result adjusted. 2007-03-26 13:20:34 +05:00
unknown
b5351740c4 Merge mysql.com:/home/ram/work/b25993/b25993.5.0
into  mysql.com:/home/ram/work/b25993/b25993.5.1


client/mysqldump.c:
  Auto merged
mysql-test/t/mysqldump.test:
  Auto merged
2007-03-26 13:01:46 +05:00
unknown
9b2e0127f0 Fix for bug : mysqldump crashes with merge table and -c option
opt_complete_insert was improperly used by accident.
Use complete_insert flag instead.


client/mysqldump.c:
  Fix for bug : mysqldump crashes with merge table and -c option
    - use complete_insert instead of opt_complete_insert.
mysql-test/r/mysqldump.result:
  Fix for bug : mysqldump crashes with merge table and -c option
    - test result.
mysql-test/t/mysqldump.test:
  Fix for bug : mysqldump crashes with merge table and -c option
    - test case.
2007-03-26 12:56:41 +05:00
unknown
7cf2e15dc5 bug#26346
Fix to a memory leak found by a complier warning.
2007-03-23 19:30:25 -04:00
unknown
09d6be9580 Merge damiendev.:C:/build/dev50
into  damiendev.:C:/build/mysql-5.1


client/mysqldump.c:
  Auto merged
2007-03-23 18:22:57 -04:00
unknown
139c950f11 bug#26346
Added some fixes for an existing memory leak and unitilialized variables, both caught by gcc.
2007-03-23 18:15:11 -04:00
unknown
dea1ffda10 Merge damiendev.:C:/build/dev50
into  damiendev.:C:/build/mysql-5.1
2007-03-23 13:47:50 -04:00
unknown
2b52bc2a8e Merge damiendev.:C:/build/mysql-5.0
into  damiendev.:C:/build/dev50
2007-03-23 13:43:46 -04:00
unknown
01afceebc3 Merge dkatz@bk-internal.mysql.com:/home/bk/mysql-5.1-maint
into  damiendev.:C:/build/mysql-5.1
2007-03-23 13:33:07 -04:00
unknown
9859ccb66d Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint


extra/yassl/src/ssl.cpp:
  Auto merged
extra/yassl/taocrypt/src/integer.cpp:
  Auto merged
extra/yassl/taocrypt/test/test.cpp:
  Auto merged
extra/yassl/testsuite/testsuite.cpp:
  Auto merged
2007-03-23 17:15:44 +01:00
unknown
3f76fbfa72 Merge pilot.blaudden:/home/msvensson/mysql/yassl_import/my50-yassl_import
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
2007-03-23 16:44:33 +01:00
unknown
37ef840f77 Import patch from yaSSL after fixing warnings upstream
extra/yassl/src/ssl.cpp:
  Import patch yassl.diff
extra/yassl/taocrypt/src/integer.cpp:
  Import patch yassl.diff
extra/yassl/taocrypt/test/test.cpp:
  Import patch yassl.diff
extra/yassl/testsuite/testsuite.cpp:
  Import patch yassl.diff
2007-03-23 16:41:17 +01:00
unknown
f7190989de Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint


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/src/ssl.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/taocrypt/src/integer.cpp:
  Auto merged
extra/yassl/taocrypt/test/test.cpp:
  Auto merged
extra/yassl/testsuite/testsuite.cpp:
  Auto merged
extra/yassl/include/openssl/ssl.h:
  Manual merge
extra/yassl/include/socket_wrapper.hpp:
  Manual merge
2007-03-23 13:43:09 +01:00
unknown
df82efbdf8 Merge pilot.blaudden:/home/msvensson/mysql/yassl_import/my50-yassl_import
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
2007-03-23 13:40:57 +01:00