Commit graph

23186 commits

Author SHA1 Message Date
unknown
606d8a5ab0 fixed conflicts
VC++Files/mysys/mysys.dsp:
  Auto merged
include/my_sys.h:
  Auto merged
sql/sql_db.cc:
  Auto merged
2005-05-20 16:34:59 -05:00
unknown
03e26e50b9 Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-5.0
into mdk10.(none):/home/reggie/bk/mysql-5.0


sql/spatial.cc:
  Auto merged
2005-05-20 16:24:12 -05:00
unknown
c1ae672add BUG# 9148: Denial of service
The problem was that on Windows the access method indicates that access to file 
such as "com1" and "lpt1" is allowed (since they are device names) and
this causes mysql to attempt to open them as databases or tables.

The fix was to write our own my_access method that uses other Win32 functions
to determine if the given argument is indeed a file and has to requested
mode.


VC++Files/mysys/mysys.dsp:
  added my_access
VC++Files/mysys/mysys_ia64.dsp:
  added my_access.c
include/my_sys.h:
  if on windows, we use my_access.
  if not on windows, then my_access points to the native access method
mysys/Makefile.am:
  added my_access to mysys build file
mysys/mf_pack.c:
  changed call to access to my_access
sql/sql_db.cc:
  changed call to access to my_access
2005-05-20 16:04:10 -05:00
unknown
fd6acea255 yaSSL fixes for Sun Forte 7
extra/yassl/include/yassl_types.hpp:
  A fix for Sun Forte 7
extra/yassl/mySTL/helpers.hpp:
  Better comment for the previous fix.
extra/yassl/mySTL/list.hpp:
  A fix for Sun Forte 7
2005-05-20 22:52:41 +04:00
unknown
b07d4dfcd7 Merge mysql.com:/usr/local/bk/mysql-5.0
into mysql.com:/home/pem/work/mysql-5.0
2005-05-20 18:03:17 +02:00
unknown
2a5a3de285 Fixed BUG#10537: Server crashes while loading data file into table through
procedure.
  by simply disabling 'load' in stored procedures, like it's already disabled
  for prepared statements. (They must be made "re-execution" safe before
  working with either PS or SP.)


mysql-test/r/sp-error.result:
  New test case for BUG#10537.
mysql-test/t/sp-error.test:
  New test case for BUG#10537.
sql/sql_yacc.yy:
  Disable LOAD in stored procedures (just as for prepared statements).
2005-05-20 17:47:08 +02:00
unknown
3b2ba12e88 Merge mysqldev@production.mysql.com:my/mysql-5.0-build
into mysql.com:/home/svoj/devel/mysql/mysql-5.0-build


extra/yassl/mySTL/helpers.hpp:
  Auto merged
2005-05-20 19:42:37 +05:00
unknown
6888f098fc Merge mysqldev@production.mysql.com:my/mysql-5.0-build
into mysql.com:/home/svoj/devel/mysql/mysql-5.0-build
2005-05-20 19:39:03 +05:00
unknown
27b7f85a0b Fixes for numerous compatibility problems in yaSSL.
extra/yassl/include/openssl/ssl.h:
  Fix -std=c++98 mode compilation failures.
extra/yassl/include/yassl_error.hpp:
  Fix -std=c++98 mode compilation failures.
extra/yassl/include/yassl_types.hpp:
  Fix -std=c++98 mode compilation failures.
extra/yassl/mySTL/helpers.hpp:
  Fix AIX 5.2 compilation problem.
extra/yassl/taocrypt/include/asn.hpp:
  Fix -std=c++98 mode compilation failures.
vio/Makefile.am:
  Add a dummy C++ file to SSL tests to make libtool use a C++ linker:
  this lets ssl tests link when using yaSSL and a non-gcc C++ compiler.
2005-05-20 18:35:49 +04:00
unknown
56cf3c8871 Merge mysql.com:/home/svoj/devel/mysql/mysql-5.0-build
into mysql.com:/mnt/archive/svoj/mysql/mysql-5.0
2005-05-20 19:34:22 +05:00
unknown
7936630e19 WL#2286 - Compile MySQL w/YASSL support
Portability fixes


