Commit graph

23471 commits

Author SHA1 Message Date
konstantin@mysql.com
52d6288e2d A comment for view_prepare_mode. 2005-05-23 22:38:12 +04:00
msvensson@neptunus.(none)
df309c622f Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-tmp
2005-05-23 20:20:22 +02:00
reggie@mdk10.(none)
90a54200c0 Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-5.0
into mdk10.(none):/home/reggie/bk/mysql-5.0
2005-05-23 13:03:11 -05:00
reggie@mdk10.(none)
c5f68180f4 merged changes from 4.1 2005-05-23 12:55:39 -05:00
reggie@mdk10.(none)
c492ffcf2e BUG#10687 - Merge engine fails under Windows
This final cset is to fix a syntax problem in ha_myisammrg.cc where a / was left out of a format string.
It also adds a check in has_path to avoid a possible redundant comparison.

ha_myisammrg.cc:
  Replaced missing / in format string
my_getwd.c:
  Added test to see if FN_LIBCHAR != '/' before doing comparison to avoid redundant comparison
2005-05-23 12:31:22 -05:00
reggie@mdk10.(none)
799b773aae Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-4.1
into mdk10.(none):/home/reggie/bk/mysql-4.1
2005-05-23 12:08:57 -05:00
reggie@mdk10.(none)
1c0da6110e BUG# 10687: Merge engine fails under Windows
This cset is to roll out the cset applied earlier from Ingo.
This bug has been fixed with a different cset.
2005-05-23 12:05:15 -05:00
msvensson@neptunus.(none)
197978e3d1 Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0.6-build
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-tmp
2005-05-23 19:01:16 +02:00
msvensson@neptunus.(none)
548994aa7b Build fixes for icc, compile _without_ "-no-gnu" 2005-05-23 18:53:53 +02:00
reggie@mdk10.(none)
c9e7c0fd56 BUG# 10687: MERGE Engine fails on Windows
This is a replacement for the original patch given by Ingo.  This one comes
from Monty.
The problem is that merge files now use unix style pathnames on all 
platforms.  The merge file open code was not properly converting those
pathnames back to non-unix when necessary.
2005-05-23 11:53:16 -05:00
gbichot@quadita2.mysql.com
83994a4d4c Removing mysqlshutdown and mysqlwatch from the Windows packages, removing their sources.
They were both undocumented and not much useful. Removal has been agreed with Mark, Miguel and MikeZ.
Removing winmysqladmin from the source (it was not included anymore in no Windows package). I'll do a test Windows noinstall.zip build before push.
MikeZ just removed mysqlshutdown and mysqlwatch from the installer scripts.
2005-05-23 16:50:20 +02:00
lars@mysql.com
4e2766ffc7 Merge mysql.com:/home/bkroot/mysql-4.1 into mysql.com:/home/bk/c4944-4.1 2005-05-23 16:23:05 +02:00
msvensson@neptunus.(none)
9d0e3521f0 Build fix 2005-05-23 15:13:21 +02:00
msvensson@neptunus.(none)
3973e55f49 Build fix 2005-05-23 15:02:02 +02:00
mskold@mysql.com
82490f1492 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
2005-05-23 07:26:55 +02:00
pekka@mysql.com
cfb1b90005 ndb - NdbDictionaryImpl.cpp: fix access to freed memory 2005-05-22 20:47:08 +02:00
kent@mysql.com
99f9ff6755 misc.hpp:
Check _LONGLONG_TYPE as well, to define 'word64', to make it
  work on Solaris 10 x86_64.
  Can't assume all x86_64 share the same assembler syntax.
  For now disabled assembler for x86_64 and Solaris.
2005-05-22 04:19:54 +02:00
kent@mysql.com
363fd14115 default_modify.c:
Use MY_STAT to declare argument to my_fstat()
des_key_file.cc:
  Use local seach path for "mysql_priv.h"
mysys.dsp, libmysqld.dsp, libmysql.dsp:
  New file needed, "../mysys/default_modify.c"
