joreland@mysql.com
f5e57076d2
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/jonas/src/mysql-4.1
2004-10-15 08:10:08 +02:00
joreland@mysql.com
d33a1050fe
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
...
into mysql.com:/home/jonas/src/mysql-4.1-ndb
2004-10-15 08:09:11 +02:00
joreland@mysql.com
00e5047e98
autotest failures
2004-10-15 08:08:39 +02:00
matt@mysql.com
60385695b4
TAG:
...
Tagged ChangeSet 1.2091 as mysql-4.1.6
configure.in:
Updated version string to 4.1.7
2004-10-15 00:55:50 -05:00
jan@hundin.mysql.fi
d0930b8efd
Merge jlindstrom@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into hundin.mysql.fi:/home/jan/talle/mysql-4.1
2004-10-15 08:24:58 +03:00
konstantin@mysql.com
105a2c1c03
Fix for Bug#6024 "Test "client_test" fails in 4.1.6-gamma build (1)":
...
let's not assume that char is signed (its signedness is not defined).
The server was also affected by the wrong typedef.
2004-10-15 03:54:40 +04:00
konstantin@mysql.com
60fc4ed057
libmysql/libmysql.c:
...
Fix for Bug#6025 "Test "client_test" fails in 4.1.6-gamma build (2)".
No need for a test case, the bug is covered already.
2004-10-15 02:52:52 +04:00
konstantin@mysql.com
f79ca4e43d
compile-hpux11-parisc2-aCC:
...
Fix a typo. Cleanup.
2004-10-15 00:36:45 +04:00
lenz@mysql.com
494731501d
Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/space/my/mysql-4.1
2004-10-14 18:32:36 +02:00
lenz@mysql.com
6deabf8ab1
Merge mysql.com:/space/my/mysql-4.1
...
into mysql.com:/space/my/mysql-4.1-build
2004-10-14 18:30:52 +02:00
monty@mishka.local
57a85986ac
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mishka.local:/home/my/mysql-4.1
2004-10-14 18:06:38 +03:00
monty@mishka.local
719c88e38f
true,false -> TRUE, FALSE
...
Simple fixes/optimization of things discovered during review of new pushed code
2004-10-14 18:03:46 +03:00
lenz@mysql.com
a524835cdd
- Cleanup: removed unreferenced local variable "local_file" in mysqlimport.c
2004-10-14 16:52:00 +02:00
bell@sanja.is.com.ua
3aaae0e390
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-4.1
2004-10-14 17:48:28 +03:00
pekka@mysql.com
d44070ef62
NDB dbtux - remove obsolete code
2004-10-14 16:27:48 +02:00
lenz@mysql.com
db3a6ebfe8
Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/space/my/mysql-4.1
2004-10-14 14:58:58 +02:00
lenz@mysql.com
8c496b487f
- added missing file strings/my_strtoll10.c to the libmysql.dsp and
...
mysqlclient.dsp project files
2004-10-14 14:54:06 +02:00
bell@sanja.is.com.ua
883883b015
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-4.1
2004-10-14 15:48:45 +03:00
jan@hundin.mysql.fi
d07ade5579
This patch removes unnecessary lock from the supremum record, takes
...
X-locks on duplicates also on LOAD DATA...REPLACE clause and
fixes a bug #6086 adding --disable_warnings and --enable_warnings around
the create table clauses in ctype_utf8 tests for InnoDB.
2004-10-14 15:36:36 +03:00
bar@mysql.com
299297d4a9
ctype_utf8.test, ctype_utf8.result:
...
Wrong handler.
2004-10-14 16:40:03 +05:00
bar@mysql.com
e827839619
Bug #6019 SELECT tries to use too short prefix index on utf8 data
2004-10-14 16:36:29 +05:00
joreland@mysql.com
164342f9f1
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
...
into mysql.com:/home/jonas/src/mysql-4.1-ndb
2004-10-14 13:24:19 +02:00
pekka@mysql.com
69f0df8a9f
NDB dbtux minor change
2004-10-14 13:23:57 +02:00
joerg@mysql.com
0290e159fb
There were no tests for bug#1644 and bug#1676, added them now.
2004-10-14 13:22:25 +02:00
bar@mysql.com
48120f77eb
ctype_utf8.test:
...
Bug#6086 "ctype_utf8" test fails when MySQL does not include InnoDB support
2004-10-14 15:29:07 +05:00
bell@sanja.is.com.ua
1729ec2ac6
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-4.1
2004-10-14 12:50:00 +03:00
bar@mysql.com
2f8f0f2eb2
Bug #6043 erratic searching for diacriticals in indexed MyISAM UTF-8 table
2004-10-14 14:14:50 +05:00
pekka@mysql.com
5c700650ca
Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
...
into mysql.com:/space/pekka/ndb/version/my41-tux
2004-10-14 10:38:47 +02:00
konstantin@mysql.com
9b2cc44e74
Followup to Bug#5985: fixing one thing that went wrong.
2004-10-14 03:37:20 +04:00
konstantin@mysql.com
7c95fa7085
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/media/sda1/mysql/mysql-4.1-5985
2004-10-14 02:54:44 +04:00
konstantin@mysql.com
5abc3de22b
A fix and test case for Bug#5985 ""prepare stmt from "select rand(?)"
...
crashes server." The fix makes Item_func_rand prepared-statements
aware plus it fixes the case when RAND is used in prepared
statements and replication is on (as well as several similar issues).
Until now we did not reset THD before every execution of a prepared
statement, so if some execution had set thd->time_zone_used
or thd->rand_used they would not be reset until next mysql_parse.
Some of post-review fixes done.
2004-10-14 02:53:59 +04:00
bell@sanja.is.com.ua
8db65bd6ae
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-4.1
2004-10-13 23:25:36 +03:00
joreland@mysql.com
5df05b7231
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/jonas/src/mysql-4.1
2004-10-13 20:14:04 +02:00
heikki@hundin.mysql.fi
5fa601111e
srv0srv.c, log0log.c, srv0srv.h, ha_innodb.cc, ha_innodb.h:
...
Implement innobase_very_fast_shutdown and innobase_start_trx_and_assign_read_view(); these were requested by Guilhem
2004-10-13 20:04:52 +03:00
ingo@mysql.com
6809db3d03
Merge istruewing@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/mydev/mysql-4.1
2004-10-13 17:57:17 +02:00
ingo@mysql.com
e21e236d33
BUG#4286 - HANDLER tables are closed by FLUSH TABLE(S).
...
BUG#4335 - one name can be handler open'ed many times.
Fixed problems detected on Windows build by VC++.
Removed unused variables.
Applied a neccessary cast.
2004-10-13 17:42:22 +02:00
konstantin@mysql.com
09b50375ed
tests/client_test.c:
...
Make checks (asserts) performed in client_test.c work in non-debug
builds.
2004-10-13 19:27:07 +04:00
joreland@mysql.com
991694bc29
Set error code, when return NULL in hupp
2004-10-13 15:53:26 +02:00
joreland@mysql.com
f47afc6fb4
Smarter test
2004-10-13 15:30:43 +02:00
joreland@mysql.com
2d1121020f
Handle DELETE/INSERT as update in operations started before LCP
2004-10-13 15:27:39 +02:00
joreland@mysql.com
dacc257bf7
Handle temporary errors in clearTable
2004-10-13 12:34:36 +02:00
joreland@mysql.com
74f17e4ca6
Fix changed interface to HugoOperations
2004-10-13 11:43:54 +02:00
joreland@mysql.com
9497ee2f9e
testBasic -n NoCommit626
...
Handle commit of zero operations
2004-10-13 11:28:24 +02:00
marko@hundin.mysql.fi
ab316c36db
InnoDB: correct potential overflow in trx_purge()
2004-10-13 11:29:57 +03:00
joreland@mysql.com
57612c479f
Merge mysql.com:/home/jonas/src/mysql-4.1
...
into mysql.com:/home/jonas/src/mysql-4.1-ndb
2004-10-13 10:19:28 +02:00
joreland@mysql.com
29c270c13e
Bug#6020, any lock >= write_allow_write is a write lock
2004-10-13 10:08:18 +02:00
tomas@poseidon.ndb.mysql.com
b40261262a
fix for some build/test errors for 4.1.6
2004-10-13 00:38:43 +00:00
konstantin@mysql.com
1ac41c9285
Move Heikki's comment about thd->query comment to proper place
...
(bad merge from 4.0)
2004-10-13 00:17:37 +04:00
mwagner@here.mwagner.org
06245b4508
post-commit:
...
Added catch for (example) WL#1234 into bk commit subjects
2004-10-12 15:08:58 -05:00
konstantin@mysql.com
cc57252bb7
ps.test, ps.result: a test case for Bug#6042 "constants
...
propogation works only once (prepared statements)".
2004-10-12 21:16:07 +04:00