mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-20 22:12:30 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
18004 commits 2780 branches 343 tags 1.6 GiB
Commit graph

4092 commits

Author SHA1 Message Date
tomas@poseidon.ndb.mysql.com
ee70c9a501 ndb_grant.later: 
Rename: mysql-test/t/ndb_grant.test -> mysql-test/t/ndb_grant.later
 2004-11-29 17:46:32 +00: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
tomas@poseidon.ndb.mysql.com
5e799e4a3b ndb_grant.later: 
Rename: mysql-test/t/ndb_grant.test -> mysql-test/t/ndb_grant.later
 2004-11-29 08:06:53 +00: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
b460059988 merged 2004-11-28 20:42:04 +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
800ffc6150 view.test: 
more max_rows for show table status
comment spellchecking...
 2004-11-28 18:00:42 +01:00
serg@serg.mylan
992f5c70dd limit Max_data_length in 'show table status' 2004-11-28 17:30:52 +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
serg@serg.mylan
5b3f7c59ec Merge bk-internal:/home/bk/mysql-5.0 
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
 2004-11-28 04:45:20 +01:00
serg@serg.mylan
319546d5f0 create/drop/rename user cleanup 2004-11-27 23:07:30 +01:00
antony@ltantony.rdg.cyberkinetica.homeunix.net
f595216869 Change sql_mode BROKEN_NOT to HIGH_NOT_PRECEDENCE 2004-11-27 19:26:46 +00:00
serg@serg.mylan
246cf0d682 Merge bk-internal:/home/bk/mysql-5.0 
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
 2004-11-27 12:37:03 +01:00
tomas@poseidon.ndb.mysql.com
48729bfa73 fixed ndb_grant test 2004-11-26 15:27:45 +00:00
tomas@poseidon.ndb.mysql.com
b0c42a4835 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
 2004-11-26 15:27:44 +00:00
gluh@gluh.mysql.r18.ru
a67b4a5b1c portability fix(for powermac) 
Fix for bug#6756: Crash if SHOW INDEX
 2004-11-26 18:26:52 +03:00
tomas@poseidon.ndb.mysql.com
97c8234b46 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
 2004-11-26 13:44:49 +00:00
ingo@mysql.com
b0cace4ed3 Merge mysql.com:/home/mydev/mysql-5.0 
into mysql.com:/home/mydev/mysql-5.0-wl2050-new
 2004-11-26 11:19:40 +01:00