extra/yassl/include/buffer.hpp:
  Use assert.h instead of less portable cassert
extra/yassl/include/log.hpp:
  Use stdio.h instead of less portable cstdio
extra/yassl/include/socket_wrapper.hpp:
  Use assert.h instead of less portable cassert
extra/yassl/mySTL/helpers.hpp:
  Use stdlib.h instead of less portable cstdlib
extra/yassl/mySTL/stdexcept.hpp:
  Use string.h instead of less portable cstring
extra/yassl/mySTL/vector.hpp:
  Use assert.h instead of less portable cassert
extra/yassl/src/ssl.cpp:
  Use stdio.h instead of less portable cstdio
extra/yassl/taocrypt/include/block.hpp:
  Use stddef.h instead of less portable cstddef, always use ptrdiff_t instead of less portable std::ptrdiff_t
extra/yassl/taocrypt/include/file.hpp:
  Use stdio.h instead of less portable cstdio
extra/yassl/taocrypt/include/integer.hpp:
  Use string.h instead of less portable cstring
extra/yassl/taocrypt/include/runtime.hpp:
  Use stdlib.h instead of less portable cstdlib
extra/yassl/taocrypt/src/dh.cpp:
  Use math.h instead of less portable cmatch
2005-05-20 19:32:51 +05:00
unknown
39c7b0987b Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0
into sanja.is.com.ua:/home/bell/mysql/bk/work-bug-5.0
2005-05-20 17:32:36 +03:00
unknown
7fa4dc6d2f Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/my/mysql-5.0
2005-05-20 17:32:35 +03:00
unknown
19f3d13c8a Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0
into gluh.mysql.r18.ru:/home/gluh/release/mysql-5.0
2005-05-20 18:32:34 +04:00
unknown
ec00a4558c Additions for --add-drop-database
client/client_priv.h:
  Adding option for drop database
client/mysqldump.c:
  Work for adding of --add-drop-database
mysql-test/r/mysqldump.result:
  New test results for --add-drop-databases
mysql-test/t/mysqldump.test:
  Tests for --add-drop-databases
