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
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)
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
jimw@mysql.com
7582b3d82d
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
jimw@mysql.com
a33a283a49
Fix change to allow FIFO as log. (Bug #8271 )
2005-05-19 14:43:10 -07:00
msvensson@neptunus.(none)
a996abc594
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
konstantin@mysql.com
f30f95183b
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.
2005-05-19 14:02:12 +04:00
jimw@mysql.com
6757a04e4c
Merge mysql.com:/home/jimw/my/mysql-5.0-build
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-05-18 17:13:31 -07:00
msvensson@neptunus.(none)
89415d272c
Merge
2005-05-18 20:52:59 +02:00
msvensson@neptunus.(none)
2d515425a3
BUG#9626
...
- Fix valgrind warnings
- Remove static db, schema and table name buffers from Ndb.cpp
2005-05-18 20:50:29 +02:00
jani@a193-229-222-105.elisa-laajakaista.fi
c63ad3b549
New file default_modify.c. Fixed a typo on mysqld.cc
...
Changed name of function my_correct_default_file to
modify_defaults_file. Improved function and fixed some
bugs in it.
2005-05-18 20:10:17 +03:00
petr@mysql.com
1c376d7da4
Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/cps/mysql/trees/mysql-5.0
2005-05-18 15:29:37 +04:00
petr@mysql.com
67364e99af
fix comments
2005-05-18 15:28:38 +04:00
kent@mysql.com
318c41e94d
default.c:
...
Disabled use of GetSystemWindowsDirectory() when compiled with VC6
mysql.cc:
Removed unused variable 'field' from print_warnings()
libmysql.dsp:
Added "my_chsize.c" and "my_seek.c"
mysqlclient.dsp:
Added "my_chsize.c"
2005-05-18 12:15:28 +02:00
monty@mysql.com
c1b512fad3
Change update_auto_increment to return 1 if get_auto_increment() returned ~(ulonglong)
...
This makes it easier to give an error in the handler if there was a problem generating an auto-increment value
2005-05-18 10:41:35 +03:00
ramil@mysql.com
0b90c8bfd6
a fix (bug #10655 : mysys/default.c compilation problem).
2005-05-16 13:40:57 +05:00
petr@mysql.com
834c47f336
Merge
2005-05-16 03:01:05 +04:00
petr@mysql.com
180d0ed620
post-review fixes
2005-05-16 01:54:02 +04:00
jimw@mysql.com
165f2abba5
Avoid doing a seek when first setting up the IO cache for a file,
...
which allows a FIFO to be used for the non-binary logs. (Bug #8271 )
2005-05-13 07:18:41 -07:00
monty@mishka.local
2d4a417330
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mishka.local:/home/my/mysql-5.0
2005-05-13 13:36:02 +03:00
monty@mishka.local
2d25da2a4b
concurrent-insert can now be set to 2 for concurrent inserts when there is holes in the data file
...
myisam_max_extra_sort_file_size is depricated
Ensure that myisam_data_pointer_size is honoured when creating new MyISAM files
Changed default value of myisam_data_pointer_size from 4 to 6 to get rid of 'table-is-full' errors
2005-05-13 12:08:08 +03:00
ramil@mysql.com
e4d1964851
--default-extra-file handling code fix.
2005-05-12 17:23:16 +05:00
ramil@mysql.com
3196a01039
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/ram/work/5.0
2005-05-07 20:25:58 +05:00
ramil@ram-book.(none)
6a7306823b
A fix (bug #5056 : defaults-extra-file throws no error when file is inaccessible).
2005-05-06 16:51:58 +05:00
monty@mishka.local
015cd1cd21
merge
2005-05-06 13:51:58 +03:00
monty@mishka.local
a9f6aab4c9
Fixes while reviewing new code
...
Added option --count to mysqlshow (to show number of rows)
Fixed possible core dump in information schema
2005-05-06 11:39:30 +03:00
shuichi@mysql.com
2244ae8cef
Added cp932 character set
2005-05-05 11:37:52 -07:00
petr@mysql.com
560a908315
fix --defaults-file and --defaults-extra-file broken by a wrong merge
2005-05-04 18:46:29 +04:00
jimw@mysql.com
2d44d93ce6
Merge mysql.com:/home/jimw/my/mysql-5.0-5354
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-05-02 10:20:22 -07:00
jimw@mysql.com
7bab94f36b
Clean up merge from 4.1
2005-05-02 10:19:37 -07:00
jimw@mysql.com
7370017daf
Merge mysql.com:/home/jimw/my/mysql-4.1-9136
...
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-05-02 08:11:32 -07:00
serg@serg.mylan
530b6ba541
Merge bk-internal:/home/bk/mysql-5.0
...
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2005-05-01 23:10:55 +02:00
serg@serg.mylan
9c332d8d2a
yassl changeset 2:
...
remove FIX_GCC_LINKING_PROBLEM and -DDEFINE_CXA_PURE_VIRTUAL
replace echo in configure.in with AC_MSG_WARN/AC_MSG_ERROR
don't set -DUSE_MYSYS_NEW for gcc 2.95
set $USE_MYSYS_NEW even if CXX is g++
yassl bugfixes
instantiate all yassl templates explicitly
2005-04-30 19:48:45 +02:00
monty@mysql.com
28a5491d3d
Merge with 4.1
2005-04-30 09:46:08 +03:00
monty@mysql.com
aa84afb983
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/my/mysql-4.1
2005-04-30 03:45:12 +03:00
monty@mysql.com
fbf31c4a8c
CAST(string_argument AS UNSIGNED) didn't work for big integers above the signed range. (Bug #7036 )
...
Produce warnings of wrong cast of strings to signed/unsigned.
Don't block not resolved IP's if DNS server is down (Bug #8467 )
Fix compiler problems with MinGW (Bug #8872 )
2005-04-29 17:03:34 +03:00
jimw@mysql.com
2441da8cd9
Add default configuration files to my_print_defaults usage, and
...
add handling of configuration file in the Windows shared system
directory. (Bug #5354 )
2005-04-28 12:11:48 -07:00
ingo@mysql.com
be34b54e1d
Merge mysql.com:/home/mydev/mysql-4.1-4100
...
into mysql.com:/home/mydev/mysql-5.0-5000
2005-04-28 19:34:05 +02:00
ingo@mysql.com
8ccbea47e8
Merge mysql.com:/home/mydev/mysql-4.1-bug5964
...
into mysql.com:/home/mydev/mysql-4.1-4100
2005-04-28 18:34:47 +02:00
ingo@mysql.com
1f0d0a6729
BUG#5964 - 4.1 MERGE tables regression from 4.0
...
Changed the creation of the .MRG file so that only the table name
is written when the MyISAM table is in the same database as the
MERGE table, a relative path is used in other cases in mysqld,
and possibly an absolute path is used in an embedded server.
No test case is added as the external behaviour is unchanged.
Only the file names within the .MRG file are changed.
2005-04-28 18:28:50 +02:00
monty@mysql.com
b40756c27e
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/my/mysql-4.1
2005-04-28 00:41:39 +03:00
msvensson@neptunus.(none)
bdb1441a65
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into neptunus.(none):/home/msvensson/mysql/mysql-4.1
2005-04-27 21:40:11 +02:00
monty@mysql.com
e18a155fd6
Fixed core dump bug when hot link list in key cache was empty. Bug #10167
2005-04-27 14:31:04 +03:00
msvensson@neptunus.(none)
e6293c49c4
Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2005-04-27 13:30:00 +02:00
msvensson@neptunus.(none)
565e660bd4
Bug #9954 mysql-4.1.11/cmd-line-utils/libedit/makelist.sh is not portable
...
- Reverted removal of errorcheck mutex initialise, used in safe_mutex_init.
2005-04-27 13:29:37 +02:00
msvensson@neptunus.(none)
203cdde955
Merge from 4.1 to 5.0
2005-04-27 12:56:01 +02:00
msvensson@neptunus.(none)
f3c72cc891
Bug #9954 mysql-4.1.11/cmd-line-utils/libedit/makelist.sh is not portable
...
- Changed makelist.sh
- Bump up required version of autoconf
- Use new style to init mutex in my_thr_init
2005-04-27 09:59:12 +02:00
monty@mysql.com
972f86f1ee
Cleanups during review
2005-04-26 23:24:59 +03:00