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

19129 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
gluh@gluh.mysql.r18.ru
c965dc34cd Fix for bug #7981: SHOW GLOBAL STATUS crashes server 2005-01-18 17:37:45 +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
serg@serg.mylan
bc78c1f296 Merge bk-internal:/home/bk/mysql-5.0 
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
 2005-01-18 15:17:01 +01: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
sergefp@mysql.com
5d9b87ea9a Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/psergey/mysql-5.0-fix-vg1
 2005-01-18 16:48:50 +03:00
guilhem@mysql.com
40f9d58bd3 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/mysql_src/mysql-5.0-clean
 2005-01-18 14:46:27 +01:00
sergefp@mysql.com
d89166cd34 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/psergey/mysql-5.0-fix-vg1
 2005-01-18 16:46:26 +03:00
guilhem@mysql.com
78b7ec0258 slave.cc: 
5.0 has a different way of knowing if master is < 3.23.57
 2005-01-18 14:46:26 +01:00
konstantin@mysql.com
fcbc69e77d Merge mysql.com:/home/kostja/work/mysql-4.1-root 
into mysql.com:/home/kostja/work/mysql-5.0-root
 2005-01-18 16:46:26 +03:00
guilhem@mysql.com
4aebc4b3fc Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/mysql_src/mysql-5.0-clean
 2005-01-18 14:46:25 +01:00
tomas@poseidon.ndb.mysql.com
57c28426ba compile error fix 2005-01-18 14:46:24 +01: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
sergefp@mysql.com
1eab462cca Post-review fixes for the previous cset. No code behavior changes. 2005-01-18 16:16:55 +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
tomas@poseidon.ndb.mysql.com
9fb87a77b1 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
 2005-01-18 13:55:39 +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
e4d1e0e916 Merge mysql.com:/space/my/mysql-4.1 into mysql.com:/space/my/mysql-5.0 2005-01-18 12:09:27 +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
serg@serg.mylan
e029511720 Merge bk-internal:/home/bk/mysql-5.0 
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
 2005-01-18 11:26:38 +01:00
guilhem@mysql.com
5fbdd9bdcd Merge mysql.com:/home/mysql_src/mysql-4.1-clean 
into mysql.com:/home/mysql_src/mysql-5.0-clean
 2005-01-18 11:06:37 +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
joreland@mysql.com
84296d55f0 ndb - use reentrant functions in HugoCalulator 2005-01-18 08:08:36 +01:00
bar@mysql.com
b2dbddc39d Merge mysql.com:/usr/home/bar/mysql-4.1 
into mysql.com:/usr/home/bar/mysql-5.0
 2005-01-18 10:45:09 +04: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
9ad75d8c75 After merge fixes 2005-01-18 05:07:22 +02:00
monty@mysql.com
502ba93b38 Merge with global tree 2005-01-18 04:03:26 +02: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
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
joerg@mysql.com
88b1fbaf2f Allow "classic" builds (= without InnoDB) by eliminating an "unresolved reference" (bug#7961). 2005-01-17 18:08:07 +01: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