Commit graph

15386 commits

Author SHA1 Message Date
konstantin@mysql.com
69a803c0ac Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/media/sda1/mysql/mysql-4.1-6059
2004-10-21 20:00:54 +04:00
joerg@mysql.com
a7d054d18f Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/M41/mysql-4.1
2004-10-21 17:57:48 +02:00
konstantin@mysql.com
9d73472840 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/media/sda1/mysql/mysql-4.1-6059
2004-10-21 19:57:23 +04:00
joerg@mysql.com
a77d91e82e Merge mysql.com:/M41/mysql-4.1 into mysql.com:/M41/push-4.1 2004-10-21 17:47:05 +02:00
ram@gw.mysql.r18.ru
136652522e A fix (bug #6138: MOD operator should not round non-integral argument). 2004-10-21 19:52:55 +05:00
konstantin@mysql.com
a55e6dda22 Manual merge. 2004-10-21 18:44:40 +04:00
konstantin@mysql.com
49a58fc64e A fix and test case for bug#6059 "mysql_stmt_field_count returns
positive numbers when no resultset is available": when sending
result set metadata we need to use virtual select_result::send_fields, 
and not address protocol directly, because select_result descendents may 
intercept result set (it's the case for example for SELECT INTO OUTFILE).
2004-10-21 18:33:53 +04:00
bar@mysql.com
701b646374 ctype-uca.c:
Optimization: move "space padding" code outside the loop
2004-10-21 19:17:04 +05:00
jani@a80-186-41-201.elisa-laajakaista.fi
f3696879db Fixed Bug#6109, 'mysql' command line client segfaults on 'quit' command.
It also did not write ~/.mysql_history file. The problem was in alloc(),
which probably does not work on HP-UX-11.23 ia64 platform. Changed some
macros into functions for better maintenance and debugging.
2004-10-21 17:17:03 +03:00
tomas@poseidon.ndb.mysql.com
7f73c4bd1f one warning out, one warning in :-), forgot the argument in assert() 2004-10-21 14:17:02 +00:00
joerg@mysql.com
61ca493a8d Adapt 'ps_10nestset' to standard test style; correct a typing error in 'ps_11bugs'. 2004-10-21 16:02:12 +02:00
tomas@poseidon.ndb.mysql.com
667e27d2d2 sorry, previous comment should have been on ithanium, not IRIX 2004-10-21 13:03:59 +00:00
tomas@poseidon.ndb.mysql.com
e035de01df use memcpy instead, other code breaks mysteriously on IRIX 2004-10-21 12:57:55 +00:00
tomas@poseidon.ndb.mysql.com
d85f64a56e Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
2004-10-21 12:34:55 +00:00
tomas@poseidon.ndb.mysql.com
d4d0c0dc0b Merge poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-ndb
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
2004-10-21 11:27:21 +00:00
tomas@poseidon.ndb.mysql.com
f5bf9c6dcf Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
2004-10-21 11:24:10 +00:00
tomas@poseidon.ndb.mysql.com
e797c14fb2 changed to same signature as rest of print functions
provite declarations for signal print functions, needed on some platforms
ome platforms don't like the length calculation for SignalDataPrintFunction
    so null terminate instead
ome platforms complain about this extra level Logger::Logger::
 null terminate SignalDataPrintFunctions instead
    move declaration of print function to SignalData.hpp
  just change from "" to <> in include
 moved double declatration of i out
2004-10-21 11:12:15 +00:00
bar@mysql.com
90f81fb801 CHARSET_INFO.txt:
Typo.
2004-10-21 15:18:31 +05:00
bar@mysql.com
aec49dae4d CHARSET_INFO.txt:
New comments about ctype[].
2004-10-21 15:11:01 +05:00
bar@mysql.com
636ddd4128 ctype_uca.result:
Forgot to commit in the previous changeset
2004-10-21 14:54:17 +05:00
bar@mysql.com
e28976e0ef Bug #5679 utf8_unicode_ci LIKE--trailing % doesn't equal zero characters 2004-10-21 14:48:37 +05:00
bar@mysql.com
e9fde8f54e Allow cp932 characters to be stored in a SJIS column 2004-10-21 12:17:59 +05:00
tomas@poseidon.ndb.mysql.com
f9ac79beb8 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
2004-10-20 17:36:19 +00:00
tomas@poseidon.ndb.mysql.com
eda3eb378d Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-ndb
2004-10-20 17:31:59 +00:00
tomas@poseidon.ndb.mysql.com
8ae6219c26 fix so that ndb handler can cope with char(0), mapped to char(1) for now 2004-10-20 17:22:58 +00:00
monty@mysql.com
b686f98f50 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/my/mysql-4.1
2004-10-20 18:58:01 +03:00
tomas@poseidon.ndb.mysql.com
a1bd5432c4 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-ndb
2004-10-20 15:58:00 +00:00
tomas@poseidon.ndb.mysql.com
0e114cc7e6 fix for wrong use of shell test 2004-10-20 15:56:57 +00:00
tomas@poseidon.ndb.mysql.com
e769c9c19e Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
2004-10-20 15:36:51 +00:00
tomas@poseidon.ndb.mysql.com
fd3f9ac19c Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
2004-10-20 15:18:54 +00:00
monty@mysql.com
4e63fb9891 After merge fixes 2004-10-20 17:28:40 +03:00
tomas@poseidon.ndb.mysql.com
aa68dfdd88 removed some (Uint32)-1 casts 2004-10-20 13:54:24 +00:00
pekka@mysql.com
43fe7e61e3 Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/space/pekka/ndb/version/my41
2004-10-20 15:43:22 +02:00
pekka@mysql.com
251c54ea0b NDB dbtux scan batch max 16->992 caused perf loss 2004-10-20 15:43:21 +02:00
tomas@poseidon.ndb.mysql.com
7623137121 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
2004-10-20 13:43:17 +00:00
tomas@poseidon.ndb.mysql.com
ec96f9a1a5 compile warning fixes 2004-10-20 13:42:41 +00:00
dlenev@mysql.com
b9bf4e8ccd Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/dlenev/src/mysql-4.1-secfix
2004-10-20 17:37:46 +04:00
konstantin@mysql.com
df58c0bce7 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/media/sda1/mysql/mysql-4.1-6049
2004-10-20 17:33:14 +04:00
monty@mysql.com
e1218474b8 Merge with 4.0 2004-10-20 16:24:28 +03:00
dlenev@mysql.com
c4281153e1 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/dlenev/src/mysql-4.1-secfix
2004-10-20 17:20:32 +04:00
pekka@mysql.com
42541dad47 Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/space/pekka/ndb/version/my41
2004-10-20 15:14:51 +02:00
pekka@mysql.com
e1786b552e NdbOperationSearch.cpp:
fix C coding error found by tomas on sol9x86
2004-10-20 15:14:50 +02:00
bar@mysql.com
ed2a655a20 ctype-utf8.c:
A faster UTF8 null-terminated string implementation.
  It is used for identifier comparison, so it's quite critical.
2004-10-20 18:07:59 +05:00
monty@mysql.com
b32ffec8fd Fix test case for innodb-lock 2004-10-20 16:04:28 +03:00
dlenev@mysql.com
a10ce662b4 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/dlenev/src/mysql-4.1-secfix
2004-10-20 17:02:15 +04:00
konstantin@mysql.com
e546d901ac Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/kostja/work/mysql-4.1-6049
2004-10-20 16:45:09 +04:00
konstantin@mysql.com
0aa9195a2c A fix and test case for bug#6058 "Prepared statements return '0000-00-00'
(date) as empty  string": preserve time type (date, time, or datetime) for
zero dates, times, and datetimes.
2004-10-20 16:43:36 +04:00
monty@mysql.com
f9cd4a60e4 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/my/mysql-4.1
2004-10-20 15:14:06 +03:00
dlenev@brandersnatch.localdomain
75d816627c Fix for bug #6173 "One can circumvent missing UPDATE privilege if
he has SELECT and INSERT privileges for table with primary key"

Now we set lex->duplicates= DUP_UPDATE right in parser if INSERT has
ON DUPLICATE KEY UPDATE clause, this simplifies insert_precheck()
function (this also fixes a bug) and some other code.
2004-10-20 16:04:43 +04:00
ingo@mysql.com
0130f4669a Merge mysql.com:/home/mydev/mysql-4.1
into mysql.com:/home/mydev/mysql-4.1-bug6151
2004-10-20 13:54:55 +02:00