mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-21 06:22:28 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
16758 commits 2781 branches 343 tags 1.6 GiB
Commit graph

3750 commits

Author SHA1 Message Date
bar@mysql.com
2f8f0f2eb2 Bug #6043 erratic searching for diacriticals in indexed MyISAM UTF-8 table 2004-10-14 14:14:50 +05:00
konstantin@mysql.com
5abc3de22b A fix and test case for Bug#5985 ""prepare stmt from "select rand(?)" 
crashes server." The fix makes Item_func_rand prepared-statements
aware plus it fixes the case when RAND is used in prepared
statements and replication is on (as well as several similar issues).
Until now we did not reset THD before every execution of a prepared
statement, so if some execution had set thd->time_zone_used
or thd->rand_used they would not be reset until next mysql_parse.
Some of post-review fixes done.
 2004-10-14 02:53:59 +04:00
joreland@mysql.com
57612c479f Merge mysql.com:/home/jonas/src/mysql-4.1 
into mysql.com:/home/jonas/src/mysql-4.1-ndb
 2004-10-13 10:19:28 +02:00
joreland@mysql.com
29c270c13e Bug#6020, any lock >= write_allow_write is a write lock 2004-10-13 10:08:18 +02:00
konstantin@mysql.com
cc57252bb7 ps.test, ps.result: a test case for Bug#6042 "constants 
propogation works only once (prepared statements)".
 2004-10-12 21:16:07 +04:00
joerg@mysql.com
ae8800d8d3 New tests for prepared statements: 
- 'ps_10nestset' uses a "nested set" approach for an employee 
  hierarchy, then does arithmetic on the "salary" field;
  (soon) to be extended by inserts / deletes which imply
  mass updates on the "l"/"r" fields showing the set inclusion,
- 'ps_11bugs' will get (some of ?) those bug DB entries which
  refer to prepared statements, but whose number does not appear
  in a test file comment - so it will also be extended.
 2004-10-12 16:00:50 +02:00
joreland@mysql.com
4041575a46 Fix order by 2004-10-12 07:20:38 +02:00
guilhem@mysql.com
c84737d6e8 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0 
into mysql.com:/home/mysql_src/mysql-4.0
 2004-10-11 11:02:24 +02:00
guilhem@mysql.com
13af58aab6 Fix for BUG#5949 "error code 1223 in binlog when using innobackup": 
when one connection had done FLUSH TABLES WITH READ LOCK, some updates, and then COMMIT,
it was accepted but my_error() was called and so, while client got no error, error was logged in binlog.
We now don't call my_error() in this case; we assume the connection know what it does.
This problem was specific to 4.0.21. The change is needed to make replication work with existing versions of innobackup.
 2004-10-11 11:01:38 +02:00
timour@mysql.com
8ab4a7a101 Merge with implementation of WL#1724. 2004-10-11 10:47:08 +03:00
tomas@poseidon.ndb.mysql.com
f05a92ce4b Merge poseidon.ndb.mysql.com:/home/tomas/mysql-4.1 
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-ndb-merge
 2004-10-10 14:08:18 +00:00
ram@gw.mysql.r18.ru
e970eab39d Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into gw.mysql.r18.ru:/usr/home/ram/work/4.1.b5382
 2004-10-10 16:31:42 +05:00
tomas@poseidon.ndb.mysql.com
f3d002c1b6 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
 2004-10-10 11:31:41 +00:00
ram@gw.mysql.r18.ru
0962ac560f clean-up, indentation fixes. 2004-10-10 15:29:06 +05:00
bell@sanja.is.com.ua
29593da2f6 showing table type now is controled by new parameter 'FULL' of SHOW TABLES command (SHOW FULL TABLES) (as it was decided on last dev conf) 2004-10-10 13:15:14 +03:00
tomas@poseidon.ndb.mysql.com
252c14049e Merge poseidon.ndb.mysql.com:/home/tomas/mysql-4.1 
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-ndb-merge
 2004-10-10 10:03:10 +00:00
