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
26651 commits 2793 branches 343 tags 1.7 GiB
Commit graph

1911 commits

Author SHA1 Message Date
joreland@mysql.com
84a04b4a9d merge 2005-06-13 14:09:09 +02:00
joreland@mysql.com
5e4ce743a3 Merge mysql.com:/home/jonas/src/wl1882 
into mysql.com:/home/jonas/src/mysql-5.0-ndb
 2005-06-13 11:59:51 +02:00
kent@mysql.com
811e51ec84 Merge mysql.com:/Users/kent/mysql/bk/mysql-5.0-tmp 
into mysql.com:/Users/kent/mysql/bk/mysql-5.0
 2005-06-10 20:12:45 +02:00
ndbdev@dl145b.mysql.com
8d44b54295 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1
 2005-06-10 07:22:27 +02:00
jimw@mysql.com
a5285b141e Merge mysql.com:/home/jimw/my/mysql-4.1-clean 
into  mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-06-09 18:00:47 -07:00
kent@mysql.com
4d0a81aa8b config-win.h: 
Enabled yaSSL on Windows
Many files:
  Added yaSSL to Visual Studio 6 project files
 2005-06-09 05:04:59 +02:00
svoj@mysql.com
f9751e1785 Merge mysql.com:/var/tmp/sslbug/mysql-4.0 
into mysql.com:/var/tmp/sslbug/mysql-4.1
 2005-06-08 21:40:58 +05:00
svoj@mysql.com
cc31c4c7fb Fix for 
BUG#10675 - MySQL fails to build with --openssl on Mac OS X 10.4
BUG#11150 - HP-UX yaSSL/OpenSSL configure/header problem
Remove obsolete code.
 2005-06-08 21:07:25 +05:00
svoj@mysql.com
7e44f6f591 WL#2466 - Fulltext: "always-index" words 
Trie and Aho-Corasick code added to distribution.
 2005-06-07 21:17:09 +05:00
joreland@mysql.com
5be3eecc42 Add "--instance=name" option to load_defaults (or env(MYSQL_INSTANCE)) 
which enables having multiple mysqld in same my.cnf 
       without mysql_multi or IM
 2005-06-07 16:52:50 +02:00
ndbdev@dl145b.mysql.com
2fb1fb5877 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1
 2005-06-07 06:50:50 +02:00
ndbdev@dl145b.mysql.com
161a58ab4b merge 2005-06-06 23:39:19 +02:00
monty@mysql.com
775f17667b Merge with 4.1 2005-06-07 00:31:53 +03:00
jani@a193-229-222-105.elisa-laajakaista.fi
ea7f982ef0 Some fixes for Netware. 2005-06-06 18:30:59 +03:00
bar@mysql.com
2df945d87b Bug#8610: The ucs2_turkish_ci collation fails with upper('i') 
UPPER/LOWER now can return a string with different length.

mi_test1.c:
  Adding new arguments.
Many files:
  Changeing caseup/casedn to return a result with different
  length than argument.
sql_string.h:
  Removing unused method,
mysql_priv.h:
  Removing unused method
 2005-06-06 16:54:15 +05:00
mronstrom@mysql.com
d316bc88d8 Patch for bugs in bitmap (endian issue) 2005-06-06 08:59:00 +02: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
tomas@poseidon.ndb.mysql.com
f6d51a44f4 Merge 2005-06-04 19:26:35 +02:00
serg@serg.mylan
aaa4c11d11 mergemerged 2005-06-03 21:24:13 +02:00
serg@serg.mylan
e4d4baed62 merged 2005-06-03 18:29:36 +02:00
lenz@mysql.com
852a57300d - include/config-win.h: removed double HAVE_CHARSET_cp932 #define 
- mysql-test/Makefile.am: added a pattern match for t/*.sql 
  (t/mysql_delimiter.sql was missing from the source distribution)
 2005-06-03 18:20:25 +02:00
serg@serg.mylan
f55a378e9a *don't* mess with kernel defines, boy. 
and HAVE_ATOMIC_ADD/HAVE_ATOMIC_SUB is tested in configure
 2005-06-03 15:05:18 +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
tomas@poseidon.ndb.mysql.com
644906bf9c bitmap bug fixes and interface change 2005-06-02 18:40:25 +02:00
serg@serg.mylan
cdb1474dae Merge bk-internal:/home/bk/mysql-5.0 
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
 2005-06-02 15:46:55 +02:00
schwenke@lmy003.xl.local
7d6b47c994 misc. fixes for windoze builds 2005-06-02 15:32:02 +02:00
serg@serg.mylan
f3a95357fe Merge bk-internal:/home/bk/mysql-5.0 
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
 2005-06-02 11:02:01 +02:00
tomas@poseidon.ndb.mysql.com
925548d349 Merge 2005-06-02 00:51:30 +02:00
lenz@mysql.com
9afd2563e9 Merge of 4.1 -> 5.0 2005-06-01 15:11:14 +02:00
serg@serg.mylan
6e37d8c15d FIELD_TYPE_NEWDECIMAL is numeric too 2005-06-01 09:32:05 +02:00
tomas@poseidon.ndb.mysql.com
5088b28d09 Merge 2005-05-31 14:37:47 +02:00
lenz@mysql.com
53e49d0521 Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/space/my/mysql-4.1
 2005-05-27 09:52:03 +02:00
msvensson@neptunus.(none)
697cfe7f07 Merge from 4.1 2005-05-26 21:01:55 +02:00
joerg@mysql.com
9504bd0ddd Manual merge. 2005-05-26 12:51:44 +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
lenz@mysql.com
c58535f6d3 - merged the 4.1.12a Changes back into the main tree 2005-05-26 11:43:47 +02:00
monty@mysql.com
6d5d6c9257 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/my/mysql-4.1
 2005-05-25 12:57:29 +03: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
serg@serg.mylan
e2c8f63ed4 simplifying new/my_arg_new wrapping 2005-05-24 21:02:42 +02:00
lenz@mysql.com
236ca3626f - added the cp932 charset support to the Windows builds 2005-05-24 14:46:28 +02: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
msvensson@neptunus.(none)
548994aa7b Build fixes for icc, compile _without_ "-no-gnu" 2005-05-23 18:53:53 +02:00
msvensson@neptunus.(none)
9d0e3521f0 Build fix 2005-05-23 15:13:21 +02: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
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
bell@sanja.is.com.ua
e37fbf2382 Macos 10.4 compatibility changes 2005-05-20 16:21:23 +03: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
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