jani@a193-229-222-105.elisa-laajakaista.fi
ae745ef283
Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0-icc
2005-09-30 15:29:01 +03:00
jonas@perch.ndb.mysql.com
b43d0f0495
Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.0
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-push
2005-09-30 12:25:39 +02:00
jani@a193-229-222-105.elisa-laajakaista.fi
aa08fd0d0a
Small fixes.
2005-09-30 12:35:12 +03:00
jonas@perch.ndb.mysql.com
21153069fb
export forced_defaults_file using global variable defaults_file
...
analog with defaults_extra_file and defaults_grouop_suffix
2005-09-30 09:54:53 +02:00
kent@mysql.com
095efe48a5
Makefile.am, configure.in:
...
Enable "make distcheck" to work
2005-09-24 15:51:45 +02:00
jani@a193-229-222-105.elisa-laajakaista.fi
acf218b708
Several fixes revelaled by Intel compiler.
2005-09-23 16:47:08 +03:00
konstantin@mysql.com
2d4c54ba1b
Merge mysqldev@production.mysql.com:my/mysql-5.0-release
...
into mysql.com:/opt/local/work/mysql-5.0-root
2005-09-23 00:46:59 +04:00
konstantin@mysql.com
6f8d3c4844
A fix and a test case for Bug#6513 "Test Suite: Values inserted by using
...
cursor is interpreted latin1 character and Bug#9819 "Cursors: Mysql Server
Crash while fetching from table with 5 million records."
A fix for a possible memory leak when fetching into an SP cursor
in a long loop.
The patch uses a common implementation of cursors in the binary protocol and
in stored procedures and implements materialized cursors.
For implementation details, see comments in sql_cursor.cc
2005-09-22 02:11:21 +04:00
serg@serg.mylan
3b41e3362b
aftermerge fix
2005-09-21 17:38:26 +02:00
serg@serg.mylan
a083ff160e
merged
2005-09-21 13:53:22 +02:00
sergefp@mysql.com
a26e1b7280
Merge mysql.com:/home/psergey/bk-trees/mysql-4.1
...
into mysql.com:/home/psergey/mysql-4.1-csc6030-r3
2005-09-21 02:20:55 +04:00
sergefp@mysql.com
f9475d1d15
BUG#12232: Add a server option to treat NULL values as equal when calculating MyISAM index
...
statistics (like 4.0 did) (patch #3 , with review #1 & #2 feedback addressed)
2005-09-21 02:18:29 +04:00
SergeyV@selena.
c2f734ce42
Merge svlasenko@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into selena.:H:/MYSQL/src/#12929-mysql-4.1
2005-09-20 20:11:38 +04:00
bar@mysql.com
6424e9cce1
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/usr/home/bar/mysql-5.0.b10504
2005-09-19 09:46:25 +05:00
bar@mysql.com
1d12ac8849
Bug#10504
...
Character set does not support traditional mode
ctype_utf8.result, ctype_utf8.test:
adding test case.
password.c, mysql_com.h
Changeing octet2hex availability from static to public.
item_strfunc.cc:
Result string is now checked to be well-formed.
Warning/error is generated, depending on sql_mode.
2005-09-16 10:24:37 +05:00
SergeyV@selena.
2e9e0b33c5
Fixes bug #12929 . Uses my_cgets instead of _cgets function, thus eliminating
...
a restriction to 255 chars for editable buffer.
2005-09-16 01:56:16 +04:00
joerg@mysql.com
8b7b6f46f3
Compile problem about "madvise()" on Solaris (bug#7156). (Patch supplied by Kent)
2005-09-15 19:00:25 +02:00
ingo@mysql.com
18cb2e8388
Merge mysql.com:/home/mydev/mysql-4.1-4100
...
into mysql.com:/home/mydev/mysql-5.0-5000
2005-09-14 13:37:16 +02:00
ingo@mysql.com
6e725adc00
Bug#12920 - key_read_requests counter appears to re-set
...
After merge fix.
2005-09-14 13:18:16 +02:00
ingo@mysql.com
8130641e8e
Merge mysql.com:/home/mydev/mysql-4.0-4000
...
into mysql.com:/home/mydev/mysql-4.1-4100
2005-09-14 10:34:41 +02:00
ingo@mysql.com
7314307762
Bug#12920 - key_read_requests counter appears to re-set
...
Enlarged the counter variables to ulonglong.
2005-09-14 09:56:49 +02:00
msvensson@neptunus.(none)
7fb9d5aaa0
Fix QNX warning
2005-09-14 08:33:00 +02:00
jimw@mysql.com
a60ed0b75d
Merge mysql.com:/home/jimw/my/mysql-4.1-clean
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-09-12 17:00:50 -07:00
jimw@mysql.com
d7dc2f68db
Merge bk-internal:/home/bk/mysql-4.1
...
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-09-12 12:47:45 -07:00
jimw@mysql.com
16e5f22162
Merge mysqldev@production.mysql.com:jimw/mysql-4.1-sco
...
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-09-12 10:19:56 -07:00
joerg@mysql.com
54ceb62b8d
Merge mysql.com:/M40/clone-4.0 into mysql.com:/M40/upward-4.0
2005-09-08 11:04:43 +02:00
jimw@mysql.com
a540a66b26
Port to SCO OpenServer 6. May require running ./configure with
...
--build=i686-unknown-sysv5SCO_SV6.0.0
2005-09-07 20:23:07 +02:00
SergeyV@selena.
784582b857
Merge selena.:H:/MYSQL/src/#05588-mysql-4.0
...
into selena.:H:/MYSQL/src/#05588-mysql-4.1
2005-09-07 14:59:41 +04:00
jimw@mysql.com
3be42aabc5
Merge mysql.com:/home/jimw/my/mysql-5.0-11787
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-09-03 09:34:34 -07:00
kent@mysql.com
5b65d8fb03
my_global.h:
...
Back port of QNX work around for rint()
2005-09-02 11:11:29 +02:00
jimw@mysql.com
d6db387aea
Merge mysql.com:/home/jimw/my/mysql-4.1-clean
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-08-31 19:12:16 -07:00
jimw@mysql.com
c3f4ecb544
Merge mysql.com:/home/jimw/my/mysql-4.1-7156
...
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-08-31 18:34:16 -07:00
jimw@mysql.com
1d997477aa
Merge mysql.com:/home/jimw/my/mysql-4.1-clean
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-08-31 15:24:06 -07:00
jimw@mysql.com
37bf8394ab
Add test for madvise() being declared in C++ code, because it is not
...
on Solaris even though it is available, and declare it ourselves in
that case. (Bug #7156 )
2005-08-31 10:08:55 -07:00
jimw@mysql.com
0dc444ec4e
Fix incorrect spellings of "dropped" in source and tests. (Bug #12828 )
2005-08-30 12:24:37 -07:00
SergeyV@selena.
3fdd500288
Fixes bug #11815 . Convert file path to UNIX format to build correct query
...
string while replicating LOAD DATA INFILE statement.
2005-08-30 22:19:15 +04:00
SergeyV@selena.
e82e15b051
Fixes bug #5588 . vio_was_interrupted() function was added to detect
...
read timeout properly on win32.
2005-08-30 19:19:28 +04:00
kent@mysql.com
64c2d24978
libmysqld.vcproj:
...
Changed spelling "Commerical" to "Commercial"
mysqld.vcproj:
Aligned engines with Unix version
sql_class.cc:
VC7 needs my_free() cast of first arg to be (gptr)
my_global.h:
Can't assume macro set_timespec_nsec exists if set_timespec does
2005-08-25 23:24:43 +02:00
jani@a193-229-222-105.elisa-laajakaista.fi
fe977b0cd0
Several fixes for Netware.
2005-08-24 22:03:34 +03:00
monty@mishka.local
49413542bd
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mishka.local:/home/my/mysql-5.0
2005-08-22 16:06:00 +03:00
monty@mishka.local
d62295e44e
Cleanup during review of new pushed code
2005-08-22 01:13:37 +03:00
elliot@mysql.com
55b81af671
Merge mysql.com:/home/emurphy/src/bk-clean/mysql-4.1
...
into mysql.com:/home/emurphy/src/work/mysql-5.0
2005-08-19 15:29:30 -04:00
elliot@mysql.com
d9efe655ed
Bug#11338 Fixes from review (identical functionality).
2005-08-19 14:49:34 -04:00
jani@a193-229-222-105.elisa-laajakaista.fi
c6ee26ab45
Some minor fixes for Netware. These were required after we started building
...
against a later version of libc.
2005-08-18 21:26:25 +03:00
jani@a193-229-222-105.elisa-laajakaista.fi
3bfa514655
Changes for Netware. This is needed when building against newer Libc
...
than we've used before.
2005-08-18 21:22:35 +03:00
jimw@mysql.com
a3ae4e0fc7
Fix up definition of new set_timespec_nsec() macro. (Related to bug #12582 )
2005-08-17 18:08:30 -07:00
elliot@mysql.com
1664e31f12
Merge mysql.com:/Users/emurphy/src/bk-clean/mysql-4.1
...
into mysql.com:/Users/emurphy/src/work/mysql-4.1-bug11338
2005-08-17 04:32:29 -04:00
elliot@mysql.com
197782605f
BUG#11338 (logging of prepared statement w/ blob type)
...
In cp932, '\' character can be the second byte in a
multi-byte character stream. This makes it difficult to use
mysql_escape_string. Added flag to indicate which languages allow
'\' as second byte of multibyte sequence so that when putting a prepared
statement into the binlog we can decide at runtime whether hex encoding
is really needed.
2005-08-17 04:26:32 -04:00
jimw@mysql.com
054e78943e
Fix SLEEP() to be interruptable. (Bug #12582 )
2005-08-16 16:31:16 -07:00
jimw@mysql.com
a3eaf4eec2
Merge mysql.com:/home/jimw/my/mysql-4.1-clean
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-08-15 12:37:45 -07:00