bar@mysql.com
b11e78381a
ctype-cp932.c:
...
After backporting from 5.0 fix.
There is no an extra argument in 4.1.
2005-07-21 13:10:27 +05:00
pappa@c-450ae253.1238-1-64736c10.cust.bredbandsbolaget.se
ac6623f08f
Fix merge
2005-07-20 22:30:34 -04:00
pappa@c-450ae253.1238-1-64736c10.cust.bredbandsbolaget.se
9663b9a974
Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-4.0
...
into c-450ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/mysql-4.1
2005-07-20 21:58:33 -04:00
mronstrom@mysql.com
4cb963439a
Bug #10600 After review fixes
2005-07-20 21:19:01 +02:00
tomas@poseidon.ndb.mysql.com
3d0d5eb25b
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
2005-07-20 18:58:51 +02:00
tomas@poseidon.ndb.mysql.com
6ca09e8b8f
Bug #12055 NDB temp tables created by ALTER TABLE are usable
...
- do not discover temporary files and make them visible
2005-07-20 18:40:55 +02:00
georg@lmy002.wdf.sap.corp
dc0645f7cf
Merge grichter@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into lmy002.wdf.sap.corp:/home/georg/work/mysql/prod/mysql-4.1
2005-07-20 13:32:43 +02:00
georg@lmy002.wdf.sap.corp
3468c8485d
cs fixes from last commit
2005-07-20 13:31:45 +02:00
jani@a193-229-222-105.elisa-laajakaista.fi
0f7639ba15
Added some missing casts and changed a define for alloca().
2005-07-20 13:27:57 +03:00
bar@mysql.com
8564322500
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/usr/home/bar/mysql-4.1.innolike
2005-07-20 11:00:33 +05:00
jimw@mysql.com
bb6918e312
Merge mysql.com:/home/jimw/my/mysql-4.1-7249
...
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-07-19 10:35:15 -07:00
monty@mishka.local
292aefeeca
Fixed some test cases that was not forgotten in a recent patch
2005-07-19 19:47:54 +03:00
monty@mishka.local
29d9aa65f3
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mishka.local:/home/my/mysql-4.1
2005-07-19 19:28:26 +03:00
monty@mishka.local
7e83d09ce7
Simple fixes during review of new code
2005-07-19 19:25:05 +03:00
georg@lmy002.wdf.sap.corp
3e1ae2633a
fix for bug#12001
2005-07-19 17:31:18 +02:00
georg@lmy002.wdf.sap.corp
21a88afeed
minor fix (backport from 5.0) - changed function prototype/definition
2005-07-19 17:12:00 +02:00
tulin@dl145b.mysql.com
c9abae2ce2
printout of cluster config to use same tokens as documentation
2005-07-19 16:34:56 +02:00
tulin@dl145b.mysql.com
2f01676b37
ConfigInfo.cpp:
...
BUG#12028, cannot use default section for hostname in cluster config
made clearer error message
2005-07-19 15:25:55 +02:00
tulin@dl145b.mysql.com
74438e6683
BUG#12028, cannot use default value for HostName in cluster config
...
+ added switch --print-full-config
+ removed unused REP configuration
2005-07-19 14:33:38 +02:00
tulin@dl145b.mysql.com
1c2cfd80a2
perror.c:
...
BUG#11999, incorrect --help on perror with ndb
2005-07-19 11:52:24 +02:00
mronstrom@mysql.com
2d23c691f7
Bug #10600
...
remove_table_from_cache fails to signal other thread and gets
blocked when other thread also gets blocked
2005-07-19 00:29:19 +02:00
reggie@linux.site
8f605428cb
Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into linux.site:/home/reggie/bk/bug7142
2005-07-18 08:03:59 -06:00
konstantin@mysql.com
8b3d39163a
Alleviate the autoconf requirement.
2005-07-18 18:03:58 +04:00
gbichot@production.mysql.com
4853da1ae7
Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into production.mysql.com:/nfstmp1/guilhem/mysql-4.1-prod
2005-07-18 14:51:13 +02:00
gbichot@production.mysql.com
7cd2fb13ff
Fix for BUG#12003 "assertion failure in testsuite (double lock of
...
LOCK_thread_count)" and for BUG#12004 "SHOW BINARY LOGS reports 0
for the size of all binlogs but the current one".
There are a lot of 4.1->5.0 unmerged changes (hardest are in the optimizer), can't merge; still pushing in 4.1 because my changes
are very small. Feel free to ask me if you have problems merging them.
2005-07-18 14:46:53 +02:00
joerg@mysql.com
b323a77375
QNX does not know "uint", so the cast is rewritten as "unsigned int".
2005-07-18 13:52:18 +02:00
lenz@mysql.com
00c3b9438d
Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/space/my/mysql-4.1
2005-07-18 11:31:11 +02:00
igor@rurik.mysql.com
54dd7e5ebf
select.result, select.test:
...
Added a test case for bug #11745 .
sql_select.cc:
Fixed bug # 11745.
Added support of where clause for queries with FROM DUAL.
sql_yacc.yy:
Fixed bug # 11745.
Added optional where clause for queries with FROM DUAL.
2005-07-17 09:46:14 -07:00
igor@rurik.mysql.com
553f2a59f3
Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into rurik.mysql.com:/home/igor/mysql-4.1
2005-07-16 18:28:09 -07: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
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
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
jimw@mysql.com
eb785d70b8
Fix error in formatting metadata in mysqltest.
2005-07-15 12:31:57 -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
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
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
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
reggie@linux.site
65a1d74fb1
added a comment referring to the bug report
2005-07-15 03:51:55 -06:00
tomas@poseidon.ndb.mysql.com
da6d150453
BUG#11596 (partial fix), IP addresses not shown in ndb_mgm SHOW command on second ndb_mgmd (or on ndb_mgmd restart)
2005-07-15 10:44:54 +02:00
lenz@mysql.com
cad779388a
Merge mysql.com:/space/my/mysql-4.1.13-clone
...
into mysql.com:/space/my/mysql-4.1-build
2005-07-15 09:15:06 +02:00