Commit graph

5029 commits

Author SHA1 Message Date
bar@mysql.com
d50d213162 Merge 2005-03-05 18:20:35 +04:00
gluh@gluh.mysql.r18.ru
df2b38913f WL2131: Access control for SHOW ... PROCEDURE|FUNCTION ... 2005-03-05 14:35:32 +03:00
igor@linux.local
6d7862aeaf logging_ok:
Logging to logging@openlogging.org accepted
func_group.result, func_group.test:
  Added a test case for bug #8893.
opt_sum.cc:
  A misplaced initialization for the returned parameter
  prefix_len in the function find_key_for_maxmin caused
  usage of a wrong key prefix by the min/max optimization
  in cases when the matching index was not the first index
  that contained the min/max field.
2005-03-04 20:24:13 -08:00
hf@deer.(none)
d3ee99ad91 Fix for bug #8431 (FLOOR returns incorrect result) 2005-03-04 23:06:00 +04:00
dlenev@mysql.com
5b16dbf960 Manual merge SP-locking improvements patch with current tree. 2005-03-04 17:46:45 +03:00
dlenev@brandersnatch.localdomain
5a6c7027f0 Better approach for prelocking of tables for stored routines execution
and some SP-related cleanups.

- We don't have separate stage for calculation of list of tables
  to be prelocked and doing implicit LOCK/UNLOCK any more.
  Instead we calculate this list at open_tables() and do implicit
  LOCK in lock_tables() (and UNLOCK in close_thread_tables()).
  Also now we support cases when same table (with same alias) is
  used several times in the same query in SP.

- Cleaned up execution of SP. Moved all common code which handles
  LEX and does preparations before statement execution or complex
  expression evaluation to auxilary sp_lex_keeper class. Now 
  all statements in SP (and corresponding instructions) that
  evaluate expression which can contain subquery have their
  own LEX.
2005-03-04 16:35:28 +03:00
bar@mysql.com
7e8e033290 type_blob.result, func_system.result, func_str.result, ctype_collate.result:
fixing test results accordingly.
func_system.test:
  New test that illegal mix of collations does not happen anymore.
item_strfunc.h:
    safe_charset_converter() was added for system constants.
item_strfunc.cc:
  safe_charset_converter() was added for system constants.
item_func.cc, item.h, item.cc:
  Bug#8291: Illegal collation mix with USER() function.
  After discussion with PeterG and Serge, a new coercibility
  level for "system constants" was introduced, between
  COERRIBLE and IMPLICIT. Thus:
  SELECT col1 = USER() FROM t1; - is done according to col1 collation.
  SELECT 'string' = USER(); - is done according to USER() collation.
  At the same time, "nagg" and "strong" members were removed as unused.
item_create.cc:
  Version is a system constant too.
