konstantin@mysql.com
8e72214d74
Merge mysql.com:/opt/local/work/mysql-4.1-root
...
into mysql.com:/media/sda1/mysql/mysql-5.0-merge
2005-07-16 13:45:32 +04:00
timour@mysql.com
ff0c7f22cf
Added test for Bug #11521
...
"Negative integer keys incorrectly substituted for 0 during range analysis."
The problem is that the range optimizer incorrectly replaces any negative
constant with '0' for all types except BIGINT because the method save_in_field()
casts negative integers to non-negative. This causes incorrect query
results where (0 = any_negative_number).
The problem caused by this bug is fixed by the patch for BUG#11185.
That patch constitutes an optimization due to which the problem code is
never called with negative constants. This patch adds a test so we are sure
that the problem does not reappear.
2005-07-16 10:30:25 +03:00
georg@lmy002.wdf.sap.corp
912fef706a
cs fixes
2005-07-16 09:19:23 +02:00
georg@lmy002.wdf.sap.corp
83cf055d0c
Merge grichter@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into lmy002.wdf.sap.corp:/home/georg/work/mysql-5.0
2005-07-16 09:13:31 +02:00
bell@sanja.is.com.ua
f4f9b853dd
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-bug6-5.0
2005-07-16 08:35:21 +03:00
georg@lmy002.wdf.sap.corp
53c630a524
Restore previous used client charset in mysql_reconnect
...
Moved mysql_set_character_set function to client.c
Changed function prototype for mysql_set_character_set (as suggested
by Konstantin)
2005-07-16 07:13:40 +02:00
jimw@mysql.com
c61ce0d90d
Merge bk-internal:/home/bk/mysql-4.1
...
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-07-15 18:59:18 -07:00
evgen@moonbone.local
52569ad519
Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into moonbone.local:/work/mysql-4.1-bug-11868
2005-07-16 05:59:17 +04:00
evgen@moonbone.local
81d93df1ae
Fix bug#11868 NOT NULL ref optimization in subquery used in update must be
...
disabled if ref is built with a key from the updated table
Problem was in add_not_null_conds() optimization function.
It contains following code:
JOIN_TAB *referred_tab= not_null_item->field->table->reginfo.join_tab;
...
add_cond_and_fix(&referred_tab->select_cond, notnull);
For UPDATE described in bug report referred_tab is 0 and dereferencing it
crashes the server.
2005-07-16 05:31:16 +04:00
brian@zim.(none)
b2f83ec3f8
Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into zim.(none):/home/brian/mysql/foo-5.0
2005-07-15 17:37:17 -07:00
brian@zim.(none)
f39e07d6de
Added federated to max base test.
2005-07-15 17:36:20 -07:00
patg@krsna.patg.net
db1fb6a7e5
This is the same patch as 1.1937, with small variable declaration changes, memory
...
deallocation cleanup
2005-07-15 17:33:47 -07:00
jimw@mysql.com
6a18b7f1a2
Merge bk-internal:/home/bk/mysql-4.1
...
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-07-15 16:29:15 -07:00
konstantin@mysql.com
68ab7f8e9f
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/opt/local/work/mysql-4.1-root
2005-07-16 03:29:14 +04:00
jimw@mysql.com
d408fca40e
Merge bk-internal:/home/bk/mysql-4.1
...
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-07-15 16:29:14 -07:00
reggie@linux.site
29ddf3af61
Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into linux.site:/home/reggie/bk/bug7403
2005-07-15 17:29:13 -06:00
konstantin@mysql.com
e08caeeee2
A fix and a test case for Bug#9359 "Prepared statements take snapshot
...
of system vars at PREPARE time": implement a special Item
to handle system variables. This item substitutes itself with
a basic constant containing variable value at fix_fields.
2005-07-16 03:29:13 +04:00
evgen@moonbone.local
0298bc347a
Fix bug#11482 4.1.12 produces different resultset for a complex query
...
than in previous 4.1.x
Wrongly applied optimization were adding NOT NULL constraint which results in
rejecting valid rows and reduced result set.
The problem was that add_notnull_conds() while checking subquery were adding
NOT NULL constraint to left joined table, to which, normally, optimization
don't have to be applied.
2005-07-16 03:29:12 +04:00
georg@lmy002.wdf.sap.corp
9293bdc849
fix for bug#11893
...
increased version number for shared lib to 15
2005-07-16 00:23:33 +02:00
bell@sanja.is.com.ua
b4a723e4d2
post merge changes: added safe_charset_converter to other static functions
2005-07-16 00:52:00 +03:00
bell@sanja.is.com.ua
8aad35f9d2
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-bug6-5.0
2005-07-16 00:17:05 +03:00
bell@sanja.is.com.ua
6114bee47c
stop evaluation constant functions in WHERE (BUG#4663)
...
correct value of CURRENT_USER() in SP with "security definer" (BUG#7291)
2005-07-16 00:01:44 +03:00
jimw@mysql.com
eb785d70b8
Fix error in formatting metadata in mysqltest.
2005-07-15 12:31:57 -07:00
reggie@linux.site
95a5c8ef49
Merge linux.site:/home/reggie/bk/bug7403
...
into linux.site:/home/reggie/bk/mysql-5.0
2005-07-15 12:15:45 -06:00
brian@zim.(none)
aa032356e2
Removed dead options, fixed pentium script to no longer ask for isam (its not included in 5.0).
2005-07-15 11:15:44 -07:00
jimw@mysql.com
b4b874568b
Merge mysql.com:/home/jimw/my/mysql-4.1-9979
...
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-07-15 10:52:22 -07:00
pem@mysql.com
d503283863
Post-review fix: Made test bug9538 test robust.
2005-07-15 19:46:44 +02:00
pem@mysql.com
f66c839ef0
Merge mysql.com:/usr/local/bk/mysql-5.0
...
into mysql.com:/home/pem/work/mysql-5.0
2005-07-15 19:46:43 +02:00
tomas@poseidon.ndb.mysql.com
d6e2fae0ae
Bug#9442, moved ps ucs2 test from ps.test to ctype_ucs.test
2005-07-15 19:46:42 +02:00
tomas@poseidon.ndb.mysql.com
ab20a6f654
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
2005-07-15 17:27:26 +02:00
pem@mysql.com
7d7f34cf1c
Fixed BUG#9538: SProc: Creation fails if we try to SET system variable
...
using @@var_name in proc
Made sure we don't lose the tokenizer state when swapping lex in during SET
parsing.
2005-07-15 17:24:19 +02:00
lenz@mysql.com
1ca37ca193
Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/space/my/mysql-5.0
2005-07-15 17:19:25 +02:00
pem@mysql.com
10db4d030f
Made .c files compile with a C compiler.
2005-07-15 17:19:25 +02:00
tomas@poseidon.ndb.mysql.com
da6533e8bb
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
2005-07-15 17:19:24 +02:00
tomas@poseidon.ndb.mysql.com
d8a584f064
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
2005-07-15 17:14:34 +02:00
georg@lmy002.wdf.sap.corp
02599bdf27
minor fix for restoring the previous characterset in
...
test_client_character_set
2005-07-15 17:05:00 +02:00
tomas@poseidon.ndb.mysql.com
d0d82338cb
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
2005-07-15 15:40:15 +02:00
georg@lmy002.wdf.sap.corp
00398f5e1e
Merge grichter@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into lmy002.wdf.sap.corp:/home/georg/work/mysql-5.0
2005-07-15 15:06:47 +02:00
georg@lmy002.wdf.sap.corp
8c4cd0427f
Fix for bug #11037 .
...
When all rows are fetched subsequent calls to mysql_stmt_fetch return
now MYSQL_NO_DATA instead of errorcode 1.
2005-07-15 14:30:47 +02:00
reggie@linux.site
f9adcc3cac
Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into linux.site:/home/reggie/bk/bug7403
2005-07-15 06:15:00 -06:00
tomas@poseidon.ndb.mysql.com
b144b920a0
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-new
2005-07-15 14:14:59 +02:00
tomas@poseidon.ndb.mysql.com
f54afc792f
Merge
2005-07-15 14:13:23 +02:00
tomas@poseidon.ndb.mysql.com
f97c11fe03
minor type fixes to prev patch
2005-07-15 13:57:21 +02:00
tomas@poseidon.ndb.mysql.com
cd590a6a02
Merge poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-release
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-new
2005-07-15 13:32:08 +02:00
tomas@poseidon.ndb.mysql.com
52d40b3f60
Merge mysqldev@production.mysql.com:my/mysql-4.1-release
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-release
2005-07-15 13:30:01 +02:00
ramil@mysql.com
cd20ee4361
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/usr/home/ram/work/mysql-5.0
2005-07-15 16:27:59 +05:00
ramil@mysql.com
ffb7421955
NO_DEFAULT_VALUE_FLAG and BLOB_FLAG combined
2005-07-15 16:25:31 +05:00
ramil@mysql.com
b11d04e50a
a fix (bug #9881 : ALTER TABLE gives wrong error message with sql-mode TRADITIONAL).
2005-07-15 15:50:57 +05:00
tomas@poseidon.ndb.mysql.com
ca75369663
BUG#11898 ndb_mgmd not releasing resources, added "ping" on add_listener
...
+ added close of some fd's
+ debug prints
2005-07-15 12:40:20 +02:00
tomas@poseidon.ndb.mysql.com
c9e320019b
Bug #11132 , reverted bug-fix, it introduces another bug. Ndbd's may get the same nodeid
...
In 4.1 the connection to the management server _must_ stay, that is how we
ensure that the nodeids are reserved correctly
2005-07-15 12:35:26 +02:00