2005-05-21 23:23:39 +02:00
reggie@mdk10.(none)
78b40d0a0f BUG# 9148: Denial of service
This is a second patch needing another review.  The first patch didn't solve
the entire problem.  open and fopen on Windows will still open
files like "com1.sym" when they shouldn't.  This patch
checks that the file exists before trying to open it.
2005-05-21 12:31:58 -05:00
heikki@hundin.mysql.fi
d68a52377a ha_innodb.cc:
The natural InnoDB type for NEWDECIMAL is FIXBINARY, not BINARY, since there probably is no benefit from stripping trailing bytes 0x20; note that tables created with 5.0.6 and containing DECIMAL do not need to be rebuilt, as BINARY works as well; note that because of Jani's fix to bug 10465, tables created with 5.0.? - 5.0.5 DO NEED TO BE REBUILT if they contain DECIMAL
2005-05-21 18:44:51 +03:00
igor@rurik.mysql.com
2433210829 join_outer.test, join_outer.result:
Added test cases for bug #9938.
item.h:
  Fixed bug #9938: missing method not_null_tables for Item_ref.
2005-05-21 08:44:50 -07:00
igor@rurik.mysql.com
01fcf04d95 sql_select.cc:
Added missing comment for fix of #10561.
2005-05-21 08:39:35 -07:00
igor@rurik.mysql.com
e4006f2fed opt_range.cc:
Post review corrections for optimization request #10561.
2005-05-21 07:02:43 -07:00
igor@rurik.mysql.com
fdb6c661a3 range.result, range.test:
Added test cases for optimization request #10561.
opt_range.cc, sql_select.cc:
  Fixed bug #10561: an optimization request to allow
  range analysis for NOT IN and NOT BETWEEN.
2005-05-21 06:11:44 -07:00
reggie@mdk10.(none)
d0f51ad8d8 Merge mdk10.(none):/home/reggie/bk/bug9148
into mdk10.(none):/home/reggie/bk/mysql-5.0
2005-05-20 16:59:31 -05:00
reggie@mdk10.(none)
2536b5933a fixed stupid typo that added a ! before my_access 2005-05-20 16:53:41 -05:00
reggie@mdk10.(none)
21133df02a fixed conflicts 2005-05-20 16:34:59 -05:00
reggie@mdk10.(none)
abec445934 Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-5.0
into mdk10.(none):/home/reggie/bk/mysql-5.0
2005-05-20 16:24:12 -05:00
reggie@mdk10.(none)
48c584537d 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.
2005-05-20 16:04:10 -05:00
konstantin@mysql.com
b6c93da24c yaSSL fixes for Sun Forte 7 2005-05-20 22:52:41 +04:00
pem@mysql.com
68b730263b 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
pem@mysql.comhem.se
4c69f7fb4e 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.)
2005-05-20 17:47:08 +02:00
svoj@mysql.com
5ce823ec28 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:42:37 +05:00
svoj@mysql.com
aacdad8436 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
konstantin@mysql.com
d8859b2ee2 Fixes for numerous compatibility problems in yaSSL. 2005-05-20 18:35:49 +04:00
svoj@mysql.com
39db1e5e4a 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
svoj@mysql.com
7c375cab5a WL#2286 - Compile MySQL w/YASSL support
Portability fixes
2005-05-20 19:32:51 +05:00
bell@sanja.is.com.ua
299f06d4fd 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
monty@mysql.com
f5f92ce146 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
gluh@gluh.mysql.r18.ru
d3833fa4ff 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
brian@zim.(none)
6182241268 Additions for --add-drop-database 2005-05-20 06:56:02 -07:00
ramil@mysql.com
d7a98ea7b8 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
ramil@mysql.com
68d17a209d 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
ramil@mysql.com
bb9dc47d3d a fix (bug #10757: gis-rtree.test fails) 2005-05-20 18:48:18 +05:00
monty@mysql.com
2229d9a964 Add missing test result 2005-05-20 16:31:46 +03:00
lars@mysql.com
d158d2e755 Merge mysql.com:/home/bkroot/mysql-4.1 into mysql.com:/home/bk/c4944-4.1 2005-05-20 15:30:15 +02:00
bell@sanja.is.com.ua
e37fbf2382 Macos 10.4 compatibility changes 2005-05-20 16:21:23 +03:00
kent@mysql.com
94142fa0d0 my_vsnprintf.c, sql_select.cc, sql_delete.cc, field_conv.cc, rt_split.c:
Fixes for valgrind errors and compatiblity issues by Monty
2005-05-20 15:17:13 +02:00
monty@mysql.com
9c45c28d11 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/my/mysql-5.0
2005-05-20 16:16:22 +03:00
monty@mysql.com
0b75f6e37b compatibility issues
Fixed errors reported by valgrind (some errors in NDB remains)
2005-05-20 16:14:35 +03:00