mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-19 13:32:33 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
17578 commits 2784 branches 343 tags 1.6 GiB
Commit graph

3927 commits

Author SHA1 Message Date
guilhem@mysql.com
980d1b658e Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/mysql_src/mysql-4.1-clean
 2005-01-14 10:59:37 +01:00
dlenev@mysql.com
8be6787640 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/dlenev/src/mysql-4.1-dtbug
 2005-01-14 10:09:01 +03:00
monty@mysql.com
2204baa5a3 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/my/mysql-4.1
 2005-01-14 00:10:03 +02:00
monty@mysql.com
7c457a1bd7 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/my/mysql-4.1
 2005-01-13 20:09:41 +02:00
jimw@mysql.com
7e1f47022c Merge jwinstead2@wwwtst1.mysql.com:mysql-4.1-7235 
into mysql.com:/home/jimw/my/mysql-4.1-clean
 2005-01-13 09:24:07 -08:00
jimw@mysql.com
d63dc891c1 Add test cases to verify that SHOW CREATE TABLE always outputs the 
key algorithm for keys where they were explicitly specified.
 2005-01-13 18:22:35 +01:00
jimw@mysql.com
7639e5afaf Merge jwinstead2@wwwtst1.mysql.com:mysql-4.1-7774 
into mysql.com:/home/jimw/my/mysql-4.1-clean
 2005-01-13 09:07:21 -08:00
guilhem@mysql.com
a02601ecc5 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/mysql_src/mysql-4.1-clean
 2005-01-13 15:35:36 +01:00
bar@mysql.com
e3d6e6736b bug#7284: strnxfrm returns different results for equal strings 2005-01-13 18:12:04 +04:00
jani@ua141d10.elisa.omakaista.fi
9cea2457ec Fixed a problem with a test. Time could be 0 or 1 seconds, depending 
on whether running with or without valgrind.
 2005-01-13 15:04:57 +02:00
dlenev@mysql.com
52baee6346 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/dlenev/src/mysql-4.1-dtbug
 2005-01-13 14:46:41 +03:00
