Commit graph

16934 commits

Author SHA1 Message Date
heikki@hundin.mysql.fi
63abeebb55 Merge heikki@bk-internal.mysql.com:/home/bk/mysql-4.1
into hundin.mysql.fi:/home/heikki/mysql-4.1
2005-01-21 16:10:41 +02:00
bar@mysql.com
2f6e0864ad Bug#7943: Wrong prefix lengths reported on UTF-8 columns
SHOW KEYS FROM t1 now displays number of characters in Sub_part,
not number of bytes, to be compatible with SHOW CREATE TABLE.
2005-01-21 16:49:20 +04:00
joreland@mysql.com
e0df86cd35 bug#8051 - ndb, typo, more info on crash 2005-01-21 08:28:23 +01:00
joreland@mysql.com
6f8a1f03c0 Bug#8051 - ndb
Make sure to ship error code in system error signal
2005-01-21 07:53:02 +01:00
heikki@hundin.mysql.fi
c1e5f61be1 Merge heikki@bk-internal.mysql.com:/home/bk/mysql-4.1
into hundin.mysql.fi:/home/heikki/mysql-4.1
2005-01-20 19:01:44 +02:00
kent@mysql.com
7885d70b88 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/Users/kent/mysql/bk/mysql-4.1-perl
2005-01-20 14:16:29 +01:00
kent@mysql.com
f4cdb433c6 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/Users/kent/mysql/bk/mysql-4.1-perl
2005-01-20 12:40:42 +01:00
bar@mysql.com
ca48cfbfcc item_cmpfunc.cc:
Bug#7834 Illegal mix of collations in IN operator
  IN was the first function supporting 
  character set convertion.
  agg_arg_charsets() was written afterwards,
  which is more flexible.
  Now IN just reuses this function.
2005-01-20 15:38:56 +04:00
joreland@mysql.com
187dce645b Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/jonas/src/mysql-4.1
2005-01-20 12:27:33 +01:00
joreland@mysql.com
e49de25171 bug#8010 - ndb
release connections when last op was simple read
2005-01-20 12:19:48 +01:00
lenz@mysql.com
4b0a82487f Merge mysql.com:/space/my/mysql-4.0 into mysql.com:/space/my/mysql-4.1 2005-01-20 12:09:17 +01:00
lenz@mysql.com
3215550735 - Improved Do-rpm to perform RPM builds inside of a chrooted build
environment (using "build" on SUSE Linux)
2005-01-20 12:07:44 +01:00
lenz@mysql.com
98e7e2b439 Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/space/my/mysql-4.1
2005-01-20 10:47:42 +01:00
joreland@mysql.com
8f0cdf54ee Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/jonas/src/mysql-4.1
2005-01-20 10:12:26 +01:00
bar@mysql.com
07be090e6e errmsg.txt:
Minor fix after character set conversion.
2005-01-20 13:08:16 +04:00
joreland@mysql.com
670de075ff Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/jonas/src/mysql-4.1
2005-01-20 09:53:29 +01:00
bar@mysql.com
d45e954801 configure.in:
Add SJIS version of Japanese error messages.
  Windows version should include this new file,
  instead of the EUC-JP version.
