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

5181 commits

Author SHA1 Message Date
igor@rurik.mysql.com
a90d2bd97c join_outer.result, join_outer.test: 
Added a test case for bug #9017.
item_cmpfunc.h:
  A wrong not_null_tables method for Item_cond_xor
  caused a conversion of a left join into an inner join
  that was not valid.
 2005-03-12 23:31:52 -08:00
serg@serg.mylan
0c31836fa5 Merge bk-internal:/home/bk/mysql-5.0 
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
 2005-03-12 20:17:16 +01:00
jimw@mysql.com
f463143158 Update tests and test results after merge, disable broken NDB tests 2005-03-11 15:06:03 -08:00
jimw@mysql.com
c56a00ec98 Merge bk-internal:/home/bk/mysql-5.0 
into mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-03-11 12:47:29 -08:00
jimw@mysql.com
441f863f52 Merge mysql.com:/home/jimw/my/mysql-5.0-8902 
into mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-03-11 12:46:11 -08:00
jimw@mysql.com
eaea82d3af Merge query_cache tests 2005-03-11 12:38:38 -08:00
serg@serg.mylan
a85613f62c Merge bk-internal:/home/bk/mysql-5.0 
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
 2005-03-11 21:37:52 +01:00
serg@serg.mylan
7b19170cf7 BUG#9101 - RELEASE/ROLLBACK TO SAVEPOINT did not forget savepoints correctly 2005-03-11 21:10:41 +01:00
jimw@mysql.com
50f9fc3368 Merge test and results 2005-03-11 11:07:32 -08:00
ramil@mysql.com
ec41753240 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/usr/home/ram/work/5.0.b9029
 2005-03-11 12:30:55 +04:00
sergefp@mysql.com
f9322a85a4 Merge mysql.com:/home/psergey/mysql-4.1-bug8711 
into mysql.com:/home/psergey/mysql-5.0-bug8711
 2005-03-11 02:26:38 +03:00
sergefp@mysql.com
763039a17b Merge 2005-03-11 02:23:16 +03:00
sergefp@mysql.com
5d865045c9 Fix for BUG#8711: "<=>" may have true value for NULL arguments, so make 
Item_func_equal::not_null_tables() always return 0.
 2005-03-11 02:17:03 +03:00
ramil@mysql.com
ec06f3e762 a fix (bug #9029 Traditional: Wrong SQLSTATE returned for string truncation). 2005-03-10 17:08:45 +04:00
timour@mysql.com
b9c56257bb Merge 2005-03-10 13:59:48 +02:00
timour@mysql.com
abf659dee9 Merge mysql.com:/home/timka/mysql/src/4.1-bug-7425 
into mysql.com:/home/timka/mysql/src/4.1-dbg
 2005-03-10 11:50:55 +02:00
igor@rurik.mysql.com
db4ca33f52 Merge rurik.mysql.com:/home/igor/dev/mysql-4.1-0 
into rurik.mysql.com:/home/igor/dev/mysql-5.0-0
 2005-03-09 16:53:20 -08:00
igor@rurik.mysql.com
4406118cf8 func_str.result: 
Correction after manual merge.
 2005-03-09 13:20:52 -08:00
igor@rurik.mysql.com
af5d21357e Manual merge 2005-03-09 10:58:52 -08:00
serg@serg.mylan
79573a5ee8 after merge fixes 2005-03-09 19:22:30 +01:00
timour@mysql.com
f489e56291 Fix for BUG#7425. 
The reported problems were due to two completely unrelated omissions.
1) The file sort procedure didn't correctly create the sort key in
   make_sortkey when the sortkey was an unsigned integer.
2) The name resolution procedure for column references inside a HAVING
   clause did not propagate the unsigned_flag of the resolved references.
This patch corrects both problems.
 2005-03-09 16:51:03 +02:00
serg@serg.mylan
956682de1a merged 2005-03-09 14:09:06 +01:00
serg@serg.mylan
c49928447d Merge bk-internal:/home/bk/mysql-5.0 
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
 2005-03-09 13:02:51 +01:00
serg@serg.mylan
1e09c15a8b don't close binlog in the destructor - use explictit MYSQL_LOG::cleanup for this 2005-03-09 12:29:51 +01:00
igor@rurik.mysql.com
4559fb998b func_str.result, func_str.test: 
Added a test case for bug #8669.
item_strfunc.cc:
  Fixed bug #8669.
  Function AES_DECRYPT can return NULL value.
 2005-03-09 00:15:51 -08:00