2005-05-20 06:56:02 -07:00
unknown
25d661adfc Merge mysql.com:/usr/home/ram/work/mysql-4.1-build
into mysql.com:/usr/home/ram/work/mysql-4.1
2005-05-20 18:52:55 +05:00
unknown
78d81529f4 Merge mysql.com:/usr/home/ram/work/mysql-4.1-build
into mysql.com:/usr/home/ram/work/mysql-5.0-build
2005-05-20 18:51:13 +05:00
unknown
2ef41d3d21 a fix (bug #10757: gis-rtree.test fails)
myisam/sp_key.c:
  a fix (bug #10757: gis-rtree.test fails)
  float8get() doesn't properly work with local variables sometimes.
2005-05-20 18:48:18 +05:00
unknown
aaf5e0485c Add missing test result
mysql-test/t/subselect.test:
  Add test of result
2005-05-20 16:31:46 +03:00
unknown
355000fa4e Merge mysql.com:/home/bkroot/mysql-4.1 into mysql.com:/home/bk/c4944-4.1 2005-05-20 15:30:15 +02:00
unknown
cd21509935 Macos 10.4 compatibility changes
include/my_global.h:
  make it compilable on mac os
ndb/src/kernel/SimBlockList.cpp:
  make it compilable with gcc 4.0
2005-05-20 16:21:23 +03:00
unknown
31cffb8a7f my_vsnprintf.c, sql_select.cc, sql_delete.cc, field_conv.cc, rt_split.c:
Fixes for valgrind errors and compatiblity issues by Monty


myisam/rt_split.c:
  Fixes for valgrind errors and compatiblity issues by Monty
sql/field_conv.cc:
  Fixes for valgrind errors and compatiblity issues by Monty
sql/sql_delete.cc:
  Fixes for valgrind errors and compatiblity issues by Monty
sql/sql_select.cc:
  Fixes for valgrind errors and compatiblity issues by Monty
strings/my_vsnprintf.c:
  Fixes for valgrind errors and compatiblity issues by Monty
2005-05-20 15:17:13 +02:00
unknown
ccafae43da Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/my/mysql-5.0


sql/sql_select.cc:
  Auto merged
2005-05-20 16:16:22 +03:00
unknown
027c10f3bb compatibility issues
Fixed errors reported by valgrind (some errors in NDB remains)


myisam/rt_split.c:
  Added missing cast that caused problem on novell
  (minor code cleanup)
ndb/src/ndbapi/Ndb.cpp:
  Moved DBUG_ENTER to remove warning from DBUG library
sql/field_conv.cc:
  Added test for valgrind/purify to avoid warning
sql/item_sum.cc:
  Removed comment and added ASSERT as setup can't be called twice anymore
sql/sql_delete.cc:
  Fixed wrong return value
sql/sql_parse.cc:
  More debugging
sql/sql_select.cc:
  Removed duplicate call to setup() which caused a memory leak
strings/my_vsnprintf.c:
  Added support for '%c' (used when printing my_getopt errors)
2005-05-20 16:14:35 +03:00
unknown
648b072da2 do not try to use equal field from outer query as field of local join (BUG#6384)
mysql-test/r/subselect.result:
  changes in plans
  test for bug#6384
mysql-test/t/subselect.test:
  test for bug#6384
sql/sql_select.cc:
  do not set equal field from outer query
2005-05-20 16:01:41 +03:00
unknown
122e029a2c Merge gluh.mysql.r18.ru:/home/gluh/release/mysql-5.0-build
into gluh.mysql.r18.ru:/home/gluh/release/mysql-5.0
2005-05-20 16:55:00 +04:00
unknown
be218f51f5 addition of "REFERENCED_TABLE_SCHEMA",
"REFERENCED_TABLE_NAME", "REFERENCED_COLUMN_NAME" fields into
  KEY_COLUMN_USAGE table
2005-05-20 16:39:28 +04:00
unknown
3034935a87 Merge mysql.com:/home/jimw/my/mysql-5.0-build
into  mysql.com:/home/jimw/my/mysql-5.0-clean
2005-05-19 17:43:17 -07:00
unknown
496a3f20ad Merge mysql.com:/home/jimw/my/mysql-5.0-8271
into  mysql.com:/home/jimw/my/mysql-5.0-build
2005-05-19 15:14:02 -07:00
unknown
4c3d3bb2f4 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2005-05-20 00:05:24 +02:00
unknown
f0c4cc2683 Change to 5.0.7(again)
configure.in:
  Bump version number
2005-05-20 00:04:43 +02:00
unknown
50c4ed93c1 Merge mysqldev@production.mysql.com:my/mysql-5.0-build
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-build
2005-05-19 23:56:16 +02:00
unknown
bdf5dbcd9a Cset exclude: matt@mysql.com|ChangeSet|20050519052223|06259
Cset exclude: msvensson@neptunus.(none)|ChangeSet|20050425090838|60886


configure.in:
  Exclude
sql/opt_range.cc:
  Exclude
2005-05-19 23:52:17 +02:00
unknown
fb00361bae Fix change to allow FIFO as log. (Bug #8271)
mysys/mf_iocache.c:
  Reset seek_not_done after doing a seek.
2005-05-19 14:43:10 -07:00
unknown
1da5382a9f BUG# 10687 - MERGE engine fails under Windows
This patch was submitted by Ingo and it appears to work correctly.


sql/ha_myisammrg.cc:
  use FN_LIBCHAR instead of / so buff works correctly on Windows
strings/my_vsnprintf.c:
  add support for %c to my_vsnprintf
2005-05-19 16:02:14 -05:00
unknown
c321b2ba6e Merge mdk10.(none):/home/reggie/bk/mysql-4.1
into mdk10.(none):/home/reggie/bk/mysql-5.0


sql/spatial.cc:
  Auto merged
sql/sql_udf.cc:
  Auto merged
2005-05-19 15:50:44 -05:00
unknown
93be6a80b4 Merge mysqldev@production.mysql.com:my/mysql-5.0-build
into mysql.com:/home/svoj/devel/mysql/mysql-5.0-build
2005-05-20 01:49:17 +05:00
unknown
4679c7a8fe WL#2286 - Compile MySQL w/YASSL support
compilation fixes


extra/yassl/src/cert_wrapper.cpp:
  yaSSL compilation fix on nocona
extra/yassl/taocrypt/include/error.hpp:
  yaSSL compilation fix
extra/yassl/taocrypt/include/misc.hpp:
  yaSSL compilation fix on many platforms
tools/Makefile.am:
  mysqltestmanager with yaSSL enabled compilation fix on FreeBSD 5.3
2005-05-20 01:44:05 +05:00
unknown
f210d1ddf1 Merge mysqldev@production.mysql.com:my/mysql-5.0-build
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-build


sql/item_func.cc:
  Auto merged
2005-05-19 22:23:59 +02:00
unknown
f4a584f501 This fixed a compile problem on Windows
sql_udf.cc:
  changed dl_name to udf->dl in mysql_create_function


sql/sql_udf.cc:
  changed dl_name to udf->dl in mysql_create_function
2005-05-19 15:18:49 -05:00
unknown
4482604ec6 hf's fix for bug #9060 (FORMAT returns incorrect result)
we need proper rounding there


mysql-test/r/func_math.result:
  test result fixed
mysql-test/t/func_math.test:
  test case added
sql/item_func.cc:
  my_double_round implementation added
sql/item_strfunc.cc:
  my_double_round used
sql/mysql_priv.h:
  my_double_round interface
2005-05-20 01:04:08 +05:00
unknown
0100b28de8 after merge 2005-05-19 20:54:37 +02:00
unknown
4422b07126 Merge neptunus.(none):/home/msvensson/mysql/bug9626
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-build


mysql-test/r/type_newdecimal.result:
  Auto merged
mysql-test/t/type_newdecimal.test:
  Auto merged
sql/item_func.cc:
  Auto merged
2005-05-19 20:41:23 +02:00
unknown
384456fc10 BUG#9626 valgrind warnings
- after review fixes


mysql-test/r/ndb_basic.result:
  Test using table with long name
mysql-test/t/ndb_basic.test:
  Test using table with long name
ndb/include/transporter/TransporterDefinitions.hpp:
  Define constant for max section size
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Add check for not sending too long table name to ndb kernel
2005-05-19 20:38:48 +02:00
unknown
fea271c3b5 Merge mysql.com:/usr/home/ram/work/mysql-4.1-build
into mysql.com:/usr/home/ram/work/mysql-4.1
2005-05-19 23:31:40 +05:00
unknown
9c1bc4252f Merge mysql.com:/usr/home/ram/work/mysql-4.1-build
into mysql.com:/usr/home/ram/work/mysql-5.0-build


sql/spatial.cc:
  Auto merged
2005-05-19 22:55:10 +05:00
unknown
b8d22413c0 hf's fix for bug #10626 ( gis.test fails)
sql/spatial.cc:
  just float8get doesn't work well with the local variables -                     
  they can be of processor-specific floating type - not the                       
  standard decimal (by hf)
2005-05-19 22:53:35 +05:00
unknown
cb61155226 Merge mysqldev@production.mysql.com:my/mysql-5.0-build
into msdesk.mysql.com:/home/magnus/mysql-5.0-build
2005-05-19 16:10:34 +02:00
unknown
1dfd89e026 Fix
ndb/src/kernel/blocks/ndbfs/AsyncFile.cpp:
  Removed fix, does not work.
2005-05-19 16:00:32 +02:00
unknown
2f24096172 a fix (#10742: Can't compile "sql_lex.cc" on AIX 5.2).
sql/gen_lex_hash.cc:
  a fix (#10742: Can't compile "sql_lex.cc" on AIX 5.2).
  typo fixed.
2005-05-19 18:56:01 +05:00