ram@gw.mysql.r18.ru
48305dcd69 A fix (bug #5382: Server crashes after writing INTO OUTFILE) 2004-10-10 14:40:24 +05:00
tomas@poseidon.ndb.mysql.com
c5020e3b4c Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
 2004-10-10 08:32:15 +00:00
tomas@poseidon.ndb.mysql.com
060707c2f1 Fixes bug with tableImpl with blobs not being initialized properly w.r.t pointer to blob tableImpl in column 
added blob to test to see that blob tables don't show up in show tables
    auto increment setting need not fetch blob tables (will otherwise generate error during table creation)
    moved addBlobTables out of fetchGlobalTableImpl to get_local_table_info
    changed addBlobTables to start from last column and break if all blobs added
    also addBlobTables will return -1 if failed (typically getTable)
    changed to using get_local_table_info with internal table name where applicable for efficiency
    added option to get_local_table_info wether to fetch blob tables or not
    getTable always fetches the blobtables
    moved addBlobTables to get_local_table_info to always be called, even if main table goes to cache only
 2004-10-10 08:31:45 +00:00
ram@gw.mysql.r18.ru
5e352defa5 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into gw.mysql.r18.ru:/usr/home/ram/work/4.1.gconcat
 2004-10-10 12:35:39 +05:00
ram@gw.mysql.r18.ru
5f857a7a82 Blob support for the group_concat() function. 
(Bug #4315: GROUP_CONCAT with ORDER BY returns strange results for TEXT fields
 Bug #5564: Strange behaviour with group_concat and distinct
 Bug #5970: group_concat doesn't print warnings)
 2004-10-10 12:10:53 +05:00
konstantin@mysql.com
daa4c2495c A fix and test case for Bug#5987 "subselect in bool function 
crashes server (prepared statements)": the bug was that all boolean
items always recovered its original arguments at statement cleanup 
stage.
This collided with Item_subselect::select_transformer, which tries to 
permanently change the item tree to use a transformed subselect instead of
original one.
So we had this call sequence for prepare:
mysql_stmt_prepare -> JOIN::prepare -> 
Item_subselect::fix_fields -> the item tree gets transformed ->
Item_bool_rowready_func2::cleanup, item tree is recovered to original
state, while it shouldn't have been;
mysql_stmt_execute -> attempts to execute a broken tree -> crash.
Now instead of bluntly recovering all arguments of bool functions in 
Item_bool_rowready_func2::cleanup, we recover only those
which were changed, and do it in one place.
There still would exist a possibility for a collision with subselect
tranformation, if permanent and temporary changes were performed at the 
same stage.
But fortunately subselect transformation is always done first, so it 
doesn't conflict with the optimization done by propogate_cond_constants.
Now we have: 
mysql_stmt_prepare -> JOIN::prepare -> subselect transformation 
permanently changes the tree -> cleanup doesn't recover anything, 
because nothing was registered for recovery.
mysql_stmt_execute -> JOIN::prepare (the tree is already transformed, 
so it doesn't change), JOIN::optimize -> 
propogate_cond_constants -> temporary changes the item tree 
with constants -> JOIN::execute -> cleanup -> 
the changes done by propogate_cond_constants are recovered, as
they were registered for recovery.
 2004-10-10 02:39:22 +04:00
igor@rurik.mysql.com
71f6ab7a09 Merge for Item_equal. 2004-10-09 10:34:13 -07:00
bell@sanja.is.com.ua
183036ea9a 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-10-09 18:52:27 +03:00
bell@sanja.is.com.ua
c287345cb8 fixed incorrect type custing (fixed problem with runing tests with --debug (thanks, Sergei Gluhov spoted it)) 2004-10-09 18:51:19 +03:00
magnus@neptunus.(none)
01c29fc921 BUG#5973 ndb table belonging to different database shows up in SHOW TABLES 2004-10-08 13:37:13 +02:00
dlenev@brandersnatch.localdomain
80d2d8d662 Fix for bug #5887 "Triggers with string literals cause errors" 
Fixed small error in new .FRM parser which caused it to handle 
improperly escaped strings.
 2004-10-08 15:16:03 +04:00
bell@sanja.is.com.ua
c5f5a8b65c 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-10-08 11:29:06 +03:00
kent@mysql.com
05c01360e3 Makefile.am, client_test.test, mysql-test-run.sh: 
To make client_test work as mysql-test-run test case, needs to install it
 2004-10-08 01:39:20 +02:00
konstantin@mysql.com
d7bda287de Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/media/sda1/mysql/mysql-4.1-5748-anew
 2004-10-08 02:22:40 +04:00
konstantin@mysql.com
2aa7ec0d9d A fix for Bug#5748 "Prepared statement with BETWEEN and bigint values 
crashes mysqld": implementation for a generic item tree modifications
registry. Every item tree modification which should be rolled back for
subsequent execution of a prepared statement or stored procedure should
be saved in the registry. All such modifications are rolled back at once
during cleanup stage of PS.
Actual fix for the bug just adds a call to register modifications to
convert_constant_item.
Post review fixes implemented.
 2004-10-08 02:21:19 +04:00
monty@mysql.com
aa2327f95e Portability fix (Got different results for double -> longlong when compiling with full optimization) 2004-10-08 00:48:42 +03:00
bell@sanja.is.com.ua
78acfbb740 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-10-07 23:00:33 +03:00
bell@sanja.is.com.ua
78997a2acd allow merging views with subqueries in WHERE clause (BUG#5504) 2004-10-07 22:54:31 +03:00
tomas@poseidon.ndb.mysql.com
0d5c9fb910 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-ndb-merge
 2004-10-07 16:57:53 +00:00
tomas@poseidon.ndb.mysql.com
69f40808e2 ndb_alter_table.result, ndb_alter_table.test: 
...
 2004-10-07 16:30:21 +00:00
magnus@neptunus.(none)
d167c09834 Merge msvensson@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb 
into neptunus.(none):/home/magnus/mysql/mysql-4.1-ndb
 2004-10-07 15:42:56 +02:00
tomas@poseidon.ndb.mysql.com
6f0dc0f48e Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-ndb
 2004-10-07 13:42:55 +00:00
pem@mysql.comhem.se
8b1a6d377f Revised BUG#5000: SPs can be created with no default database. 
Now simply give an error if no database. (The "global SP feature" will be
done using PATH instead.)
 2004-10-07 15:32:36 +02:00
monty@mysql.com
3a24c279be Fix results (becasue of strict mode) 2004-10-07 16:18:27 +03:00
bell@sanja.is.com.ua
d73ba9660d test of DELETE privilege and cyclic reference added in case of altering view (BUG#5148) 
fixed ALTER VIEW syntax
fixed WITH CHECK OPTION clause printing in SHOW CREATE VIEW
 2004-10-07 15:43:04 +03:00
tomas@poseidon.ndb.mysql.com
a257686692 more order by fixes 2004-10-07 12:36:37 +00:00
magnus@neptunus.(none)
ac9016df91 Initialise "sorted" variable in constructor of QUICK_SELECT. The variable is set to 1 in test_if_skip_sort_order if we decide to optimize "order by" by uinsg index_read. 2004-10-07 11:57:48 +02:00
tomas@poseidon.ndb.mysql.com
0ac2c35fe9 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-ndb
 2004-10-07 09:57:46 +00:00
dlenev@mysql.com
e5483ab3bd Manual merge of tree containing fix for bug #5915 "ALTER TABLE behaves 
differently when converting column to auto_increment in 4.1" with
current tree.
 2004-10-07 13:51:32 +04:00
monty@mysql.com
546c2bd6ab Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/my/mysql-4.1
 2004-10-07 12:37:21 +03:00
tomas@poseidon.ndb.mysql.com
690cdfc697 added order by to give same order results on different endian and different sized clusters 2004-10-07 09:27:39 +00:00
bell@sanja.is.com.ua
da5a55e3cd sql_updatable_view_key replaced with updatable_views_with_limit 
now default behaviour do not prevent any updates of view.
Also updating VIEWs of queries without LIMIT clause will not be checked at all (there will not be even warning)
(changes according to discussion on last dev-conf)
 2004-10-07 12:13:42 +03:00
dlenev@brandersnatch.localdomain
1f54900630 Fix for bug #5915 "ALTER TABLE behaves differently when converting column 
to auto_increment in 4.1".
Now we are enforcing NO_AUTO_VALUE_ON_ZERO mode during ALTER TABLE only
if we are converting one auto_increment column to another auto_increment
column (this also includes most common case when we don't do anything
with such column).

Also now when we convert some column to TIMESTAMP NOT NULL column with
ALTER TABLE we convert NULL values to current timestamp, (as we do this
in INSERT). One can still get old behavior by setting system TIMESTAMP
variable to 0.
 2004-10-07 13:02:39 +04:00
tomas@poseidon.ndb.mysql.com
a8d2692c65 adder order by 2004-10-07 08:42:11 +00:00
monty@mysql.com
6239edc1d1 After merge fixes 
Some bigger code changes was necessary becasue of the multi-table-update and the new HANDLER code
 2004-10-07 10:50:13 +03:00
monty@mysql.com
62f3cd6a31 Merge with 4.0 for 4.1 release 
Noteworthy:
- New HANDLER code
- New multi-update-grant-check code
- Table lock code in ha_innodb.cc was not applied
 2004-10-06 19:14:33 +03:00
tomas@poseidon.ndb.mysql.com
ae87bd11fb Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-ndb2
 2004-10-06 13:34:17 +00:00
tomas@poseidon.ndb.mysql.com
884892a650 bug#5736, subqueries and not in 
and testcases
 2004-10-06 13:18:55 +00:00
joreland@mysql.com
f715d82a74 testcase for bug#5736 
fix of changed clo to mysql-test-run
 2004-10-06 11:00:09 +02:00
ram@gw.mysql.r18.ru
0944bed7fc Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.0 
into gw.mysql.r18.ru:/usr/home/ram/work/4.0.b5733
 2004-10-06 12:49:56 +05:00
bar@mysql.com
3fc7640a19 Bug #5832 SELECT doesn't return records in some cases 2004-10-05 21:22:14 +05:00
joreland@mysql.com
761bc1ce4d Merge mysql.com:/home/jonas/src/mysql-4.1 
into mysql.com:/home/jonas/src/mysql-4.1-ndb
 2004-10-05 15:02:10 +02:00
gluh@gluh.mysql.r18.ru
2a621e275b Fix for bug #5555: "GROUP BY enum_field" returns incorrect results 2004-10-05 17:02:09 +04:00
joreland@mysql.com
9d6cb54bce Merge mysql.com:/home/jonas/src/mysql-4.1 
into mysql.com:/home/jonas/src/mysql-4.1-ndb
 2004-10-05 14:04:33 +02:00
joreland@mysql.com
0a8bbe4d85 wl2135 - index restart 2004-10-05 12:17:42 +02:00
ingo@mysql.com
c546074e21 Merge mysql.com:/home/mydev/mysql-4.0 
into mysql.com:/home/mydev/mysql-4.0-bug4286
 2004-10-05 11:33:13 +02:00
igor@rurik.mysql.com
a9b759af3e join_outer.result, join_outer.test: 
Added a test case for bug #5896.
sql_select.cc:
  Fixed the problem of ignoring on expressions depending
  only on outer table when outer table either contains
  1 row or is guaranteed to return only 1 row (bug #5896).
 2004-10-04 22:26:36 -07:00
monty@mishka.local
76a315410b After merge fixes 2004-10-05 03:05:20 +03:00
monty@mishka.local
5eca078b19 merge 2004-10-05 01:10:23 +03:00
monty@mishka.local
0fa62b691b Fixed bug in strict mode (A state was not properly cleared on successful insert/update's) 2004-10-05 01:05:15 +03:00
dlenev@mysql.com
0d83bdf20d Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/dlenev/src/mysql-4.1-ryan
 2004-10-04 20:13:16 +04:00
dlenev@mysql.com
a4d5804e31 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/dlenev/src/mysql-4.1-ryan
 2004-10-04 17:16:49 +04:00
dlenev@brandersnatch.localdomain
cfd34f779f Made TIMESTAMP NULL columns without explicit DEFAULT value to be always 
treated as DEFAULT NULL columns (independently from their position in
table).

(still to be discussed with Monty, Brian, Trudy et al. before push)
 2004-10-04 17:13:31 +04:00
tomas@poseidon.ndb.mysql.com
bc5ca3a1ce Merge 2004-10-04 12:36:25 +00:00
tomas@poseidon.ndb.mysql.com
e13b136c9a bug #5872, transactions should only be restarted with transaction.on flag off if execute_commit has been performed 
added testcase for this
use force send for all executes
 2004-10-04 12:26:26 +00:00
bell@sanja.is.com.ua
9062e99ee6 merge 2004-10-04 13:56:48 +03:00
bell@sanja.is.com.ua
9d9c950445 postmerge fix 2004-10-04 13:45:35 +03:00
tomas@poseidon.ndb.mysql.com
f6ad058388 Merge 2004-10-03 21:39:04 +00:00
antony@ltantony.rdg.cyberkinetica.homeunix.net
b36a565931 Merge ltantony.rdg.cyberkinetica.homeunix.net:/usr/home/staff/repositories/mysql-4.0 
into ltantony.rdg.cyberkinetica.homeunix.net:/usr/home/antony/work/bug4118
 2004-10-03 00:25:09 +01:00
antony@ltantony.rdg.cyberkinetica.homeunix.net
2973a047ea Bug#4118: multi-table UPDATE takes WRITE lock on read table 
Ensures that WRITE lock is not obtained on all tables referenced.
 2004-10-03 00:20:47 +01:00
monty@mishka.local
be4ca46fbe More fixes for strict mode: 
More tests.
Better error messages.
Fixed bug when checking if we updated all needed columns for INSERT.
Give an error if we encounter a wrong float value during parsing.
Don't print DEFAULT for columns without a default value in SHOW CREATE/SHOW FIELDS.
Fixed UPDATE IGNORE when using STRICT mode.
 2004-10-02 22:20:08 +03:00
tomas@poseidon.ndb.mysql.com
fbf2a6ac0c Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
 2004-10-01 22:15:05 +00:00
tomas@poseidon.ndb.mysql.com
5745223a90 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
 2004-10-01 21:35:50 +00:00
dellis@goetia.(none)
141a5eeaca Merge dellis@bk-internal.mysql.com:/home/bk/mysql-4.1 
into goetia.(none):/home/dellis/mysqlab/bk/mysql-4.1
 2004-10-01 14:53:52 -05:00
dellis@goetia.(none)
ce6f076315 grant.test, grant.result, sql_acl.cc: 
BUG #5831 Changed mysql_revoke_all() to successfully delete all privileges for a user in one pass.
 2004-10-01 14:48:48 -05:00
brian@avenger.(none)
da71f76910 Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.0 
into avenger.(none):/export/brian/mysql/schema-5.0
 2004-10-01 12:44:52 -07:00
brian@avenger.(none)
335a81ebb0 Update to add keyword "SCHEMA" and "SCHEMAS". Small test case was added too. 2004-10-01 12:39:11 -07:00
kent@mysql.com
391cc2963a Merge mysql.com:/home/bk/mysql-4.1 
into mysql.com:/users/kboortz/daily/work/mysql-4.1-vax
 2004-10-01 18:28:44 +02:00
kent@mysql.com
3f717d7c00 client_test.test: 
Temporarely disabled client_test test
  Use MASTER_MYSOCK to get socket path
 2004-10-01 18:27:24 +02:00
tomas@poseidon.ndb.mysql.com
929e98b45b Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
 2004-10-01 16:17:04 +00:00
dlenev@mysql.com
53209cc4fc Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/dlenev/src/mysql-4.1-ryan
 2004-10-01 18:55:17 +04:00
dlenev@brandersnatch.localdomain
2511990c97 Support for TIMESTAMP columns holding NULL values. Unlike all other 
column types TIMESTAMP is NOT NULL by default, so in order to have 
TIMESTAMP column holding NULL valaues you have to specify NULL as
one of its attributes (this needed for backward compatibility).

Main changes:
Replaced TABLE::timestamp_default_now/on_update_now members with
TABLE::timestamp_auto_set_type flag which is used everywhere
for determining if we should auto-set value of TIMESTAMP field 
during this operation or not. We are also use Field_timestamp::set_time()
instead of handler::update_timestamp() in handlers.
 2004-10-01 18:54:06 +04:00
dellis@goetia.(none)
f5b7774e99 Merge dellis@bk-internal.mysql.com:/home/bk/mysql-4.1 
into goetia.(none):/home/dellis/mysqlab/bk/mysql-4.1
 2004-10-01 08:22:12 -05:00
mskold@mysql.com
dd8c74beac Added index cardinality check 2004-10-01 14:57:17 +02:00
dellis@goetia.(none)
8a12b5add0 logging_ok: 
Logging to logging@openlogging.org accepted
sql_acl.cc, grant.test, grant.result:
  BUG 5831 Changed mysql_revoke_all() to successfully delete all privileges for a user in one pass.
 2004-10-01 07:50:26 -05:00
mskold@mysql.com
ca47a4a25c Changed test to be independent on scan order 2004-10-01 14:23:31 +02:00
ram@gw.mysql.r18.ru
4ec50dc4d7 delete.result, delete.test: 
A fix (bug #5733: Table handler error with self-join multi-table DELETE).
records.cc:
  A fix (bug #5733: Table handler error with self-join multi-table DELETE).
 2004-10-01 16:23:54 +05:00
tomas@poseidon.ndb.mysql.com
5e8ce3841a bug#5349 ALTER TABLE corrupts TEXT (and blob?) 2004-10-01 11:16:49 +00:00
jan@hundin.mysql.fi
aaf661fcaa Merge jlindstrom@build.mysql.com:/home/bk/mysql-4.1 
into hundin.mysql.fi:/home/jan/mysql-4.1
 2004-10-01 08:39:34 +03:00
kent@mysql.com
48006039c1 client_test.test: 
Use TESTS_BINDIR to point out bin dir for "client_test"
mysql-test-run.sh:
  Export TESTS_BINDIR to be used from --exec
 2004-10-01 00:32:42 +02:00
tomas@poseidon.ndb.mysql.com
77582df921 bug#5782 2004-09-30 21:36:25 +00:00
kent@mysql.com
d7bdb6bede Merge mysql.com:/home/bk/mysql-4.1 
into mysql.com:/users/kboortz/daily/work/mysql-4.1-vax
 2004-09-30 19:41:39 +02:00
kent@mysql.com
b045736508 mysql_protocols.test: 
--exec now checks return code, make all command lines succeed
 2004-09-30 19:40:33 +02:00
magnus@neptunus.(none)
4faaed98ed Merge fixes 2004-09-30 16:12:28 +02:00
dlenev@mysql.com
28f933fe10 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/dlenev/src/mysql-4.1-bg4302
 2004-09-30 16:30:34 +04:00
dlenev@brandersnatch.localdomain
0aa589d099 Final solution for bug# 4302 "Ambiguos order by when renamed column is 
identical to another in result"
According to SQL standard queries like 
"select t1.a as col from t1, t2 order by a" should return an error if
both tables contain field a.
 2004-09-30 16:28:17 +04:00
magnus@neptunus.(none)
9e4ba7dac2 WL#1424 Added more advanced test cases for autodiscovery 2004-09-30 14:20:14 +02:00
pem@mysql.comhem.se
f3a0ba3515 Fixed BUG#4905: Stored procedure doesn't clear for "Rows affected". 2004-09-29 18:55:05 +02:00
bell@sanja.is.com.ua
013512abab merge 2004-09-29 17:10:17 +03:00
jan@hundin.mysql.fi
2be1005bcf Merge jlindstrom@build.mysql.com:/home/bk/mysql-4.1 
into hundin.mysql.fi:/home/jan/mysql-4.1
 2004-09-29 08:22:37 +03:00
tomas@poseidon.ndb.mysql.com
80b2b102b4 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-ndb
 2004-09-28 17:44:40 +00:00
monty@mishka.local
1fc7e6af85 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into mishka.local:/home/my/mysql-5.0
 2004-09-28 20:19:03 +03:00
monty@mishka.local
f2941380c4 Strict mode & better warnings 
Under strict mode MySQL will generate an error message if there was any conversion when assigning data to a field.
Added checking of date/datetime fields.
If strict mode, give error if we have not given value to field without a default value (for INSERT)
 2004-09-28 20:08:00 +03:00
kent@mysql.com
43d3516cc6 Merge mysql.com:/home/bk/mysql-4.1 
into mysql.com:/users/kboortz/daily/work/mysql-4.1-vax
 2004-09-28 16:43:05 +02:00
kent@mysql.com
155e1ec330 client_test.test: 
Run client_test as a testcase
  new file
mysql-test-run.sh:
  More clearly report failure if --force, also exit 1
client_test.c:
  Use MAXPATHLEN in test_frm_bug()
  Renable test cases disabled for running from mysql-test-run
mysqltest.c:
  Don't check errno from popen, may not be set
 2004-09-28 16:27:50 +02:00
bell@sanja.is.com.ua
3bddaaf80f fix test suite for portability 2004-09-28 12:31:33 +03:00
mskold@mysql.com
18d5e9b45c Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb 
into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1-ndb
 2004-09-28 10:34:26 +02:00
mskold@mysql.com
1b9d0b340d Adjusted so auto_increment value after bulk insert will be exactly +1 after last (if no parallel inserts) 2004-09-28 09:53:14 +02:00
tomas@poseidon.ndb.mysql.com
8e653fcb04 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-ndb
 2004-09-27 16:11:58 +00:00
jan@hundin.mysql.fi
7d9766b107 Merge jlindstrom@build.mysql.com:/home/bk/mysql-4.1 
into hundin.mysql.fi:/home/jan/mysql-4.1
 2004-09-27 10:46:02 +03:00
dlenev@mysql.com
4ff9f1f558 Merge bk-internal.mysql.com:/home/bk/mysql-4.0 
into mysql.com:/home/dlenev/src/mysql-4.0-bg4131-3
 2004-09-27 00:50:29 +04:00
dlenev@mysql.com
263b33e12d Fix for bug #4131 "TIMESTAMP columns missing minutes and seconds when 
using GROUP BY"
Now we are setting Field_timestamp::field_length to 19 in open_table()
if we are in new mode (and we are restoring it back when we are coming
back to normal mode). This also should solve potential problems with
some of LOAD DATA INFILE and SELECT * INTO in this mode.
 2004-09-27 00:50:00 +04:00
bar@noter.intranet.mysql.r18.ru
010f4242b7 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1/ 
into noter.intranet.mysql.r18.ru:/root/mysql-4.1
 2004-09-26 21:55:17 +05:00
bar@noter.intranet.mysql.r18.ru
29b8c6b1e0 bug #5723 length(varchar utf8 field) returns verying results 2004-09-26 21:52:20 +05:00
bell@sanja.is.com.ua
ff102adddf fix xml with view 2004-09-26 19:00:55 +03:00
mskold@mysql.com
f29939c453 Setting MODE_NO_AUTO_VALUE_ON_ZERO at copying in copy_data_between_tables 2004-09-26 17:11:28 +02:00
bell@sanja.is.com.ua
75b628b89d Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 
into sanja.is.com.ua:/home/bell/mysql/bk/work-4.1
 2004-09-26 17:31:06 +03:00
magnus@shellback.(none)
94b305b226 Merge 2004-09-26 16:21:15 +02:00
magnus@shellback.(none)
059941db21 WL#1424 Updated after review 
* Changed the implementation of ndbcluster_find_files to be more efficient, using only one mutex lock
* Moved ha_find_files to end of mysql_find_files so that it can be passed the list that we are interested to find.
 2004-09-26 16:11:24 +02:00
dlenev@brandersnatch.localdomain
b7d7c62f24 Disabled part of ps_1general.test behaving differently on different builds. 
(Until mysqltest will support replace_result and replace_column on metadata).
 2004-09-26 15:57:07 +04:00
bell@sanja.is.com.ua
6df58cc97e Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 
into sanja.is.com.ua:/home/bell/mysql/bk/work-4.1
 2004-09-25 18:37:28 +03:00
konstantin@mysql.com
d03f447f84 Results of WL#1856 "Conversion of client_test.c tests cases to mysqltest 
if possible"
        - many new test cases
        - more and improved comments
      New files: t/ps_7ndb.test       test suite for NDB tables
                 r/ps_7ndb.result     expected results
                 include/ps_conv.inc  conversion test cases
+ review comments and fixes.
 2004-09-25 19:08:02 +04:00
tomas@poseidon.ndb.mysql.com
71d5ea8f85 fix for invalidating table if mismatch with frm 
removed debug printout
    new test in alter table for dictionay update test with multiple connections
    added coice of setting MaxNoOfOrderedIndexes
    added option to run "--small-bench"
 2004-09-24 16:58:25 +00:00
ingo@mysql.com
e47decfa7f BUG#4286 - HANDLER tables are closed by FLUSH TABLE(S). 
BUG#4335 - one name can be handler open'ed many times.
Reworked the HANDLER functions and interface.
Using a HASH to store information on open tables that
survives FLUSH TABLE.
HANDLER tables alias names must now be unique, though it
is allowed in 4.0 to qualify them with the database name
of the base table.
 2004-09-24 18:39:25 +02:00
hf@deer.(none)
c14b95f656 Merging 2004-09-24 18:35:39 +05:00
tomas@poseidon.ndb.mysql.com
0273e84b7f Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-ndb-merge
 2004-09-24 11:07:55 +00:00
bell@sanja.is.com.ua
2264bb01ca new show create view output 
mysqldump view support (BUG#4972)
workaround to allow view work after LOCK TABLES
 2004-09-24 12:50:10 +03:00
bar@noter.intranet.mysql.r18.ru
b5b7801917 logging_ok: 
Logging to logging@openlogging.org accepted
sql_show.cc, type_enum.test, type_enum.result:
  Bug #5628 German characters in field-defs will be '?' with some table definitions
 2004-09-24 13:14:44 +05:00
konstantin@mysql.com
aa80184072 A fix and test case for bug#5688 "Upgraded 4.1.5 Server seg faults" 2004-09-23 18:01:55 +04:00
hf@deer.(none)
7f7f7b0d5f Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1 
into deer.(none):/home/hf/work/mysql-4.1.5371
 2004-09-23 17:01:30 +05:00
guilhem@mysql.com
00d2e803dc Fix for BUG#5705: "SET CHARATER_SET_SERVERetc will be lost if STOP SLAVE before following query": 
we do not increment rli->group_master_log_pos if we are just after a SET ONE_SHOT (it's not a standalone event)
 2004-09-23 12:16:56 +02:00
hf@deer.(none)
5301a08091 Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1 
into deer.(none):/home/hf/work/mysql-4.1.5371
 2004-09-23 15:12:32 +05:00
jan@hundin.mysql.fi
97e30064b2 Merge jlindstrom@build.mysql.com:/home/bk/mysql-4.1 
into hundin.mysql.fi:/home/jan/mysql-4.1
 2004-09-23 10:11:28 +03:00
hf@deer.(none)
d8c626eb53 Additional fix for bug #5136 (Geometry object is corrupted when queried) 
CREATE TABLE t1 SELECT POINT(1,2); fixed
 2004-09-22 22:36:53 +05:00
tomas@poseidon.ndb.mysql.com
a0317069e5 Merge 2004-09-21 12:56:05 +00:00
magnus@neptunus.(none)
58899f0137 Merge msvensson@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb 
into neptunus.(none):/home/magnus/mysql/wl/wl1424_discover_2
 2004-09-21 12:23:27 +02:00
magnus@neptunus.(none)
0097c6d9b2 Changed WL#1424 to use the function ha_find_files. This is a simpler implementation and all handler specific code is hidden in the appropriate handler. 2004-09-21 12:13:58 +02:00
brian@private-client-ip-101.oz.net
ce218b9b99 Merge baker@bk-internal.mysql.com:/home/bk/mysql-4.1 
into private-client-ip-101.oz.net:/Users/brian/mysql/mysql-4.1
 2004-09-21 10:18:33 +02:00
brian@brian-akers-computer.local
9dbe9d533e The major change for this changeset is the addition of code to handle: 
OPTIMIZE TABLE <archive table>

This recompresses the table, thus removing any additional gzip headers caused by opening/closing or flushing the table.
 2004-09-21 03:33:22 +02:00
joreland@mysql.com
b5fe917271 Merge mysql.com:/home/jonas/src/mysql-4.1 
into mysql.com:/home/jonas/src/mysql-4.1-ndb
 2004-09-20 20:56:16 +02:00
magnus@neptunus.(none)
2a344c0bc1 Merge msvensson@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb 
into neptunus.(none):/home/magnus/mysql/wl/wl1424_discover_2
 2004-09-20 17:32:40 +02:00
magnus@neptunus.(none)
cdc7a32f37 Merged Thd_ndb 2004-09-20 14:28:43 +02:00
joreland@mysql.com
b931460546 Merge mysql.com:/home/jonas/src/mysql-4.1 
into mysql.com:/home/jonas/src/mysql-4.1-ndb
 2004-09-20 13:36:23 +02:00
magnus@neptunus.(none)
9aab724d6c Ues buf pointer in get_ndb_value 
Merge fixes
 2004-09-20 12:40:53 +02:00
magnus@neptunus.(none)
47168d1219 Merged new ndb_insert.test and .result 2004-09-20 11:14:31 +02:00
jan@hundin.mysql.fi
03621882f3 Merge jlindstrom@build.mysql.com:/home/bk/mysql-4.1 
into hundin.mysql.fi:/home/jan/mysql-4.1
 2004-09-19 17:36:34 +03:00
gluh@gluh.mysql.r18.ru
276622c92d Fix for bug #5595: NULLIF() IS NULL returns false if NULLIF() returns NULL 2004-09-18 13:06:44 +04:00
konstantin@mysql.com
4230eae857 A fix and test case for bug#5510 "inserting Null in AutoIncrement primary 
key Column Fails".
 2004-09-18 01:10:09 +04:00
bell@sanja.is.com.ua
74e7df0d80 SHOW CREATE VIEW (TABLE) privilege now reqiere show create privilege 
(BUG#4777)
 2004-09-17 22:23:59 +03:00
bell@sanja.is.com.ua
26589ba8ce Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0 
into sanja.is.com.ua:/home/bell/mysql/bk/work-5.0
 2004-09-17 19:16:54 +03:00
bell@sanja.is.com.ua
f11bcefae1 fixed error handling if creating derived table failed 
single row subquery always can return NULL (no rows found) (BUG#5590)
 2004-09-17 19:08:46 +03:00
pem@mysql.comhem.se
5b10e3e5b5 Fixed BUG#3583: query cache doesn't work for stored procedures. 2004-09-17 15:40:38 +02:00
pekka@mysql.com
e274047c24 Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb 
into mysql.com:/space/pekka/ndb/version/my41-cc
 2004-09-17 14:18:32 +02:00
pekka@mysql.com
d02998e20f ndb charsets (wl-1732) final part: use strxfrm + strcoll 2004-09-17 14:09:21 +02:00
antony@ltantony.rdg.cyberkinetica.homeunix.net
0b6dc49388 Bug#5553 - Multi table UPDATE IGNORE fails on dup key 
We don't want the update to abort when IGNORE is specified
 2004-09-17 12:07:59 +01:00
bell@sanja.is.com.ua
d2474ee2e5 Do not try use fields examples is expression and fiend used or SET/ENUM field used in types merging procedure (BUG#5618) 2004-09-17 13:23:57 +03:00
monty@mishka.local
095f7e8740 Removed wrong warnings in test suite (This was because select_insert / select_create results was not freed. 
Added thd to openfrm() for initialization of TABLE->in_use. This fixed a bug in BDB handling where table->in_use was used early
 2004-09-17 03:08:23 +03:00
bell@sanja.is.com.ua
226d4ad8f4 now we allow to careate VIEW without any privileges on view columns (except create view privilege) (BUG#5152) 2004-09-17 00:16:57 +03:00
bell@sanja.is.com.ua
09b316f051 updateability of field with collation support (BUG#5506) 2004-09-16 23:45:20 +03:00
jan@hundin.mysql.fi
762c24f29a Merge jlindstrom@build.mysql.com:/home/bk/mysql-4.1 
into hundin.mysql.fi:/home/jan/mysql-4.1
 2004-09-16 21:32:05 +03:00
konstantin@mysql.com
2fd2846f55 A quick fix for bug#5556: replace a column of SHOW TABLE STATUS result 
with a fixed constant to pass on QNX:
max_data_file_length is calculated depending on max possible value of
record pointer. It's different on QNX, so the difference in results is OK.
 2004-09-16 22:13:24 +04:00
bell@sanja.is.com.ua
97a1418d16 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 
into sanja.is.com.ua:/home/bell/mysql/bk/work-update-4.1
 2004-09-16 17:47:53 +03:00
bell@sanja.is.com.ua
f6dba131eb Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 
into sanja.is.com.ua:/home/bell/mysql/bk/work-sum-4.1
 2004-09-16 16:24:46 +03:00
ram@gw.mysql.r18.ru
dda34d21b9 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into gw.mysql.r18.ru:/usr/home/ram/work/4.1
 2004-09-16 15:05:17 +05:00
ram@gw.mysql.r18.ru
80f6c7e9a9 Clean-up. The length of compress() may depend on zlib version, etc. 2004-09-16 15:01:12 +05:00
monty@mishka.local
37864e2727 Merge 2004-09-15 22:36:57 +03:00
monty@mishka.local
91ff64e107 Added options --auto-increment-increment and --auto-increment-offset. 
This allows one to setup a master <-> master replication with non conflicting auto-increment series.
Cleaned up binary log code to make it easyer to add new state variables.
Added simpler 'upper level' logic for artificial events (events that should not cause cleanups on slave).
Simplified binary log handling.
Changed how auto_increment works together with to SET INSERT_ID=# to make it more predictable: Now the inserted rows in a multi-row statement are set independent of the existing rows in the table. (Before only InnoDB did this correctly)
 2004-09-15 22:10:31 +03:00
wax@mysql.com
c315ee2f60 Merge mysql.com:/home/wax/mysql/mysql-4.1 
into mysql.com:/home/wax/mysql/mysql-4.1mysqltest
 2004-09-16 00:53:06 +06:00
wax@mysql.com
d6dadac46c Merge mysql.com:/home/wax/mysql/mysql-4.1 
into mysql.com:/home/wax/mysql/mysql-4.1mysqltest
 2004-09-16 00:50:05 +06:00
wax@kishkin.ru
eb7515366b WL#964 
porting mysql_test_run on Linux and Windows
 2004-09-16 00:47:45 +06:00
mskold@mysql.com
9cf8385540 Merge mskold@build.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/usr/local/home/marty/MySQL/test/mysql-4.1
 2004-09-15 19:01:00 +02:00
mskold@mysql.com
4a9805679e Fixed handling of NO_AUTO_VALUE_ON_ZERO 2004-09-15 18:44:18 +02:00
hf@deer.(none)
02595629c2 Fix for bug #5532 (error 22 inserting GIS data) 
This bug is the result of weird error happening with mi_float8get and double
arythmetic. I described that in 'Bug that looks potentially dangerous' email
 2004-09-15 19:46:42 +05:00
magnus@neptunus.(none)
013486701c BUG#4775 "Duplicate key requires rollback of transaction" - Improved error message telling that transaction is aborted 
BUG#4312 "wrong behaviour on insert .. on duplicate key" functionality disabled
 2004-09-15 14:44:21 +02:00
ram@gw.mysql.r18.ru
b3dc9f65b0 A fix (bug #5540: CONCAT function and 'double' type). 2004-09-15 15:13:17 +05:00
ingo@mysql.com
89b29aa1b3 Merge mysql.com:/home/mydev/mysql-4.1 
into mysql.com:/home/mydev/mysql-4.1-bug5318
 2004-09-14 18:17:03 +02:00
tomas@poseidon.(none)
457dfbe779 Added testcase for select count() during transaction with failures 
added fix for keeping "records" up to date when execute() fails
 2004-09-14 15:51:57 +00:00
ingo@mysql.com
38767cadba Merge mysql.com:/home/mydev/mysql-4.1 
into mysql.com:/home/mydev/mysql-4.1-bug5318
 2004-09-14 13:50:30 +02:00
ingo@mysql.com
ce8db2bfb7 BUG#5318 - failure: 'IGNORE_SPACE' affects numeric values after DEFAULT. 
Added a check to recover from IGNORE_SPACE in this situation: 
<ident-character(s)><space><dot><ident-character(s)>
The ignored space led to the false identification of the dot
as an ident separator (like "db.table").
 2004-09-14 13:49:08 +02:00
magnus@neptunus.(none)
619b8a0beb Merge msvensson@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb 
into neptunus.(none):/home/magnus/mysql/wl/wl1424_discover_2
 2004-09-14 10:03:56 +02:00
ram@gw.mysql.r18.ru
a3a6b7fa25 A fix (bug #5497: COMPRESS() returns NULL for large strings). 2004-09-13 18:43:59 +05:00
magnus@neptunus.(none)
d41f7af07e Merged 2004-09-13 14:49:50 +02:00
magnus@neptunus.(none)
8abbb28f8b WL1424 Multiple MySQL Servers: SHOW TABLES etc. should detect new and delete old tables. 2004-09-13 14:46:38 +02:00
ram@gw.mysql.r18.ru
2488b827de A fix (bug #5498 TRIM fails with LEADING or TRAILING if remstr = str). 2004-09-13 14:25:43 +05:00
ram@gw.mysql.r18.ru
0480c17730 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into gw.mysql.r18.ru:/usr/home/ram/work/4.1.b5428
 2004-09-13 12:39:04 +05:00
bar@mysql.com
134b5c7d75 Persian collation, contibuted by Jody McIntyre 2004-09-13 12:07:01 +05:00
gluh@gluh.mysql.r18.ru
3b7378f992 Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.1 
into gluh.mysql.r18.ru:/home/gluh/MySQL-BUGS/mysql-4.1
 2004-09-12 10:41:06 +04:00
bell@sanja.is.com.ua
bcadf50bc0 Merge abelkin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0
 2004-09-11 18:50:54 +03:00
gluh@gluh.mysql.r18.ru
c1d25e32ec Fix for bug #5513: FIND_IN_SET fails if set ends with a comma 2004-09-11 15:48:23 +04:00
ingo@mysql.com
ad12db7678 Merge mysql.com:/home/mydev/mysql-4.1 
into mysql.com:/home/mydev/mysql-4.1-bug4788
 2004-09-11 12:31:28 +02:00
bell@sanja.is.com.ua
900a62961f view with WHERE in nested join (BUG#5511) 2004-09-10 22:39:04 +03:00
bell@sanja.is.com.ua
796b625420 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 
into sanja.is.com.ua:/home/bell/mysql/bk/work-4.1
 2004-09-10 21:40:18 +03:00
tomas@poseidon.(none)
74336d596f removed shaky test case 2004-09-10 17:40:02 +00:00
ingo@mysql.com
6c47f075c7 BUG#4788 - show create table provides incorrect statement. 
Added code to adjust the field_length of user variables 
in dependence on the field type.
Aded new constants for numeric field widths.
 2004-09-10 18:56:47 +02:00
pem@mysql.com
e66b5c404c Merge mysql.com:/usr/local/bk/mysql-5.0 
into mysql.com:/home/pem/work/mysql-5.0-merge
 2004-09-10 16:33:21 +02:00
pem@mysql.comhem.se
728000b225 Fixed BUG#4941: Stored procedure crash fetching null value into variable. 2004-09-10 16:28:11 +02:00
bell@sanja.is.com.ua
24e1464d5a information about different variables agged to query cache (BUG#5515, BUG#5394) 2004-09-10 16:28:18 +03:00
bell@sanja.is.com.ua
c2f652211a post merge fix 2004-09-10 15:08:30 +03:00
bell@sanja.is.com.ua
5fff725e43 Merge 2004-09-10 14:01:02 +03:00
bell@sanja.is.com.ua
4cb6527421 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0 
into sanja.is.com.ua:/home/bell/mysql/bk/work-show-5.0
 2004-09-10 13:11:33 +03:00
pem@mysql.comhem.se
624cf0e537 Fixed BUG#3294: Stored procedure crash if table dropped before use. 
Dropping the table was not the real problem, the problem was with errors
  occuring within error handlers.
 2004-09-10 11:11:52 +02:00
timour@mysql.com
e76e617e01 Implementation of the last review comments for WL#1724 
"Min/Max Optimization for Queries with Group By Clause"
 2004-09-10 04:45:15 +03:00
bell@sanja.is.com.ua
763c57d41f Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0 
into sanja.is.com.ua:/home/bell/mysql/bk/work-show-5.0
 2004-09-10 02:26:09 +03:00
bell@sanja.is.com.ua
a23857e071 post merge fixes 2004-09-10 02:22:44 +03:00
dlenev@mysql.com
9cc2dba2ea Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/dlenev/src/mysql-5.0-1218-a
 2004-09-09 23:45:19 +04:00
dlenev@brandersnatch.localdomain
0ae54976d3 After merge fixes for WL#1218 "Triggers" 2004-09-09 23:44:27 +04:00
pem@mysql.comhem.se
dde44b8c8c Fixed BUG#4487: Stored procedure connection aborted if uninitialized char. 2004-09-09 19:08:54 +02:00
tomas@poseidon.(none)
abf5add3f5 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into poseidon.(none):/home/tomas/mysql-4.1-ndb-merge
 2004-09-09 16:34:25 +00:00
dlenev@mysql.com
c46e640009 Yet another manual merge with main tree for patch for WL#1218 "Triggers" 2004-09-09 19:52:10 +04:00
bell@sanja.is.com.ua
336cb5f8be merge 2004-09-09 16:52:22 +03:00
bar@mysql.com
57093db2e1 Bug #5430 ctype_tis620 test failure 2004-09-09 18:44:53 +05:00
monty@mysql.com
e67fcee270 Update after merge 2004-09-09 14:55:28 +03:00
tulin@build.mysql.com
c039c35bba Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into build.mysql.com:/users/tulin/mysql-4.1-ndb-merge
 2004-09-09 10:41:33 +02:00
bar@mysql.com
cda336b928 Bug #5447 Select does not find records 
Note, there is no need to propagate this change into 4.1.
 2004-09-09 12:23:10 +05:00
monty@mysql.com
49cd04b510 Merge on pull 2004-09-09 07:26:28 +03:00
monty@mysql.com
f2829d0386 After merge fixes of merge with 4.1 that included the new arena code. 
Fixed (together with Guilhem) bugs in mysqlbinlog regarding --offset
Prefix addresses with 0x for easier comparisons of debug logs
Fixed problem where MySQL choosed index-read even if there would be a much better range on the same index
This fix changed some 'index' queries to 'range' queries in the test suite
Don't create 'dummy' WHERE clause for trivial WHERE clauses where we can remove the WHERE clause.
This fix removed of a lot of 'Using where' notes in the test suite.
Give NOTE instead of WARNING if table/function doesn't exists when using DROP IF EXISTS
Give NOTE instead of WARNING for safe field-type conversions
 2004-09-09 06:59:26 +03:00
dlenev@brandersnatch.localdomain
6dc933b730 WL#1218 "Triggers" 
After review and after merge fixes.
 2004-09-09 00:46:01 +04:00
bell@sanja.is.com.ua
af5785c692 Merge abelkin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
 2004-09-08 21:58:22 +03:00
bell@sanja.is.com.ua
31c63b07c9 test case of bug#5220 2004-09-08 21:54:01 +03:00
sergefp@mysql.com
b30570be29 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/dbdata/psergey/mysql-4.1-bug-grp
 2004-09-08 22:44:16 +04:00
sergefp@mysql.com
c8422dfcc7 Fix for bug#5400 "GROUP_CONCAT returns everything twice": 
Don't evaluate the value of GROUP_CONCAT several times for the same 'group', reuse the value instead.
 2004-09-08 22:43:37 +04:00
pem@mysql.comhem.se
b83af8607a Fixed BUG#5000: SPs can be created with no default database. 
Easy to prevent crash, but the question was how to treat this case?
  We ended up implementing the "global" SPs (i.e. with no associated
  db), which were planned but left unresolved when SPs moved into dbs.
  So now things like "call .p()" work too.
 2004-09-08 14:23:14 +02:00
bell@sanja.is.com.ua
0badc913bb check that table used in multi-update is unique added (BUG#5455) 2004-09-08 13:39:15 +03:00
pem@mysql.comhem.se
3aa2a62f37 Fixed BUG#5258: Stored procedure modified date is 0000-00-00. 
Althought techically not a but (as it's functioning as designed),
  it was decided that the design should be changed. Some users have
  a problem with dates being '0000-00-00' and the SQL standard specifies
  that the modification date should be the same as the creation date
  at creation.
 2004-09-08 11:42:18 +02:00
dlenev@mysql.com
9b1bc6a4d5 Merge of changes from the main tree to tree for WL#1218 "Triggers". 2004-09-08 13:29:21 +04:00
bell@sanja.is.com.ua
425857f5b2 test of updating and fetching from the same table check (BUG##5157) 2004-09-08 10:18:04 +03:00
igor@rurik.mysql.com
dab8918647 Merge rurik.mysql.com:/home/igor/mysql-4.1 
into rurik.mysql.com:/home/igor/dev/mysql-4.1-0
 2004-09-07 19:49:16 -07:00
igor@rurik.mysql.com
7777f759cb func_group.test, func_group.result: 
Added test case for bug #5406.
opt_sum.cc:
  Fixed bug #5406.
 2004-09-07 19:46:09 -07:00
serg@serg.mylan
0afcaac5a8 after merge 2004-09-07 22:10:15 +02:00
serg@serg.mylan
323e683cbf merged 2004-09-07 21:30:28 +02:00
bell@sanja.is.com.ua
5d3f95b173 returning test environment 2004-09-07 20:40:16 +03:00
igor@rurik.mysql.com
9bafeecb24 Merge rurik.mysql.com:/home/igor/mysql-4.0 
into rurik.mysql.com:/home/igor/dev/mysql-4.0-0
 2004-09-07 10:08:17 -07:00
igor@rurik.mysql.com
b0784773a7 select.test: 
Added newline at the end of file.
 2004-09-07 10:03:46 -07:00
bell@sanja.is.com.ua
48a1b10b58 ixed table and db name of fields incase of lower_case_table_names (BUG#5154) 2004-09-07 19:58:02 +03:00
serg@serg.mylan
c26246b083 after merge fixes 2004-09-07 16:56:31 +02:00
serg@serg.mylan
413a8753e2 merged 2004-09-07 15:18:53 +02:00
tomas@poseidon.(none)
7d192fcbd7 fixed NdbConnection::restart and made use of it in ha_ndbcluster 
added testcase
 2004-09-07 12:30:11 +00:00
dlenev@brandersnatch.localdomain
9ed038dd6f WL#1218 "Triggers". Some very preliminary version of patch. 
Mostly needed for Monty for him getting notion what needed for triggers 
from new .FRM format. 

Things to be done:
- Right placement of trigger's invocations
- Right handling of errors in triggers (including transaction rollback)
- Support for priviliges
- Right handling of DROP/RENAME table (hope that it will be handled automatically
  with merging of .TRG into .FRM file)
- Saving/restoring some information critical for trigger creation and replication
  with their definitions (e.g. sql_mode, creator, ...)
- Replication

Already has some known bugs so probably not for general review.
 2004-09-07 16:29:46 +04:00
guilhem@mysql.com
3dd35e1ab6 clean up at end of test (thanks serg) 2004-09-07 14:20:48 +02:00
serg@serg.mylan
001dfd3d48 cleanup 2004-09-07 13:36:27 +02:00
tomas@poseidon.(none)
2fdb262c4a fixed and added test case for bug#5431 
+ fix for support of multiple mgmt servers
 2004-09-07 10:54:31 +00:00
magnus@neptunus.(none)
84aec2faba Merge msvensson@build.mysql.com:/home/bk/mysql-4.1 
into neptunus.(none):/home/magnus/mysql/mysql-4.1
 2004-09-07 12:46:16 +02:00
magnus@neptunus.(none)
8788f96ecb Fix for INSERT with multiple values and start/end_bulk_insert 2004-09-07 12:45:19 +02:00
bar@mysql.com
2c86049dec Bug #5228 ORDER BY CAST(enumcol) sorts incorrectly under certain conditions 2004-09-07 15:42:19 +05:00