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
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
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
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
konstantin@mysql.com
753959cd88
Manual merge
2005-05-05 13:47:09 +04:00
kent@mysql.com
c4acdc6e0f
terminal.c, sql_bitmap.h, my_sys.h, configure.in, config.h:
...
Initial Metrowerks CodeWarrior compiler support
2005-05-05 09:15:14 +02: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
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
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
serg@serg.mylan
810b2c3d40
remove the rest of isam/merge references
...
fix a race condition in TC_LOG_BINLOG::unlog
2005-04-05 13:17:49 +02:00
konstantin@mysql.com
eeeedd31b9
Manual merge
2005-03-26 01:44:54 +03:00
konstantin@mysql.com
ff8017f0d3
A fix for Bug#8226 "Cannot connect via shared memory":
...
provide created shared memory objects with proper
access rights to make them usable when client and server
are running under different accounts.
Post review fixes.
2005-03-26 01:21:52 +03:00
serg@serg.mylan
376a4ee03b
Field::quote_data():
...
don't call escape_string_for_mysql() unnecesary
don't overwrite local buffer
escape_string_for_mysql():
take a length of the destination buffer as an argument
2005-03-17 12:27:45 +01:00
serg@serg.mylan
10c06f257a
include/my_global.h
...
define _XOPEN_SOURCE=500 for solaris
include/my_sys.h
remove a cast
2005-03-15 18:31:56 +01:00
jani@ua141d10.elisa.omakaista.fi
8db4423b8c
Fixed Bug#8922.
...
Reverted Jim's patch.
2005-03-08 18:12:12 +02:00
jimw@mysql.com
d22a4e70f9
Clean up merge
2005-03-07 13:26:27 -08:00
joerg@mysql.com
c45cfb7c07
Manual merge of the 4.0.24 compile changes into the 4.1 tree.
2005-03-07 10:27:20 +01:00
joerg@mysql.com
631aac9d00
Prevent a collision with the system's '#define errno ...' by guarding the variable declaration.
2005-03-04 10:22:50 +01:00
joerg@mysql.com
809b18e298
Prevent a collision with the system's '#define errno ...' by guarding the variable declaration.
2005-03-03 12:35:39 +01:00
jimw@mysql.com
2ca5cec8c2
Avoid calls to my_seek() and my_tell() on log files so that
...
non-seekable files like FIFOs can be used for logs other
than the binlog. (Bug #8271 )
2005-03-02 18:14:58 -08:00
petr@mysql.com
c193b3281d
Merge mysql.com:/home/cps/mysql/trees/mysql-5.0
...
into mysql.com:/home/cps/mysql/devel/im-fix-review
2005-02-27 18:53:11 +03:00
serg@serg.mylan
a4dbb3b061
compatibility fixes, crashing tests
2005-02-22 15:22:37 +01:00
petr@mysql.com
1e6bfa39c3
Merge mysql.com:/home/cps/mysql/trees/mysql-5.0
...
into mysql.com:/home/cps/mysql/devel/im-fix-review
2005-02-20 23:01:07 +03:00
serg@serg.mylan
1bc6ae8913
portability fixes
2005-02-20 20:08:33 +01:00
serg@serg.mylan
e29191e5c5
windows compilation fixes
2005-02-19 12:15:30 +01:00
petr@mysql.com
dbc0937dd0
made IM to work with --defaults-file smoothly
2005-02-18 14:58:30 +03:00
ram@gw.mysql.r18.ru
c38886b20c
timed_mutexes moved to include/my_sys.h and mysys/my_static.c
...
to avoid linking problems referring to the variable from .c programs.
2005-01-26 18:37:49 +04:00
monty@mysql.com
0a1076a25f
Merge with 4.1
2005-01-15 14:09:45 +02:00
monty@mysql.com
7681e62422
Merge
2005-01-15 03:49:07 +02:00
monty@mysql.com
6d280ac161
Fixed possible access to unintialized memory in filesort when using many buffers
2005-01-15 03:47:06 +02:00
hf@deer.(none)
196c95e938
Merging conflicts resolved
2005-01-11 21:00:53 +04:00
hf@deer.(none)
5eb5fd12be
fix for bug #5920 (embedded-server mysql doesn't handle --defaults-file)
2005-01-03 19:21:54 +04:00
ingo@mysql.com
c39be2d0e7
WL#1895 - Print message to error log in case of detected MyISAM corruption
...
Changed my_error() to print error messages, which come from
arbitrary registered ranges of error messages. Messages can
be unregistered (and should be at end of the program).
Added registration of handler error messages.
Added a new mi_print_error() macro and a new
mi_report_error() function, which supply error
messages with a table name.
Added calls to mi_print_error() or mi_report_error()
at all places in MyISAM, where table corruption is detected.
2004-12-23 20:11:38 +01:00
kaa@polly.local
2ce0ad6d7e
Forward port of HugeTLB, InnoDB doublewrite and checksums patches to 5.0
2004-12-14 22:26:31 +03:00
serg@serg.mylan
f09429a4df
protection: TRASH in delete
...
fixed a bug that it discovered
2004-11-28 15:53:17 +01:00
serg@serg.mylan
87840e841c
Merge bk-internal:/home/bk/mysql-5.0
...
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2004-11-15 19:27:06 +01:00
brian@avenger.(none)
f05daf02ba
Resolved merge from 4.1 -> 5.0 (mainly Guilhem's work with mysqldump)
2004-11-11 18:58:57 -08:00
monty@mysql.com
68130e428a
Added possibility to detect if libmysqld is restarted
...
(Needed to check if memory allocated with mysql_once_init() has been freed)
2004-11-11 00:36:18 +02:00
serg@serg.mylan
f58484fac2
s/ha_store_ptr/my_store_ptr/
...
s/ha_get_ptr/my_get_ptr/
2004-11-07 22:39:27 +01:00
serg@serg.mylan
bb9cc04026
mmap portability layer, mmap for Windows
...
new macro: thread_safe_decrement, thread_safe_dec_and_test, statistic_decrement
2004-11-04 22:55:47 +01:00
monty@mysql.com
afbe601302
merge with 4.1
2004-10-29 19:26:52 +03:00
monty@mishka.local
719c88e38f
true,false -> TRUE, FALSE
...
Simple fixes/optimization of things discovered during review of new pushed code
2004-10-14 18:03:46 +03:00
dlenev@brandersnatch.localdomain
f5d1b711c6
Implementation of Monty's idea about clear_alloc_root() optimization and cleanup of work
...
with memory roots in THD/Statement/Item_arena.
Added assertions preventing memory allocation on bzero'ed MEM_ROOT since it is worked by
pure luck and was very ineffective.
2004-09-23 13:48:17 +04:00
dlenev@brandersnatch.localdomain
574f850afa
Two small fixes to make -debug version usable again.
2004-09-14 00:35:42 +04:00
jani@rhols221.adsl.netsonic.fi
0b3d778691
Merge.
2004-09-13 18:12:44 +03:00
jani@rhols221.adsl.netsonic.fi
fe23df1a2b
Added per thread status variables, after review, patch v1.1.
2004-09-13 16:48:01 +03:00
monty@mysql.com
49cd04b510
Merge on pull
2004-09-09 07:26:28 +03:00
