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
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
tulin@dl145c.mysql.com
23f79bd1f2 merge 2005-05-17 10:17:53 +02: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
mronstrom@mysql.com
c33a0673a6 Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.1
into mysql.com:/Users/mikron/wl1682
2005-05-12 12:01:01 +02:00
mronstrom@mysql.com
cf642995f6 Many fixes 2005-05-12 11:20:50 +02: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
joerg@mysql.com
a0cac19e6e Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/M50/mysql-5.0
2005-04-26 19:11:54 +02:00
ramil@mysql.com
7882cd32bc A fix (bug #9756: mysql client failing on dumps containing certain \ sequences). 2005-04-26 15:43:20 +05:00
joerg@mysql.com
49ac2dac3e Automerge / manual check of the fixes for NPTL configuration (bug#2173, bug#5871, and bug#9497).
Post-merge fix will follow.
2005-04-26 12:03:37 +02:00
joerg@mysql.com
eaa79cb452 Step 2 of the switch to support configuration with NPTL:
Define a new CPP symbol that the target OS is Linux, and use it where only the OS matters and not the threads Library.
Until now, 'HAVE_LINUXTHREADS' was used to indicate "Target is Linux" in many places.
When we support configuration with NPTL but no Linuxthreads, this misuse must cease.
2005-04-20 20:38:57 +02:00
jani@a193-229-222-105.elisa-laajakaista.fi
1658d737b3 Fixed Bug#6593, "Inconsistency in handling option prefixes (--skip, --disable, etc.)" 2005-04-19 00:22:57 +03:00
petr@mysql.com
da9a6aecad Merge mysql.com:/home/cps/mysql/trees/mysql-4.1
into mysql.com:/home/cps/mysql/trees/mysql-5.0
2005-04-14 01:57:52 +04:00
petr@mysql.com
75cfee68fb post review fix 2005-04-14 01:39:24 +04:00
joerg@mysql.com
198b6117f9 Proper handling of "utf8-general-cs" clollation: Missing parts in configuration. 2005-04-11 11:12:08 +02:00
joerg@mysql.com
6bd1bea723 Add missing parts for the "Cybozu" custom build, to avoid future manual patches. 2005-04-08 13:56:48 +02:00
monty@mysql.com
a7c6348192 Fixed errors found during review 2005-04-06 19:43:35 +03:00
monty@mysql.com
beb28b27e0 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/my/mysql-5.0
2005-04-06 17:23:34 +03:00
monty@mysql.com
49e721677f Fixed errors descovered by valgrind 2.4
Added suppression file for some valgrind warnings that are not real errors
2005-04-06 17:22:21 +03: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
jani@ua141d10.elisa.omakaista.fi
6ed11e3bb3 A fix for Netware. 2005-04-05 13:15:04 +03:00
bar@mysql.com
6d3f944d80 merge 2005-03-29 17:24:26 +05:00
petr@mysql.com
e57534e64b more merge fixes 2005-03-29 16:15:22 +04:00
petr@mysql.com
7428d7ee25 manual merge 2005-03-29 13:55:11 +04:00
bar@mysql.com
396bbdbee5 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/usr/home/bar/mysql-4.1
2005-03-29 14:49:33 +05:00
bar@mysql.com
2d1e9862bc Adding Cybozu's patch.
Not active by default.
One need to pass -DHAVE_CYBOZU_COLLATION to 
activate it.
2005-03-29 14:48:47 +05:00
petr@mysql.com
28a02c9bd0 Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/cps/mysql/trees/mysql-4.1
2005-03-29 11:58:34 +04: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
petr@mysql.com
8139af1807 Post-review fixes for "!include" patch originating from Yahoo! (the whole patch is recommitted) 2005-03-25 04:13:30 +03:00
serg@serg.mylan
f4d4df2ca4 Merge bk-internal:/home/bk/mysql-5.0
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2005-03-21 13:43:25 +01:00
dlenev@mysql.com
ea8adbff36 Manual merge of csets from -build tree into main 5.0 tree. 2005-03-21 11:39:47 +03:00
jimw@mysql.com
ee2b4ec959 Eliminate warnings noticed by VC7. This includes fixing my_mmap() on
Windows to call CreateFileMapping() with correct arguments, and
propogating the introduction of query_id_t to everywhere query ids are
passed around. (Bug #8826)
2005-03-18 16:12:25 -08:00
serg@serg.mylan
6ab6dc2d1f Merge bk-internal:/home/bk/mysql-5.0
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2005-03-17 18:37:13 +01: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
brian@zim.(none)
473e1ffd3a Removed support for RAID, mit-threads, and MySQL FS (really, if someone wants this feature look at a web-dav hookup). 2005-03-16 16:22:56 -08:00
jimw@mysql.com
bd76a4baba Fix handling of the -e flag to my_print_defaults. (Bug #9136) 2005-03-15 15:54:57 -08:00
serg@serg.mylan
79573a5ee8 after merge fixes 2005-03-09 19:22:30 +01:00
serg@serg.mylan
956682de1a merged 2005-03-09 14:09:06 +01:00
joerg@mysql.com
b2c4d73997 Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/M50/mysql-5.0
2005-03-08 17:35:53 +01:00
joerg@mysql.com
3bbc35ac01 Merge changes. 2005-03-08 17:24:07 +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
serg@serg.mylan
d6fa7288c8 Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2005-03-07 14:28:10 +01:00
joerg@mysql.com
792d401981 Merge 4.0.24 compile changes into the 4.1 tree. 2005-03-07 10:28:56 +01: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
serg@serg.mylan
2b447eceb1 myisam/ft_parser.c
protection against invalid string in ft_get_word
mysys/my_symlink2.c
    typo fixed
2005-03-06 12:31:40 +01:00
joerg@mysql.com
4e136e8d1a Please the Sun C compiler by qualifying 'inline' as 'static inline'. 2005-03-04 12:31:30 +01:00
ingo@mysql.com
212388bd3c Merge with after merge fix 2005-03-04 11:37:45 +01:00
joerg@mysql.com
6ccbe89d52 Qualify 'inline' functions as 'static inline' to please the Sun C compiler. 2005-03-04 11:26:08 +01:00
serg@serg.mylan
f2c414e024 Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2005-03-04 00:05:52 +01:00
jimw@mysql.com
f7c01cfb76 Merged from 4.1 2005-03-03 15:01:46 -08:00
serg@serg.mylan
e47d0a0e2d merge 2005-03-03 23:07:20 +01:00
serg@serg.mylan
45641ff65c Merge bk-internal:/home/bk/mysql-4.0/
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
2005-03-03 21:13:57 +01:00
serg@serg.mylan
8d9a53a78c Fixes for bugs reported by Stefano Di Paola (stefano.dipaola@wisec.it) 2005-03-03 19:51:29 +01:00
jimw@mysql.com
9df04058fe Merge mysql.com:/home/jimw/my/mysql-4.1-8707
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-03-03 10:50:18 -08: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
serg@serg.mylan
60e1c869f5 workaround for a bug removed 2005-03-02 15:29:46 +01:00
reggie@mdk10.(none)
1c45844a22 my_mmap.c:
Changed #warning pragma at the bottom to only occur when being used on non-Windows OS
2005-03-01 05:54:48 -06:00
petr@mysql.com
dfba6f4e9b Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/cps/mysql/devel/im-fix-review
2005-03-01 01:59:37 +03:00
petr@mysql.com
053f2fcb7d fix compilation failure on sunfire280 2005-03-01 01:38:04 +03:00
monty@mysql.com
3839e443a4 merge with 4.1 2005-02-28 12:18:39 +02:00
monty@mysql.com
253bfcf783 Fixed wrong memory references found by purify
(No really critical errors found, but a few possible wrong results)
2005-02-28 11:59:46 +02: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
monty@mysql.com
7e5f74f8f2 Merge with global tree 2005-02-25 17:12:06 +02:00
ramil@mysql.com
4ab10bcedf merge 2005-02-25 16:34:17 +04:00
monty@mysql.com
cd78e701a5 Show all generated warnings in SHOW ERROR
Previously we only stored the first given error (the error sent to the client)
2005-02-24 23:33:42 +02:00
reggie@mdk10.(none)
2ffd3a3a61 Changes to allow 5.0.3 to compile on Windows after XA was pushed
logging_ok:
  Logging to logging@openlogging.org accepted
mi_packrec.c:
  Using HAVE_SYS_MMAN_H to protect include of sys/mman.h and replaced calls to mmap and munmap with my_mmap and my_munmap
mi_extra.c:
  Now using HAVE_SYS_MMAN_H to protect include of sys/mman.h
my_mmap.c:
  Changed how no mmap message is printed for Windows
sql_map.cc:
  Changed HAVE_MMAP to HAVE_SYS_MMAN_H and replaced calls to mmap and munmap with my_mmap and my_munmap
2005-02-23 16:29:03 -06:00
jimw@mysql.com
3ecabaa9f7 Don't try to create a symlink if the DATA DIRECTORY specified for a table
is the same as the normal datadir for that database. (Bug #8707)
2005-02-23 13:59:04 -08:00
bar@mysql.com
a88af6c1dd Merge 2005-02-23 17:03:34 +04:00
monty@mysql.com
e2ea35ec67 Merge with 4.1 2005-02-22 15:47:00 +02:00
bar@mysql.com
5ef265f219 Bug#8349 myisamchk: --set-charset does not work
What we need to be able to set in myisamchk is
actually a collation, not a character set. This
fix just changes to display the proper error message.
2005-02-22 16:37:25 +04:00
bar@mysql.com
c0230f6f5f ctype_latin1.result, ctype_latin1.test, charset.c:
Treat unknown characters straight in a query as syntax error, rather skipping it as a space character.
2005-02-22 09:56:07 +04: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
petr@mysql.com
451de5dbfb merge 2005-02-19 02:22:05 +03:00
petr@mysql.com
dbc0937dd0 made IM to work with --defaults-file smoothly 2005-02-18 14:58:30 +03:00
serg@serg.mylan
c0dda01f76 Merge serg.mylan:/usr/home/serg/Abk/mysql-5.0
into serg.mylan:/usr/home/serg/Abk/mysql-5.0-xa
2005-02-18 12:02:46 +01:00
bar@mysql.com
dcb0f52e9a Merge: don't add this into configure in as it is already in
config/ac-macros/character_sets.m4
2005-02-18 13:21:30 +04:00
bar@mysql.com
c926e43f65 A way not to compile UCA collations 2005-02-18 12:58:16 +04:00
jimw@mysql.com
7eb8c130f7 Merge 2005-02-17 16:16:58 -08:00
jimw@mysql.com
e2291bdc7e Only escape the first character in a sequence of bytes that appears to be
a multibyte character, but was not a valid multibyte character. Refinement
of fix for Bug #8378.
2005-02-15 11:31:01 -08:00
serg@serg.mylan
fd828e5b4d manually merged 2005-02-14 21:50:09 +01:00
monty@mysql.com
a1a39fab84 Merge with 4.1 2005-02-10 02:27:37 +02:00
jimw@mysql.com
5bb39302ab When escaping a string in a multi-byte character set, escape all bytes of
a character that appears to be a multi-byte character based on its first
byte, but is not actually a valid multi-byte character. (Bug #8378)
2005-02-09 16:14:13 -08:00
jani@ua141d10.elisa.omakaista.fi
1c2f4ffecb Applied a patch for Netware. 2005-02-08 19:49:40 +02:00
monty@mysql.com
80b3e02462 Fixed bug detected by sp-tests
Cleanup during reviews of new pushed code
2005-02-05 16:05:46 +02:00
monty@mysql.com
422c2eb868 4.1 -> 5.0 merge 2005-02-03 13:18:30 +02:00
monty@mysql.com
b87e0c52a7 Proper fix for comparision with ' '
(Bug #7788 "Table is full" occurs during a multitable update")
2005-02-01 16:27:08 +02:00
Sinisa@sinisa.nasamreza.org
14d887c423 Merge sinisa.nasamreza.org:/mnt/work/mysql-4.1
into sinisa.nasamreza.org:/mnt/work/petica
2005-01-29 23:00:17 +02:00
Sinisa@sinisa.nasamreza.org
d8f467cfe8 Fix for a "table is full" bug in multi-table updates (Bug #7788) 2005-01-29 22:56:00 +02: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
serg@serg.mylan
c76405a7ee merged 2005-01-24 19:41:42 +01:00
serg@serg.mylan
1ca9d6497b remove the entry from the list, before freeing 2005-01-24 18:38:46 +01:00
serg@serg.mylan
24468e48f3 Merge bk-internal:/home/bk/mysql-5.0
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2005-01-24 18:06:01 +01:00
serg@serg.mylan
79240013b2 Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2005-01-24 15:50:13 +01:00
serg@serg.mylan
67ba2e367a fixes/cleanups according to Coverity report 2005-01-24 15:48:25 +01:00
timour@mysql.com
36f1e91b69 Merge of fix for BUG#4258 from 4.1.
Needs additional manual merge.
2005-01-21 17:38:36 +02:00
timour@mysql.com
7fb0de20f3 Final patch for BUG#4285.
This patch collects all previous patches into one.

The main problem was due to that there is are two variables -
dflt_key_cache and sql_key_cache with have more or less duplicate
function. The reson for the bug was that the default value in the key
cache hash was set to dflt_key_cache, then sql_key_cache was set to a
new key cache object, and then dflt_key_cache was set to sql_key_cache
which was different from the dflt_key_cache_var. After sending SIGHUP,
the server was using the original default value for the key cache hash,
which was different from the actual key cache object used for the
default key cache.
2005-01-19 12:55:54 +02:00
serg@serg.mylan
e029511720 Merge bk-internal:/home/bk/mysql-5.0
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2005-01-18 11:26:38 +01:00
monty@mysql.com
502ba93b38 Merge with global tree 2005-01-18 04:03:26 +02:00
monty@mysql.com
e5b788146a Fixed new bug that caused symlink test to fail 2005-01-18 03:49:39 +02:00
serg@serg.mylan
1034677f94 XA (not completely polished out yet) 2005-01-16 13:16:23 +01:00
monty@mysql.com
0a1076a25f Merge with 4.1 2005-01-15 14:09:45 +02:00
monty@mysql.com
a37e91e435 Changed interface for my_strntod() to make it more general and more portable 2005-01-15 12:28:38 +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
monty@mysql.com
de4ec3ed30 Fix accesses to uninitialized memory (found by valgrind) 2005-01-13 03:02:49 +02:00
serg@serg.mylan
39b69a3cc9 Merge bk-internal:/home/bk/mysql-5.0
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2005-01-12 21:11:55 +01:00
hf@deer.(none)
dba173c46b Merge bk@192.168.21.1:/usr/home/bk/mysql-5.0
into deer.(none):/home/hf/work/mysql-5.0.clean
2005-01-12 20:05:32 +04:00
hf@deer.(none)
c64897dbe8 --defaults-extra-file bug fixed 2005-01-12 19:57:26 +04:00
shuichi@mysql.com
852d74a68e renamed charset name 'eucjp_ms' to 'eucjpms' 2005-01-12 02:58:15 -08:00
shuichi@mysql.com
3126e82291 added new character set - cp932, eucjp_ms 2005-01-11 17:45:36 -08:00
serg@serg.mylan
f7dc7064b8 Merge bk-internal:/home/bk/mysql-5.0
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2005-01-11 22:34:10 +01:00
hf@deer.(none)
6f511796fc Merging fixed 2005-01-11 23:28:56 +04:00
hf@deer.(none)
196c95e938 Merging conflicts resolved 2005-01-11 21:00:53 +04:00
hf@deer.(none)
8b3b364893 Merge bk@192.168.21.1:/usr/home/bk/mysql-4.1
into deer.(none):/home/hf/work/mysql-4.1.5920
2005-01-11 19:58:52 +04:00
serg@serg.mylan
652a4694fa Merge bk-internal:/home/bk/mysql-5.0
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2005-01-11 16:12:33 +01:00
konstantin@mysql.com
a0bc131743 Merge mysql.com:/home/kostja/work/mysql-4.1-7428
into mysql.com:/home/kostja/work/mysql-5.0-root
2005-01-11 14:47:12 +03:00
konstantin@mysql.com
067d13f632 A fix for linking failure of MySQL client when linking with imap libraries
(Bug#7428) (renamed: hash_reset -> my_hash_reset)
2005-01-11 13:53:10 +03:00
serg@serg.mylan
04c617f25e my_close(), my_sync(): retry if EINTR 2005-01-11 00:14:46 +01:00
serg@sergbook.mysql.com
a609bc45f2 merge 2005-01-07 15:02:25 +02:00
guilhem@mysql.com
1f6c72ccf1 Merge mysql.com:/home/mysql_src/mysql-4.0
into mysql.com:/home/mysql_src/mysql-4.1-clean
2005-01-06 21:31:47 +01:00
guilhem@mysql.com
4b2d003bf1 Fix for BUG#7714 "if disk full, sometimes MyISAM doesn't wait for free space, corrupts table"
This happened only if my_write() couldn't write even one byte.
I cannot easily add a .test for this, but I tested by hand before and after the change.
2005-01-06 21:30:39 +01:00
serg@sergbook.mysql.com
f472cec178 merged 2005-01-06 19:32:16 +02:00
kent@mysql.com
9fe6813a09 my_sleep.c:
On Windows my_sleep() always gave a zero microsecond sleep
2005-01-05 16:35:43 +01:00
jani@ua141d10.elisa.omakaista.fi
81d99da104 Added checking for my.cnf file from environment variable MYSQL_HOME
instead of DATADIR.
2005-01-04 20:13:47 +02:00
ingo@mysql.com
76d0f49495 Fixed a typo. 2005-01-03 20:48:49 +01: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
monty@mysql.com
34d5331cee Merge with global tree 2004-12-31 00:50:30 +02: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
monty@mishka.local
4f4bbfc279 Merge with 4.1 2004-12-22 13:54:39 +02:00
monty@mysql.com
f37fd31ddc Merge with global tree 2004-12-18 06:05:16 +02:00
monty@mysql.com
3fb088a075 Add 0x before pointers (to help with debugging)
Add support for VARCHAR with 1 or 2 length bytes
Enable VARCHAR packing in MyISAM files (previous patch didn't pack data properly)
Give error if we got problems in temporary tables during a SELECT
Don't use new table generated by ALTER TABLE if index generation fails
Fixed wrong call by range_end() (Could cause an ASSERT in debug mode)
2004-12-18 05:19:21 +02:00
ram@gw.mysql.r18.ru
0effd2ce04 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0
into gw.mysql.r18.ru:/usr/home/ram/work/5.0.bit.new
2004-12-17 18:58:44 +04:00
ram@gw.mysql.r18.ru
92f89369ae bit type 2004-12-17 18:06:05 +04:00
konstantin@mysql.com
2083ecd124 myisam/sort.c:my_var_write and mysys/hash.c:hash_key made static inline,
not simply inline, to fix the linking failure on Sun Solaris 9 (sparc)
with Sun Studio 9, reported by Peter Harvey.
2004-12-16 02:43:35 +03: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
monty@mysql.com
77207d19f2 Merge with new VARCHAR code 2004-12-06 19:18:35 +02:00
monty@mysql.com
67ce247965 Add support for up to VARCHAR (size up to 65535)
Renamed HA_VAR_LENGTH to HA_VAR_LENGTH_PART
Renamed in all files FIELD_TYPE_STRING and FIELD_TYPE_VAR_STRING to MYSQL_TYPE_STRING and MYSQL_TYPE_VAR_STRING to make it easy to catch all possible errors
Added support for VARCHAR KEYS to heap
Removed support for ISAM
Now only long VARCHAR columns are changed to TEXT on demand (not CHAR)
Internal temporary files can now use fixed length tables if the used VARCHAR columns are short
2004-12-06 02:00:37 +02:00
serg@serg.mylan
ee933cd198 merged 2004-11-22 21:33:15 +01:00
bar@mysql.com
e3b94d4ef5 Bug #6737: REGEXP gives wrong result with case sensitive collation:
- A new flag MY_CS_CSSORT was introduced for case sensitivity.
- Item_func_regexp doesn't substiture ICASE not only
  for binary collations but for case sensitive collations as well.
2004-11-22 11:58:40 +04:00
serg@serg.mylan
2d3dd65cc1 merged 2004-11-20 18:36:41 +01:00
timour@mysql.com
5d1f920ba7 correct name of function in synopsis 2004-11-18 16:52:45 +02:00
serg@serg.mylan
e68bd85b77 merged 2004-11-17 18:04:36 +01:00
igor@rurik.mysql.com
9edff6c591 key_cache.result, key_cache.test:
Added a test case for bug #6447.
mf_keycache.c:
  Fixed bug #6447. Erronious code in the key_cache_read function
  caused problems when reading key blocks with offset>0 into
  key cache. The code of key_cache_insert and key_cache_write
  was modified similarly.
2004-11-16 13:58:49 -08: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
bell@sanja.is.com.ua
d76db8b999 marge 2004-11-13 19:45:36 +02:00
bell@sanja.is.com.ua
7210195f1e now my_printf_error is not better then my_error, but my_error call is shorter
used only one implementation of format parser of (printf)
fixed multistatement
2004-11-13 19:35:51 +02:00
monty@mysql.com
e0f1e6af36 Portability fix for gcc 2.95.3
After merge fixes
2004-11-12 21:24:16 +02:00
jani@ua141d10.elisa.omakaista.fi
fe0b00985f Merge with 4.0 2004-11-12 20:38:58 +02:00
monty@mysql.com
addd1a0da8 Merge with 4.1 2004-11-12 19:58:24 +02:00
jani@ua141d10.elisa.omakaista.fi
76b8c8747d Removed an unneccessary for() and variable. 2004-11-12 19:22:58 +02:00
monty@mysql.com
b56851fd7a Merge on pull 2004-11-12 17:48:01 +02:00
bell@sanja.is.com.ua
1555469b64 merge 2004-11-12 15:36:31 +02:00
bell@sanja.is.com.ua
31f7811183 post-review fixes 2004-11-12 14:34:00 +02:00
monty@mysql.com
9252656d49 merge with 4.0 2004-11-12 11:17:53 +02: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
jani@a80-186-24-72.elisa-laajakaista.fi
54dac2cfac Some code clean-up and optimization. 2004-11-11 16:59:36 +02:00
jani@a80-186-24-72.elisa-laajakaista.fi
4f04217879 Removed check for .ini file elsewhere, except on Windows. 2004-11-11 16:20:39 +02:00
ram@gw.mysql.r18.ru
1d967b8dcf A fix (bug #6551: UMASK_DIR & UMASK not taken into account (mysqld.cc my_init.c inconsistency)).
my_umask and my_umask_dir initialization has been moved to the my_init() func.
2004-11-11 12:35:55 +04: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
jani@a193-229-222-105.elisa-laajakaista.fi
bfdf57ef31 Fixed a typo that caused segmentation fault when using
--defaults-extra-file option.
2004-11-05 23:58:30 +02:00
jani@a193-229-222-105.elisa-laajakaista.fi
083a2f5613 Changed default.c so that it now checks for my.ini and then
my.cnf from the default directories.
2004-11-05 18:59:19 +02:00