2005-03-04 14:20:49 +04:00
jimw@mysql.com
2c6e46f47e Clean up merge of fix for Bug #3309. 2005-03-03 17:44:28 -08:00
jimw@mysql.com
f7c01cfb76 Merged from 4.1 2005-03-03 15:01:46 -08:00
jimw@mysql.com
96e034f50e Fix symlink test to avoid filenames with paths 2005-03-03 12:36:27 -08:00
jimw@mysql.com
9df04058fe Merge mysql.com:/home/jimw/my/mysql-4.1-8707
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-03-03 10:50:18 -08:00
jimw@mysql.com
0e8a5dbe08 Merge mysql.com:/home/jimw/my/mysql-4.1-3309
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-03-03 10:47:20 -08:00
gluh@gluh.mysql.r18.ru
7367af4757 Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0
into gluh.mysql.r18.ru:/home/gluh/MySQL-MERGE/mysql-5.0
2005-03-03 19:21:26 +03:00
gluh@gluh.mysql.r18.ru
104072f154 Fix for bug #8164: subquery with INFORMATION_SCHEMA.COLUMNS, 100 % CPU 2005-03-03 19:20:16 +03:00
konstantin@mysql.com
fe2d63a060 Fixes for bug#8115 "Server Crash with prepared statement"
and bug#8849 "problem with insert statement with table alias's": 
make equality propagation work in stored procedures and prepared 
statements.
Equality propagation can change AND/OR structure of ON expressions,
so the fix is to provide each execution of PS/SP with it's own
copy of AND/OR tree. We have been doing that already for WHERE clauses,
now ON clauses are also copied.
2005-03-03 17:38:59 +03:00
bar@mysql.com
4a9176b418 Bugs: #8063: make test mysqldump [ fail ]
See mysqldump.test diff for more details
2005-03-03 15:43:00 +04:00
ramil@mysql.com
710a32621c Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/usr/home/ram/work/5.0
2005-03-03 15:38:00 +04:00
ramil@mysql.com
de1153b5e6 manual merge 2005-03-03 14:29:37 +04:00
bar@mysql.com
aaf4b11f11 Bug#8840 Empty string comparison and character set 'cp1250'
Secondary weight out of bounds was picked up in mistake when
the string is empty, instead of returning 0.
2005-03-03 14:15:37 +04:00
pem@mysql.com
f170e8e03e Merge mysql.com:/usr/local/bk/mysql-5.0
into mysql.com:/home/pem/work/mysql-5.0
2005-03-03 10:51:20 +01:00
sergefp@mysql.com
00a560c727 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/psergey/mysql-4.1-bugs
2005-03-03 05:04:00 +03:00
jimw@mysql.com
5d2bedc391 Fix bug in checking of table-specific grats that caused IP/NETMASK
hostnames to not be matched correctly. (Bug #3309)
2005-03-02 16:30:24 -08:00
pem@mysql.com
e4908b4020 Merge mysql.com:/usr/local/bk/mysql-5.0
into mysql.com:/home/pem/work/mysql-5.0
2005-03-02 18:05:57 +01:00
patg@krsna.patg.net
e3f8c2f51e Merge mysqldev@production.mysql.com:/data0/mysqldev/my/mysql-5.0-merge
into krsna.patg.net:/home/patg/mysql-5.0
2005-03-02 09:01:07 -08:00
guilhem@mysql.com
7110f21c39 Last part of fix for BUG#7998 "Replication should be more clever about when to replicate RELEASE_LOCK()" + fixes after merge 2005-03-02 17:52:38 +01:00
pem@mysql.comhem.se
027c5a6dac Fixed BUG#8762: Stored Procedures: Inconsistent behavior
of DROP PROCEDURE IF EXISTS statement.
2005-03-02 17:25:58 +01:00
ramil@mysql.com
89d44e039e Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/usr/home/ram/work/4.1
2005-03-02 20:04:38 +04:00
patg@krsna.patg.net
0aec332ba3 Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0
into krsna.patg.net:/home/patg/mysql-5.0
2005-03-02 08:04:26 -08:00
ramil@mysql.com
89a105abc5 a fix for --ps-protocol (bug #6089: FOUND_ROWS returns wrong values when no table/view is used) 2005-03-02 20:00:48 +04:00
guilhem@mysql.com
d1f089b3d7 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/mysql_src/mysql-5.0-xa
2005-03-02 16:40:04 +01:00
serg@serg.mylan
998c540fa9 Merge bk-internal:/home/bk/mysql-5.0
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2005-03-02 15:31:03 +01:00
guilhem@mysql.com
c6cedf52e3 Merge 2005-03-02 14:46:19 +01:00
guilhem@mysql.com
c6f1a2e453 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/mysql_src/mysql-4.1-clean
2005-03-02 11:38:38 +01:00
guilhem@mysql.com
11a1c83c03 Fix for BUG#8325 "Deadlock in replication thread stops replication":
in slave SQL thread: if a transaction fails because of InnoDB deadlock or innodb_lock_wait_timeout exceeded,
optionally retry the transaction a certain number of times (new variable --slave_transaction_retries).
2005-03-02 11:29:48 +01:00
ingo@mysql.com
306bd2fc69 Merge 2005-03-02 10:56:13 +01:00
serg@serg.mylan
7535886f1c Merge bk-internal:/home/bk/mysql-5.0
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2005-03-02 10:41:23 +01:00
serg@serg.mylan
02d88c398f bug#8151 - truncate leaves a transaction open
deadlock in MYSQL_LOG::new_file()
style fixes
2005-03-02 10:38:25 +01:00
ingo@mysql.com
d3d7c46b1c Bug#8306 - TRUNCATE leads to index corruption
Added a check, if the table, which we are going to create, is open.
This can happen if a MERGE mapped table is TRUNCATEd.
2005-03-02 10:35:00 +01:00
patg@krsna.patg.net
9e3c670b02 Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0
into krsna.patg.net:/home/patg/mysql-5.0
2005-03-01 23:23:11 -08:00
jani@ua141d10.elisa.omakaista.fi
111e1cb29d Fix for Bug#5615 and merge from 4.1 2005-03-01 22:19:19 +02:00
jani@ua141d10.elisa.omakaista.fi
62b9fc5da6 Merge 2005-03-01 14:50:59 +02:00
ramil@mysql.com
c862c11aab Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/usr/home/ram/work/4.1.b6089
2005-03-01 14:19:32 +04:00
ramil@mysql.com
8f90906961 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/usr/home/ram/work/4.1.b6089
2005-03-01 12:31:05 +04:00
ramil@mysql.com
4225b8e8ff Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/usr/home/ram/work/4.1.b5615
2005-03-01 12:20:55 +04:00
sergefp@mysql.com
d2fec05179 Fix for BUG#8562: In Item_int_with_ref::new_item() create Item_int or Item_uint
depending on ref->unsigned_flag. Item_int_with_ref can refer to both signed and 
unsigned integers.
2005-02-28 23:50:06 +03:00
monty@mysql.com
571fae94da Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/my/mysql-5.0
2005-02-28 22:27:55 +02:00
pem@mysql.com
8364b41946 Merge mysql.com:/usr/local/bk/mysql-5.0
into mysql.com:/home/pem/work/mysql-5.0
2005-02-28 19:23:58 +01:00
sergefp@mysql.com
a6ad8a4d0f Fix for BUG#8726: In JOIN::optimize on ER_TOO_BIG_SELECT error set JOIN::error to -1 to cause
the error to be sent to the client.
2005-02-28 20:21:21 +03:00
timour@mysql.com
a94142a36e Merge mysql.com:/home/timka/mysql/src/5.0-virgin
into mysql.com:/home/timka/mysql/src/5.0-bug-8532
2005-02-28 19:21:04 +02:00
pem@mysql.com
a644dc0da5 Merge mysql.com:/usr/local/bk/mysql-5.0
into mysql.com:/home/pem/work/mysql-5.0
2005-02-28 18:09:24 +01:00