guilhem@mysql.com
0517e7b22d
As rollback can be 30 times slower than insert in InnoDB, and user may
...
not know there's rollback (if it's because of a dupl row), better warn
that it's happening. It can also be of use for a DBA killing a
connection and wondering what this connection is still doing now. Example:
| 5 | root | localhost | test | Killed | 10 | Rolling back | insert into i select * from j |
2004-11-08 21:45:23 +01:00
guilhem@mysql.com
80d164c8bb
Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/mysql_src/mysql-4.1-clean
2004-11-03 23:41:41 +01:00
heikki@hundin.mysql.fi
13a60a7631
ibuf0ibuf.c:
...
Do not print to .err log about discarding ibuf entries in DISCARD TABLESPACE; removed compiler warning about unused variable
2004-11-04 00:10:00 +02:00
guilhem@mysql.com
613c98ce3e
Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/mysql_src/mysql-4.1-clean
2004-11-03 22:44:51 +01:00
pekka@mysql.com
b9ec6803ae
NDB blobs - try to handle insert-update-delete under autocommit=0
2004-11-03 20:21:56 +01:00
lars@mysql.com
424ff9741d
Merge mysql.com:/home/bkroot/mysql-4.1
...
into mysql.com:/home/bk/b5551-4.1-v4
2004-11-03 18:24:44 +01:00
lars@mysql.com
485de9cbb7
Fix for bug#5551 (Version 4).
...
The idea of the fix is that the administrative statements
OPTIMIZE TABLE, REPAIR TABLE and ANALYZE TABLE should not
generate binlog errors if there is no errors on the master.
2004-11-03 18:23:58 +01:00
bar@mysql.com
45451568bf
opt_range.cc, range.result, range.test:
...
Bug #6045 : Binary Comparison regression in MySQL 4.1
Binary searches didn't use a case insensitive index, now they do.
2004-11-03 15:22:33 +04:00
serg@serg.mylan
4650f0acab
bad automerge (?) fixed
2004-11-02 23:34:40 +01:00
serg@serg.mylan
dd5486a599
one more name clash in public includes fixed
...
http://lists.mysql.com/internals/18149
2004-11-02 22:46:55 +01:00
monty@mysql.com
8ba52759a3
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/my/mysql-4.1
2004-11-02 21:40:55 +02:00
tomas@poseidon.ndb.mysql.com
c54d36b066
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
2004-11-02 19:40:54 +00:00
tomas@poseidon.ndb.mysql.com
ded5595cb2
add compile flad -DSNPRINTF_RETURN_TRUNC on hp ux 11
...
remove compiler warning
patch for my_vsnprintf not dully implemented
patch for platfroms that return -1 on snprintf overflow
compile fix for hpux
2004-11-02 19:40:10 +00:00
monty@mysql.com
2185f1a56c
Remove usage of !$ from mysql-tests
...
Added protocol::flush() for easier embedded-server code
Increase block allocation variables a bit as they where a bit too small for MySQL 4.1
Added option --silent to client_test
2004-11-02 20:13:27 +02:00
rburnett@build.mysql.com
383bfc4fb9
Merge build.mysql.com:/home/bk/mysql-4.1
...
into build.mysql.com:/users/rburnett/mysql-4.1-current
2004-11-02 18:37:25 +01:00
rburnett@build.mysql.com
8b472a7605
Bug# 5303 Windows --log-error option doesn't work correctly
2004-11-02 18:18:21 +01:00
monty@mysql.com
f5c77f6a06
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/my/mysql-4.1
2004-11-02 18:54:16 +02:00
joerg@mysql.com
7c0e191d27
Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/M41/mysql-4.1
2004-11-02 16:25:48 +01:00
joerg@mysql.com
1b94652bde
Test expansion: "MOD" on non-integral first operand.
2004-11-02 15:09:57 +01:00
pekka@mysql.com
d84dbdfcad
Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/space/pekka/ndb/version/my41
2004-11-02 14:25:30 +01:00
joreland@mysql.com
6e6f610fed
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/jonas/src/mysql-4.1
2004-11-02 14:03:23 +01:00
joreland@mysql.com
8d34e2d45b
build issue
...
Fix so that signed/unsigned char does not matter in comparision
2004-11-02 13:58:22 +01:00
pekka@mysql.com
6563fa1c8b
NDB fix blob parts distribution - backwards compatible
2004-11-02 13:15:55 +01:00
bar@mysql.com
97ecfced53
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/usr/home/bar/mysql-4.1
2004-11-02 16:02:52 +04:00
bar@mysql.com
6a3b1d443f
Many files:
...
Allow mixing of different character sets for more SQL functions.
item_func.h:
Allow mixing of different character sets for more SQL functions..
2004-11-02 16:02:12 +04:00
heikki@hundin.mysql.fi
6eb74fd00d
Merge heikki@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into hundin.mysql.fi:/home/heikki/mysql-4.1
2004-11-02 13:35:14 +02:00
heikki@hundin.mysql.fi
c68ea1665c
ha_innodb.cc:
...
Correct English grammar
2004-11-02 13:34:11 +02:00
ram@gw.mysql.r18.ru
1e2b370e2f
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into gw.mysql.r18.ru:/usr/home/ram/work/4.1.b6309
2004-11-02 14:50:26 +04:00
ram@gw.mysql.r18.ru
e1979f2580
A fix (bug #6309 : myisamchk compiled without debug support , --help shows vise versa
...
bug #6380 : mysqlcheck --help prints wrong --debug msg for non-debug version).
2004-11-02 13:14:07 +04:00
heikki@hundin.mysql.fi
c0061627d8
dict0load.c:
...
Raise fatal semaphore wait timeout to 2 hours when we are printing the InnoDB table monitor output
2004-11-02 09:46:23 +02:00
monty@mysql.com
9972d68078
merge with 4.0
2004-11-02 08:58:45 +02:00
bar@mysql.com
bc6bbebbc8
ctype_sjis.result, ctype_sjis.test, ctype-sjis.c:
...
Bug #6223 Japanese half-width kana characters get truncated. Bytes 0xA1..0xDF were not treated as a single byte sequence in a mistake.
2004-11-02 09:00:46 +04:00
tomas@poseidon.ndb.mysql.com
4768c83872
removed unused member variable (probably causing some of the problems we've seen with ndb_mgmd)
2004-11-01 22:27:29 +00:00
tomas@poseidon.ndb.mysql.com
a813f91934
Merge poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-ndb
2004-11-01 18:26:57 +00:00
tomas@poseidon.ndb.mysql.com
8ec96081fd
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
2004-11-01 18:22:34 +00:00
tomas@poseidon.ndb.mysql.com
ebd0ee4a0d
fix for solaris forte -instances=static
...
added libNDBT.a
removed printout
fixed error that ndb_show_tables required table name
2004-11-01 18:21:57 +00:00
konstantin@mysql.com
96829a4639
Remove support for obsolete 4.1.1 prepared statements C API names:
...
having approval for it since 4.1.4, I also have some assurance that
very few people actually used this: to enable these calls a user
had to #define HAVE_DEPRECATED_411_API and recompile the client library.
2004-11-01 19:01:50 +03:00
pekka@mysql.com
ff7e440bb0
NDB blobs restore backwards compatibility
2004-11-01 16:04:36 +01:00
pekka@mysql.com
21984b0caa
Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/space/pekka/ndb/version/my41
2004-11-01 15:43:54 +01:00
tomas@poseidon.ndb.mysql.com
1827256ac5
fix call of string::copy() if HAVE_FCONVERT is set
2004-11-01 14:43:53 +00:00
tomas@poseidon.ndb.mysql.com
da1355beb2
Merge poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-ndb
2004-11-01 14:28:29 +00:00
tomas@poseidon.ndb.mysql.com
98b43e7f24
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
2004-11-01 14:25:40 +00:00
tomas@poseidon.ndb.mysql.com
d129fffe57
configure.in:
...
added flag on sun forte, -instances=static
(check is only made for "non-gcc", hopefully enough)
2004-11-01 14:25:07 +00:00
tomas@poseidon.ndb.mysql.com
1af4ef1b69
Merge poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-ndb
2004-11-01 13:58:35 +00:00
tomas@poseidon.ndb.mysql.com
29ab709764
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
2004-11-01 13:56:15 +00:00
tomas@poseidon.ndb.mysql.com
41e39c7be3
aligned ndb versioning with mysql
...
changed define SNPRINTF_RETURN_ZERO to SNPRINTF_RETURN_TRUNC
added define NDB_INIT
removed getarg, strlcat, strlcpy
aligned ndb version with mysql version
cpcd: removed old way of reading config file and replaced with mysql load_defaults
changed from using getarg to my_getopts
use mysql my_progname
moved getarg to test
2004-11-01 13:55:43 +00:00
pekka@mysql.com
6da0dd791f
NDB blob fixes. INCOMPATIBLE with existing blobs
2004-11-01 13:01:20 +01:00
joreland@mysql.com
f8e15a41f5
Removed old not used/illegal declaration
2004-11-01 12:49:38 +01:00
joreland@mysql.com
aababf28a2
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/jonas/src/mysql-4.1
2004-11-01 10:51:44 +01:00
matthias@three.local.lan
afecfd77b5
Merge mleich@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into three.local.lan:/home/matthias/Arbeit/mysql-4.1/src
2004-11-01 10:51:43 +01:00