matthias@three.local.lan
b91567cfcb
Merge mleich@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into three.local.lan:/home/matthias/Arbeit/mysql-4.1/src
2004-12-16 10:22:23 +01:00
konstantin@mysql.com
2083ecd124
myisam/sort.c:my_var_write and mysys/hash.c:hash_key made static inline,
...
not simply inline, to fix the linking failure on Sun Solaris 9 (sparc)
with Sun Studio 9, reported by Peter Harvey.
2004-12-16 02:43:35 +03:00
konstantin@mysql.com
91457448c2
A fix of return value of mysql_stmt_bind_result() and cleanup.
2004-12-15 01:37:22 +03:00
ram@gw.mysql.r18.ru
a2a3d82e62
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into gw.mysql.r18.ru:/usr/home/ram/work/4.1
2004-12-14 18:48:54 +04:00
ram@gw.mysql.r18.ru
d599808fbc
Clean-up.
...
TYPE=MyISAM replaced with ENGINE=MyISAM.
2004-12-14 18:47:34 +04:00
wax@kishkin.ru
e81d48fdd9
corrected mysqltest.dsp
...
corrected mysql_test_run_new.dsp
added dependency
corrected path of mysql_test_run_new.dsp
fixed wrong code
added my_create_tables.c
removed command_line
fixed #elif
restored NAME_MAX and MAX_FNAME
added create_system_files()
added compare() for windows
added all files of testes in script
added mysql-test in script
2004-12-14 18:46:55 +05:00
ram@gw.mysql.r18.ru
7c31ea4d83
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into gw.mysql.r18.ru:/usr/home/ram/work/4.1
2004-12-14 16:26:10 +04:00
bar@mysql.com
4fa867494d
bug#6275 "client_test" fail in 4.1.7 make test
...
bug#6911 resultset metadata always return client character set
2004-12-14 15:58:30 +04:00
ram@gw.mysql.r18.ru
5c5d51c2d6
A quick fix for bug #7257 : Crash in default tests: 'subselect'
2004-12-14 15:41:01 +04:00
matthias@three.local.lan
621daba7b6
Merge mleich@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into three.local.lan:/home/matthias/Arbeit/mysql-4.1/src
2004-12-14 12:24:59 +01:00
ram@gw.mysql.r18.ru
9399fe3327
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into gw.mysql.r18.ru:/usr/home/ram/work/4.1
2004-12-14 14:25:33 +04:00
tomas@poseidon.ndb.mysql.com
94b3e06dd6
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-clean
2004-12-14 10:24:26 +01:00
tomas@poseidon.ndb.mysql.com
ef419b3338
mysql-test-run.sh:
...
removed diskless option for ndb test
2004-12-14 10:23:35 +01:00
ram@gw.mysql.r18.ru
e063ab1fb5
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into gw.mysql.r18.ru:/usr/home/ram/work/4.1
2004-12-14 12:30:16 +04:00
sergefp@mysql.com
75fc0ac4d5
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/dbdata/psergey/mysql-4.1-merge-fix
2004-12-14 11:18:01 +03:00
acurtis@pcgem.rdg.cyberkinetica.com
afd4520529
Bug#7242
...
The "insert_update" causes a server crash when using prepared statements
Must clear table->insert_values after completing every prepared statement
2004-12-14 08:12:04 +00:00
sergefp@mysql.com
a7147bec84
Test for BUG#7242: Testing prepare + several times execute
...
(here in client_test.c because we need to check if several PS execution works and the bug shows up with binary protocol only )
2004-12-14 10:57:30 +03:00
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
matthias@three.local.lan
e69c8e76f9
Merge mleich@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into three.local.lan:/home/matthias/Arbeit/mysql-4.1/src
2004-12-13 21:10:04 +01:00
mwagner@here.mwagner.org
bde49d08c7
Makefile.am:
...
s/spaces/TAB/
2004-12-13 14:03:19 -06:00
mleich@mysql.com
3b5a741aff
Small bug fix
...
ps-modify1 used the user variables @1, @2, @100 set within ps_query and
ps_modify. That architecture was wrong, because the dependence
of ps_modify1 on ps_query and ps_modify makes the test script
maintenance and the use of these test cases during bug fixing/
debugging of single sub test cases very uncomfortable.
Therefore these user variables (@1, @2, @100) are also set within ps-modify1.
The result files of the test cases ps_2myisam, ps_3innodb, ps_4heap, ps_6bdb,
ps_7ndb will be affected by that change and show 3 additional lines, but
nothing else will change.
2004-12-13 21:00:43 +01: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
matthias@three.local.lan
9733292440
Merge mleich@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into three.local.lan:/home/matthias/Arbeit/mysql-4.1/src
2004-12-13 18:53:49 +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
matthias@three.local.lan
ac11cba790
Merge mleich@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into three.local.lan:/home/matthias/Arbeit/mysql-4.1/src
2004-12-13 12:24:35 +01:00
tomas@poseidon.ndb.mysql.com
4b6a752180
bug #7230
...
+ fixed testcase
2004-12-13 11:45:45 +01:00