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
kent@mysql.com
c6002966be
mysql-test-run.pl:
...
Removed -c from /bin/sh call
make_win_src_distribution.sh:
Copy all content in mysql-test
make_win_binary_distribution.sh, make_binary_distribution.sh:
Add Perl version of mysql-test-run to package
s_win32_dsp, s_win32, s_vxworks, s_test, s_readme, s_java, s_javah:
Bug #6209 changes for building Berkeley DB from BitKeeper on Solaris
2005-03-09 01:34:22 +01: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
jani@ua141d10.elisa.omakaista.fi
633f50cbef
Added possibility to add disabled tests to mysql-test-run.
2005-03-08 18:32:31 +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
tomas@poseidon.ndb.mysql.com
dfab08eab0
mysql-test-run.sh:
...
added skip-ndbcluster switch
2005-03-07 14:28:09 +01:00
tomas@poseidon.ndb.mysql.com
f5e9b79c28
mysql-test-run to default run with ndbcluster if compiled with that support
2005-03-07 13:42:01 +01: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
e41c59e9ea
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:51:03 +03: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
joerg@mysql.com
5c5ac0e3b1
Ensure that '*.disabled' files are truly optional, so that their non-existence
...
will not cause "make" to fail.
2005-03-03 16:01:39 +01: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
joerg@mysql.com
c28adf3173
Ensure that the tests with '--ps-protocol' and '--embedded-server' are taken even
...
after the previous run had some failures, provided it did not totally crash.
2005-03-03 13:04:44 +01: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
mysqldev@mysql.com
2d70229ffc
committing this deletion of federated.disabled, which was already committed in another tree apparently; just to make bk happy.
2005-03-03 09:49:34 +01:00
pem@mysql.com
5021eebe1d
Merge mysql.com:/usr/local/bk/mysql-5.0
...
into mysql.com:/home/pem/work/mysql-5.0
2005-03-03 09:46:13 +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
patg@krsna.patg.net
7038981d0b
WL# 2094, removed federated 'disable' file.
2005-03-02 16:14:46 -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
ingo@mysql.com
2d9909aef9
Bug#8306 - TRUNCATE leads to index corruption
...
After merge fix.
The bugfix results in a different error message in this situation.
2005-03-02 11:49:50 +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
mskold@mysql.com
c7c2eacfb8
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-25 08:28:43 +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
guilhem@mysql.com
91d1cf4931
Fix for BUG#8783 kill.test must always sleep 2 seconds, even if
...
mysql-test-run runs with --sleep=10; otherwise GET_LOCK() times out
before being killed so we get 0 instead of NULL. Verified that it
works on our powermacg5 where the test was failing.
2005-02-24 19:13:55 +01: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
jimw@mysql.com
624f855e94
Make sure that warning message when GROUP_CONCAT() cuts values is also
...
updated with the correct number of lines. (Bug #8681 )
2005-02-23 17:58:20 -08: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
3cb61419bd
get time for thread switching
2005-02-24 03:25:53 +02:00
bell@51.0.168.192.in-addr.arpa
bf43b0d31a
fixed typo in test
2005-02-24 02:59:36 +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
serg@serg.mylan
da13ab086d
write "COMMIT" into binlog if there's no Xid at the end of transaction
...
new tests
2005-02-23 14:55:16 +01:00
gluh@gluh.mysql.r18.ru
3e9bf3af34
Fix for bug #7217 : information_schema: columns are varbinary() instead of timestamp &
...
bug #7215 : information_schema: columns are longtext instead of varchar
2005-02-23 15:15:36 +03:00
tomas@poseidon.ndb.mysql.com
5a7f3ce9c1
Merge
2005-02-23 10:29:31 +01:00
gluh@gluh.mysql.r18.ru
eac72d405f
Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into gluh.mysql.r18.ru:/home/gluh/MySQL/mysql-5.0
2005-02-23 12:08:35 +03:00
patg@krsna.patg.net
02a25fd48a
WL# 2094 Federated Storage Handler
...
Patch #2 , all coding style changes per Kostja's review
(as requested to keep style changes separate from functionality changes),
as well as changes to the test suit to no longer use hard-coded port
values in foreign table creation statement
2005-02-23 00:38:29 -08:00
jimw@mysql.com
41043bb3f5
Merge
2005-02-22 16:39:21 -08:00
lars@mysql.com
e330e2698d
After merge fixes
2005-02-23 00:50:30 +01:00
lars@mysql.com
77f46e9c43
Merge mysql.com:/home/bkroot/mysql-5.0 into mysql.com:/home/bk/mysql-5.0
2005-02-22 23:05:53 +01:00
lars@mysql.com
7271a6014f
Merge 4.1->5.0
2005-02-22 22:40:34 +01:00
jimw@mysql.com
df3c8db4f3
Merge bk-internal:/home/bk/mysql-4.1
...
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-02-22 13:14:49 -08:00
patg@krsna.patg.net
e3579fa672
Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into krsna.patg.net:/home/patg/mysql-5.0
2005-02-22 11:02:21 -08:00
sergefp@mysql.com
cdadc990e4
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/psergey/mysql-5.0-bug8397
2005-02-22 21:59:42 +03:00
sergefp@mysql.com
18373b1611
Fix for BUG#8397 (second commit after review):
...
In Item_cache_decimal::store(item) the call item->val_decimal_result()
returns NULL if the passed item has an SQL null value. Don't try copying
NULL into Item_cache_decimal::val in this case.
2005-02-22 21:58:10 +03:00
monty@mysql.com
dcea8122d6
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/my/mysql-5.0
2005-02-22 18:31:30 +02:00
monty@mysql.com
ee8c7a3eb5
After merge fixes
2005-02-22 18:30:40 +02:00
serg@serg.mylan
1ca547f5b2
Merge bk-internal:/home/bk/mysql-5.0
...
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2005-02-22 17:02:16 +01:00
sergefp@mysql.com
1f21ac3cd3
Fix for BUG#8579 (failing test case): Allow small differences in #rows estimate in test results
2005-02-22 18:30:44 +03:00
serg@serg.mylan
8cb554b3c7
merged
2005-02-22 15:31:38 +01:00
serg@serg.mylan
a4dbb3b061
compatibility fixes, crashing tests
2005-02-22 15:22:37 +01:00
monty@mysql.com
e2ea35ec67
Merge with 4.1
2005-02-22 15:47:00 +02:00
gluh@gluh.mysql.r18.ru
c058e25397
Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into gluh.mysql.r18.ru:/home/gluh/MySQL/mysql-5.0
2005-02-22 16:39:39 +03:00
lars@mysql.com
c583eb6954
Merge mysql.com:/home/bkroot/mysql-4.1 into mysql.com:/home/bk/b6676-4.1
2005-02-22 14:17:17 +01:00
lars@mysql.com
6b06ff5956
Merge lthalmann@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/bkroot/mysql-4.1
2005-02-22 14:12:42 +01:00
bell@51.0.168.192.in-addr.arpa
a9b40a8c0b
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-22 14:52:26 +02:00
monty@mysql.com
7914e24409
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/my/mysql-4.1
2005-02-22 14:43:14 +02:00
lars@mysql.com
e31ea39d0c
Merge mysql.com:/home/bkroot/mysql-4.1 into mysql.com:/home/bk/b6676-4.1
2005-02-22 13:39:41 +01:00
bell@51.0.168.192.in-addr.arpa
babcdb6407
Merge 51.0.168.192.in-addr.arpa:/Users/bell/mysql/bk/mysql-4.1
...
into 51.0.168.192.in-addr.arpa:/Users/bell/mysql/bk/work-4.1
2005-02-22 14:34:59 +02:00
lars@mysql.com
d2ecf8e6a5
Merge mysql.com:/home/bkroot/mysql-4.1 into mysql.com:/home/bk/b6676-4.1
2005-02-22 13:29:20 +01:00
lars@mysql.com
2d1089e8c1
Merge mysql.com:/home/bkroot/mysql-4.1 into mysql.com:/home/bk/b6662-4.1
2005-02-22 13:22:34 +01:00
monty@mysql.com
f55e200248
Fixed compiler warnings
...
Fixed failing myisam.test and rpl_rotate_logs.test on some configurations
2005-02-22 14:15:50 +02:00
bar@mysql.com
89a5530822
A user variable are now always have IMPLICIT coercibility,
...
independently from the expression it is initialized from.
In other words, this change treats a user variable like
a table with one column and one record. Discussed with
PeterG, Serg and Lars. This change also simplifies replication
allowing not to replicate variables' coercibility.
2005-02-22 15:55:40 +04:00
gluh@gluh.mysql.r18.ru
4ea9835455
Fix for bug #7476 : crash on SELECT * FROM INFORMATION_SCHEMA.TABLES(after review)
2005-02-22 14:42:44 +03:00
lars@mysql.com
1d3c67000b
BUG#6662: Changes after Guilhems and Sergs review
2005-02-22 12:40:31 +01:00
bell@51.0.168.192.in-addr.arpa
9a9811f3a4
Merge 51.0.168.192.in-addr.arpa:/Users/bell/mysql/bk/mysql-4.1
...
into 51.0.168.192.in-addr.arpa:/Users/bell/mysql/bk/work-4.1
2005-02-22 13:00:00 +02:00
monty@mysql.com
22a76c1dfb
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/my/mysql-4.1
2005-02-22 12:51:54 +02:00
monty@mysql.com
e2dc9b4099
Backport my_strntod() from 5.0
...
Change string->float conversion to delay division as long as possible.
This gives us more exact integer->float conversion for numbers of type '123.45E+02' (Bug #7740 )
2005-02-22 12:51:23 +02:00
bell@51.0.168.192.in-addr.arpa
04cffe4dfb
postreview fix
2005-02-22 12:43:49 +02:00
bell@51.0.168.192.in-addr.arpa
9270c24f5f
Abort procesing current item if it was substituted by view field (BUF#6894)
...
Post-review fixes
2005-02-22 12:27:08 +02:00
joreland@mysql.com
e533f8767b
Merge mysql.com:/home/jonas/src/mysql-5.0
...
into mysql.com:/home/jonas/src/mysql-5.0-ndb
2005-02-22 08:25:01 +01:00
bar@mysql.com
c0230f6f5f
ctype_latin1.result, ctype_latin1.test, charset.c:
...
Treat unknown characters straight in a query as syntax error, rather skipping it as a space character.
2005-02-22 09:56:07 +04:00
tomas@poseidon.ndb.mysql.com
6c7e13de9b
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
2005-02-22 00:32:33 +01:00
serg@serg.mylan
178be07aa3
Merge bk-internal:/home/bk/mysql-5.0
...
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2005-02-22 00:17:56 +01:00
serg@serg.mylan
b43029f4eb
bug#8646 - deadlock if long transaction causes binlog rotate
2005-02-22 00:15:31 +01:00
monty@mysql.com
f5acf0be01
Generate warning in ha_delete_table() if files is missing in handler
2005-02-21 20:41:48 +02:00
bell@51.0.168.192.in-addr.arpa
164be86325
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-21 19:51:10 +02:00
lars@mysql.com
be28ef0a20
BUG#6662: Importing mysqldumps should not show any warnings of level "notes".
2005-02-21 18:40:28 +01:00
lars@mysql.com
5cffeb2b85
BUG#6676: Derivation of user variables should be of derivation "IMPLICIT"
2005-02-21 16:26:04 +01:00
hf@deer.(none)
f7b5ef47b1
Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into deer.(none):/home/hf/work/mysql-5.0.clean
2005-02-21 19:23:03 +04:00
hf@deer.(none)
803ed1a116
Tests modified to coved decimal-related code
2005-02-21 19:20:05 +04:00
mskold@mysql.com
b3d3f73753
Merge
2005-02-21 16:13:29 +01:00
ramil@mysql.com
d2f8149861
Cleanup.
2005-02-21 18:03:06 +04:00
bar@mysql.com
1bd47888b3
ctype_utf8.result, ctype_utf8.test, ctype-utf8.c:
...
Bugs: #8385 : utf8_general_ci treats cyrillic letters I and SHORT I as the same
2005-02-21 17:17:30 +04:00
ramil@mysql.com
39f497b9dd
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/usr/home/ram/work/5.0
2005-02-21 16:53:00 +04:00
ramil@mysql.com
a290359477
A fix (bug #7661 : 'classic' shows different test effects which must be cared for)
...
"create table ta(a bit...) engine=innodb" moved to innodb.test
2005-02-21 16:39:13 +04:00
bell@51.0.168.192.in-addr.arpa
950b7db381
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-21 13:16:25 +02:00
joreland@mysql.com
347c700211
Merge mysql.com:/home/jonas/src/mysql-5.0
...
into mysql.com:/home/jonas/src/mysql-5.0-ndb
2005-02-21 11:48:44 +01:00
joreland@mysql.com
a467157878
ndb - ndb_multi - reset query cache at end of test
2005-02-21 11:45:51 +01:00
bell@51.0.168.192.in-addr.arpa
0ac11a0601
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-21 02:14:20 +02:00
patg@krsna.patg.net
e6352ee568
Merge
2005-02-20 14:20:05 -08:00
serg@serg.mylan
1bc6ae8913
portability fixes
2005-02-20 20:08:33 +01:00
bell@51.0.168.192.in-addr.arpa
a11369b999
Merge
2005-02-20 18:49:27 +02:00
serg@serg.mylan
5cc794b753
Merge bk-internal:/home/bk/mysql-5.0
...
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2005-02-20 15:53:40 +01:00
serg@serg.mylan
24dcb103f3
fix rpl_trunc_binlog to test the new behaviour
2005-02-19 22:24:13 +01:00
monty@mysql.com
88d2e2973d
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/my/mysql-5.0
2005-02-19 19:00:41 +02:00
monty@mysql.com
218e00ac68
Fixed BUILD script to use --with-berkeley-db instead of --with-bdb
...
Lots of small fixes to multi-precision-math path
Give Note for '123.4e'
Added helper functions type 'val_string_from_real()
Don't give warnings for end space for string2decimal()
Changed storage of values for SP so that we can detect length of argument without strlen()
Changed interface for str2dec() so that we must supple the pointer to the last character in the buffer
2005-02-19 18:58:27 +02:00
jimw@mysql.com
10800c1eb5
Merge mysql.com:/home/jimw/my/mysql-4.1-8475
...
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-02-18 15:40:17 -08:00
pem@mysql.com
32a3c16385
Merge mysql.com:/usr/local/bk/mysql-5.0
...
into mysql.com:/home/pem/work/mysql-5.0
2005-02-18 17:46:30 +01:00
pem@mysql.comhem.se
a69fc3c03f
Fixed...
...
BUG#6642: Stored procedure crash if expression with set function
BUG#7013: Stored procedure crash if group by ... with rollup
BUG#7743: 'Lost connection to MySQL server during query' on Stored Procedure
BUG#7992: SELECT .. INTO variable .. within Stored Procedure crashes
the server
BUG#8116: calling simple stored procedure twice in a row results
in server crash
Rolling back the item change list after each substatement in a procedure
fixed the failing assert().
2005-02-18 17:39:32 +01:00
kent@mysql.com
34e7e98a45
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-compile
2005-02-18 14:55:32 +01:00
serg@serg.mylan
b68514ddd1
after-merge fix
2005-02-18 14:53:23 +01:00
kent@mysql.com
3f218b85cf
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-compile
2005-02-18 14:37:24 +01:00
kent@mysql.com
d94b8662f4
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-compile
2005-02-18 14:21:00 +01:00
serg@serg.mylan
e1beaeac17
Merge serg.mylan:/usr/home/serg/Abk/mysql-5.0
...
into serg.mylan:/usr/home/serg/Abk/mysql-5.0-xa
2005-02-18 13:57:54 +01:00
serg@serg.mylan
1235e6d2c7
Merge serg.mylan:/usr/home/serg/Abk/mysql-5.0
...
into serg.mylan:/usr/home/serg/Abk/mysql-5.0-xa
2005-02-18 13:38:10 +01:00
msvensson@neptunus.(none)
3369b65931
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2005-02-18 13:31:28 +01:00
msvensson@neptunus.(none)
f454fc8a6c
BUG#8585 ndb_cache fails on aix52
2005-02-18 13:29:27 +01:00
mskold@mysql.com
adb94fcb2c
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-18 13:16:25 +01:00
bar@mysql.com
6ef93274b0
Merge mysql.com:/usr/home/bar/mysql-4.1
...
into mysql.com:/usr/home/bar/mysql-5.0.fresh
2005-02-18 16:14:28 +04:00
bar@mysql.com
47b85939a5
Bug #7878 with utf_general_ci, equals (=) has problem with accent insensitivity
...
Backporting Monty's fix for 5.0 into 4.1.
2005-02-18 16:10:12 +04:00
serg@serg.mylan
c0dda01f76
Merge serg.mylan:/usr/home/serg/Abk/mysql-5.0
...
into serg.mylan:/usr/home/serg/Abk/mysql-5.0-xa
2005-02-18 12:02:46 +01:00
msvensson@neptunus.(none)
3d0883bb05
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-8583
2005-02-18 11:02:21 +01:00
msvensson@neptunus.(none)
4ebbb92054
BUG#8583 ndb_...multi tests fail in 5.0.3
...
- the variable MASTER_MY_PORT1 was used from the script, but it was not set to the port where the second server was started
2005-02-18 10:57:10 +01:00
tomas@poseidon.ndb.mysql.com
8d4142ee31
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-ndb-wl2278
2005-02-18 09:21:42 +01:00
jimw@mysql.com
e9a5b7d500
Clean up merge from 4.1, including making several enum fields
...
in the grant tables case-insensitive and updating test results.
2005-02-17 18:07:14 -08:00
jimw@mysql.com
7eb8c130f7
Merge
2005-02-17 16:16:58 -08:00
jimw@mysql.com
3c700572b4
Merge bk-internal:/home/bk/mysql-4.1
...
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-02-17 15:23:28 -08:00
jimw@mysql.com
e3ff1bf326
Merge mysql.com:/home/jimw/my/mysql-4.1-8303
...
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-02-17 13:54:05 -08:00
jimw@mysql.com
9de31feab9
Merge mysql.com:/home/jimw/my/mysql-4.1-7617
...
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-02-17 13:53:35 -08:00
jimw@mysql.com
219e29d7ae
Merge mysql.com:/home/jimw/my/mysql-4.1-8471
...
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-02-17 13:53:07 -08:00
acurtis@pcgem.rdg.cyberkinetica.com
4b4a5659df
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into pcgem.rdg.cyberkinetica.com:/var/db/bk/work-acurtis/bug8147.3
2005-02-17 21:53:05 +00:00
jimw@mysql.com
08624c0061
Merge mysql.com:/home/jimw/my/mysql-4.1-8355
...
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-02-17 13:48:34 -08:00
jimw@mysql.com
9df11a3c5e
Merge mysql.com:/home/jimw/my/mysql-4.1-7989
...
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-02-17 13:47:14 -08:00
jimw@mysql.com
1c22de9032
Log each slow query in a multi-statement query to the slow query log.
...
(Bug #8475 )
2005-02-17 11:48:44 -08:00
kent@mysql.com
87d6da972f
make_binary_distribution.sh, Makefile.am:
...
Make .disabled files part of distribution
2005-02-17 20:07:52 +01:00
patg@krsna.patg.net
26d5bf9296
Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into krsna.patg.net:/home/patg/mysql-5.0
2005-02-17 10:34:39 -08:00
acurtis@pcgem.rdg.cyberkinetica.com
35f772c2bd
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into pcgem.rdg.cyberkinetica.com:/var/db/bk/work-acurtis/bug8147.3
2005-02-17 17:53:05 +00:00
acurtis@pcgem.rdg.cyberkinetica.com
10ab9e982f
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into pcgem.rdg.cyberkinetica.com:/var/db/bk/work-acurtis/bug8147.1
2005-02-17 17:52:49 +00:00
acurtis@pcgem.rdg.cyberkinetica.com
647eaaea1d
Bug#8147
...
Merge from 4.1
2005-02-17 17:38:13 +00:00
heikki@hundin.mysql.fi
173e200c65
innodb.test, innodb.result:
...
Remove the test show status like InnoDB_rows_read; the value on IA64 was 0.01 percent bigger than on x86; maybe some different optimization
2005-02-17 19:20:13 +02:00
mskold@mysql.com
dc7368cf3f
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-17 16:41:38 +01:00
mskold@mysql.com
14c9ff5ce0
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0-ndb
2005-02-17 15:39:23 +01:00
mskold@mysql.com
a93816588a
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-17 15:27:16 +01:00
msvensson@neptunus.(none)
55824f59b7
Merged test case
2005-02-17 14:45:52 +01:00
msvensson@neptunus.homeip.net
a004533a76
BUG#8547: Wrong errormessage when dropping table that does not exist in NDB
...
- Added tescases
- Added handling of HA_ERR_NO_SUCH_TABLE in mysql_rm_table_part2 so that
error messages now are consistent
2005-02-17 14:22:44 +01:00
jani@ua141d10.elisa.omakaista.fi
10ab1c5582
Fixed a result file. Some redundant notes printing had been removed from source
...
code, because a warning was given also.
2005-02-17 15:12:49 +02:00
serg@serg.mylan
530eecbd99
Merge serg.mylan:/usr/home/serg/Abk/mysql-5.0
...
into serg.mylan:/usr/home/serg/Abk/mysql-5.0-xa
2005-02-17 14:00:44 +01:00
serg@serg.mylan
2b41b8fa01
post-review fixes. Now ROLLBACK is done in Format_description_log_event
2005-02-17 13:52:16 +01:00
pekka@mysql.com
e2268e55c3
Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/space/pekka/ndb/version/my50
2005-02-17 12:13:17 +01:00
pekka@mysql.com
f789749757
ndb - accept ps_7ndb.result
2005-02-17 12:13:16 +01:00
svoj@mysql.com
349112292f
bug#6958
...
Fixed that negative arguments to certain integer options wrap around.
2005-02-17 15:04:04 +04:00
mskold@mysql.com
8b853bbbc7
Added tests for newdecimal in condition pushdown
2005-02-17 11:16:24 +01:00
igor@rurik.mysql.com
817bf33d48
Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into rurik.mysql.com:/home/igor/mysql-5.0
2005-02-17 01:51:56 -08:00
igor@rurik.mysql.com
326b3ec1e7
select.test:
...
Manual post-merge
2005-02-17 00:51:27 -08:00
igor@rurik.mysql.com
b6be797f81
Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into rurik.mysql.com:/home/igor/mysql-4.1
2005-02-17 00:38:33 -08:00
tomas@poseidon.ndb.mysql.com
6e51577b52
Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-ndb-wl2278
2005-02-17 09:37:07 +01:00
igor@rurik.mysql.com
5a3806e5df
Manual merge
2005-02-17 00:34:06 -08:00
tomas@poseidon.ndb.mysql.com
ec33ff6792
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
2005-02-17 07:36:54 +01:00
patg@krsna.patg.net
986e122303
Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into krsna.patg.net:/home/patg/mysql-5.0
2005-02-16 22:36:43 -08:00
tomas@poseidon.ndb.mysql.com
7b2f7b43c5
Merge
2005-02-17 07:05:00 +01:00
igor@rurik.mysql.com
4fd1869c6b
Merge rurik.mysql.com:/home/igor/mysql-4.1
...
into rurik.mysql.com:/home/igor/dev/mysql-4.1-0
2005-02-16 21:20:39 -08:00
igor@rurik.mysql.com
eedde7ba3e
select.result, select.test:
...
Added a test case for bug #7098 .
sql_select.cc:
Fixed bug #7098 .
When a string field was substituted for an equal constant
the collation of the constant was changed by mistake for
the binary collation.
2005-02-16 21:17:20 -08:00
kent@mysql.com
a2c728b2ca
Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1-perl
...
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-compile
2005-02-17 05:25:46 +01:00
kent@mysql.com
682a27c1f0
init_db.sql:
...
Make SQL more readable, substitute hostname at runtime
mysql-test-run.pl:
Run init scripts with /bin/sh, ignore return code
2005-02-17 05:22:14 +01:00
sergefp@mysql.com
3724e8e0b4
A "fix" for problem discovered in BUG#8510: remove ONLY_FULL_GROUP_BY mode from ANSI mode, as currently
...
ONLY_FULL_GROUP_BY mode is overly restrictive.
2005-02-17 07:12:31 +03:00
kent@mysql.com
706a0dbc37
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-compile
2005-02-17 03:35:55 +01:00
kent@mysql.com
c9f6fbff1d
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/Users/kent/mysql/bk/mysql-4.1-perl
2005-02-17 03:34:30 +01:00
kent@mysql.com
ba927fdb4c
Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1-perl
...
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-compile
2005-02-17 03:04:28 +01:00
kent@mysql.com
75ebab7861
Windows compatibility changes of the 'rpl_delete_all',
...
'ps_1general' and 'fulltext_cache' test cases.
2005-02-17 02:59:39 +01:00
dean@mysql.com
2baf0a158c
Merge dellis@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/dellis/bkl/bug-4.1
2005-02-16 19:37:53 -06:00
acurtis@pcgem.rdg.cyberkinetica.com
a1bf1c926e
Bug#8147
...
Fix ambigious table error for INSERT..SELECT..UPDATE
2005-02-17 01:33:59 +00:00
dean@mysql.com
b64fdf882a
Merge dellis@bk-internal.mysql.com:/home/bk/mysql-4.0
...
into mysql.com:/home/dellis/mysqlab/bk/mysql-4.0
2005-02-16 19:15:08 -06:00
kent@mysql.com
75b0b945ca
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/Users/kent/mysql/bk/mysql-4.1-perl
2005-02-17 02:11:03 +01:00
dean@mysql.com
2f7595ea84
Merge mysql.com:/home/dellis/bkl/bug-4.1
...
into mysql.com:/home/dellis/bkl/bug-5.0
2005-02-16 17:35:00 -06:00
guilhem@mysql.com
18ecaae189
Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/mysql_src/mysql-5.0-xa
2005-02-16 23:27:20 +01:00
guilhem@mysql.com
f314564451
Fixes after 4.1->5.0 merge.
2005-02-16 23:23:20 +01:00
mskold@mysql.com
96188c81e9
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-16 23:16:02 +01:00
mskold@mysql.com
63a19c4791
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0-ndb
2005-02-16 21:29:19 +01:00
pekka@mysql.com
338f75a49d
ndb - fix new decimal type mysql vs. ndb
2005-02-16 21:19:42 +01:00
guilhem@mysql.com
0987d81ae6
Merge
2005-02-16 21:03:58 +01:00
tomas@poseidon.ndb.mysql.com
334d92db03
reuse nodeid if ndbd is restarted
2005-02-16 20:46:34 +01:00
tomas@poseidon.ndb.mysql.com
6e53d8f75d
Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-ndb-wl2278
2005-02-16 18:41:58 +01:00
serg@serg.mylan
5ddb6354a5
after merge fixes
2005-02-16 17:34:02 +01:00
tomas@poseidon.ndb.mysql.com
27538f49e3
Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-ndb-wl2278
2005-02-16 17:27:58 +01:00
pekka@mysql.com
c32fc95769
ndb - temp: comment out decimal tests t/ndb*
2005-02-16 17:10:17 +01:00
pem@mysql.com
25a9717a03
Merge mysql.com:/usr/local/bk/mysql-5.0
...
into mysql.com:/home/pem/work/mysql-5.0
2005-02-16 16:12:52 +01:00
pem@mysql.comhem.se
de2b28c1ad
Fixed BUG#8540: Local variable overrides an alias.
2005-02-16 16:06:41 +01:00
pekka@mysql.com
c177f9fc4a
Merge
2005-02-16 13:14:21 +01:00
mskold@mysql.com
5d23cdb591
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-16 13:13:13 +01:00
pekka@mysql.com
0d03304294
Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/space/pekka/ndb/version/my41-1.2154.30.2
2005-02-16 12:48:38 +01:00
pekka@mysql.com
7c9a155c4a
ndb - fix old decimal type mysql vs ndb
2005-02-16 12:45:59 +01:00
kent@mysql.com
b32f693ee4
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/Users/kent/mysql/bk/mysql-4.1-perl
2005-02-16 12:10:13 +01:00
mskold@mysql.com
37301115c3
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0-ndb
2005-02-16 11:17:14 +01:00
dean@mysql.com
e7f410a14a
Merge
2005-02-16 04:04:34 -06:00
msvensson@neptunus.homeip.net
e4ad041abf
Fix ndb_autodiscover
2005-02-16 11:02:48 +01:00
gluh@gluh.mysql.r18.ru
638dc7d9e9
Fix for bug#7915: crash,JOIN VIEW, subquery, SELECT .. FROM INFORMATION_SCHEMA.COLUMNS
2005-02-16 13:00:03 +03:00
dean@mysql.com
87718094aa
fulltext.test, fulltext.result:
...
Test case for bug#8522, to test for out of bounds memory access in ft_nlq_find_relevance().
2005-02-16 03:13:29 -06:00
guilhem@mysql.com
8e93873d5b
Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/mysql_src/mysql-4.1-clean
2005-02-16 10:02:54 +01:00
guilhem@mysql.com
bbcc1464d5
rpl_multi_query.test: disable ps-protocol as PS don't support multi-queries
2005-02-16 10:01:05 +01:00
igor@rurik.mysql.com
3100f891d2
Manual merge
2005-02-15 21:03:17 -08:00
igor@rurik.mysql.com
d9f66a261b
Merge rurik.mysql.com:/home/igor/mysql-4.0
...
into rurik.mysql.com:/home/igor/dev/mysql-4.0-0
2005-02-15 18:48:04 -08:00
igor@rurik.mysql.com
d4779d3534
delete.result, delete.test:
...
Added a test case for bug #8392 .
sql_delete.cc:
Fixed bug #8392 .
The bug caused a crash for a delete statement with ORDER BY
that explicitly referred to the modified table.
2005-02-15 18:45:42 -08:00
jimw@mysql.com
a6afab6a55
Always lowercase database names from 'host' and 'db' grant tables when they
...
are loaded and lower_case_table_names is set, but issue a warning when it is
done. (Bug #7989 )
2005-02-15 13:36:46 -08:00
jimw@mysql.com
dee9795b5b
Merge
2005-02-15 12:19:01 -08:00
patg@krsna.patg.net
7396fa1d11
Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into krsna.patg.net:/home/patg/mysql-5.0
2005-02-15 11:54:55 -08:00
dlenev@brandersnatch.localdomain
0a96ef4c90
Temporary disabling part of test which fails in --ps-protocol mode.
2005-02-15 22:17:44 +03:00
monty@mysql.com
71e4859389
After merge fixes
2005-02-15 19:25:42 +02:00
kent@mysql.com
50fe0ccbea
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/Users/kent/mysql/bk/mysql-4.1-perl
2005-02-15 16:13:03 +01:00
monty@mysql.com
38d1a42481
Merge with 4.1
2005-02-15 17:12:13 +02:00
monty@mysql.com
410e51c854
Fixed failing test cases 'row.test' when running with --ps-protocol
...
Simple optimzations done while reviewing code
2005-02-15 16:45:00 +02:00
guilhem@mysql.com
a8380942bf
Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/mysql_src/mysql-4.1-clean
2005-02-15 14:12:26 +01:00
monty@mysql.com
788a2658a3
Better bug fix for #5569 : "Incorrect "Access Denied" error with SAME login DIFFERENT host"
...
This fixes also the reverse lookup bug introduced by the previous patch
2005-02-15 14:42:13 +02:00
mskold@mysql.com
fdbcad3eaf
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-15 12:06:29 +01:00
mskold@mysql.com
d32c3d6940
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0-ndb
2005-02-15 11:38:00 +01:00
jimw@mysql.com
3d7a384d00
Allow hostnames that are IP addresses with a netmask even when
...
running with --skip-name-resolve. (Bug #8471 )
2005-02-14 20:33:14 -08:00
kent@mysql.com
8244a65bea
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/Users/kent/mysql/bk/mysql-4.1-perl
2005-02-15 00:19:04 +01:00
guilhem@mysql.com
55fb16a7a6
1) undoing my fix for BUG#8055 "Trouble with replication from temporary tables and ignores"
...
and fixing it another way (per Monty; a simpler solution which does not increase the number
of binlog events is to always execute DROP TEMPORARY TABLE IF EXISTS on slave). A new test rpl_drop_temp.
2) fixing BUG#8436 "Multiple "stacked" SQL statements cause replication to stop" by setting
thd->query_length to the length of the query being executed, not counting the next queries
if this is a multi-query. Should also improve display of SHOW PROCESSLIST. A new test rpl_multi_query.
2005-02-14 23:47:17 +01:00
mskold@mysql.com
62a08929fa
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-14 22:30:01 +01:00
serg@serg.mylan
fd828e5b4d
manually merged
2005-02-14 21:50:09 +01:00
sergefp@mysql.com
c30f7feba1
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/psergey/mysql-4.1-bug8218
2005-02-14 23:49:01 +03:00
sergefp@mysql.com
919f2f2364
Merge mysql.com:/home/psergey/mysql-4.1-bug8218
...
into mysql.com:/home/psergey/mysql-5.0-bug8218
2005-02-14 23:47:31 +03:00
sergefp@mysql.com
021f9849ef
Remove redundant DROP TABLE from test case
2005-02-14 23:45:48 +03:00
mats@mysql.com
30bf28202c
Bug#8412: For replication to work correctly, the prologue and
...
epilogue to an SQL statement should not have an error code even
when the SQL statement itself has an error code.
2005-02-14 18:39:33 +01:00
mskold@mysql.com
1dcbc45b43
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0-ndb
2005-02-14 17:35:14 +01:00
matthias@three.local.lan
d6c5089e92
Merge mleich@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into three.local.lan:/home/matthias/Arbeit/mysql-5.0/src
2005-02-14 16:34:36 +01:00
gluh@gluh.mysql.r18.ru
29510ce029
Fix for bug#8156:information_schema and lowercase_table3 fail on OSX
...
Can't repeat information_schema test failure
Fix for lowercase_table3 only
2005-02-14 18:23:10 +03:00
svoj@mysql.com
643b602832
Bug#8351
...
Fix for crash when using a double quote in boolean fulltext query.
2005-02-14 18:54:12 +04:00
mleich@mysql.com
cb56fcaa94
Removal of a not needed statement
2005-02-14 14:20:43 +01:00
matthias@three.local.lan
e8bf23c16a
Merge three.local.lan:/home/matthias/Arbeit/mysql-5.0/src
...
into three.local.lan:/home/matthias/Arbeit/mysql-5.0/src-WL1420
2005-02-14 10:23:53 +01:00
mskold@mysql.com
b371e8a567
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-14 09:22:14 +01:00
bell@sanja.is.com.ua
2d3076b69d
removed wrong distinct UNION detection (BUG#6565)
2005-02-14 02:06:21 +02:00
acurtis@pcgem.rdg.cyberkinetica.com
4957c4850d
Bug#2435
...
Alter handling for UNION syntax
Tests for UNION and parentheses
2005-02-13 22:35:52 +00:00
kent@mysql.com
a983841625
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/Users/kent/mysql/bk/mysql-4.1-perl
2005-02-13 19:52:41 +01:00
kent@mysql.com
ba3f9acff6
Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1-perl
...
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-compile
2005-02-13 18:22:38 +01:00
sergefp@mysql.com
c0c50efdef
Fix for BUG#8218:
...
Remove TMP_TABLE_PARAM::copy_funcs_it. TMP_TABLE_PARAM is a member of JOIN which is
copied via memcpy, and List_iterator_fast TMP_TABLE_PARAM::copy_funcs_it ends up
pointing to the wrong List.
2005-02-12 22:58:54 +03:00
mskold@mysql.com
7760b1cad8
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0-ndb
2005-02-12 14:57:39 +01:00
bar@mysql.com
9ba7392306
Bug#8235 Connection collation change & table create with default result in crash
2005-02-12 16:27:22 +04:00
serg@serg.mylan
40da910d4c
Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2005-02-12 09:38:15 +01:00
serg@serg.mylan
42bb0901a3
Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2005-02-12 00:10:07 +01:00
serg@serg.mylan
d355174522
make LOAD INDEX to work
2005-02-12 00:05:13 +01:00
igor@rurik.mysql.com
cdb40830d2
Manual merge
2005-02-11 15:00:29 -08:00
igor@rurik.mysql.com
1bb04b0642
distinct.result:
...
Adjustment of the result file after the revision of the fix for bug #7520 .
2005-02-11 13:44:54 -08:00
mskold@mysql.com
66343612d1
Merge
2005-02-11 22:30:37 +01:00
mskold@mysql.com
828a785610
Condition pushdown v.2
2005-02-11 22:05:24 +01:00
igor@rurik.mysql.com
634424ca16
select.result:
...
After revision of the fix for bug #7520 .
table.cc:
Revised the fix for bug #7520 .
Made it compliant with 5.0 code where the bug does not exist.
2005-02-11 10:39:26 -08:00
matthias@three.local.lan
9c7d94d408
Merge three.local.lan:/home/matthias/Arbeit/mysql-5.0/src
...
into three.local.lan:/home/matthias/Arbeit/mysql-5.0/src-WL1420
2005-02-11 17:57:35 +01:00
ingo@mysql.com
601a4fdfa2
Merge
2005-02-11 11:59:35 +01:00
igor@rurik.mysql.com
a697e5da15
Merge rurik.mysql.com:/home/igor/mysql-4.1
...
into rurik.mysql.com:/home/igor/dev/mysql-4.1-0
2005-02-10 23:48:35 -08:00
igor@rurik.mysql.com
4ef431ad55
select.result:
...
Adjusted results of the test case for bug #7520 for 4.1.
2005-02-10 23:47:57 -08:00
igor@rurik.mysql.com
06ff30f6c0
Merge rurik.mysql.com:/home/igor/dev/mysql-4.0-0
...
into rurik.mysql.com:/home/igor/dev/mysql-4.1-0
2005-02-10 22:17:18 -08:00
igor@rurik.mysql.com
8b3d59ad42
select.result, select.test:
...
Added a test case for bug #7520 .
table.cc:
Fixed bug #7520 .
The bug was caused by a wrong calculation of the field max_key_length for
a TABLE structure when there was an index on a blob field.
2005-02-10 22:15:38 -08:00
joreland@mysql.com
ec5ac47eb8
Merge mysql.com:/home/jonas/src/mysql-5.0
...
into mysql.com:/home/jonas/src/mysql-5.0-ndb
2005-02-11 06:46:05 +01:00
jimw@mysql.com
c4187750ff
Fix all of the enum and set columns in privilege tables to be
...
case-insensitive. (Bug #7989 )
2005-02-10 20:25:14 -08:00
jimw@mysql.com
eecb813c6b
Re-enable ctype_latin1_de test for embedded server (already passes, so it
...
appears to have been accidently disabled) and enable ctype_ucs after moving
a subtest that requires binlog to its own test file.
2005-02-10 18:08:30 -08:00
bell@sanja.is.com.ua
ea8caabb10
Better emulation correct SELECT tree for fields expressions of merging view during name resolving (BUG#6394)
2005-02-10 23:01:59 +02:00
matthias@three.local.lan
54684534fd
Merge three.local.lan:/home/matthias/Arbeit/mysql-5.0/src
...
into three.local.lan:/home/matthias/Arbeit/mysql-5.0/src-WL1420
2005-02-10 20:28:47 +01:00
mats@mysql.com
6611d3d2f8
Merge mysql.com:/home/bkroot/mysql-5.0
...
into mysql.com:/home/bk/b7853-mysql-5.0
2005-02-10 19:15:53 +01:00
bell@sanja.is.com.ua
5040e7cdb4
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-repl-5.0
2005-02-10 20:08:11 +02:00
joreland@mysql.com
1bda3aaa24
Merge mysql.com:/home/jonas/src/mysql-5.0
...
into mysql.com:/home/jonas/src/mysql-5.0-ndb
2005-02-10 17:12:53 +01:00
bell@sanja.is.com.ua
9b1bf2da5a
merge
2005-02-10 18:01:06 +02:00
joreland@mysql.com
87349f0d81
Merge mysql.com:/home/jonas/src/mysql-5.0
...
into mysql.com:/home/jonas/src/mysql-5.0-ndb
2005-02-10 16:19:44 +01:00
konstantin@mysql.com
7d735c7207
manual merge
2005-02-10 16:58:02 +03:00
msvensson@neptunus.homeip.net
a172575854
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into neptunus.homeip.net:/home/msvensson/mysql/mysql-5.0
2005-02-10 14:41:52 +01:00
monty@mysql.com
ccb2f3381b
Things missing in last changset
...
After merge fixes
Don't give duplicate warnings for some ::store() functions
2005-02-10 15:41:51 +02:00
msvensson@neptunus.homeip.net
8fb1f824ea
Change script to avoiud multiple --debug flags when starting master servers
2005-02-10 14:13:23 +01:00
bell@sanja.is.com.ua
cfedc23bce
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-5.0
2005-02-10 13:05:17 +02:00
jimw@mysql.com
3c5602faec
Re-enable alter_table test for embedded server by moving grant-related test
...
to grant.test and using replace_column to neuter the Privileges column in
SHOW FULL COLUMNS.
2005-02-09 18:17:40 -08:00
jimw@mysql.com
845139731b
Merge mysql.com:/home/jimw/my/mysql-4.1-zlib
...
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-02-09 16:36:24 -08:00
monty@mysql.com
a1a39fab84
Merge with 4.1
2005-02-10 02:27:37 +02:00
matthias@three.local.lan
74ba5b0808
Merge three.local.lan:/home/matthias/Arbeit/mysql-5.0/src
...
into three.local.lan:/home/matthias/Arbeit/mysql-5.0/src-WL1420
2005-02-09 21:47:54 +01:00
bell@sanja.is.com.ua
70797f571f
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-4.1
2005-02-09 21:14:06 +02:00
bell@sanja.is.com.ua
90c0024217
reverted patch for BUG#7351 (because of performance ussie)
2005-02-09 21:08:08 +02:00
serg@serg.mylan
db13afd89d
auto-ROLLBACK if binlog was not closed properly
...
auto-commit on Xid_log_event
2005-02-09 20:04:28 +01:00
tomas@poseidon.ndb.mysql.com
264bac2f1d
ndb_port_base is obsolete with WL#2278
2005-02-09 19:29:37 +01:00
monty@mysql.com
ab5aed6047
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/my/mysql-4.1
2005-02-09 19:22:35 +02:00
lenz@mysql.com
afa2a462a1
Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/space/my/mysql-4.1-merge
2005-02-09 17:58:29 +01:00
lenz@mysql.com
420d29159f
Merge mysql.com:/space/my/mysql-4.1-merge
...
into mysql.com:/space/my/mysql-5.0
2005-02-09 17:52:31 +01:00
lenz@mysql.com
a0089319d2
- make sure to include the embedded test results in the source distribution
2005-02-09 17:49:43 +01:00
msvensson@neptunus.homeip.net
b8490b5524
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into neptunus.homeip.net:/home/msvensson/mysql/mysql-5.0
2005-02-09 16:26:06 +01:00
msvensson@neptunus.homeip.net
0ed971878d
Fix so that master and master1 does not write to same .trace file
2005-02-09 16:23:22 +01:00
matthias@three.local.lan
83b1d82add
Merge three.local.lan:/home/matthias/Arbeit/mysql-5.0/src
...
into three.local.lan:/home/matthias/Arbeit/mysql-5.0/src-WL1420
2005-02-09 15:33:01 +01:00
wax@kishkin.ru
a0507f98b9
merge
2005-02-09 19:13:20 +05:00
bell@sanja.is.com.ua
6cda5f53da
postreview changes
...
(used t3, moved after last bug, renamed)
2005-02-09 16:02:37 +02:00
mleich@mysql.com
48bc6d477d
Merge mysql.com:/home/matthias/Arbeit/mysql-5.0/src
...
into mysql.com:/home/matthias/Arbeit/mysql-5.0/src-WL1420
2005-02-09 11:00:15 +01:00
bell@sanja.is.com.ua
b0a1ee8751
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-5.0
2005-02-09 11:41:55 +02:00
jimw@mysql.com
5ebbc834fe
Fix removal of tables from cache when the database they are contained
...
within is dropped and lower_case_table_names is set. (Bug #8355 )
2005-02-08 15:14:14 -08:00
hf@deer.(none)
96558f6ad3
Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into deer.(none):/home/hf/work/mysql-5.0.clean
2005-02-09 02:54:08 +04:00
hf@deer.(none)
b94a482ee9
Precision Math implementation
2005-02-09 02:50:45 +04:00
bell@sanja.is.com.ua
eb4fb7253d
Merge
2005-02-09 00:31:56 +02:00
sergefp@mysql.com
dcc65b77a6
Fix for BUG#8371: wrong rec_per_key value for hash index on temporary table
2005-02-08 23:44:51 +03:00
pem@mysql.comhem.se
2c26ebe359
WL#2130: Table locking for stored FUNCTIONs
...
Collect all tables and SPs refered by a statement, and open all tables
with an implicit LOCK TABLES. Do find things refered by triggers and views,
we open them first (and then repeat this until nothing new is found), before
doing the actual lock tables.
2005-02-08 20:52:50 +01:00
kent@mysql.com
e27f92103e
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/Users/kent/mysql/bk/mysql-4.1-perl
2005-02-08 18:14:26 +01:00
wax@mysql.com
7d1af16c2a
Merge mysql.com:/home/wax/mysql/mysql-4.1
...
into mysql.com:/home/wax/mysql/mysql-4.1test2
2005-02-08 18:51:42 +05:00
kent@mysql.com
f2b3a33551
Merge
2005-02-08 13:59:29 +01:00
mleich@mysql.com
c1c4822bf3
Insertion of additional sub test cases checking DATA/TIME/TIMESTAMP
...
functionality into the test case "strict".
The additional sub test cases are part of the SoW6 test draft
(sow6-dates.test) written by Trudy/PeterG.
sow6-dates will be no longer needed, because "strict" contains with
this extension all sub test cases of sow6-dates.
2005-02-08 13:46:04 +01:00
monty@mysql.com
79ec81071a
Better bugfix for "HAVING when refering to RAND()" (Bug #8216 )
...
Ensure that references in HAVING, ORDER BY or GROUP BY are calculated after fields in SELECT.
This will ensure that any reference to these has a valid value.
Generalized the code for split_sum_func()
2005-02-08 14:41:09 +02:00
tomas@poseidon.ndb.mysql.com
6c9cf886dd
Merge poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
2005-02-08 11:12:54 +01:00
monty@mysql.com
e795134875
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/my/mysql-5.0
2005-02-08 10:55:06 +02:00
tomas@poseidon.ndb.mysql.com
6c25300796
ndbcluster now runs clean in 4.1, 5.0 may still need some work
2005-02-08 06:11:05 +01:00
jimw@mysql.com
6515400d92
Add the zlib .libs directory to LD_LIBRARY_PATH in mysql-test-run.sh,
...
which fixes running the tests when using the bundled zlib.
2005-02-07 15:17:30 -08:00
jimw@mysql.com
bd72e16540
Merge mysql.com:/home/jimw/my/mysql-5.0-6368
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-02-07 12:20:08 -08:00
bell@sanja.is.com.ua
b196fa2cfa
merge
2005-02-07 21:39:37 +02:00
kent@mysql.com
df3415f079
mysql-test-run.pl:
...
Corrected user name passing
Honor the --master-binary and --slave-binary options
Insert the host name into 'user' table
Added --udiff option, to get unified diff output
Call special mtr_run_test() for running "mysqltest"
mtr_report.pl:
Added --udiff option, to get unified diff output
init_db.sql:
Insert the host name into 'user' table
2005-02-07 20:32:56 +01:00
monty@mysql.com
09cb17374b
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/my/mysql-5.0
2005-02-07 21:10:15 +02:00
tomas@poseidon.ndb.mysql.com
9a1e257087
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
2005-02-07 19:31:02 +01:00
monty@mysql.com
dcb7865548
Merge with 4.1 to get bug fix
2005-02-07 19:42:03 +02:00
tomas@poseidon.ndb.mysql.com
9220ef26d0
Merge
2005-02-07 18:05:11 +01:00
tomas@poseidon.ndb.mysql.com
ee985f9a7e
mysql-test-run.sh:
...
fixed start-and-exit flag
2005-02-07 17:59:46 +01:00
tomas@poseidon.ndb.mysql.com
3249388a5d
have test suite continue even if ndbcluster fails to start if --force flag is set
2005-02-07 17:46:52 +01:00
monty@mysql.com
3fe60486e4
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/my/mysql-4.1
2005-02-07 18:14:31 +02:00
monty@mysql.com
32f91f48e8
Fixed bug in HAVING when refering to RAND() through alias
...
(BUG 8216)
2005-02-07 18:13:57 +02:00
joreland@mysql.com
b0c4128c6a
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/jonas/src/mysql-5.0
2005-02-07 13:26:45 +01:00
tomas@poseidon.ndb.mysql.com
082c266725
ndb_basic.test:
...
corrected typo
2005-02-07 13:26:44 +01:00
joreland@mysql.com
31169016c0
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/jonas/src/mysql-5.0
2005-02-07 13:15:40 +01:00
tomas@poseidon.ndb.mysql.com
6c18eabc30
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
2005-02-07 13:15:39 +01:00
joreland@mysql.com
fdb38a8b1a
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/jonas/src/mysql-5.0
2005-02-07 11:44:17 +01:00
tomas@poseidon.ndb.mysql.com
4637544c61
small testcase update
2005-02-07 11:17:24 +01:00
joreland@mysql.com
3dde8baa4e
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/jonas/src/mysql-4.1
2005-02-07 10:26:09 +01:00
gluh@gluh.mysql.r18.ru
15273035ce
Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into gluh.mysql.r18.ru:/home/gluh/MySQL/mysql-5.0
2005-02-07 11:57:14 +03:00
joreland@mysql.com
85ab07967b
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/jonas/src/mysql-5.0
2005-02-07 07:32:29 +01:00
patg@krsna.patg.net
0a48c5b5c2
WL# 2094
...
This patch contains all that my previous patch (1.1814) contained, with the addition of using cli_fetch_lengths for
handling binary data (Bar noted this on the review of 1.1814, Guilhem suggested using cli_fetch_lenghts by
making available via removal of static in method definition and declaration in mysql.h, but
Konstantin had some reservations, but he said to commit the patch using this anyway,
and I suppose this can be discussed. I abandoned 1.1814 because Monty made a couple
fixes to my code as well as formatting changes, and I thought it would just be easier
to hand-edit my changes into a fresh clone and then make a patch.
The reason for using cli_fetch_lengths is so that I can correctly get the length of
the field I am setting into the field. I was previously using 'strlen' but Bar pointed out this
won't correctly get the length of binary data and is also less effecient. Upon testing,
it was in fact verified that binary data in a blob table was being inserted correctly,
but not being retrieved correctly, all due to not having the correct value for the
field:
(*field)->store(row[x], strlen(row[x]), &my_charset_bin);
was changed to:
(*field)->store(row[x], lengths[x], &my_charset_bin);
lengths being a unsigned long pointer to the values of the field lengths from a
MYSQL_ROW.
Since the server doesn't have the function "mysql_fetch_lengths" available, I tried
to use "result->lengths", but this isn't set, so I finally successfully used
cli_fetch_lenghts, which does give the correct lengths, and now the binary data gets
retrieved correctly.
I've also run the code through indent-ex and am using Brian's vimrc to ensure correct formatting!
This code passes the entire test suite, without any errors or warning on both my
workstation and build.mysql.com
2005-02-06 09:40:07 -08:00
bell@sanja.is.com.ua
d29fb3f192
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-4.1
2005-02-06 15:08:25 +02:00
bell@sanja.is.com.ua
0a8595df42
Merge sanja.is.com.ua:/home/bell/mysql/bk/work-4.1
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-5.0
2005-02-06 13:17:12 +02:00
bell@sanja.is.com.ua
1853c2fe89
fixed test 'subselect' in case when innodb is not compiled in (thanks HF who niticed it)
2005-02-06 13:06:12 +02:00
joreland@mysql.com
abe792307b
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/jonas/src/mysql-5.0
2005-02-06 10:41:59 +01:00
joreland@mysql.com
fec79d0358
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/jonas/src/mysql-4.1
2005-02-06 10:39:48 +01:00
guilhem@mysql.com
8c508c25a2
result update after 4.1->5.0 merge
2005-02-05 19:49:02 +01:00
guilhem@mysql.com
a70adb5d2a
Merge
2005-02-05 18:07:50 +01:00
jimw@mysql.com
be593c3251
Update test result
2005-02-05 08:54:13 -08:00
jimw@mysql.com
3c10ccd3f7
Merge bk-internal:/home/bk/mysql-5.0
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-02-05 07:52:55 -08:00
guilhem@mysql.com
b97a519d72
Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/mysql_src/mysql-4.1-clean
2005-02-05 15:29:38 +01:00
joreland@mysql.com
2953a79835
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/jonas/src/mysql-5.0
2005-02-05 07:17:53 +01:00
joreland@mysql.com
7fba2bf3aa
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/jonas/src/mysql-4.1
2005-02-05 07:16:07 +01:00
sergefp@mysql.com
511a166d55
Fix for BUG#7519: Index statistics is not displayed after ANALYZE for temporary tables:
...
Call file->extra() with HA_STATUS_CONST in mysqld_show_keys.
The fix will not be merged into 4.1/5.0 because they don't have this problem already.
2005-02-05 06:23:23 +03:00
sergefp@mysql.com
fb113b94e4
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/psergey/mysql-4.1-bug7816
2005-02-05 01:53:12 +03:00
sergefp@mysql.com
72c473ec58
Merge mysql.com:/home/psergey/mysql-4.1-bug7816
...
into mysql.com:/home/psergey/mysql-5.0-bug7716
2005-02-05 01:52:17 +03:00
guilhem@mysql.com
44c2dcff36
Fix for BUG#8055 "Trouble with replication from temporary tables and ignores":
...
when we close the session's temp tables at session end, we automatically write to binlog *one* DROP TEMPORARY TABLE *per tmp table*.
2005-02-04 22:43:54 +01:00
jimw@mysql.com
14bb626dff
Update test results
2005-02-04 12:59:02 -08:00
jimw@mysql.com
8c8553af81
Merge changes
2005-02-04 11:59:02 -08:00
jimw@mysql.com
b509f2b373
Merge mysql.com:/home/jimw/my/mysql-4.1-6067
...
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-02-04 10:39:13 -08:00
mysqldev@mysql.com
79b88ead4a
Merge bk-internal:/home/bk/mysql-4.1
...
into mysql.com:/home/mysqldev/tulin/mysql-4.1
2005-02-04 18:45:02 +01:00
tulin@mysql.com
d017a604fe
Merge bk-internal:/home/bk/mysql-5.0
...
into mysql.com:/home/mysqldev/tulin/mysql-5.0
2005-02-04 17:32:18 +01:00
kent@mysql.com
d1abda58b3
mysql-test-run.sh:
...
USE_RUNNING_SERVER should be set to 0 or 1
2005-02-04 17:24:18 +01:00
hf@deer.(none)
40fe0b3971
Embedded version of test fixed
2005-02-04 19:12:15 +04:00
msvensson@neptunus.homeip.net
c9d7cd043b
Merge neptunus.homeip.net:/home/msvensson/mysql/mysql-5.0
...
into neptunus.homeip.net:/home/msvensson/mysql/mysql-5.0-cluster-extra
2005-02-04 15:13:45 +01:00
mats@mysql.com
f6caefef2d
Bug#7853 (mysqlbinlog does not accept input from stdin)
...
The utility 'mysqlbinlog' now accepts input from stdin. It can
now be used to read the output from, e.g., 'zcat' or other utility.
2005-02-04 14:29:54 +01:00
mysqldev@mysql.com
753ea29f86
Merge bk-internal:/home/bk/mysql-4.1
...
into mysql.com:/home/mysqldev/tulin/mysql-4.1
2005-02-04 14:29:52 +01:00
mysqldev@mysql.com
abf7837fbb
resolved merge conflict
2005-02-04 14:27:09 +01:00
tomas@poseidon.ndb.mysql.com
27a69e573a
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
2005-02-04 14:27:08 +01:00
tomas@poseidon.ndb.mysql.com
7fd685ffe8
added test to trigger drifferent fragmentations in ndb
...
corrected documentation on fragmentation
set "fragmentation medium" to mean 2 fragments per node instead of 1
set default fragmentation to small instead of medium
bug#8284 adjust fragmentation to max_rows
2005-02-04 14:25:08 +01:00
gluh@gluh.mysql.r18.ru
b0bf195064
Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into gluh.mysql.r18.ru:/home/gluh/MySQL/mysql-4.1
2005-02-04 16:24:00 +03:00