mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-31 19:11:46 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
29752 commits 2790 branches 343 tags 1.7 GiB
Commit graph

1436 commits

Author SHA1 Message Date
monty@mysql.com
8c94b5fba7 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/my/mysql-5.0
 2005-06-06 20:42:55 +03:00
monty@mysql.com
dec2607e1d Ensure that we reset auto-increment cache if we have to do an UPDATE becasue of REPLACE 
This fixes bug #11080: Multi-row REPLACE fails on a duplicate key error
 2005-06-06 20:41:52 +03:00
reggie@monster.
4283fdb170 fixes for compiler warnings from VC6 2005-06-06 11:34:52 -05:00
serg@serg.mylan
6a5349028c a compiler must see '#pragma implementation' *before* 
'#pragma interface' (that comes with the #include'd header file)
 2005-06-05 19:38:52 +02:00
monty@mysql.com
4b7882dc73 merge 2005-06-05 17:19:50 +03:00
monty@mysql.com
25a2c4a71e Cleanup during review 
Simple optimization for 2 argument usage to function of variable arguments
Fix stack overrun when using 1+1+1+1+1+1+1+....
Update crash-me results for 5.0
Don't call post_open if pre_open() fails (optimization)
 2005-06-05 17:01:20 +03:00
tomas@poseidon.ndb.mysql.com
f6d51a44f4 Merge 2005-06-04 19:26:35 +02:00
serg@serg.mylan
91f6308d00 yassl template instantiation - don't do too much 
mysys/my_access.c: remove incorrect fix
comments
 2005-06-03 13:43:17 +02:00
tomas@poseidon.ndb.mysql.com
8d4a10977a changed name of my_bitmap member since it has a different meaning than in 5.0 2005-06-02 22:10:57 +02:00
reggie@monster.
0e139b8908 Merge monster.:D:/Work/mysql-4.1 into monster.:D:/Work/mysql5.0 2005-06-02 12:36:55 -05:00
tomas@poseidon.ndb.mysql.com
644906bf9c bitmap bug fixes and interface change 2005-06-02 18:40:25 +02:00
reggie@monster.
7b9d4eaa92 fixed compile problem by replacing W_OK with F_OK 2005-06-02 11:12:58 -05:00
ingo@mysql.com
9dc980b131 Merge mysql.com:/home/mydev/mysql-4.1-4100 
into mysql.com:/home/mydev/mysql-5.0-5000
 2005-06-02 11:44:49 +02:00
ingo@mysql.com
3ba1b99034 Merge mysql.com:/home/mydev/mysql-4.1 
into mysql.com:/home/mydev/mysql-4.1-4100
 2005-06-02 10:02:08 +02:00
tomas@poseidon.ndb.mysql.com
bef102ec90 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1
 2005-06-02 09:50:47 +02:00
kent@mysql.com
f0fcc54b0c Merge 2005-06-02 04:45:09 +02:00
kent@mysql.com
bd48eed988 tztime.cc: 
Set #pragma implementation" earlier
Many files:
  Need to include <my_global.h> before #ifdef USE_PRAGMA_IMPLEMENTATION
 2005-06-02 02:43:32 +02:00
jimw@mysql.com
24f14c93cf Fix hashcmp() to handle special case of zero length, which 
resulted in the hostname cache being ineffective. Based on
patch from Jeremy Cole of Yahoo! (Bug #10931)
 2005-06-01 11:30:59 -07:00
ingo@mysql.com
b28a44e999 Bug#10602 - LOAD INDEX INTO CACHE deadlocks 
Fixed two deadlocks.
Made minor changes.
 2005-06-01 14:20:16 +02:00
tomas@poseidon.ndb.mysql.com
5088b28d09 Merge 2005-05-31 14:37:47 +02:00
msvensson@neptunus.(none)
697cfe7f07 Merge from 4.1 2005-05-26 21:01:55 +02:00
msvensson@neptunus.(none)
975ca22872 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into neptunus.(none):/home/msvensson/mysql/mysql-4.1
 2005-05-26 12:10:05 +02:00
msvensson@neptunus.(none)
83d430353e Add ifdefs to control when "#pragma implementation" should be used 
Added some more ifdefs for "#pragma interface"
 2005-05-26 12:09:14 +02:00
monty@mysql.com
fb90aaa7b5 Cleanup during code review 
Faster detection of wrong table names (like PRN) on windows
 2005-05-25 12:56:47 +03:00
lars@mysql.com
93565c8e7d Merge mysql.com:/home/bkroot/mysql-4.1 into mysql.com:/home/bk/c4944-4.1 2005-05-24 01:09:23 +02:00
gbichot@bk-internal.mysql.com
a49ccfe6f0 Merge bk-internal.mysql.com:/data0/bk/mysql-4.1 
into bk-internal.mysql.com:/data0/bk/mysql-5.0
 2005-05-24 00:31:28 +02:00
reggie@mdk10.(none)
3384ecc988 BUG# 9148 Denial of service 
fixups of test case and comment formatting
 2005-05-23 14:48:25 -05: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)
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
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
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
ndbdev@dl145c.mysql.com
30def9f3f8 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into dl145c.mysql.com:/home/ndbdev/tomas/mysql-5.1
 2005-05-23 10:45:48 +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
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
ndbdev@dl145c.mysql.com
f0f8b0a97b Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into dl145c.mysql.com:/home/ndbdev/tomas/mysql-5.1
 2005-05-20 06:25:02 +02: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
ndbdev@dl145c.mysql.com
4b47828478 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into dl145c.mysql.com:/home/ndbdev/tomas/mysql-5.1
 2005-05-19 18:37:33 +02: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
tulin@dl145c.mysql.com
be861a7ccf merge 2005-05-19 09:04:24 +02: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
tulin@dl145c.mysql.com
03590c20bd merge 2005-05-18 22:26:23 +02:00
msvensson@neptunus.(none)
89415d272c Merge 2005-05-18 20:52:59 +02:00