brian@avenger.(none)
0c5ac2dd5b
Fix for gcc 4.0 (they have removed min/max operators).
2005-07-11 16:56:18 -07:00
ramil@mysql.com
fe09e62d36
Merge mysql.com:/usr/home/ram/work/mysql-4.1
...
into mysql.com:/usr/home/ram/work/mysql-5.0
2005-07-06 14:01:30 +05:00
ramil@mysql.com
f82420356f
a fix (bug #11544 : Use of missing rint() function on QNX).
2005-07-06 13:51:53 +05:00
jimw@mysql.com
485f2c93c2
Merge mysql.com:/home/jimw/my/mysql-5.0-10214
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-07-05 09:47:20 -07:00
bell@sanja.is.com.ua
d3905f3d0e
Name resolution context added (BUG#6443)
2005-07-01 07:05:42 +03:00
konstantin@mysql.com
f60ebc4815
A fix and a test case for Bug#10794 "mysql_stmt_attr_set no
...
open cursor after mysql_stmt_execute" + post-review fixes.
The bug was caused by wrong flags in stmt->server_status on the client
side: if there was no cursor, the server didn't send server_status
flags to the client, and the old flags were used to set up the
fetch function of a statement. Consequently, stmt_read_row_from_cursor was
used when there was no cursor. The fix fixes the server to always
send server flags to the client.
2005-06-30 16:17:10 +04:00
marty@linux.site
e4aedcc2c1
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
...
into linux.site:/home/marty/MySQL/mysql-5.0
2005-06-30 12:20:52 +02:00
jani@a193-229-222-105.elisa-laajakaista.fi
3df73db1cf
Applied some Netware related patches.
2005-06-29 14:02:11 +03:00
jimw@mysql.com
409592e652
Add my_str_malloc and _free function pointers to strings library
...
which will by default exit(1) if malloc() fails, but can be set
to do something else by the calling program does, which mysqld
does to use my_malloc(..., MYF(MY_FAE)) instead. Also checks
allocation in conf_to_src utility program. (Bug #7003 )
2005-06-24 13:41:33 -07:00
ingo@mysql.com
ef6d371113
Merge mysql.com:/home/mydev/mysql-5.0
...
into mysql.com:/home/mydev/mysql-5.0-bug8321
2005-06-24 19:47:20 +02:00
ingo@mysql.com
1c33fbc4c1
Bug#10178 - failure to find a row in heap table by concurrent UPDATEs
...
Bug#10568 - Function 'LAST_DAY(date)' does not return NULL for invalid argument.
Manual merge.
2005-06-24 19:47:18 +02:00
ingo@mysql.com
e81358565b
Bug#8321 - myisampack bug in compression algorithm
...
Added 64-bit extensions, comments, extended statistics
and trace prints.
2005-06-24 19:34:55 +02:00
ramil@mysql.com
66330a9d59
an improvement (bug #7851 : C++ 'new' conflicts with kernel header asm/system.h).
2005-06-24 12:51:11 +05:00
jimw@mysql.com
3ccb90c085
Make status of NO_BACKSLASH_ESCAPES mode known to the client so
...
it can use it to switch to only quoting apostrophes by doubling
them when it is in effect. (Bug #10214 )
2005-06-23 18:29:56 -07:00
konstantin@mysql.com
b3d977df10
Rename all prepared statements COM_ commands to prefix with COM_STMT_
2005-06-17 23:26:25 +04: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
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
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
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
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
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
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
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
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
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