2005-01-20 12:39:46 +04:00
bar@mysql.com
1650728655 errmsg.txt:
new file
2005-01-20 12:37:02 +04:00
sergefp@mysql.com
b1c3e43060 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/dbdata/psergey/mysql-4.1-bug7885
2005-01-19 23:02:28 +03:00
jimw@mysql.com
027d1ff19e Merge mysql.com:/home/jimw/my/mysql-4.1-build
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-01-19 10:26:03 -08:00
jimw@mysql.com
effec1490f Fix all BUILD/*max* scripts to use -DBIG_TABLES, like our real Max builds do.
(Simpler fix than last commit -- no need to mess with base_cxxflags.)
2005-01-19 10:24:51 -08:00
joreland@mysql.com
67b044cc47 ndb - make sure scan recevier pointers are aligned 2005-01-19 18:32:34 +01:00
lenz@mysql.com
1cc2c832d4 Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/space/my/mysql-4.1
2005-01-19 14:07:00 +01:00
joreland@mysql.com
51a443a1c3 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/jonas/src/mysql-4.1
2005-01-19 10:07:13 +01:00
tomas@poseidon.ndb.mysql.com
594ee4c018 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
2005-01-19 10:07:12 +01:00
tomas@poseidon.ndb.mysql.com
2776424102 added possibility to add extra opts to ndbd and ndb_mgmd in mysql-test-run 2005-01-19 10:00:41 +01:00
joreland@mysql.com
9fa613b676 bug#7777 - ndb compile on qnx
remove usage of compiler supplied <new> and instead
  impl. own inlined placement new
2005-01-19 09:15:34 +01:00
joreland@mysql.com
b0b8f9115a bug#7693 - ndb
when using shm transporter, set sigmask on each thread using pthread_sigmask
2005-01-19 07:23:20 +01:00
jimw@mysql.com
06f60f6d65 Merge bk-internal:/home/bk/mysql-4.1
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-01-18 13:34:22 -08:00
Sinisa@sinisa.nasamreza.org
08639a88b2 Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.1
into sinisa.nasamreza.org:/mnt/work/mysql-4.1
2005-01-18 23:29:47 +02:00
Sinisa@sinisa.nasamreza.org
477047401c fixing wrong value for "examined rows" when UNION's are used. 2005-01-18 23:13:29 +02:00
jimw@mysql.com
1ffa2a3dc4 Update type_float test results after merge. 2005-01-18 13:12:40 -08:00
jimw@mysql.com
59ffad87cc Merge mysql.com:/home/jimw/my/mysql-4.1-6913
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-01-18 12:27:00 -08:00
jimw@mysql.com
2fac8bd044 Merge changed tests 2005-01-18 12:25:56 -08:00
jimw@mysql.com
bc35532bcc Merge mysql.com:/home/jimw/my/mysql-4.0-7700
into mysql.com:/home/jimw/my/mysql-4.0-clean
2005-01-18 11:39:10 -08:00
dlenev@mysql.com
028ece5735 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/dlenev/src/mysql-4.1-merges
2005-01-18 21:49:33 +03:00
lenz@mysql.com
2fbe625ee8 - small improvement for the logrotate config file (patch found in the SUSE
source RPM): use "mysqladmin ping" instead of grepping the process list 
  for the mysqld binary (should be more portable than relying on the "ps"
  options
2005-01-18 17:35:32 +01:00
dlenev@brandersnatch.localdomain
0787a97b1c Added test for bug #7884 "Able to add invalid unique index on TIMESTAMP
prefix", which roots were fixed in 4.0 tree.
2005-01-18 17:45:49 +03:00
sergefp@mysql.com
b1d55200b1 Fix for BUG#7885 2005-01-18 17:26:05 +03:00
konstantin@mysql.com
0e56df7572 Cleanups in Makefile.ams 2005-01-18 17:26:04 +03:00
dlenev@mysql.com
3d4eb575a2 Manual merge of fix for bug #7884 "Able to add invalid unique index on
TIMESTAMP prefix" into 4.1 tree.
2005-01-18 17:23:46 +03:00
dlenev@mysql.com
9e8d33ca35 Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/dlenev/src/mysql-4.0-bg7884
2005-01-18 17:05:09 +03:00
dlenev@mysql.com
b894c47d1d Clean up in implementation of f_is_geom()/f_is_bitfield()/f_is_enum()
macros.

It does not fixes any bugs in 4.0. But it prevents from future error in
any bugfixes that may use these macros. Also after merging into 4.1 tree
this cleanup will fix bug #7884 "Able to add invalid unique index on
TIMESTAMP prefix".
2005-01-18 17:04:16 +03:00
bar@mysql.com
8cfe729678 1. Item now uses my_charset_bin by default,
not default_charset_into. It fixes the
problem that in some cases numbers where
treated as CHAR(N), not as BINARY(N), e.g.
wrong 'charsetnr' when sent to the client side.
2. IFNULL didn't aggregate argument charsets
and collations, so IFNULL(1,'a') produced
a CHAR(N). Now produces a BINARY(N).
3. SELECT PROCEDURE ANALIZE now returns
BINARY columns, which is much better than it worked
previously: CHAR with the default character set.
But in the future it's worth to fix the fields
'Field_name' and 'Optimal_fieldtype' to use UTF8,
and 'Min_value' and 'Max_value' to inherit their charsets
from the original items. But it is not important,
and BINARY(N) is OK for now.
4. Tests were fixed accordingly. No new tests were
made, as the old onces cover everything.
2005-01-18 17:41:06 +04:00
konstantin@mysql.com
9fa2bb096c Fix 'make distclean' goal. 2005-01-18 16:23:10 +03:00
guilhem@mysql.com
b08170f18c Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/mysql_src/mysql-4.1-clean
2005-01-18 14:07:47 +01:00
lenz@mysql.com
a074e676bf Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/space/my/mysql-4.0
2005-01-18 12:10:11 +01:00
lenz@mysql.com
69bfcfe33a Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/space/my/mysql-4.1
2005-01-18 11:41:51 +01:00
guilhem@mysql.com
9569b0226f Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/mysql_src/mysql-4.1-clean
2005-01-18 10:24:25 +01:00
bar@mysql.com
8f23e90232 #7874: CONCAT() gives wrong results mixing latin1 field and utf8 string literals
We should not overwrite res if it is returned from a const item.
2005-01-18 10:42:29 +04:00