jimw@mysql.com
2b2efa4208 Add all SQL_MODE settings to proc table. (Bug #8902) 2005-03-08 17:40:43 -08:00
acurtis@pcgem.rdg.cyberkinetica.com
8d94824aa1 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into pcgem.rdg.cyberkinetica.com:/var/db/bk/work-acurtis/bug3788.4
 2005-03-09 01:15:42 +00:00
acurtis@pcgem.rdg.cyberkinetica.com
e354c75113 Fix test after merge 2005-03-09 01:13:11 +00:00
acurtis@ltantony.rdg.cyberkinetica.homeunix.net
be3c863ba0 Merge in fix Bug#3788 2005-03-08 22:32:09 +00:00
Sinisa@sinisa.nasamreza.org
b8e28ff9bd Fixing post-merge errors 2005-03-09 00:09:18 +02:00
Sinisa@sinisa.nasamreza.org
b2c77c1c9c post merge fixes 2005-03-08 22:59:21 +02:00
Sinisa@sinisa.nasamreza.org
f066f4db83 making a better test case for bug #8850 2005-03-08 22:44:35 +02:00
serg@serg.mylan
5a2c426eb8 Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
 2005-03-08 19:47:49 +01:00
serg@serg.mylan
9272081ebb BUG#6635 - test_if_skip_sort_order() thought it can skip filesort 
for fulltext searches too
 2005-03-08 19:45:55 +01:00
Sinisa@sinisa.nasamreza.org
172294e92e Fix to make builds possible 2005-03-08 20:06:08 +02:00
pem@mysql.com
1f429fc1fe Merge mysql.com:/usr/local/bk/mysql-5.0 
into mysql.com:/home/pem/work/mysql-5.0
 2005-03-08 09:51:00 +01:00
jimw@mysql.com
df84c534dd Flush entries from the query cache for tables used in 
administrative statements that may alter the table, such
as REPAIR TABLE. (Bug #8480)
 2005-03-07 18:15:19 -08:00
pem@mysql.comhem.se
6a15e01393 Fixed BUG#8937: Stored Procedure: AVG() works as SUM() in SELECT ... INTO statement 2005-03-07 18:09:53 +01:00
hf@deer.(none)
fbbb58c6ae Fix for bug #8935 CAST(time AS DECIMAL) crashes 2005-03-07 20:53:51 +04:00
pem@mysql.comhem.se
9c2fe003dc Reorganized sp.test (all bugs at the end now). 2005-03-07 17:16:37 +01:00
Sinisa@sinisa.nasamreza.org
5da6cd551d Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.1 
into sinisa.nasamreza.org:/mnt/work/mysql-4.1
 2005-03-07 16:23:41 +02:00
hf@deer.(none)
e5a2d03743 Merging 2005-03-07 17:45:39 +04:00
hf@deer.(none)
cef95249bd Fix for bug #8465 (MIN, MAX return incorrect result) 2005-03-07 16:38:05 +04:00
hf@deer.(none)
b8e5df4b7d Fix for bug #8464 (AVG returns incorrect result) 
Actually problem was not in AVG function, but in SUM before the AVG in the
query.
 2005-03-07 16:08:06 +04:00
mskold@mysql.com
6fc6a7521a Fix for Bug #8753 Invalid schema object version after dropping index 2005-03-07 10:21:38 +01:00
Sinisa@sinisa.nasamreza.org
79ac22e324 A fix for a bug #8830, which occured when binary data from blob was 
dumped with --hex-blob and --skip-extended-insert options.
 2005-03-05 22:06:07 +02:00
Sinisa@sinisa.nasamreza.org
a54b5ea52f Fixing bug #8850 in such a way that when TRUNCATE is called within 
stored  procedure,  it  is converted  to DELETE.
 2005-03-05 21:44:15 +02:00
bar@deer.(none)
42e5de1bee func_group.test, func_str.result, func_group.result: 
after merge fixes
 2005-03-05 20:44:22 +04:00
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
acurtis@pcgem.rdg.cyberkinetica.com
5e1d2ad68c Bug#3788 
Crashes with stored procedure return non-string values
  Also fixes Bug#2773
 2005-03-04 21:14:35 +00: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
pem@mysql.comhem.se
54a2448bce Fixed BUG#8760: Stored Procedures: Invalid SQLSTATE is allowed in 
a DECLARE ? HANDLER FOR stmt.
 2005-02-28 18:07:06 +01:00
ramil@mysql.com
c896fcb483 merging 2005-02-28 19:59:38 +04:00
monty@mysql.com
72b692e11f Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/my/mysql-5.0
 2005-02-28 16:22:26 +02:00
timour@mysql.com
03e7620d3f Fix for BUG#8532. 
The problem was in that the code that analyses the applicability of the
QUICK_GROUP_MIN_MAX access method for DISTINC queries assumed that there
are no duplicate column references in the DISTINCT clause, and it added
non-exiting key parts for the duplicate column references. 

The solution adds a test to check whether the select list already contained
a field with the same name. If such field was already present, then it was
already decided to use its key part for index access. In this such case we
must skip the duplicate field instead of counting it as a new field.
 2005-02-28 16:20:02 +02:00
ramil@mysql.com
883ff0cc81 merging 2005-02-28 18:11:18 +04:00
sergefp@mysql.com
a06c6d41bb Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.0 
into mysql.com:/home/psergey/mysql-4.0-look
 2005-02-28 15:40:45 +03:00
sergefp@mysql.com
b44f24000b Merge 2005-02-28 14:52:35 +03:00
monty@mysql.com
3839e443a4 merge with 4.1 2005-02-28 12:18:39 +02:00
monty@mysql.com
253bfcf783 Fixed wrong memory references found by purify 
(No really critical errors found, but a few possible wrong results)
 2005-02-28 11:59:46 +02:00
pekka@mysql.com
0df7b6317c Merge mysql.com:/space/pekka/ndb/version/my50 
into mysql.com:/space/pekka/ndb/version/my50-ndb
 2005-02-27 17:25:31 +01:00
svoj@mysql.com
af026ef164 Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/svoj/devel/mysql/stddev-mysql-5.0
 2005-02-27 13:33:20 +04:00
mskold@mysql.com
b9aa67bc76 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/usr/local/home/marty/MySQL/test/mysql-5.0-ndb
 2005-02-26 16:15:36 +01:00
sergefp@mysql.com
eb5d5de05f Fix for BUG#8560: Set max_sort_char for any 8-bit charset with binary collation. max_sort_char is needed by 
my_like_range_simple to produce upper bound constants for LIKE "str_%" and similar expressions.
 2005-02-26 17:15:04 +03:00
svoj@mysql.com
800aaae1fb BUG#3190 fix (request for STDDEV_SAMP, VAR_SAMP). 
This bug is also known as WL#1639.
 2005-02-25 22:19:04 +04:00
monty@mysql.com
f949f6a915 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/my/mysql-5.0
 2005-02-25 19:51:29 +02:00
pem@mysql.comhem.se
2af86eafc7 Fixed BUG#8757: Stored Procedures: Scope of Begin and End Statements do not work properly. 2005-02-25 17:56:45 +01:00
monty@mysql.com
7e5f74f8f2 Merge with global tree 2005-02-25 17:12:06 +02:00
pem@mysql.comhem.se
76c6d9cd91 Fixed BUG#6857: current_time() in STORED PROCEDURES 
Have to thd->set_time() before each substatement execution, to make
  current_time() et al return different times within the same procedure.
 2005-02-25 13:19:44 +01:00
monty@mysql.com
cd78e701a5 Show all generated warnings in SHOW ERROR 
Previously we only stored the first given error (the error sent to the client)
 2005-02-24 23:33:42 +02:00
lars@mysql.com
c99c44805c Fix of an incorrect merge 2005-02-24 17:25:06 +01:00
mskold@mysql.com
4e6a4dfa13 Merge 2005-02-24 14:48:12 +01:00
mskold@mysql.com
d3573d7e21 Added tests for BINARY|VARBINARY LIKE|NOT LIKE 2005-02-24 14:20:12 +01:00
pem@mysql.comhem.se
2b1f0bf1f5 Fixed BUG#8638: Test 'sp' fails: Stored Procedure often sends warning 1329 
The warning sent is by itself ok, the problem was rather why it wasn't
  sent on some other platforms...
  The real problem was that a total_warn_count which was inconsistent with warn_list
  was sent back with send_eof() during SP execution, which in turn cause a protocol
  error in mysqltest.
 2005-02-24 13:56:09 +01:00
pekka@mysql.com
8b8dc46513 Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb 
into mysql.com:/space/pekka/ndb/version/my50-ndb
 2005-02-24 13:07:34 +01:00
pekka@mysql.com
b67f82d901 ndb - wl-1203 fix binary LIKE binary in ndb api 2005-02-24 13:07:33 +01:00
joreland@mysql.com
2952f73c16 merge 2005-02-24 06:24:46 +01:00
bell@51.0.168.192.in-addr.arpa
cfdf5bcdc8 fixed test results 2005-02-24 04:07:58 +02:00
bell@51.0.168.192.in-addr.arpa
36265381fc Merge 51.0.168.192.in-addr.arpa:/Users/bell/mysql/bk/mysql-5.0 
into 51.0.168.192.in-addr.arpa:/Users/bell/mysql/bk/work-repl-5.0
 2005-02-24 03:28:33 +02:00
bell@51.0.168.192.in-addr.arpa
5d6cc9de06 Merge 51.0.168.192.in-addr.arpa:/Users/bell/mysql/bk/mysql-5.0 
into 51.0.168.192.in-addr.arpa:/Users/bell/mysql/bk/work-repl-5.0
 2005-02-24 01:11:59 +02:00
mats@mysql.com
bfce3aee8d Bug#8412: merged from 4.1 2005-02-23 23:01:51 +01:00
jimw@mysql.com
3ecabaa9f7 Don't try to create a symlink if the DATA DIRECTORY specified for a table 
is the same as the normal datadir for that database. (Bug #8707)
 2005-02-23 13:59:04 -08:00
bell@51.0.168.192.in-addr.arpa
99114bb60e Merge 51.0.168.192.in-addr.arpa:/Users/bell/mysql/bk/work-qc_item_view-5.0 
into 51.0.168.192.in-addr.arpa:/Users/bell/mysql/bk/work-repl-5.0
 2005-02-23 23:00:41 +02:00
bell@51.0.168.192.in-addr.arpa
8655e4327e Merge 51.0.168.192.in-addr.arpa:/Users/bell/mysql/bk/mysql-5.0 
into 51.0.168.192.in-addr.arpa:/Users/bell/mysql/bk/work-qc_item_view-5.0
 2005-02-23 22:56:24 +02:00
bell@51.0.168.192.in-addr.arpa
270d93b83d Merge 51.0.168.192.in-addr.arpa:/Users/bell/mysql/bk/mysql-5.0 
into 51.0.168.192.in-addr.arpa:/Users/bell/mysql/bk/work-repl-5.0
 2005-02-23 22:16:51 +02:00
serg@serg.mylan
b8288584e9 innodb-dependent test moved from rpl_rotate_logs.test to binlog.test 2005-02-23 20:35:59 +01:00
serg@serg.mylan
e38b3e2390 Merge bk-internal:/home/bk/mysql-5.0 
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
 2005-02-23 20:10:58 +01:00
mskold@mysql.com
07cdc9e334 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/usr/local/home/marty/MySQL/test/mysql-5.0-ndb
 2005-02-23 20:08:21 +01:00
guilhem@mysql.com
624aaa4b09 result fixes after my change to mysqlbinlog (which was accidentally 
pushed some minutes ago)
 2005-02-23 19:59:25 +01:00
mats@mysql.com
6ad51ffb3c Bug#8412: Merge from 4.0 2005-02-23 19:58:54 +01:00
mats@mysql.com
a4cdb93b38 Merge mysql.com:/home/bkroot/mysql-4.0 
into mysql.com:/home/bk/b8412-mysql-4.0
 2005-02-23 19:40:31 +01:00
serg@serg.mylan
9c9d1fd406 Merge bk-internal:/home/bk/mysql-5.0 
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
 2005-02-23 19:20:17 +01:00
patg@krsna.patg.net
0909b09b43 Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0 
into krsna.patg.net:/home/patg/mysql-5.0
 2005-02-23 09:35:18 -08:00
serg@serg.mylan
383c6e312a don't log BEGIN in auto-commit mode 
correct end_log_pos for Xid_log_event
 2005-02-23 18:26:49 +01:00
bell@52.0.168.192.in-addr.arpa
25e87cd6f7 Merge 52.0.168.192.in-addr.arpa:/Users/bell/mysql/bk/mysql-5.0 
into 52.0.168.192.in-addr.arpa:/Users/bell/mysql/bk/work-repl-5.0
 2005-02-23 19:22:52 +02:00
gluh@gluh.mysql.r18.ru
c6f1e9627a Merge gluh.mysql.r18.ru:/home/gluh/MySQL-MERGE/mysql-4.1 
into gluh.mysql.r18.ru:/home/gluh/MySQL-MERGE/mysql-5.0
 2005-02-23 20:22:51 +03:00
gluh@gluh.mysql.r18.ru
fc9c20995f Fix for bug #6572: SHOW ERRORS doesn't 2005-02-23 20:18:21 +03:00
mskold@mysql.com
e0dbdca79e ha_ndbcluster.cc: 
Fixed faulty debug printout
ndb_condition_pushdown.test, ndb_condition_pushdown.result:
  Added BINARY and VARBINARY tests
 2005-02-23 17:18:06 +01:00
gluh@gluh.mysql.r18.ru
907c7af3ce Merge gluh.mysql.r18.ru:/home/gluh/MySQL-MERGE/mysql-4.1 
into gluh.mysql.r18.ru:/home/gluh/MySQL-MERGE/mysql-5.0
 2005-02-23 18:47:00 +03:00
gluh@gluh.mysql.r18.ru
2b5ee94a33 Fix for bug#6317: string function CHAR, parameter is NULL, wrong result 2005-02-23 18:15:45 +03:00
mskold@mysql.com
364492239b Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb 
into mysql.com:/usr/local/home/marty/MySQL/test/mysql-5.0-ndb
 2005-02-23 15:54:22 +01:00
mskold@mysql.com
fcc37a0787 Fixes for condition pushdown to storage engine based on comments from code review 2005-02-23 15:51:26 +01:00