jimw@mysql.com
51781b0bfc Fix conversion of floating point values to character fields when the 
absolute value of the float is less than 1, and also fix calculation of
length for negative values. (Bug #7774)
 2005-01-13 00:41:45 +01:00
guilhem@mysql.com
44ce4b43ef Fix for BUG#7793 "mysqlbinlog produces incorrect queries": 
when printing SET @var in mysqlbinlog, backtick the collation (as BINARY is a reserved word)
 2005-01-12 19:42:46 +01:00
dlenev@brandersnatch.localdomain
23c9e0a75a Fix for bug #7586 "TIMEDIFF for sec+microsec not working properly". 2005-01-12 12:18:36 +03:00
jani@ua141d10.elisa.omakaista.fi
fd79354273 Fixed Bug#2813, "analyse does not quot string values in enams from string". 2005-01-11 19:40:33 +02:00
monty@mysql.com
f4274fe9be Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/my/mysql-4.1
 2005-01-11 19:35:00 +02:00
bar@mysql.com
2bd854c859 Bug #7730 Server crash using soundex on an utf8 table 
Don't use my_tolower: it works only for 8bit charsets.
 2005-01-11 19:58:53 +04:00
joreland@mysql.com
6c69e3d2b3 bug#7798 - ndb - range scan with invalid table version could cause node failure 2005-01-11 13:30:11 +01:00
dlenev@brandersnatch.localdomain
2f32115092 Fix for bug #7418 "TIMESTAMP not always converted to DATETIME in MAXDB 
mode".

Changed grammar rule for "type" token. Now we have one branch with 
optional length specification for TIMESTAMP type instead of two separate
branches.
 2005-01-11 14:26:40 +03:00
guilhem@mysql.com
b9926d71c0 A test for the BUG#7658 just fixed in 4.0 (could not put it into 4.0 as in 4.0 we don't replicate OPTIMIZE TABLE). 2005-01-10 15:13:33 +01:00
monty@mysql.com
56fb6f31ba Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/my/mysql-4.1
 2005-01-10 15:28:17 +02:00
pekka@mysql.com
50c3a883b2 ndb - wl-1442 fix Time ordering 2005-01-08 19:28:44 +01:00
pekka@mysql.com
0462ccfe3c ndb - wl-1442 fix Date ordering 2005-01-08 16:57:51 +01:00
pekka@mysql.com
7ef7580bb7 ndb - wl-1442 updated ndb_index_ordered.result 2005-01-08 15:18:24 +01:00
jimw@mysql.com
f28a18c2d5 Show the index type even for indexes using the default index type in 
tables that support multiple index types. (Bug #7235)
 2005-01-08 06:15:41 +01:00
jimw@mysql.com
c2eb3bf9f6 Correctly truncate integers inserted into field and double columns 
with a number of decimals specified. (Bug #7361)
 2005-01-07 17:44:18 +01:00
timour@mysql.com
a8f8433c9d Fix for BUG#7331. 
The problem was that when a QUICK_SELECT access method is chosen,
test_if_skip_sort_order() discovered that the index being used
by the quick select will not deliver tuples in sorted order.
In this case test_if_skip_sort_order() tried to change the index
used by the quick select, but it didn't properly set the other
members of the quick select, and especially the range flags of
the ranges in QUICK_SELECT::ranges.

The fix re-invokes the function SQL_SELECT::test_quick_select
to correctly create a valid QUICK_SELECT object.
 2005-01-06 10:49:26 +02:00
monty@mysql.com
d35d4eab91 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/my/mysql-4.1
 2005-01-03 21:14:20 +02:00
serg@sergbook.mysql.com
203cc19e48 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into sergbook.mysql.com:/usr/home/serg/Abk/mysql-4.1
 2004-12-31 18:00:49 +01:00
serg@sergbook.mysql.com
b8cbe63bfe Merge bk-internal.mysql.com:/home/bk/mysql-4.0 
into sergbook.mysql.com:/usr/home/serg/Abk/mysql-4.0
 2004-12-31 12:55:42 +01:00
serg@sergbook.mysql.com
45ce994e5d post-merge 2004-12-31 11:52:14 +01:00
monty@mysql.com
78da7196ad Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/my/mysql-4.1
 2004-12-31 12:05:43 +02:00
monty@mysql.com
1bd22faa05 Remove DUP_IGNORE from enum_duplicates and instead use a separate ignore flag 
This allows use to use INSERT IGNORE ... ON DUPLICATE ...
 2004-12-31 12:04:35 +02:00
dlenev@brandersnatch.localdomain
cd98fcf4e9 Merged fixes for bug #7297 "Two digit year should be interpreted 
correctly even with zero month and day" and bug #7515 "from_unixtime(0)
now returns NULL instead of the Epoch" into 4.1 tree.
 2004-12-30 23:44:42 +03:00
serg@sergbook.mysql.com
c7e756f959 merged 2004-12-30 21:11:40 +01:00
serg@sergbook.mysql.com
12bf7dcd04 unsufficient privilege checks in GRANT, when a grantor has column-level privileges 2004-12-30 21:01:11 +01:00
dlenev@mysql.com
4ef7ac5c09 Manual merge of fix for bugs of #7297 and #7515 into 4.1 tree. 2004-12-30 21:37:32 +03:00
dlenev@mysql.com
2600fb3bdf Merge bk-internal.mysql.com:/home/bk/mysql-4.0 
into mysql.com:/home/dlenev/src/mysql-4.0-bg7297
 2004-12-30 21:18:45 +03:00
dlenev@mysql.com
2878395ab1 Fix for bug #7515 "from_unixtime(0) now returns NULL instead of 
the Epoch". (With after review fixes).
 2004-12-30 21:18:10 +03:00
dlenev@mysql.com
e0280694cd Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/dlenev/src/mysql-4.1-dtbug
 2004-12-30 20:41:29 +03:00
sergefp@mysql.com
27e0f12ff1 Fix func_concat.result: allow -0.00 to be converted to string both with and without leading minus 2004-12-30 14:56:31 +03:00
dlenev@brandersnatch.localdomain
d70bd3f8fb Fix for bug #6914 "Problems using time()/date() output in expressions". 
When we cast datetime value to DATE (TIME) type we should throw away its
time (date) part. This was not done properly if CAST() function was used
in datetime expressions.
 2004-12-30 13:39:01 +03:00
timour@mysql.com
1613bf2731 Merge mysql.com:/home/timka/mysql/src/4.1-virgin 
into mysql.com:/home/timka/mysql/src/4.1-dbg
 2004-12-28 13:22:39 +02:00
timour@mysql.com
064c73490b Fix for BUG#7455. 
The fix checks if the trim string argument is NULL. If so, the standard
mandates that the function result must be also NULL.
 2004-12-28 11:57:56 +02:00
lars@mysql.com
967fac4ef6 WL#2319 V2: Exclude tables from dump 
- Added a hash to keep track of database-table pairs.
- Specified database-table tables do not get dumped
 2004-12-27 19:10:30 +01:00
timour@mysql.com
fbc96c79a1 Merge mysql.com:/home/timka/mysql/src/4.1-virgin 
into mysql.com:/home/timka/mysql/src/4.1-dbg
 2004-12-27 14:06:28 +02:00
timour@mysql.com
5eab756a63 Fix for BUG#7377. This fix adds the same implementation for ha_myisammgr::index_type as in version 5.0. 2004-12-27 14:05:35 +02:00
igor@rurik.mysql.com
8f602f2af8 Merge rurik.mysql.com:/home/igor/mysql-4.1 
into rurik.mysql.com:/home/igor/dev/mysql-4.1-0
 2004-12-26 02:08:23 -08:00
igor@rurik.mysql.com
04974868a1 subselect.result, subselect.test: 
Added a couple of new test cases for bug #7351.
 2004-12-26 02:04:40 -08:00
igor@rurik.mysql.com
d3fa245363 subselect.result, subselect.test: 
Added test cases for bug #7351.
item_cmpfunc.cc:
  Fixed bug #7351: incorrect result for a query with a
  subquery returning empty set.
  If in the predicate v IN (SELECT a FROM t WHERE cond)
  v is null, then the result of the predicate is either
  INKNOWN or FALSE. It is FALSE if the subquery returns
  an empty set.
item_subselect.cc:
  Fixed bug #7351: incorrect result for a query with a
  subquery returning empty set.
  The problem was due to not a quite legal transformation
  for 'IN' subqueries. A subquery containing a predicate
  of the form
  v IN (SELECT a FROM t WHERE cond)
  was transformed into
  EXISTS(SELECT a FROM t WHERE cond AND (a=v OR a IS NULL)).
  Yet, this transformation is valid only if v is not null.
  If v is null, then, in the case when
  (SELECT a FROM t WHERE cond) returns an empty set the value
  of the predicate is FALSE, otherwise the result of the
  predicate is INKNOWN.
  The fix resolves this problem by changing the result
  of the transformation to
  EXISTS(SELECT a FROM t WHERE cond AND (v IS NULL OR (a=v OR a IS NULL)))
  in the case when v is nullable.
  The new transformation prevents applying the lookup
  optimization for IN subqueries. To make it still
  applicable we have to introduce guarded access methods.
 2004-12-25 19:17:57 -08:00
Sinisa@sinisa.nasamreza.org
ca74ce3398 additional 4.0 -> 4.1 merge !! 2004-12-25 00:07:22 +02:00
Sinisa@sinisa.nasamreza.org
f385e79ad4 4.0 -> 4.1 merge 2004-12-24 23:07:10 +02:00
dlenev@mysql.com
71da86aa11 Manual merge of changes making GRANTs, which change SSL attributes and/or 
user limits to behave well on 5.0 tables, into 4.1 tree.
 2004-12-23 22:16:43 +03:00
Sinisa@sinisa.nasamreza.org
d110146252 Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.0 
into sinisa.nasamreza.org:/mnt/work/mysql-4.0
 2004-12-23 21:11:31 +02:00
Sinisa@sinisa.nasamreza.org
3c5a325897 Fix for a bug #7495 2004-12-23 21:08:54 +02:00
dlenev@mysql.com
caade862ae Make GRANTs, which change SSL attributes and/or user limits, 
to behave well on 5.0 tables (well now you can't use tables from 4.1
and 5.0 with 4.0 because former use utf8, but still it is nice to have
similar code in acl_init() and replace_user_table()).
This also will make such GRANTs working in 5.0 (they are broken now).
 2004-12-23 21:59:36 +03:00
serg@serg.mylan
7960b09bca incorrect result fixed 2004-12-23 17:32:29 +01:00
Sinisa@sinisa.nasamreza.org
e409ebf143 A fix for the bug #7495 2004-12-22 21:31:17 +02:00
dlenev@mysql.com
beb2c1d909 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/dlenev/src/mysql-4.1-smfix
 2004-12-22 19:00:03 +03:00
dlenev@brandersnatch.localdomain
7b9fd879f6 Fix for bug #7458 "Microseconds are gobbled from the string result of 
STR_TO_DATE() function if there is another format specifier after %f 
in format string". Also small cleanup of STR_TO_DATE() implementation.
(After review version.)
 2004-12-22 18:58:25 +03:00
pekka@mysql.com
60b79f2b7e Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/space/pekka/ndb/version/my41
 2004-12-22 13:38:16 +01:00
pekka@mysql.com
f57153fe81 ndb: bug#7340 fix 2004-12-22 13:38:15 +01:00
bar@mysql.com
e53b446a73 Bug#7020: mysqldump --compatible=mysql40 still dumps in UTF8 
See mysqldump.test comments for more details
 2004-12-22 16:02:27 +04:00
bar@mysql.com
57ec14d939 Bug#7302: UCS2 data in ENUM field get truncated when new column is added 2004-12-21 17:12:27 +04:00
ram@gw.mysql.r18.ru
19f3570ba8 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into gw.mysql.r18.ru:/usr/home/ram/work/4.1.b7281
 2004-12-21 11:43:25 +04:00
ram@gw.mysql.r18.ru
dfbdbfd006 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into gw.mysql.r18.ru:/usr/home/ram/work/4.1.b7281
 2004-12-21 10:51:11 +04:00
hf@deer.(none)
98f2a83539 Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1 
into deer.(none):/home/hf/work/mysql-4.1.clean
 2004-12-21 10:31:09 +04:00
hf@deer.(none)
e91a4ce0be Merge bk@192.168.21.1:/usr/home/bk/mysql-4.1 
into deer.(none):/home/hf/work/mysql-4.1.clean
 2004-12-21 10:26:01 +04:00
hf@deer.(none)
e5125d3e88 Fix to perform correctly with charsets in embedded server 2004-12-21 10:05:58 +04:00
sergefp@mysql.com
1e102d1aaf Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/dbdata/psergey/mysql-4.1-order-bug
 2004-12-21 03:02:38 +03:00
sergefp@mysql.com
0700f27ca1 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/dbdata/psergey/mysql-4.1-bug6825
 2004-12-21 02:32:30 +03:00
ram@gw.mysql.r18.ru
da562b7e02 A fix (bug #7281: RAND(RAND) crashes server). 2004-12-20 13:47:38 +04:00
guilhem@mysql.com
031474cf17 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/mysql_src/mysql-4.1-clean
 2004-12-18 18:31:49 +01:00
antony@ltantony.rdg.cyberkinetica.homeunix.net
498c2bc46a Fix test results 2004-12-18 15:15:41 +00:00
antony@ltantony.rdg.cyberkinetica.homeunix.net
1be319a708 Merge Bug#7391 from 4.0 2004-12-18 15:12:10 +00:00
antony@ltantony.rdg.cyberkinetica.homeunix.net
a524018ab3 Fix test 2004-12-18 11:57:17 +00:00
antony@ltantony.rdg.cyberkinetica.homeunix.net
3047649845 Bug#7391 - Multi-table UPDATE security regression 
Add in missing privilege checks. 
  Tests for the privileges.
 2004-12-18 02:07:32 +00:00
guilhem@mysql.com
884663662b Fix for BUG#7358: removing warning reporting of mysqldump 4.1.8 when calling SHOW CREATE DATABASE, as we deal almost gracefully with it 
(back to behaviour of 4.1.7). Warning was not fatal: mysqldump continued. And the good thing is that it helped spot that starting from 4.1.7,
SHOW CREATE DATABASE failed (if --single-transaction and first db has non-empty InnoDB table and there is a second db) and thus mysqldump
produced CREATE DATABASE statements missing the CHARACTER SET clause. Removing the bug which was in the server, and the warning reporting in
mysqldump (compatibility with old servers).
 2004-12-17 23:37:43 +01:00
mleich@mysql.com
c5eb9f1e4c Delete files which were accidently created within the last push 2004-12-17 17:03:15 +01:00
matthias@three.local.lan
006a512f8f Merge mleich@bk-internal.mysql.com:/home/bk/mysql-4.1 
into three.local.lan:/home/matthias/Arbeit/mysql-4.1/src
 2004-12-17 11:02:44 +01:00
sergefp@mysql.com
da332aca40 Fix for BUG#6825: When calculating Item_func_neg::max_length, add 1 for '-'. 
For numeric constants we only need to add, since the parser doesn't produce 
negative numbers. 
For strings we only add (we actually could substract 1 if given string is a constant 
and it has '-number' form but we're not doing that because 
 * we set max_length bigger then necessary in other cases as well.  
 * the current solution is simpler and safer (bigger max_length is better then cutting out)
 2004-12-17 12:14:45 +03:00
guilhem@mysql.com
f057721954 A .test for BUG#6287 "Slave skips auto_increment values in Replication with InnoDB" 
which Heikki fixed in 4.1.8 and 4.0.23. I verified that without Heikki's patch the test fails (7 gets inserted).
Test added to 4.1 because in testsuite of 4.0 it's impossible to start slave with InnoDB.
 2004-12-16 23:14:41 +01:00
matthias@three.local.lan
5c4d2286d4 Merge mleich@bk-internal.mysql.com:/home/bk/mysql-4.1 
into three.local.lan:/home/matthias/Arbeit/mysql-4.1/src
 2004-12-16 20:35:16 +01:00
timour@mysql.com
410086b347 Test for BUG#6054. The bug itsel is fixed by the fix for #5837. 2004-12-16 18:46:38 +02:00
timour@mysql.com
cc6a30214c Moved drop table statement to the end. 2004-12-16 18:44:39 +02:00
timour@mysql.com
53a9af8f1d Test for BUG#6054. The bug itsel is fixed by the fix for #5837. 2004-12-16 18:04:51 +02:00
dlenev@mysql.com
aeaeb3f022 Fix for bug #7297 "Two digit year should be interpreted correctly 
even with zero month and day" aka "Date decoding trouble"

Two digit year should be interpreted correctly as year in 20th or 21st
century even with zero month and day. Only exception should be zero date
'00-00-00' or '00-00-00 00:00:00'.
 2004-12-16 16:31:50 +03:00
matthias@three.local.lan
b91567cfcb Merge mleich@bk-internal.mysql.com:/home/bk/mysql-4.1 
into three.local.lan:/home/matthias/Arbeit/mysql-4.1/src
 2004-12-16 10:22:23 +01:00
ram@gw.mysql.r18.ru
d599808fbc Clean-up. 
TYPE=MyISAM replaced with ENGINE=MyISAM.
 2004-12-14 18:47:34 +04:00
bar@mysql.com
4fa867494d bug#6275 "client_test" fail in 4.1.7 make test 
bug#6911 resultset metadata always return client character set
 2004-12-14 15:58:30 +04:00
matthias@three.local.lan
621daba7b6 Merge mleich@bk-internal.mysql.com:/home/bk/mysql-4.1 
into three.local.lan:/home/matthias/Arbeit/mysql-4.1/src
 2004-12-14 12:24:59 +01:00
sergefp@mysql.com
e06ac0e5ab Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/dbdata/psergey/mysql-4.1-merge-fix
 2004-12-14 03:37:20 +03:00
mleich@mysql.com
3b5a741aff Small bug fix 
ps-modify1 used the user variables @1, @2, @100 set within ps_query and 
           ps_modify. That architecture was wrong, because the dependence
           of ps_modify1 on ps_query and ps_modify makes the test script
           maintenance and the use of these test cases during bug fixing/
           debugging of single sub test cases very uncomfortable.
Therefore these user variables (@1, @2, @100) are also set within ps-modify1.

The result files of the test cases ps_2myisam, ps_3innodb, ps_4heap, ps_6bdb,
ps_7ndb will be affected by that change and show 3 additional lines, but
nothing else will change.
 2004-12-13 21:00:43 +01:00
jimw@mysql.com
ef77509424 Merge jwinstead@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/jwinstead2/mysql-4.1
 2004-12-13 20:24:13 +01:00
matthias@three.local.lan
9733292440 Merge mleich@bk-internal.mysql.com:/home/bk/mysql-4.1 
into three.local.lan:/home/matthias/Arbeit/mysql-4.1/src
 2004-12-13 18:53:49 +01:00
sergefp@mysql.com
03acb8155f Merged (will need a post-merge fix) 2004-12-13 20:10:07 +03:00
acurtis@pcgem.rdg.cyberkinetica.com
4864dce086 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into pcgem.rdg.cyberkinetica.com:/usr/home/acurtis/work/wl2274.2
 2004-12-13 14:19:20 +00:00
acurtis@pcgem.rdg.cyberkinetica.com
9818cadd1b WL#2274 - INSERT..SELECT..UPDATE 
UPDATE clause conflicts with SELECT for use of item_list field.
  Alter UPDATE clause to use new lex field update_list
  Tests included
 2004-12-13 12:26:28 +00:00
matthias@three.local.lan
ac11cba790 Merge mleich@bk-internal.mysql.com:/home/bk/mysql-4.1 
into three.local.lan:/home/matthias/Arbeit/mysql-4.1/src
 2004-12-13 12:24:35 +01:00
bell@sanja.is.com.ua
05c1385c50 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 
into sanja.is.com.ua:/home/bell/mysql/bk/work-ref-4.1
 2004-12-13 01:32:49 +02:00
bell@sanja.is.com.ua
f65403cd75 fixed optimized SOME subquery 2004-12-13 01:21:14 +02:00
sergefp@mysql.com
2d9fae642c Merge fix for BUG#6976 from 4.0 2004-12-11 20:13:43 +03:00
sergefp@mysql.com
0de1d4a9a9 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.0 
into mysql.com:/dbdata/psergey/mysql-4.0-bug6976
 2004-12-11 20:02:45 +03:00
sergefp@mysql.com
f78a60593a Fix for BUG#6976: 
In Item_ref::Item_ref set maybe_null (and other fields fix_fields sets) to be the 
same as in (*ref), because Item_ref::fix_fields() will not be called.  Previously 
maybe_null was 0 always and this produced a bogus state where 
maybe_null==0 && is_null() == true 
which broke evaluation for some upper-level Items, like AND and OR.
 2004-12-11 19:59:09 +03:00
bell@sanja.is.com.ua
b9abf25a55 new reference which refer to current value not to result used for resolving outer 
refernces if subqueri is not in HAVING clause (BUG#7079)
  and the same used for subquery transformetion
 2004-12-11 17:13:19 +02:00
sergefp@mysql.com
5b0e3b132c Post-merge fixes 2004-12-11 16:36:12 +03:00
sergefp@mysql.com
aee9340493 Fix for BUG#5837 merged from 4.0 2004-12-11 15:55:50 +03:00
sergefp@mysql.com
6b55909673 Fix for BUG#5837 - attempt 3. 
Call mark_as_null_row in join_read_const and join_read_system.
 2004-12-11 15:51:52 +03:00
serg@serg.mylan
d16c9e8615 getting rid of now() is tests 2004-12-11 09:39:29 +01:00
jimw@mysql.com
475d1a8934 Fix results file for insert_select test with embedded server. (Bug #7167) 2004-12-10 23:50:09 +01:00
bar@mysql.com
f1e876252d Privileges columns were removed from output to be able 
to reuse test results for both server and --embedded-server
versions.
 2004-12-10 17:58:13 +04:00
bar@mysql.com
0cfa0adda5 Bug #6819 Some ujis characters cannot be inserted into table 
Allow to insert not-assigned UJIS codes.
 2004-12-10 16:08:18 +04:00
hf@deer.(none)
192715dbbb Fix for bug #6516 (Server crash loading spatial data) 
(after discussion with SerG)
 2004-12-10 16:06:49 +04:00
Sinisa@sinisa.nasamreza.org
d7734fd8ac Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.1 
into sinisa.nasamreza.org:/mnt/work/mysql-4.1
 2004-12-10 00:19:52 +02:00
Sinisa@sinisa.nasamreza.org
6772f0a721 A fix for a crashing bug #7101, which occures when the 
expression involving LEFT() function is used in GROUP BY
field.
 2004-12-10 00:17:43 +02:00
bar@mysql.com
c735aaebfc Bugs: #7111: server crashes when regexp is used 2004-12-09 15:56:19 +04:00
dlenev@mysql.com
62a6d9749b Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/dlenev/src/mysql-4.1-bg6765
 2004-12-09 13:33:12 +03:00
dlenev@brandersnatch.localdomain
4b0882e0a6 Fix for bug #6765 "Implicit access to time zone description 
tables requires privileges for them if some table or column level grants
present" (with after-review fixes).

We should set SELECT_ACL for implicitly opened tables in 
my_tz_check_n_skip_implicit_tables() to be able to bypass privilege
checking in check_grant(). Also we should exclude those tables from
privilege checking in multi-update.
 2004-12-09 13:31:46 +03:00
matthias@three.local.lan
2d90fe51b1 Merge mleich@bk-internal.mysql.com:/home/bk/mysql-4.1 
into three.local.lan:/home/matthias/Arbeit/mysql-4.1/src
 2004-12-09 11:24:46 +01:00
konstantin@mysql.com
356005efd7 A fix and test case for Bug#6873 "PS, having with subquery, crash 
during execute"
 2004-12-09 00:37:17 +03:00
konstantin@mysql.com
b40fc58245 A followup to Bug#6878 "Crash with engine=memory", reported as Bug#6986 
""show_check" fails on 64bit platforms": now minimal rec_length
of a HEAP table >= sizeof(void*), hence it's platform-dependant.
 2004-12-08 01:34:50 +03:00
bell@sanja.is.com.ua
45ac6cf81a Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 
into sanja.is.com.ua:/home/bell/mysql/bk/work-sub-4.1
 2004-12-07 19:32:16 +02:00
matthias@three.local.lan
ddd4398799 Merge mleich@bk-internal.mysql.com:/home/bk/mysql-4.1 
into three.local.lan:/home/matthias/Arbeit/mysql-4.1/src
 2004-12-07 17:18:49 +01:00
ram@gw.mysql.r18.ru
83f3d06f36 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into gw.mysql.r18.ru:/usr/home/ram/work/4.1.b6993
 2004-12-07 18:25:12 +04:00
bell@sanja.is.com.ua
562ec49290 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 
into sanja.is.com.ua:/home/bell/mysql/bk/work-sub-4.1
 2004-12-07 14:18:14 +02:00
gluh@gluh.mysql.r18.ru
c946d4dd7b Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.1 
into gluh.mysql.r18.ru:/home/gluh/MySQL-BUGS/mysql-4.1.6840
 2004-12-07 15:18:13 +03:00
gluh@gluh.mysql.r18.ru
069438d1bb Fix for bug #6840: Default value is not checked in ALTER column SET DEFAULT 'x' 2004-12-07 14:08:56 +03:00
ram@gw.mysql.r18.ru
f449ba85e8 A fix (bug #6993: Max myisam_data_pointer_size limited to 7). 2004-12-07 14:51:13 +04:00
mskold@mysql.com
4458722f55 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/usr/local/home/marty/MySQL/test/mysql-4.1
 2004-12-07 10:31:55 +01:00
hf@deer.(none)
477093eb8b Merge bk@192.168.21.1:/usr/home/bk/mysql-4.1 
into deer.(none):/home/hf/work/mysql-4.1.6755
 2004-12-07 11:20:11 +04:00
bell@sanja.is.com.ua
b218560604 merge 2004-12-07 09:07:37 +02:00
brian@avenger.(none)
f30049f411 Fix for crummy compiler that didn't udnerstand for declaration. Another fix for example storage engine to pass, not skip, test. 2004-12-06 16:26:05 -08:00
mskold@mysql.com
36a16ffb0a Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/usr/local/home/marty/MySQL/test/mysql-4.1
 2004-12-06 22:58:15 +01:00
bar@mysql.com
248a968581 UCS2 support in ENUM and SET, which also fixes: 
Bug #5174 SHOW CREATE TABLE hangs up if the table contains half-with katakana enum values
UCS2 values are stored in HEX encoding in FRM file
 2004-12-06 20:45:32 +04:00
gluh@gluh.mysql.r18.ru
2686161c00 Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.1 
into gluh.mysql.r18.ru:/home/gluh/MySQL-BUGS/mysql-4.1.6840
 2004-12-06 19:03:39 +03:00
gluh@gluh.mysql.r18.ru
0282d03215 Syntax extention: 'ALTER DATABASE' without db name (after review) 2004-12-06 19:01:51 +03:00
mskold@mysql.com
3791170159 Fix for bug#6935 table rename does not work with ndb tables 2004-12-06 14:51:10 +01:00
mskold@mysql.com
75da2fb3f4 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/usr/local/home/marty/MySQL/test/mysql-4.1
 2004-12-06 14:15:52 +01:00
bar@mysql.com
8878c58fe2 Fixed thar proper charset was not set in Field_set::val_str() 2004-12-06 16:22:51 +04:00
hf@deer.(none)
e211b26330 Fix for bug #6755 (ALTER TABLE ENABLE KEYS corrupts spatial index) 2004-12-06 11:42:41 +04:00
bell@sanja.is.com.ua
1b07e3b2db postreview fixes 2004-12-04 00:14:18 +02:00
bell@sanja.is.com.ua
a3ad1765a8 merge 2004-12-03 23:24:41 +02:00
bell@sanja.is.com.ua
b48ec20ac7 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 
into sanja.is.com.ua:/home/bell/mysql/bk/work-qc-4.1
 2004-12-03 22:40:11 +02:00
bell@sanja.is.com.ua
734ffb8452 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 
into sanja.is.com.ua:/home/bell/mysql/bk/work-global-4.1
 2004-12-03 22:13:53 +02:00
jimw@mysql.com
5c29de39bd Fix t/rpl_create_database.test: replace version in SHOW BINLOG RESULTS 2004-12-03 18:42:35 +01:00
jimw@mysql.com
48fc4cbc6b Merge 2004-12-03 17:48:19 +01:00
mats@mysql.com
fe70f8c747 Merge mysql.com:/space/bkroot/mysql-4.1 
into mysql.com:/space/bk/b6391-mysql-4.1
 2004-12-03 12:15:31 +01:00
mats@mysql.com
2bbdf2403d Bug#6391 (binlog-do-db rules ignored) 
CREATE DATABASE statement used the current database instead of the
  database created when checking conditions for replication.
  CREATE/DROP/ALTER DATABASE statements are now replicated based on
  the manipulated database.
 2004-12-03 12:13:51 +01:00
jimw@mysql.com
08f771a0cc Manual fixes to merge of fix for Bug #6682 to 4.1. 2004-12-03 02:44:33 +01:00
jimw@mysql.com
4b8e96d5ca Merge 2004-12-03 00:39:55 +01:00
jimw@mysql.com
13649d90ae Prevent adding 'CREATE TABLE .. SELECT' query to the binary log when the 
insertion of new records partially failed. It would get logged because of the
logic to log a partially-failed 'INSERT ... SELECT' (which can't be rolled back
in non-transactional tables), but 'CREATE TABLE ... SELECT' is always rolled
back on failure, even for non-transactional tables. (Bug #6682)
(Original fix reimplemented after review by Serg and Guilhem.)
 2004-12-03 00:05:11 +01:00
lenz@mysql.com
eb6c38fe9c - updated lowercase_table3 test result (T1.InnoDB -> T1.ibd). Failure was 
discovered on Mac OS X
 2004-12-02 21:32:36 +01:00
mskold@mysql.com
cca3fc671f Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/usr/local/home/marty/MySQL/test/mysql-4.1
 2004-12-02 14:25:55 +01:00
monty@mysql.com
55cc515c8f merged on pull 2004-12-02 14:47:14 +02:00
hf@deer.(none)
c7ef44857f Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1 
into deer.(none):/home/hf/work/mysql-4.1.clean
 2004-12-02 16:46:30 +04:00
monty@mysql.com
d1a666d59a Cleanups during review stage 
Added auto-correct of field length for enum/set tables for ALTER TABLE
This is becasue of a bug in previous MySQL 4.1 versions where the length for enum/set was set incorrectly after ALTER TABLE
 2004-12-02 14:43:51 +02:00
hf@deer.(none)
71bfbbdcd0 Fixes to make mysql-test-run --embedded-server working 2004-12-02 16:08:17 +04:00
matthias@three.local.lan
257d1f6db3 Merge mleich@bk-internal.mysql.com:/home/bk/mysql-4.1 
into three.local.lan:/home/matthias/Arbeit/mysql-4.1/src
 2004-12-02 12:54:32 +01:00
ram@gw.mysql.r18.ru
3b111a9b42 A fix (bug #6878: Crash with engine=memory). 2004-12-02 15:06:15 +04:00
ram@gw.mysql.r18.ru
7ed2753300 A fix (bug #6878: Crash with engine=memory). 2004-12-02 14:34:53 +04:00
ram@gw.mysql.r18.ru
c78eefbc95 Fixes (bug #6932: 'revoke all privileges...' doesn't remove all proper columns from columns_priv 
bug #6933: error in the tests/grant.pl test).
 2004-12-02 13:34:30 +04:00
bar@mysql.com
a09a603d83 Bug #6379: ENUM values are incorrectly converted 
- add_field_to_list() now uses <List>String
instead of TYPELIB to be able to distinguish
literals 'aaa' and hex literals 0xaabbcc.
- move some code from add_field_to_list() where
  we don't know column charset yet, to 
  mysql_prepare_table(), where we do.
 2004-12-02 12:48:43 +04:00
bar@mysql.com
a38160f370 Move common trailing space checks into an include file. 
Check UCS2 trailing spaces.
 2004-12-01 19:25:05 +04:00
joreland@mysql.com
0718f788d6 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/jonas/src/mysql-4.1
 2004-12-01 10:15:25 +01:00
joreland@mysql.com
64d6563afa Merge mysql.com:/home/jonas/src/mysql-4.1-fix 
into mysql.com:/home/jonas/src/mysql-4.1
 2004-12-01 10:13:55 +01:00
joreland@mysql.com
9acd3ea38d testcase for bug#6871, ndb, replace with collations 2004-12-01 10:13:18 +01:00
bell@sanja.is.com.ua
4c017d18e2 Merge 2004-12-01 10:25:11 +02:00
mskold@mysql.com
da1f5728fd Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/usr/local/home/marty/MySQL/test/mysql-4.1
 2004-12-01 09:22:26 +01:00
mwagner@mysql.com
2e0d1b3f9c openssl_1.result, have_openssl_1.require, openssl_1.test: 
Update SSL Cipher so that 'openssl_1' test passes (BUG#6152)
 2004-12-01 02:35:02 +01:00
guilhem@mysql.com
81609d6e1c Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0 
into mysql.com:/home/mysql_src/mysql-4.1-clean
 2004-11-30 22:22:12 +01:00
guilhem@mysql.com
7219d2be90 two-line fix for BUG#6732 "FLUSH TABLES WITH READ LOCK + COMMIT makes next FLUSH...LOCK hang forever" 
(originally reported as "second run of innobackup hangs forever and can even hang server").
Plus testcase for the bugfix and comments about global read locks.
 2004-11-30 22:20:52 +01:00
tomas@poseidon.ndb.mysql.com
aec0b4e4d7 fixed error in test result 
added extra calls to retrieve connectstring used
    reengineered connect somewhat to make retries etc explicit
 2004-11-30 17:47:47 +00:00
tomas@poseidon.ndb.mysql.com
abb50b38ee ps_7ndb.result, ps_7ndb.test: 
ndb now runs ps tests just like the others
 2004-11-30 15:08:26 +00:00
mskold@mysql.com
9aca0cdac5 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/usr/local/home/marty/MySQL/test/mysql-4.1
 2004-11-30 10:21:12 +01:00
ram@gw.mysql.r18.ru
3f741570e9 An additional test for 'CREATE DATABASE' with non-default character set. 2004-11-30 13:19:35 +04:00
ram@gw.mysql.r18.ru
0ca8fd2ee9 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into gw.mysql.r18.ru:/usr/home/ram/work/4.1.b6101
 2004-11-30 12:27:17 +04:00
mskold@mysql.com
18afa572f6 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/usr/local/home/marty/MySQL/test/mysql-4.1
 2004-11-30 07:47:52 +01:00
joreland@mysql.com
e86ce67ea5 Merge mysql.com:/home/jonas/src/mysql-4.1-fix 
into mysql.com:/home/jonas/src/mysql-4.1
 2004-11-30 07:43:19 +01:00
joreland@mysql.com
474f23a402 ndb - fixed long overdue problems with unique indexes and null values 2004-11-30 07:41:26 +01:00
matthias@three.local.lan
97f40042d0 Merge mleich@bk-internal.mysql.com:/home/bk/mysql-4.1 
into three.local.lan:/home/matthias/Arbeit/mysql-4.1/src
 2004-11-29 12:11:36 +01:00
sergefp@mysql.com
0bf584d9a5 Fix and testcase for BUG#6699 2004-11-29 06:51:30 +03:00
mskold@mysql.com
0648cc4285 Added better test for Bug #6794 Wrong outcome of update operation of ndb table 2004-11-28 22:33:01 +01:00
mskold@mysql.com
065184dac3 Fix for Bug #6794 Wrong outcome of update operation of ndb table 2004-11-28 22:28:36 +01:00
serg@serg.mylan
cb538e45f5 post-merge fix 2004-11-28 19:48:41 +01:00
serg@serg.mylan
96729c62be merged 2004-11-28 18:19:01 +01:00
serg@serg.mylan
989721d12f bad merge fixed 2004-11-28 17:06:40 +01:00
serg@serg.mylan
1a32157950 Merge bk-internal.mysql.com:/home/bk/mysql-4.1/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
 2004-11-28 16:32:01 +01:00
serg@serg.mylan
7eccc3107f skip last compress test if we're short of RAM 2004-11-28 16:31:14 +01:00
matthias@three.local.lan
ea28fc6351 Merge mleich@bk-internal.mysql.com:/home/bk/mysql-4.1 
into three.local.lan:/home/matthias/Arbeit/mysql-4.1/src
 2004-11-26 10:49:14 +01:00
monty@mysql.com
eb304bd49f Fixes while reviewing code 
(Cleanups and better bug fixes)
 2004-11-26 02:31:22 +02:00
bell@sanja.is.com.ua
3c108b2a84 init values to avoid junk returning in case of null value asking without assigning value (BUG#6806) 2004-11-25 22:54:49 +02:00
mats@mysql.com
4ac392fa45 Merge mkindahl@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/space/bkroot/mysql-4.1
 2004-11-25 13:35:53 +01:00
timour@mysql.com
f1e86036ee Merge mysql.com:/home/timka/mysql/src/4.0-virgin 
into mysql.com:/home/timka/mysql/src/4.0-master
 2004-11-25 13:25:35 +02:00
mats@mysql.com
9ffb3fd39c Merge 2004-11-25 12:23:41 +01:00
timour@mysql.com
38ab93c6be Merge for BUG#3759 which was missing from the main tree for some reason. 2004-11-25 11:37:28 +02:00
mats@mysql.com
fe0911e95e Merge mysql.com:/space/bkroot/mysql-4.0 
into mysql.com:/space/bk/b6148-mysql-4.0
 2004-11-25 09:38:52 +01:00
mats@mysql.com
c06cae0f55 Fix for Bug#6148. Only rewind read position in binary log when the 
slave SQL thread is started.
 2004-11-25 09:26:45 +01:00
serg@serg.mylan
e80bd82e83 Merge bk-internal.mysql.com:/home/bk/mysql-4.1/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
 2004-11-24 23:47:14 +01:00
serg@serg.mylan
e8203e437a bug#6784 
mi_flush_bulk_insert (on dup key error in mi_write)
was mangling info->dupp_key_pos
 2004-11-24 23:16:16 +01:00
bar@mysql.com
0f79f61480 Bug#6787 LIKE not working properly with _ and utf8 data 2004-11-24 20:09:54 +04:00
serg@serg.mylan
2ca5a0f2b1 merged 2004-11-22 20:15:48 +01:00
antony@ltantony.rdg.cyberkinetica.homeunix.net
076f27147f Bug#6252 - Duplicate columns in keys should fail 
Added check for duplicate column in key
  Added tests and fixed tests which exploit bug
 2004-11-22 18:07:04 +00:00
serg@serg.mylan
af51d26238 Merge bk-internal:/home/bk/mysql-4.0/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
 2004-11-22 18:47:23 +01:00
serg@serg.mylan
dca2182fdc ft_boolean_search.c: 
bug#6705 - (+trunc1* +trunc2*)
fulltext.test, fulltext.result:
  bug#6705
 2004-11-22 18:37:30 +01:00
serg@serg.mylan
44926664a5 Merge bk-internal.mysql.com:/home/bk/mysql-4.1/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
 2004-11-22 14:55:20 +01:00
serg@serg.mylan
41c33c29a3 Bug #6748 heap_rfirst() doesn't work (and never did!) 
range for BETWEEN typo fixed
 2004-11-22 14:53:18 +01:00
mskold@mysql.com
31f5d69d3a Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/usr/local/home/marty/MySQL/test/mysql-4.1
 2004-11-22 13:58:50 +01:00
mskold@mysql.com
6cdf1fc96f Added NULL value tests for UNIQUE index 2004-11-22 13:58:11 +01:00
dlenev@mysql.com
7897baf7b1 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/dlenev/src/mysql-4.1-bg6462
 2004-11-22 14:21:49 +03:00
dlenev@brandersnatch.localdomain
30f0c495b7 Backport of fix making myisam test results repeatable 2004-11-22 14:17:04 +03:00
mskold@mysql.com
3455e345b2 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/usr/local/home/marty/MySQL/test/mysql-4.1
 2004-11-22 12:02:32 +01:00
dlenev@mysql.com
64cd633f43 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/dlenev/src/mysql-4.1-bg6462
 2004-11-22 13:06:31 +03:00
dlenev@brandersnatch.localdomain
c37977c87d Fix for bug #6462 "Same request on same data returns different 
results." a.k.a. "Proper cleanup of subqueries is missing for SET and DO
statements". (Version #2 with after-review fixes).

To perform proper cleanup for statements that can contain subqueries 
but don't have main select we must call free_undelaid_joins().
 2004-11-22 13:05:10 +03:00
mskold@mysql.com
f0e95c3704 Added checks for NOT NULL for all fields in UNIQUE INDEX (USING HASH) 2004-11-22 10:35:03 +01:00
bar@mysql.com
e3b94d4ef5 Bug #6737: REGEXP gives wrong result with case sensitive collation: 
- A new flag MY_CS_CSSORT was introduced for case sensitivity.
- Item_func_regexp doesn't substiture ICASE not only
  for binary collations but for case sensitive collations as well.
 2004-11-22 11:58:40 +04:00
konstantin@mysql.com
6337ea8a40 A fix and test case for Bug#6297 "prepared statement, wrong handling 
of <parameter> IS NULL":
we must not only set Item::null_value in Item_param, but implement
Item_param::is_null() to work well with IS NULL/IS NOT NULL clauses.
 2004-11-21 12:04:27 +03:00
dlenev@mysql.com
4e52cc2ded Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/dlenev/src/mysql-4.1-bg6266
 2004-11-19 21:51:37 +03:00
dlenev@mysql.com
aaee135243 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/dlenev/src/mysql-4.1-bg6439
 2004-11-19 21:38:51 +03:00
dlenev@mysql.com
5627dddb93 Manual merge of fix for bug #6439 "from_unixtime() function returns 
wrong datetime values for too big argument" from 4.0 tree to 4.1 tree.
 2004-11-19 19:19:45 +03:00
bar@mysql.com
3b0fd7fe96 func_str.result: 
This test was moved into func_group.
 2004-11-19 19:35:37 +04:00
dlenev@mysql.com
cb7e272e46 Manual merge of fix for bug #6266 "Invalid DATETIME value is not handled 
properly" with main tree.
 2004-11-19 18:35:36 +03:00
bar@mysql.com
770c9be8c2 Bug #6658 MAX(column) returns incorrect coercibility 
Also, Item_sum_hybrid->charset was removed as redundant,
and switched to use collation.collation instead.
 2004-11-19 19:35:36 +04:00
dlenev@mysql.com
40083741ee Merge bk-internal.mysql.com:/home/bk/mysql-4.0 
into mysql.com:/home/dlenev/src/mysql-4.0-bg6439
 2004-11-19 17:54:14 +03:00
bar@mysql.com
6de458c232 Reuse ctype_common.inc instead of retyping 
the same queries.
 2004-11-19 14:33:55 +04:00
bar@mysql.com
f9d1a5a1c6 Incorrect response with partial utf8 index 2004-11-19 14:25:25 +04:00
tomas@poseidon.ndb.mysql.com
287fe9e313 ndb_grant.result, ndb_grant.test: 
new file
 2004-11-19 09:17:36 +00:00
matthias@three.local.lan
4dc6ccb858 Merge mleich@bk-internal.mysql.com:/home/bk/mysql-4.1 
into three.local.lan:/home/matthias/Arbeit/mysql-4.1/src
 2004-11-19 08:38:20 +01:00
bell@sanja.is.com.ua
f5e253dc2f reporting empty result added in case of max/min optimisation of ALL/ANY/SOME subqueries 
fixed null processing in NOT operation used in ALL subquery (Bug #6247)
 2004-11-18 18:10:07 +02:00
mskold@mysql.com
7bbee8c95d Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/usr/local/home/marty/MySQL/test/mysql-4.1
 2004-11-18 15:55:18 +01:00
bar@mysql.com
fe3b359b74 Check that the third UNION part with COLLATE 
clause resolves collation conflict for the
first and the second parts pair.
 2004-11-18 16:15:48 +04:00
mskold@mysql.com
a4d061a5d9 Fix for bug#4312 ndb table, wrong behaviour on insert .. on duplicate key .. 2004-11-18 12:11:56 +01:00
matthias@three.local.lan
beec94f0bf Merge mleich@bk-internal.mysql.com:/home/bk/mysql-4.1 
into three.local.lan:/home/matthias/Arbeit/mysql-4.1/src
 2004-11-18 10:01:18 +01:00
serg@serg.mylan
19067008b8 Merge bk-internal.mysql.com:/home/bk/mysql-4.1/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
 2004-11-17 17:54:15 +01:00
guilhem@mysql.com
f04832b52d time independent test 2004-11-17 17:06:24 +01:00
guilhem@mysql.com
d34421c127 Fixes for compilation errors in Windows (casts from uint32* to uint*) in repl and charset code. 
Moving the part of user_var.test using UCS2 to ctype_ucs.test
 2004-11-17 16:41:30 +01:00
serg@serg.mylan
37e872de8c merged 2004-11-17 15:28:37 +01:00
serg@serg.mylan
2d8c21f700 test for bug#5528 2004-11-17 13:38:35 +01:00
matthias@three.local.lan
525d524bd5 Merge mleich@bk-internal.mysql.com:/home/bk/mysql-4.1 
into three.local.lan:/home/matthias/Arbeit/mysql-4.1/src
 2004-11-17 10:40:50 +01:00
bell@sanja.is.com.ua
d5b21d03a5 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 
into sanja.is.com.ua:/home/bell/mysql/bk/work-global-4.1
 2004-11-17 10:59:04 +02:00
igor@rurik.mysql.com
078597564d Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-4.1 
into rurik.mysql.com:/home/igor/mysql-4.1
 2004-11-16 15:07:49 -08:00
igor@rurik.mysql.com
e17073c4a2 Merge rurik.mysql.com:/home/igor/mysql-4.1 
into rurik.mysql.com:/home/igor/dev/mysql-4.1-0
 2004-11-16 14:01:40 -08:00
igor@rurik.mysql.com
9edff6c591 key_cache.result, key_cache.test: 
Added a test case for bug #6447.
mf_keycache.c:
  Fixed bug #6447. Erronious code in the key_cache_read function
  caused problems when reading key blocks with offset>0 into
  key cache. The code of key_cache_insert and key_cache_write
  was modified similarly.
 2004-11-16 13:58:49 -08:00
bell@sanja.is.com.ua
bc5a9111d7 backport Serg's fix of FT interface (BUG#6523) 2004-11-16 22:58:02 +02:00
sergefp@mysql.com
1cc999fbd4 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/dbdata/psergey/mysql-4.1-heap-bug
 2004-11-16 21:36:31 +03:00
matthias@three.local.lan
d94d8e5869 Merge mleich@bk-internal.mysql.com:/home/bk/mysql-4.1 
into three.local.lan:/home/matthias/Arbeit/mysql-4.1/src
 2004-11-16 14:56:26 +01:00
ram@gw.mysql.r18.ru
dde88ea82b A fix (bug #6449: DO server-crashing bug). 2004-11-16 14:36:25 +04:00
matthias@three.local.lan
f12d74b958 Merge mleich@bk-internal.mysql.com:/home/bk/mysql-4.1 
into three.local.lan:/home/matthias/Arbeit/mysql-4.1/src
 2004-11-16 11:25:05 +01:00
bar@mysql.com
629f1bb616 Bug #6552 CHAR column w/o length is legal, BINARY w/o length is not 2004-11-16 12:05:13 +04:00
bell@sanja.is.com.ua
27395a2fb1 fixed joincleunup to avoid double deletin tables, and too earlyfull cleanup in case of EXPLAIN 
fixed cleunup of TMP_TABLE_PARAM
(BUG#6406)
 2004-11-16 00:16:04 +02:00
matthias@three.local.lan
d1453f93ad Merge mleich@bk-internal.mysql.com:/home/bk/mysql-4.1 
into three.local.lan:/home/matthias/Arbeit/mysql-4.1/src
 2004-11-15 22:42:53 +01:00