serg@serg.mylan
ba169f81e3
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2005-10-08 16:59:41 +02:00
serg@serg.mylan
e91712d9bb
pthread_handler_decl() changed to be ctags-friendly
...
(and contain extern "C" when necessary)
2005-10-08 16:39:55 +02:00
jani@ua141d10.elisa.omakaista.fi
770b9ef34d
Fixed a bug in argument sending to get_one_option.
...
Fixed documentation for findopt().
Cleaned code a bit.
2005-10-06 22:09:15 +03:00
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
78ba02f26e
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-push
2005-09-30 13:18:31 +02:00
jani@a193-229-222-105.elisa-laajakaista.fi
26b3ef7f44
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 13:56:32 +03:00
joerg@mysql.com
ac259199e0
Merge mysql.com:/M50/noserver-5.0 into mysql.com:/M50/mysql-5.0
2005-09-30 12:49:14 +02:00
joerg@mysql.com
c90673de8b
Change "mf_keycache.c" so that it can be compiled without thread support (bug#11680):
...
"configure --without-server" (without giving "--enable-thread-safe-client").
2005-09-30 12:44:45 +02: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
43b544a968
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 12:36:23 +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
msvensson@neptunus.(none)
fbf4a5e079
Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2005-09-28 11:34:53 +02:00
msvensson@neptunus.(none)
1105d4293d
Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1
...
into neptunus.(none):/home/msvensson/mysql/fix_mysqltest/my41-fix_mysqltest
2005-09-27 16:48:41 +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
msvensson@neptunus.(none)
00bcf8cd8e
Bug #7037 Test "mysql_protocols" fails on Solaris 8 + 9 /x86
2005-09-23 14:07:31 +02:00
msvensson@neptunus.(none)
7ba13b16bd
BUG#7037 MySQL Bugs: #7037 : Test "mysql_protocols" fails on Solaris 8 + 9 /x86
2005-09-23 09:47:41 +02: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
306aa15391
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into serg.mylan:/usr/home/serg/Abk/mysql-5.0-merged
2005-09-21 17:42:44 +02:00
serg@serg.mylan
a083ff160e
merged
2005-09-21 13:53:22 +02: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
SergeyV@selena.
988c8e92d8
Small update for lock functions used in my_cgets()
2005-09-20 20:03:51 +04:00
jani@a193-229-222-105.elisa-laajakaista.fi
1a29e7b084
Fixed a missing cast.
2005-09-20 09:17:04 +03: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
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
bar@mysql.com
833bccfe57
Many files:
...
Adding esperanto collation
2005-09-12 19:35:50 +05:00
ramil@mysql.com
9730b5369a
A fix (bug #12917 : The --defaults-extra-file option is ignored by the 5.0 client binaries).
2005-09-09 12:51:43 +05:00
jani@ua141d10.elisa.omakaista.fi
9742318991
Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0
2005-09-06 20:38:55 +03:00
jani@ua141d10.elisa.omakaista.fi
28a8f6cd23
Added possibility to use string values 'true' and 'false' case
...
insensitively with boolean options. Added a warning if given
value is invalid and skips the option handling in that case.
2005-09-06 20:19:49 +03:00
msvensson@neptunus.(none)
7c7357451e
BUG#12983
...
TRASH macro confliciting with TRASH in my_sys.h
2005-09-05 12:09:35 +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
00b17c1c17
Fix handling of filenames that start the same as reserved filenames
...
on Windows. (Bug #12325 )
2005-08-31 18:32:15 -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
kent@mysql.com
7a45cd2dad
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/Users/kent/mysql/bk/mysql-5.0
2005-08-26 18:45:16 +02:00
jani@a193-229-222-105.elisa-laajakaista.fi
7b7188cea6
Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.1
...
into a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0
2005-08-26 15:56:52 +03:00
kent@mysql.com
abfbd9f9ba
Merge mysql.com:/Users/kent/mysql/bk/mysql-5.0-release
...
into mysql.com:/Users/kent/mysql/bk/mysql-5.0
2005-08-26 14:32:38 +02:00
serg@sergbook.mysql.com
d591705e69
merged
2005-08-26 13:24:59 +04:00
joerg@mysql.com
a26bfa83de
Revert a change that breaks (at least) all "max" builds.
2005-08-25 20:01:56 +02:00
monty@mishka.local
0c5ca9be62
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mishka.local:/home/my/mysql-4.1
2005-08-25 09:39:09 +03:00
monty@mishka.local
6773d24704
Remove function that was accidently added back
2005-08-25 09:03:41 +03:00
jimw@mysql.com
6964b7491e
Merge mysql.com:/home/jimw/my/mysql-5.0-11680
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-08-24 15:54:23 -07:00
serg@sergbook.mysql.com
714b27c71c
merged
2005-08-25 00:08:02 +04:00
serg@sergbook.mysql.com
909247a95f
memroot: trash the memory in free_root()
2005-08-24 23:07:06 +04:00
jimw@mysql.com
cf5dd176c0
Fix build using --without-server. (Bug #11680 )
2005-08-23 11:25:24 -07:00
kent@mysql.com
4d2cc6e503
Merge
2005-08-23 18:06:24 +02:00
elliot@mysql.com
d9efe655ed
Bug#11338 Fixes from review (identical functionality).
2005-08-19 14:49:34 -04:00
joerg@mysql.com
ecf4068fff
No C++ style comments in C source!
2005-08-17 15:11:29 +02: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