mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-02-02 03:51:50 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
24737 commits 2793 branches 343 tags 1.7 GiB
Commit graph

1263 commits

Author SHA1 Message Date
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
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
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
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
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