ingo@mysql.com
35beae1690 Changed test to remove node name from output. 
(was from WL#2050 - CREATE USER and DROP USER and RENAME USER)
 2004-11-26 11:18:20 +01:00
ram@gw.mysql.r18.ru
47abf905a5 Portability fix: we had problems with -1.1E-38, -2.2E-308 values 
on 64-bit platforms (due to compiler's optimization).
-1.1E-38  replaced with -1.1E-37
-2.2E-308 replaced with -2.2E-307
 2004-11-26 14:02:39 +04: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
ingo@mysql.com
0eca0e0a68 Merge mysql.com:/home/mydev/mysql-5.0 
into mysql.com:/home/mydev/mysql-5.0-wl2050-new
 2004-11-25 21:58:28 +01:00
ingo@mysql.com
cb53411b47 WL#2050 - CREATE USER and DROP USER and RENAME USER 
Added new commands CREATE USER and RENAME USER.
Changed behaviour of DROP USER.
Changed an error messages for the new commands.
 2004-11-25 21:55:49 +01: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
serg@serg.mylan
7dabb64176 merged 2004-11-25 17:36:43 +01:00
serg@serg.mylan
831c02463c order by group_func 2004-11-25 17:02:44 +01:00
pem@mysql.com
77bbadbf81 Merge mysql.com:/usr/local/bk/mysql-5.0 
into mysql.com:/home/pem/work/mysql-5.0
 2004-11-25 16:14:30 +01:00
pem@mysql.comhem.se
a1e0e96e2d Fixed BUG#6807: Stored procedure crash if CREATE PROCEDURE ... KILL QUERY 
...and for PURGE BEFORE too. (Don't fix_fields in the parser!)
 2004-11-25 16:13:06 +01:00
tomas@poseidon.ndb.mysql.com
538a3f7a53 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
 2004-11-25 13:33:31 +00: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
bell@sanja.is.com.ua
69ec6a4592 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0 
into sanja.is.com.ua:/home/bell/mysql/bk/work-join-5.0
 2004-11-25 02:27:02 +02:00
bell@sanja.is.com.ua
1e3d8b0839 post-merge fix 2004-11-25 02:23:13 +02: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
brian@avenger.(none)
71f31d1c94 Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.0 
into avenger.(none):/export/brian/mysql/merge/5.0
 2004-11-24 13:34:35 -08:00
brian@avenger.(none)
2b0b6ec20c Merging 4.1 to 5.0 2004-11-24 12:34:44 -08:00
bell@sanja.is.com.ua
3fa511ff54 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0 
into sanja.is.com.ua:/home/bell/mysql/bk/work-error-5.0
 2004-11-24 20:01:34 +02:00
bell@sanja.is.com.ua
6d5d5ff941 fixed problem in MacOS 
correct printing of aliases
 2004-11-24 19:48:30 +02:00
gluh@gluh.mysql.r18.ru
3256fd704e Fixed bug related to lower case table names on Power Mac 
'information_schema' test is splitted because of innodb
 2004-11-24 19:32:10 +03:00
bar@mysql.com
0f79f61480 Bug#6787 LIKE not working properly with _ and utf8 data 2004-11-24 20:09:54 +04:00
dlenev@brandersnatch.localdomain
d201074611 Fix for bug #5888 "Triggers with nonexistent columns cause packets 
out of order". (final version)

Now instead of binding Item_trigger_field to TABLE objects during
trigger definition parsing at table open, we perform pass through
special list of all such objects in trigger. This allows easily check
all references to fields in old/new version of row in trigger during
execution of CREATE TRIGGER statement (this is more courtesy for users
since we can't check everything anyway).
We also report that such reference is bad by returning error from
Item_trigger_field::fix_fields() method (instead of setup_field())
This means that if trigger is broken we will bark during trigger
execution instead of trigger definition parsing at table open.
(i.e. now we allow to open tables with broken triggers).
 2004-11-24 12:24:02 +03:00
gluh@gluh.mysql.r18.ru
22e76af9df More test cases are added 
Fixed bug 'using of alias with information schema tables in views'
removed compiler warnings
 2004-11-23 17:41:39 +03:00
serg@serg.mylan
a5ce45fc3d Merge bk-internal:/home/bk/mysql-5.0 
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
 2004-11-22 22:58:34 +01:00
serg@serg.mylan
f862ba4788 post-merge 2004-11-22 22:57:05 +01:00
serg@serg.mylan
ee933cd198 merged 2004-11-22 21:33:15 +01: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
eb8d9d3ffe merged with ul 2004-11-22 18:59:17 +01: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
4edd0f3a5e Merge bk-internal.mysql.com:/home/bk/mysql-4.1/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
 2004-11-22 16:47:23 +01:00
tomas@poseidon.ndb.mysql.com
a487b87928 added --no-defaults to ndb_drop_table in autodiscover test 2004-11-22 15:05:51 +00: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
bell@sanja.is.com.ua
072d38eb12 merge 2004-11-21 20:08:12 +02:00
bell@sanja.is.com.ua
97a1970658 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0 
into sanja.is.com.ua:/home/bell/mysql/bk/work-check-5.0
 2004-11-21 16:43:54 +02:00
bell@sanja.is.com.ua
87af10ed1e test made independend of server builtin features 2004-11-21 16:42:54 +02:00
serg@serg.mylan
05bf95dc15 make the test results repeatable 2004-11-21 15:37:52 +01: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
sergefp@mysql.com
f8b45c6dfc Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/dbdata/psergey/mysql-5.0-nov-clean
 2004-11-21 11:58:19 +03:00
sergefp@mysql.com
e6a7386c12 Fix for BUG#4177: 
* Make index merge quick selects code allow perform several scans.
 * Delay additional handler objects creation till row retrieval is started.
 2004-11-21 11:51:19 +03:00
bell@sanja.is.com.ua
8ca32a4ef6 merge 2004-11-21 10:12:11 +02:00
serg@serg.mylan
2d3dd65cc1 merged 2004-11-20 18:36:41 +01:00
gluh@gluh.mysql.r18.ru
15ada105ac changed field names, fields order according to WL description 
fixed bug: "create view v7 as select * from information_schema.tables;" failed
 2004-11-20 01:17:18 +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
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
petr@mysql.com
30789e7aa2 Merge mysql.com:/home/cps/mysql/trees/mysql-5.0 
into mysql.com:/home/cps/mysql/devel/innotask/mysql-5.0-inno-final
 2004-11-18 14:53:21 +03: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
petr@mysql.com
890211a7c4 WL 2059 Engine-specific status variables framework and WL 1922 
InnoDB status variables
 2004-11-18 13:00:42 +03:00
gluh@gluh.mysql.r18.ru
a68a9fe268 remove unused parts of code 
fix for 'show create schema_table'
fix for usage schema tables in subselect
'wrong schema table charset' fix
 2004-11-18 12:16:06 +03: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
c7532a698d merged 2004-11-17 20:07:13 +01:00
serg@serg.mylan
e68bd85b77 merged 2004-11-17 18:04:36 +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
antony@ltantony.rdg.cyberkinetica.homeunix.net
8c0d21d186 WL#638 - Fix precedence for parsing NOT ... LIKE expression s 
Rework parser expression rules
  Rework handling for "||" concat/or
  Eliminate some shift/reduce conflicts
  Add support for "xxx IS [ NOT ] truth_value"
 2004-11-17 15:49:10 +00:00
gluh@gluh.mysql.r18.ru
a288f3b3e1 Fix for Auto_increment filed value in 'show table status' 
code cleanup
 2004-11-17 18:48:12 +03: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
guilhem@mysql.com
e38dae0bc1 Merge 2004-11-16 00:04:12 +01: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
serg@serg.mylan
87840e841c Merge bk-internal:/home/bk/mysql-5.0 
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
 2004-11-15 19:27:06 +01:00
bar@mysql.com
8a2ef0a2ca Bug#6608: MySQL server crash in some query with tis620 character set. 
The bug was that the function allocates 'a', then changes the value
of 'a' with the operator ++, and then tries to free 'a'!
 2004-11-15 21:26:16 +04:00
gluh@gluh.mysql.r18.ru
c67d479918 Fixes for information_schema 2004-11-15 19:20:45 +03:00
lars@mysql.com
b7cfe5ecad BUG#6353 V2: 
Replication using replicate-rewrite-db did not work for LOAD DATA INFILE.
Now is does.  There was one place in the code that used current database 
instead of the rewrite database.
 2004-11-15 17:03:54 +01:00
dlenev@mysql.com
5ddc564d89 Proposed fix for bug #6439 "from_unixtime() function returns wrong datetime 
values for too big argument".

Added range checking for from_unixtime() argument, cleaned up code 
a bit.
 2004-11-15 16:11:13 +03:00
dlenev@brandersnatch.localdomain
b02f5aa692 Fix for bug #6266 "Invalid DATETIME value is not handled properly". 
In server we assume that datetime values stored in MYSQL_TIME struct
are normalized (and year is not greater than 9999), so we should 
perform range checks in all places then we convert something to
MYSQL_TIME.
 2004-11-15 15:44:29 +03:00
bell@sanja.is.com.ua
77540c8996 moved procedure list initialization (BUG#6517) 2004-11-15 14:37:40 +02:00
matthias@three.local.lan
bc8b00ec7a 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 09:10:27 +01:00
bell@sanja.is.com.ua
d76db8b999 marge 2004-11-13 19:45:36 +02:00
bell@sanja.is.com.ua
7210195f1e now my_printf_error is not better then my_error, but my_error call is shorter 
used only one implementation of format parser of (printf)
fixed multistatement
 2004-11-13 19:35:51 +02:00
gluh@gluh.mysql.r18.ru
321f803784 WL#1629: SHOW with WHERE(partially) & 
WL#173:  Create Data Dictionary Tables for SHOW Commands
 2004-11-13 13:56:39 +03:00
monty@mysql.com
63da075081 Merge with 4.1 to get latest fix to client_test.c 2004-11-12 21:27:52 +02:00
jani@ua141d10.elisa.omakaista.fi
fe0b00985f Merge with 4.0 2004-11-12 20:38:58 +02:00
monty@mysql.com
addd1a0da8 Merge with 4.1 2004-11-12 19:58:24 +02:00
monty@mysql.com
e9c3887b58 After merge fixes 2004-11-12 17:44:17 +02:00
dlenev@mysql.com
18f033b771 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/dlenev/src/mysql-5.0-bg5890
 2004-11-12 17:21:24 +03:00
dlenev@brandersnatch.localdomain
e7a2466024 Fix for bug #5890 "Triggers fail for DELETE without WHERE". 
If we have DELETE with always true WHERE clause we should not use 
optimized delete_all_rows() method for tables with DELETE triggers,
because in this case we will lose side-effect of deletion.
 2004-11-12 17:04:07 +03:00
bell@sanja.is.com.ua
1555469b64 merge 2004-11-12 15:36:31 +02:00
bell@sanja.is.com.ua
31f7811183 post-review fixes 2004-11-12 14:34:00 +02:00
monty@mysql.com
9252656d49 merge with 4.0 2004-11-12 11:17:53 +02:00
ram@gw.mysql.r18.ru
77fe1baf1d Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.0 
into gw.mysql.r18.ru:/usr/home/ram/work/4.0.b6564
 2004-11-12 12:38:07 +04:00
brian@avenger.(none)
f05daf02ba Resolved merge from 4.1 -> 5.0 (mainly Guilhem's work with mysqldump) 2004-11-11 18:58:57 -08:00
acurtis@pcgem.rdg.cyberkinetica.com
2ad7d5c662 Bug#6123 - GRANT USAGE creates useless mysql.db row 
Prevent creation of a row which grants no rights
  Test included
 2004-11-11 20:59:03 +00:00
bell@sanja.is.com.ua
0ef0b030a5 merge 2004-11-11 21:18:10 +02:00
mleich@mysql.com
3c0a2c0f31 Result of 
WL#2225 Extend the test cases for PS + develop a basic test routine for PS
   The basic test routine 
       mysql-test/include/patchwork-check.inc
   Test cases for the the basic test routine 
       mysql-test/t/tool_test.test    
       mysql-test/r/tool_test.result

   Test cases for prepared statements with functions
       mysql-test/t/ps_12func.test
       mysql-test/r/ps_12func.result
   Some statements are set to comment, because of open bugs.

Fresh MySQL V4.1 and V5.0 souces produce in the moment (~11-Nov-2004) the
same result files.
 2004-11-11 20:12:12 +01:00
ram@gw.mysql.r18.ru
98df9313c0 A fix (bug #6564: QUOTE(NULL) returns NULL, not the string 'NULL') 2004-11-11 18:20:40 +04:00
monty@mysql.com
20eb74dcda Write fatal errors even if silent is used in client_test 2004-11-11 14:59:13 +02:00
serg@serg.mylan
aafb2cf6a3 Merge serg.mylan:/usr/home/serg/Abk/mysql-5.0-xa 
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
 2004-11-11 13:44:10 +01:00
timour@mysql.com
e61b4454da Merge of WL#1972 "Evaluate HAVING before SELECT select-list" 2004-11-11 11:31:58 +02:00
igor@rurik.mysql.com
f65e054788 Merge rurik.mysql.com:/home/igor/mysql-5.0 
into rurik.mysql.com:/home/igor/dev/mysql-5.0-0
 2004-11-10 11:24:03 -08:00
igor@rurik.mysql.com
597781c1b1 select.result, select.test: 
Added test cases for bug #6474.
sql_select.cc:
  Fixed bug #6474. A wrong result was returned when a query
  contained the same equality of the form field=const on
  different AND levels.
 2004-11-10 11:22:39 -08:00
guilhem@mysql.com
600b965f32 Merge 2004-11-10 18:02:00 +01:00
guilhem@mysql.com
6cd218cc56 WL#1596 "make mysqldump --master-data --single-transaction able to do online dump of InnoDB AND report reliable 
binlog coordinates corresponding to the dump".
The good news is that now mysqldump can be used to get an online backup of InnoDB *which works for
point-in-time recovery and replication slave creation*. Formerly, mysqldump --master-data --single-transaction
used to call in fact mysqldump --master-data, so the dump was not an online dump (took big lock all time of dump).
The only lock which is now taken in this patch is at the beginning of the dump: mysqldump does:
FLUSH TABLES WITH READ LOCK; START TRANSACTION WITH CONSISTENT SNAPSHOT; SHOW MASTER STATUS; UNLOCK TABLES;
so the lock time is in fact the time FLUSH TABLES WITH READ LOCK takes to return (can be 0 or very long, if
a table is undergoing a huge update).
I have done some more minor changes listed in the paragraph of mysqldump.c.
WL#2237 "WITH CONSISTENT SNAPSHOT clause for START TRANSACTION":
it's a START TRANSACTION which additionally starts a consistent read on all
capable storage engine (i.e. InnoDB). So, can serve as a replacement for
BEGIN; SELECT * FROM some_innodb_table LIMIT 1; which starts a consistent read too.
 2004-11-10 17:56:45 +01:00
gluh@gluh.mysql.r18.ru
a98c29921c Fix for bug #6077: Problem with make test from 4.1.7 and bk 
portability fix(UnixWare)
 2004-11-10 18:16:58 +03:00
acurtis@pcgem.rdg.cyberkinetica.com
dd1cd8aa46 Bug#6031 - To drop database you have to execute DROP DATABASE command twice. 
DROP DATABASE failed because of file ext not in TYPELIB of known extensions.
  General solution - construct a TYPELIB at runtime instead of a static list.
 2004-11-10 15:07:11 +00:00
ram@gw.mysql.r18.ru
dee9fa8fc0 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into gw.mysql.r18.ru:/usr/home/ram/work/5.0
 2004-11-10 14:43:38 +04:00
ram@gw.mysql.r18.ru
3e8e4d06b6 A fix (bug #6475: Another server crash in 5.0.2 
bug #6515: count(distinct...) crashes the server)
 2004-11-10 14:36:21 +04:00
bar@mysql.com
c51d7acfcc 1. When mixing NULL to a character string, 
the result takes its charset/collation
attributes from the character string,
e.g.  SELECT func(NULL, _latin2'string')
now returns a latin2 result. This is
done by introducing a new derivation
(aka coercibility) level DERIVATION_IGNORABLE,
which is used with Item_null.
2. 'Pure' NULL is now BINARY(0), not CHAR(0).
I.e. NULL is now more typeless.
 2004-11-10 14:05:28 +04:00
monty@mysql.com
0ebc50b851 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/my/mysql-5.0
 2004-11-09 21:47:46 +02:00
timour@mysql.com
974c29b97b WL#1972 "Evaluate HAVING before SELECT select-list" 
- post-review fix regarding Item_fields
- added test for the changed name resolution
 2004-11-09 17:56:33 +02:00
serg@sergbook.mylan
c79f4c08d6 Merge sergbook.mylan:/usr/home/serg/Abk/mysql-5.0 
into sergbook.mylan:/usr/home/serg/Abk/mysql-5.0-xa
 2004-11-09 16:44:23 +01:00
monty@mysql.com
87af3d9113 merge on pull 2004-11-09 04:06:44 +02:00
monty@mysql.com
2bba55b57f After merge fixes 
Added push_back(void *, MEM_ROOT *) to make some list-handling code easier that needs to be allocated in a different mem-root
(Before one had to change thd->mem_root ; push_back(); restore mem_root.
 2004-11-09 03:58:44 +02:00
monty@mysql.com
81363b194d Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/my/mysql-4.1
 2004-11-09 00:22:26 +02:00
monty@mysql.com
1087186657 Merge with 4.1 to get new thd->mem_root handling 2004-11-08 17:53:32 +02:00
joreland@mysql.com
04c8621390 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/jonas/src/mysql-4.1
 2004-11-08 11:53:50 +01:00
joreland@mysql.com
9d8dcdcf72 Merge mysql.com:/home/jonas/src/new-fix 
into mysql.com:/home/jonas/src/mysql-4.1
 2004-11-08 11:26:34 +01:00
bar@mysql.com
ed807c29c9 alter_table.result, alter_table.test, field_conv.cc: 
Bug #6479  ALTER TABLE ... changing charset fails for TEXT columns
  Fix: use do_conv_blob rather than do_copy_blob
  if the column's character sets are different.
 2004-11-08 14:23:14 +04:00
joreland@mysql.com
3821a8dfca ndb: bug#6435 
fix null handling in ha_ndbcluster when using ordered index
 2004-11-08 11:11:49 +01:00
joreland@mysql.com
8acbd6a2ba ndb: bug#6451 
1) fix so that missing blob tables don't prevent table from being
    dropped
2) decrease size of blob part if record length exceeds max length
3) add test case for table wo/ corresponding blob table
4) init scan counters when sending scan_tabreq
 2004-11-08 11:06:36 +01:00
bar@mysql.com
b7776f83e7 ctype_ujis.result, ctype_ujis.test, field.cc: 
Bug#6345 Unexpected behaviour with partial indices
 2004-11-08 13:15:01 +04:00
bell@sanja.is.com.ua
a41ef77b7b Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0 
into sanja.is.com.ua:/home/bell/mysql/bk/work-view-5.0
 2004-11-08 03:33:52 +02:00
bell@sanja.is.com.ua
7c80937d27 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0 
into sanja.is.com.ua:/home/bell/mysql/bk/work-update-5.0
 2004-11-08 01:55:20 +02:00
bell@sanja.is.com.ua
9d0bb7426a postreview fixes 2004-11-08 01:54:23 +02:00
monty@mysql.com
4fbf62e6c2 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/my/mysql-4.1
 2004-11-08 01:15:26 +02:00
monty@mysql.com
b903a129e2 Simpler arena swapping code 
Now thd->mem_root is a pointer to thd->main_mem_root and THR_MALLOC is a pointer to thd->mem_root.
This gives us the following benefits:
- Allow us to easily detect if arena has already been swapped before (this fixes a bug in setup_conds() where arena was swaped twice in some cases)
- Faster swaps of arenas (as we don't have to copy the whole MEM_ROOT)
- We don't anymore have to call my_pthread_setspecific_ptr(THR_MALLOC,...) to change where memory is alloced. Now it's enough to set thd->mem_root
 2004-11-08 01:13:54 +02:00
serg@serg.mylan
26b40ddbbb merged 2004-11-07 22:48:35 +01:00
bell@sanja.is.com.ua
7eae926e26 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0 
into sanja.is.com.ua:/home/bell/mysql/bk/work-view-5.0
 2004-11-06 12:46:46 +02:00
igor@rurik.mysql.com
ca355c8a46 join_outer.result, join_outer.test: 
Added cases for bugs #6307 and #6460.
sql_select.cc:
  Fixed the problem of bug reports #6307 and #6460.
  The reported wrong result sets were due to the fact that
  the added call of the fix_fields method for the built
  AND condition that joined WHERE and ON conditions
  broke ON expression, as it removed extra AND levels
  in the built condition. 
  It looks like that no attributes of the built condition
  are needed, so we don't have to call fix_fields here.
 2004-11-05 22:15:24 -08:00
konstantin@mysql.com
fe5889dee5 A fix and test case for Bug#6102 "Server crash with prepared statement 
and blank after function name".
Crop fruits of copy-paste programming: pre-caching of stored functions
wasn't performed for prepared statements just because implementation
of prepared statements is done as an add-on to the main execution flow, 
and the preload was originally implemented for main execution branch
only (mysql_execute_command).
 2004-11-05 22:02:07 +03:00
bell@sanja.is.com.ua
064b02203f new lock for multiupdate: 
- open and create derived tables
- detect which tables should be locked for write
- lock and fill derived tables
some unitialized variables fixed
 2004-11-05 17:29:47 +02:00
timour@mysql.com
660e1236b5 WL#1972 "Evaluate HAVING before SELECT" 
- more tests, post-review changes, bug-fixes, simplifications, and improved comments
 2004-11-05 15:48:44 +02:00
bar@mysql.com
813b2f3357 user_var.result, user_var.test: 
My previous change that "set @a=NULL" doesn't change charset
  fixed 'Bug #6321' as well. Prove with a new test that
  FIELD(<uservariable content NULL>, ...) now works fine too.
 2004-11-05 14:07:12 +04:00
mskold@mysql.com
4fa3d8eb0d 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-05 08:52:44 +01:00
igor@rurik.mysql.com
c3293b875b Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-4.1 
into rurik.mysql.com:/home/igor/mysql-4.1
 2004-11-04 22:16:00 -08:00
bar@mysql.com
ae5c3ae0ba ps.result, ctype_ucs.result, ctype_ucs.test, ps.test: 
Bug #6351 make test failure "Unknown character set"
  UCS2 related tests were moved into ctype_ucs.
 2004-11-05 10:12:33 +04:00
igor@rurik.mysql.com
4df18b1aae func_in.result, func_in.test: 
Added a case for bug #6365.
item_cmpfunc.cc:
  Fixed bug #6365 : Server crashed when list of values
  in IN predicate contains NULL while the tested field is
  of the character type and not of the default set;
  e.g. when f in 'f IN (NULL,'aa') belongs to binary
  character set, while the default character set is latin1.
 2004-11-04 20:39:52 -08:00
serg@serg.mylan
de914eb3c0 new test for bdb 2004-11-04 22:37:38 +01:00
guilhem@mysql.com
76f51406ce Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0 
into mysql.com:/home/mysql_src/mysql-4.0
 2004-11-04 19:19:51 +01:00
guilhem@mysql.com
1869cd9f83 Fix for BUG##5714 "Insert into MyISAM table and select ... for update]": 
the fact that the transaction log is empty does not mean we're not in a transaction
(it could be BEGIN; SELECT * FOR UPDATE FROM ibtable: then we don't want to commit now, even if
the statement is a MyISAM update).
With a testcase.
 2004-11-04 19:19:23 +01:00
wax@mysql.com
bf2685a690 autocommit 2004-11-04 21:25:49 +05:00
monty@mysql.com
071001950e Merge with 4.1 to get in latest bug fixes 2004-11-04 15:06:24 +02:00
mskold@mysql.com
0bd6fd7875 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-04 10:43:52 +01:00
ram@gw.mysql.r18.ru
75e322e21c Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into gw.mysql.r18.ru:/usr/home/ram/work/4.1.b6331
 2004-11-04 10:24:27 +04:00
bar@mysql.com
f979603cf2 field.cc, sql_mode.result, sql_mode.test: 
"SHOW CREATE TABLE" mysql-4.0 and mysql-3.23 
  compatibiliry mode change:
  Check that a binary collation adds 'binary'
  suffix into a char() column definition in
  mysql40 and mysql2323 modes. This allows
  not to lose the column's case sensitivity
  when loading the dump in pre-4.1 servers.
 2004-11-04 08:50:07 +04:00
guilhem@mysql.com
613c98ce3e Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/mysql_src/mysql-4.1-clean
 2004-11-03 22:44:51 +01:00
pekka@mysql.com
b9ec6803ae NDB blobs - try to handle insert-update-delete under autocommit=0 2004-11-03 20:21:56 +01:00
dlenev@mysql.com
fa21feda93 Fix for bug #6387 "Queried timestamp values do not match the inserted 
value if server runs in time zone with leap seconds".

Now in my_gmt_sec() function we take into account difference between
our target and estimation in seconds part.
 2004-11-03 17:59:03 +00:00
lars@mysql.com
424ff9741d Merge mysql.com:/home/bkroot/mysql-4.1 
into mysql.com:/home/bk/b5551-4.1-v4
 2004-11-03 18:24:44 +01:00
lars@mysql.com
485de9cbb7 Fix for bug#5551 (Version 4). 
The idea of the fix is that the administrative statements 
OPTIMIZE TABLE, REPAIR TABLE and ANALYZE TABLE should not 
generate binlog errors if there is no errors on the master.
 2004-11-03 18:23:58 +01:00
monty@mysql.com
60691a637a Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/my/mysql-5.0
 2004-11-03 18:52:03 +02:00
mskold@mysql.com
700da57918 Fix for bug#6398 update of primary key fails 2004-11-03 15:53:26 +01:00
pem@mysql.comhem.se
327eb9bbff Various syntax fixes in sql/sql_yacc.yy for stored procedures: 
- No RESTICT|CASCADE in DROP SP (since it's not implemented)
  - Added optional "noise" to FETCH: [[NEXT] FROM]
  - At least one statement required in all block constructs except BEGIN-END
    (where zero is allowed)
 2004-11-03 13:49:54 +01:00
bar@mysql.com
45451568bf opt_range.cc, range.result, range.test: 
Bug #6045: Binary Comparison regression in MySQL 4.1
  Binary searches didn't use a case insensitive index, now they do.
 2004-11-03 15:22:33 +04:00
monty@mysql.com
7d3be517a4 Merge on pull 2004-11-03 13:01:38 +02:00
monty@mysql.com
47bbf768d4 Fixes after merge with 4.1 
FOUND is not a reserved keyword anymore
Added Item_field::set_no_const_sub() to be able to mark fields that can't be substituted
Added 'simple_select' method to be able to quickly determinate if a select_result is a normal SELECT
Note that the 5.0 tree is not yet up to date: Sanja will have to fix multi-update-locks for this merge to be complete
 2004-11-03 12:39:38 +02:00
monty@mysql.com
2185f1a56c Remove usage of !$ from mysql-tests 
Added protocol::flush() for easier embedded-server code
Increase block allocation variables a bit as they where a bit too small for MySQL 4.1
Added option --silent to client_test
 2004-11-02 20:13:27 +02:00
ram@gw.mysql.r18.ru
86b33f360b A fix (bug #6331: INSERT IGNORE .. SELECT breaks subsequent inserts). 2004-11-02 19:48:37 +04:00
joerg@mysql.com
7c0e191d27 Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/M41/mysql-4.1
 2004-11-02 16:25:48 +01:00
gluh@gluh.mysql.r18.ru
4c65a9447e WL#1437 :don't create new users with GRANT 2004-11-02 17:45:26 +03:00
joerg@mysql.com
1b94652bde Test expansion: "MOD" on non-integral first operand. 2004-11-02 15:09:57 +01:00
bar@mysql.com
6a3b1d443f Many files: 
Allow mixing of different character sets for more SQL functions.
item_func.h:
  Allow mixing of different character sets for more SQL functions..
 2004-11-02 16:02:12 +04:00
bar@mysql.com
bc6bbebbc8 ctype_sjis.result, ctype_sjis.test, ctype-sjis.c: 
Bug #6223 Japanese half-width kana characters get truncated. Bytes 0xA1..0xDF were not treated as a single byte sequence in a mistake.
 2004-11-02 09:00:46 +04:00
pekka@mysql.com
21984b0caa Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/space/pekka/ndb/version/my41
 2004-11-01 15:43:54 +01:00
matthias@three.local.lan
afecfd77b5 Merge mleich@bk-internal.mysql.com:/home/bk/mysql-4.1 
into three.local.lan:/home/matthias/Arbeit/mysql-4.1/src
 2004-11-01 10:51:43 +01:00
timour@mysql.com
157dfcf4a4 Minor fixes of the patch for BUG#6303 2004-11-01 10:12:39 +02:00
pekka@mysql.com
354739acb7 Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/space/pekka/ndb/version/my41
 2004-10-31 15:44:35 +01:00
pekka@mysql.com
0669646752 NDB bug-6018 support writeTuple with blobs 2004-10-31 15:33:56 +01:00
konstantin@mysql.com
e97a79f2ee Enable REPLACE ... SELECT in prepared statements. 2004-10-30 17:17:52 +04:00
monty@mysql.com
afbe601302 merge with 4.1 2004-10-29 19:26:52 +03:00
timour@mysql.com
b67f86728b Fix for BUG#6303 + fix for discovered bug with sub-queries when analyzin queries for MIN/MAX optimization (WL#1724). 2004-10-29 18:20:09 +03:00
tomas@poseidon.ndb.mysql.com
475aaac8ee Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
 2004-10-29 14:38:33 +00:00
tomas@poseidon.ndb.mysql.com
dfe8b2ecea Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
 2004-10-29 14:06:57 +00:00
mleich@mysql.com
86143bc832 These modifications are the result of 
WL#2067 add features to mysqltest: "disable_error_abort" + "$mysql_errno"

$mysql_errno is a new builtin variable of mysqltest and contains the
return code of the last command send to the server.

"--disable_abort_on_error" switches the abort of mysqltest
after "unmasked" failing statements off.
"--enable_abort_on_error" switches the abort of mysqltest
after "unmasked" failing statements on. (default)

"Maskings" are
    !$<error number>  and  --error <error number>
in the line before the statement to be checked.

The benefit of the option "--disable_abort_on_error" is that
- all statements after the failing statement are executed
- a r/<test>.reject will be produced
- it is possible to write test cases, which perform
  code sequences depending on the return code of a single
  statement
 2004-10-29 14:51:56 +02:00
serg@serg.mylan
c365960582 Merge bk-internal.mysql.com:/home/bk/mysql-4.1/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
 2004-10-29 14:31:20 +02:00
serg@serg.mylan
d2bfefc3c1 proper max_records estimation for sort-repair of fulltext indexes 2004-10-29 14:24:06 +02:00
bar@mysql.com
ea49a5181a Allow to convert to non-Unicode charset when mixing a string 
constant with a column. The string is converted into the column
character set. It conversion doesn't lose data, then operation
is possible. Otherwise, give an error, as it was earlier.
 2004-10-29 16:00:03 +05:00
tomas@poseidon.ndb.mysql.com
da3efc2b82 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb 
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
 2004-10-29 10:24:56 +00:00
hf@deer.(none)
d2bb900612 Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1 
into deer.(none):/home/hf/work/mysql-4.1.6117
 2004-10-29 09:32:32 +05:00
bell@sanja.is.com.ua
13f249a025 VIEW support for CHECK TABLE command (WL#1984) 2004-10-28 19:37:25 +03:00
tomas@poseidon.ndb.mysql.com
2ebdddf2c9 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-ndb
 2004-10-28 15:52:26 +00:00
tomas@poseidon.ndb.mysql.com
289f68a1b9 test that attribute name truncation works 
exposed the attribute name size limit for handler
   added field name truncation to ndb handler
 2004-10-28 15:35:06 +00:00
timour@mysql.com
9161669492 Implementation of WL#1972 "Evaluate HAVING before SELECT select-list" 2004-10-28 17:31:26 +03:00
tomas@poseidon.ndb.mysql.com
37025cb384 Merge poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-ndb 
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-ndb-local
 2004-10-28 11:26:19 +00:00
tomas@poseidon.ndb.mysql.com
0003a8d5a0 added test for max limit of 128 attributes in table 
new define for long signal section size
   bumbed up limit for attributes to 128
    use new define in SectionSegment
    some bug fixing of send fragmented signal +
    make chunk size a multiple the dew define for SectionSegment size
 2004-10-28 11:19:51 +00:00
bell@sanja.is.com.ua
5bf7a8c30b post-merge fix 2004-10-28 14:02:09 +03:00
bar@mysql.com
541883f9d8 Produce a "truncated" warning if a value cannot be converted 
into the column character set on INSERT/UPDATE.
 2004-10-28 15:21:20 +05:00
bell@sanja.is.com.ua
dff05eb951 merge 2004-10-28 11:02:48 +03:00
hf@deer.(none)
f4bc2e7f2d Merge bk@192.168.21.1:/usr/home/bk/mysql-4.1 
into deer.(none):/home/hf/work/mysql-4.1.6117
 2004-10-28 11:38:59 +05:00
bell@sanja.is.com.ua
75f7235e8d Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 
into sanja.is.com.ua:/home/bell/mysql/bk/work-ps-4.1
 2004-10-27 23:31:24 +03:00
bell@sanja.is.com.ua
9aa2d5f750 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 
into sanja.is.com.ua:/home/bell/mysql/bk/work-ps-4.1
 2004-10-27 21:17:31 +03:00
bell@sanja.is.com.ua
3ae044c24f removed incorrect error message about aggregate functions 
improved mechanisn of detection posibility to be NULL for single row queries
switched off substitution optimisation for single row subqueries in PS due to problem in resolving substituted expressions
(changes to make subselects test working with PS protocol)
 2004-10-27 21:11:06 +03:00
monty@mysql.com
3493f54a5e Merge with 4.0 2004-10-27 19:52:41 +03:00
monty@mysql.com
d5691702d7 Fix when compiling without InnoDB 2004-10-27 18:57:49 +03:00
serg@serg.mylan
51d3d41e8e merged 2004-10-26 21:12:14 +02:00
serg@serg.mylan
8dab51445e Bug #6019 - SELECT tries to use too short prefix index on utf8 data 
Field_string::pack should respect max_length as Field_string::pack_key does
 2004-10-26 20:31:41 +02:00