mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-31 19:11:46 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
17121 commits 2790 branches 343 tags 1.7 GiB
Commit graph

17121 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
jan@hundin.mysql.fi
814ab9cb6f Merge jlindstrom@bk-internal.mysql.com:/home/bk/mysql-4.1 
into hundin.mysql.fi:/home/jan/mysql-4.1
 2005-01-18 13:44:53 +02: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
serg@serg.mylan
b53757ba91 Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
 2005-01-18 11:45:41 +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
serg@serg.mylan
b4624288a7 myisam/ft_boolean_search.c 
-trunc* bug - don't increase yweaks in this case
 2005-01-18 11:27:38 +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
monty@mysql.com
edffca827e Merge mysql.com:/home/my/mysql-4.0 into mysql.com:/home/my/mysql-4.1 2005-01-18 03:52:15 +02:00
monty@mysql.com
e5b788146a Fixed new bug that caused symlink test to fail 2005-01-18 03:49:39 +02:00
jimw@mysql.com
a35c324358 Fix over-optimization that could result in an unsigned double field being 
set to a negative value. (Bug #7700)
 2005-01-17 16:13:56 -08:00
monty@mysql.com
5ba79d72a7 Anoter fix for moved IO_CACHE object 2005-01-18 02:04:41 +02:00
bell@sanja.is.com.ua
0594d6af8b Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 
into sanja.is.com.ua:/home/bell/mysql/bk/work-4.1
 2005-01-18 01:15:02 +02:00
bell@sanja.is.com.ua
fd3d976f64 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 
into sanja.is.com.ua:/home/bell/mysql/bk/work-valgrind-4.1
 2005-01-18 01:11:02 +02:00
serg@serg.mylan
83ef8c58a7 make the code to look safe, not only be safe 2005-01-17 22:35:53 +01:00
guilhem@mysql.com
5e43cf86a6 Fix for BUG#7965 "Slave_IO_State Stuck at 'Checking Master Version'": 
Working around hang of master < 3.23.50 on SELECT @@unknown_var
(to enable 3.23.49->4.1.10 replication)
 2005-01-17 21:26:14 +01:00
jimw@mysql.com
dbe43d34a6 Print a warning when an old table (with no character set stored) is opened 
and the default character set is multi-byte, which will result in character
column size changes. (Bug #6913)
 2005-01-17 12:22:23 -08:00
reggie@bob.(none)
da9f7c7ec4 Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-4.1 
into bob.(none):/home/reggie/bk/mysql-4.1
 2005-01-17 14:08:36 -06:00
reggie@bob.(none)
e1dc421a04 Bug #7966 query cache doesn't work properly with batch statements 
sql_lex.cc:
  Set query to not cacheable if we are using multistatements and there are multiple statements in this query
 2005-01-17 13:40:36 -06:00
lenz@mysql.com
b9f3f4a221 Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/space/my/mysql-4.1
 2005-01-17 20:33:33 +01:00
paul@kite-hub.kitebird.com
63689a210d Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1 
into kite-hub.kitebird.com:/src/extern/MySQL/bk/mysql-4.1
 2005-01-17 12:38:17 -06:00
lenz@mysql.com
c84180d2c2 Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/space/my/mysql-4.1
 2005-01-17 19:09:33 +01:00
lenz@mysql.com
b1cb5ea4dc Merge mysql.com:/space/my/mysql-4.0 
into mysql.com:/space/my/mysql-4.1-build
 2005-01-17 18:53:10 +01:00
bell@sanja.is.com.ua
dcfdf011c6 backported from 5.0 patch initialization of main select for commands where subqueries are possible 2005-01-17 19:52:07 +02:00
paul@kite-hub.kitebird.com
43f98d24ee Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1 
into kite-hub.kitebird.com:/src/extern/MySQL/bk/mysql-4.1
 2005-01-17 10:47:43 -06:00
lenz@mysql.com
09a71351e0 - Enabled the handling of architecture extensions e.g. "-64bit" when building 
Mac OS X PKGs with Do-pkg
 2005-01-17 17:22:17 +01:00
kaa@polly.local
c46f527454 Fixed memory leak in handle_local_infile() 2005-01-17 19:21:01 +03:00
timour@mysql.com
50e0474394 Merge mysql.com:/home/timka/mysql/src/4.1-virgin 
into mysql.com:/home/timka/mysql/src/4.1-bug-7331
 2005-01-17 15:46:44 +02:00
heikki@hundin.mysql.fi
a5186d0595 Merge heikki@bk-internal.mysql.com:/home/bk/mysql-4.1 
into hundin.mysql.fi:/home/heikki/mysql-4.1
 2005-01-17 14:07:16 +02:00
tomas@poseidon.ndb.mysql.com
9dbe52bdcf Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
 2005-01-17 12:53:50 +01:00
tomas@poseidon.ndb.mysql.com
beffd06278 Bug#7937 2005-01-17 12:29:43 +01:00
bell@sanja.is.com.ua
bd15d10a07 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 
into sanja.is.com.ua:/home/bell/mysql/bk/work-4.1
 2005-01-17 13:23:39 +02:00
timour@mysql.com
06fce173c0 Merge mysql.com:/home/timka/mysql/src/4.1-virgin 
into mysql.com:/home/timka/mysql/src/4.1-bug-7331
 2005-01-17 12:41:59 +02:00