Commit graph

23216 commits

Author SHA1 Message Date
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
unknown
185b5e4067 merged
sql/sql_udf.cc:
  Auto merged
sql/unireg.cc:
  Auto merged
2005-05-19 15:20:10 +02:00
unknown
4387f4d967 a fix (bug #10599: Numeric function 'abs' make server crash).
sql/item_func.cc:
  a fix (bug #10599: Numeric function 'abs' make server crash).
  Item_func_abs::decimal_op() now returns 0 if NULL.                              
  trivial optimization - get rid of an extra jump for common situations.          
  fixed Item_func_neg::decimal_op() return value if NULL.
2005-05-19 17:59:14 +05:00
unknown
3bd46ad8d2 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into neptunus.(none):/home/msvensson/mysql/bug9626
2005-05-19 14:53:57 +02:00
unknown
9364130a1a Merge mysql.com:/home/bkroot/mysql-4.1 into mysql.com:/home/bk/c4944-4.1 2005-05-19 12:59:46 +02:00
unknown
50bb203979 Fix
ndb/src/ndbapi/NdbDictionaryImpl.hpp:
  Don't use length when comparing column names
2005-05-19 12:53:44 +02:00
unknown
e439e7c649 CSC#4944: Adding File_size to output of SHOW BINARY lOGS
mysql-test/r/rpl_log.result:
  Adding File_size to output of SHOW BINARY lOGS
mysql-test/r/rpl_rotate_logs.result:
  Adding File_size to output of SHOW BINARY lOGS
sql/sql_repl.cc:
  Adding File_size to output of SHOW BINARY lOGS
2005-05-19 12:34:15 +02:00
unknown
f87f045065 Change the return type back to int (modify_defaults_file).
This fixes a compilation failure in mysql_com.h, which doesn't have
'uint' alias visibile. Maybe worth while changing to unsigned int, but
the rest of functions that work with defaults files return int.


include/my_sys.h:
  Change the return type back to int (modify_defaults_file).
include/mysql_com.h:
  Change the return type back to int (modify_defaults_file).
mysys/default_modify.c:
  Change the return type back to int (modify_defaults_file).
2005-05-19 14:02:12 +04:00
unknown
2525722245 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/usr/home/ram/work/5.0.b6961
2005-05-19 14:03:41 +05:00
unknown
c1ed128f66 a fix (bug #10599: Numeric function 'abs' make server crash).
sql/item_func.cc:
  a fix (bug #10599: Numeric function 'abs' make server crash).
  Item_func_abs::decimal_op() and Item_func_neg::decimal_op()
  now return 0 if NULL.
  Trivial optimization - get rid of an extra jump for common situations.
2005-05-19 13:35:13 +05:00
unknown
27378545f9 Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2005-05-19 09:50:43 +02:00
unknown
275aa24740 after merge fix 2005-05-19 09:47:13 +02:00
unknown
7f4e45ef03 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/usr/home/ram/work/5.0.b6961
2005-05-19 12:06:40 +05:00
unknown
c4840884d9 configure.in:
Increment to next version.


configure.in:
  Increment to next version.
2005-05-19 07:22:23 +02:00
unknown
44819149ad portablity fix 2005-05-19 05:54:31 +03:00
unknown
6cd52671d7 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/my/mysql-5.0
2005-05-19 04:49:18 +03:00
unknown
5082d2d0b4 Fixed references to uninitialized memory
sql/sp.cc:
  Simpe fix to avoid reference to unallocated memory (only opened was needed, but I reset both to make things safer and simpler)
2005-05-19 04:48:22 +03:00
unknown
dc4a390174 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/my/mysql-5.0
2005-05-19 03:17:39 +03:00
unknown
e05de07e0d Merge mysql.com:/home/jimw/my/mysql-5.0-build
into mysql.com:/home/jimw/my/mysql-5.0-clean


mysys/default.c:
  Auto merged
server-tools/instance-manager/commands.cc:
  Auto merged
2005-05-18 17:13:31 -07:00
unknown
38c78b8bb9 Revert fix for Bug #6048: it introduced new problems.
sql/item.cc:
  Revert changes
sql/item.h:
  Revert changes
sql/sp_head.cc:
  Revert changes
sql/sp_rcontext.cc:
  Revert changes
2005-05-18 17:10:48 -07:00
unknown
3e2988d00f Fixes to merge from 4.1
client/mysqldump.c:
  Temporarily disable unused (and broken) code.
mysql-test/r/group_min_max.result:
  Update results
mysql-test/r/mysqldump.result:
  Update results
mysql-test/r/subselect.result:
  Update results
mysql-test/t/group_min_max.test:
  Ignore number of rows in output of most explain results
sql/sql_insert.cc:
  Fix reference to max_unique_length
2005-05-18 15:40:34 -07:00