ram@gw.mysql.r18.ru
d35c6c9c03
Portability fix (bug #7203 : "delayed" test fails on QNX when using prepared statements)
2004-12-14 11:35:23 +04:00
sergefp@mysql.com
e06ac0e5ab
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/dbdata/psergey/mysql-4.1-merge-fix
2004-12-14 03:37:20 +03:00
sergefp@mysql.com
3c8f48d2e3
* Added comments and one assert
...
* Backport of safety measures from 5.0: make numeorous replaces:
s/item->fix_fields()/if (!item->fixed) item->fix_fields()
2004-12-14 03:36:19 +03:00
jimw@mysql.com
57917916bc
Merge jwinstead@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/jwinstead2/mysql-4.1
2004-12-14 00:23:18 +01:00
sergefp@mysql.com
3ceb04a5d8
Merge of fix for BUG#6976 continued: pulling in some Item_ref changes from 5.0
...
* Added Item_ref::set_properties
* Item_ref::Item_ref now expects to get in *item either
NULL - then fix_fields() will be called later or
ptr to Item it will refer to - then an equivalent of fix_fields() call is performed
2004-12-14 01:07:06 +03:00
guilhem@mysql.com
c2ebfaa323
Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/mysql_src/mysql-4.1-clean
2004-12-13 22:40:32 +01:00
lenz@mysql.com
2cd30dc674
- a fix for the fix - now "make test" will run the test suite with and
...
without the PS protocol
2004-12-13 21:43:30 +01:00
mwagner@here.mwagner.org
bde49d08c7
Makefile.am:
...
s/spaces/TAB/
2004-12-13 14:03:19 -06:00
mwagner@here.mwagner.org
a20c623e6b
Makefile.am:
...
Add running of test suite with --ps-protocol to 'test' target
2004-12-13 13:48:37 -06:00
jimw@mysql.com
ef77509424
Merge jwinstead@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/jwinstead2/mysql-4.1
2004-12-13 20:24:13 +01:00
sergefp@mysql.com
a8e52ef412
Merge mysql.com:/dbdata/psergey/mysql-4.0-bug6976
...
into mysql.com:/dbdata/psergey/mysql-4.1-merge
2004-12-13 20:30:44 +03:00
sergefp@mysql.com
6b14f6976f
Merged fixes for BUG#6976 and BUG#7079
2004-12-13 20:25:26 +03:00
sergefp@mysql.com
03acb8155f
Merged (will need a post-merge fix)
2004-12-13 20:10:07 +03:00
sergefp@mysql.com
9ed8cd701b
Merging fix for BUG#6976 from 4.0 to 4.1
...
The problem in 4.1 was the same as in 4.0 - fix_fields() not called for created Item_ref.
The fix is similar too - initialize Item_refs in ctor (but don't interfere with cases when
Item_ref is used by subselects).
2004-12-13 20:06:06 +03:00
guilhem@mysql.com
6c209125b7
Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/mysql_src/mysql-4.1-clean
2004-12-13 15:21:50 +01:00
acurtis@pcgem.rdg.cyberkinetica.com
4864dce086
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into pcgem.rdg.cyberkinetica.com:/usr/home/acurtis/work/wl2274.2
2004-12-13 14:19:20 +00:00
guilhem@mysql.com
de968efaf3
correcting --expire_logs_days description in mysqld --help
2004-12-13 15:10:54 +01:00
tomas@poseidon.ndb.mysql.com
450ea0e041
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-clean
2004-12-13 14:27:25 +01:00
tomas@poseidon.ndb.mysql.com
3e9db5ab2e
BackupInit.cpp:
...
quick fix for wrong allocation of size
2004-12-13 14:26:39 +01:00
bell@sanja.is.com.ua
71f03f23e9
Merge abelkin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
2004-12-13 15:08:52 +02:00
bell@sanja.is.com.ua
292c71caef
comment of class edded
2004-12-13 15:05:52 +02:00
tomas@poseidon.ndb.mysql.com
60f909a446
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-clean
2004-12-13 14:04:11 +01:00
tomas@poseidon.ndb.mysql.com
095a772f21
changed back to just restricting max meta objects in dict to make sure we can "always" configure ourselves out of unforseen limits
2004-12-13 13:58:58 +01:00
bell@sanja.is.com.ua
4648ffaee8
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-ref-4.1
2004-12-13 14:55:05 +02:00
bell@sanja.is.com.ua
157af12f36
fixed parameter to avoid accessing unallocated memory
2004-12-13 14:54:13 +02:00
tomas@poseidon.ndb.mysql.com
e45f8857a3
fixed event thread for better error handling
2004-12-13 13:43:28 +01:00
acurtis@pcgem.rdg.cyberkinetica.com
9818cadd1b
WL#2274 - INSERT..SELECT..UPDATE
...
UPDATE clause conflicts with SELECT for use of item_list field.
Alter UPDATE clause to use new lex field update_list
Tests included
2004-12-13 12:26:28 +00:00
jani@a193-229-222-105.elisa-laajakaista.fi
081a714b48
Some fixes for Netware.
2004-12-13 14:19:34 +02:00
tomas@poseidon.ndb.mysql.com
4b6a752180
bug #7230
...
+ fixed testcase
2004-12-13 11:45:45 +01:00
marko@hundin.mysql.fi
cd8743409f
dict0load.c:
...
dict_load_table(): detect the new table format of MySQL 5.0.3
2004-12-13 12:31:17 +02:00
bell@sanja.is.com.ua
9819df20c9
initialize variables (addition for BUG#7079)
2004-12-13 08:45:00 +02:00
tomas@poseidon.ndb.mysql.com
faafe1e4d0
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-clean
2004-12-13 00:52:29 +01:00
tomas@poseidon.ndb.mysql.com
5281d26824
CommandInterpreter.cpp:
...
changed help text
2004-12-13 00:51:30 +01:00
tomas@poseidon.ndb.mysql.com
afa5a6a7bf
fix bug#7193
...
added start backup parameter to enable setting wait state
and set different timeouts depending on waitstate
moved listen of backup event out of backup and into separete thread
thread created at connect() and destroyed at disconnect()
added start backup command options "nowait" "wait completed" "wait started"
fixed log level settings
2004-12-13 00:48:06 +01:00
bell@sanja.is.com.ua
05c1385c50
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-ref-4.1
2004-12-13 01:32:49 +02:00
bell@sanja.is.com.ua
f65403cd75
fixed optimized SOME subquery
2004-12-13 01:21:14 +02:00
sergefp@mysql.com
2d9fae642c
Merge fix for BUG#6976 from 4.0
2004-12-11 20:13:43 +03:00
sergefp@mysql.com
0de1d4a9a9
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.0
...
into mysql.com:/dbdata/psergey/mysql-4.0-bug6976
2004-12-11 20:02:45 +03:00
sergefp@mysql.com
f78a60593a
Fix for BUG#6976:
...
In Item_ref::Item_ref set maybe_null (and other fields fix_fields sets) to be the
same as in (*ref), because Item_ref::fix_fields() will not be called. Previously
maybe_null was 0 always and this produced a bogus state where
maybe_null==0 && is_null() == true
which broke evaluation for some upper-level Items, like AND and OR.
2004-12-11 19:59:09 +03:00
bell@sanja.is.com.ua
b9abf25a55
new reference which refer to current value not to result used for resolving outer
...
refernces if subqueri is not in HAVING clause (BUG#7079)
and the same used for subquery transformetion
2004-12-11 17:13:19 +02:00
sergefp@mysql.com
5b0e3b132c
Post-merge fixes
2004-12-11 16:36:12 +03:00
sergefp@mysql.com
aee9340493
Fix for BUG#5837 merged from 4.0
2004-12-11 15:55:50 +03:00
sergefp@mysql.com
6b55909673
Fix for BUG#5837 - attempt 3.
...
Call mark_as_null_row in join_read_const and join_read_system.
2004-12-11 15:51:52 +03:00
tomas@poseidon.ndb.mysql.com
0d27a7550f
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-clean
2004-12-11 12:11:25 +01:00
serg@serg.mylan
d7acab1530
sql/password.c: check for buffer overflow in check_scramble_323 (BUG#7187)
2004-12-11 10:17:25 +01:00
serg@serg.mylan
68174d7ace
Merge bk-internal.mysql.com:/home/bk/mysql-4.1/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2004-12-11 09:41:01 +01:00
serg@serg.mylan
d16c9e8615
getting rid of now() is tests
2004-12-11 09:39:29 +01:00
jimw@mysql.com
475d1a8934
Fix results file for insert_select test with embedded server. (Bug #7167 )
2004-12-10 23:50:09 +01:00
marko@hundin.mysql.fi
99571d271e
Merge hundin.mysql.fi:/home/marko/k/mysql-4.0
...
into hundin.mysql.fi:/home/marko/k/mysql-4.1
2004-12-10 23:38:44 +02:00
marko@hundin.mysql.fi
e8885a0824
Merge marko@bk-internal.mysql.com:/home/bk/mysql-4.0
...
into hundin.mysql.fi:/home/marko/k/mysql-4.0
2004-12-10 23:33:55 +02:00