tomas@poseidon.ndb.mysql.com
09501afd53
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
2004-11-04 08:53:11 +00:00
ram@gw.mysql.r18.ru
75e322e21c
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into gw.mysql.r18.ru:/usr/home/ram/work/4.1.b6331
2004-11-04 10:24:27 +04:00
bar@mysql.com
f979603cf2
field.cc, sql_mode.result, sql_mode.test:
...
"SHOW CREATE TABLE" mysql-4.0 and mysql-3.23
compatibiliry mode change:
Check that a binary collation adds 'binary'
suffix into a char() column definition in
mysql40 and mysql2323 modes. This allows
not to lose the column's case sensitivity
when loading the dump in pre-4.1 servers.
2004-11-04 08:50:07 +04: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
marko@hundin.mysql.fi
fd069e2bb3
InnoDB: commit after every 10000 rows in ALTER TABLE
2004-11-03 21:32:48 +02:00
pekka@mysql.com
b9ec6803ae
NDB blobs - try to handle insert-update-delete under autocommit=0
2004-11-03 20:21:56 +01:00
joerg@mysql.com
e77a5200f3
Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.0
...
into mysql.com:/M40/mysql-4.0
2004-11-03 19:02:43 +01:00
dlenev@mysql.com
fa21feda93
Fix for bug #6387 "Queried timestamp values do not match the inserted
...
value if server runs in time zone with leap seconds".
Now in my_gmt_sec() function we take into account difference between
our target and estimation in seconds part.
2004-11-03 17:59:03 +00:00
tomas@poseidon.ndb.mysql.com
3674c40631
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
2004-11-03 17:41:31 +00: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
mskold@mysql.com
700da57918
Fix for bug#6398 update of primary key fails
2004-11-03 15:53:26 +01:00
tomas@poseidon.ndb.mysql.com
0fd9d08c01
changed to use the future-proof option to ndb_mgmd
...
there was a clash in using -c, added -f as the future proof switch
2004-11-03 14:34:21 +00:00
marko@hundin.mysql.fi
b58cb6b50f
InnoDB: fix bugs in the FOREIGN KEY parser (Bug #6340 )
2004-11-03 14:56:48 +02:00
tomas@poseidon.ndb.mysql.com
2356c9f995
mysql-master-run does not need to start second mysqld with innodb, add --skip-innodb
2004-11-03 11:43:46 +00: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
joreland@mysql.com
1c9297329c
Changed implementation in NdbDaemon slightly to handle
...
bug lockf & F_TEST on linux alpha,sparc,sparc64
(http://sources.redhat.com/ml/libc-alpha/2000-10/msg00390.html )
2004-11-03 11:29:19 +01:00
marko@hundin.mysql.fi
73bb6b9c33
Merge marko@bk-internal.mysql.com:/home/bk/mysql-4.0
...
into hundin.mysql.fi:/home/marko/k/mysql-4.0
2004-11-03 11:09:41 +02:00
joreland@mysql.com
07b25eaaa6
Changed order or template specializations (to make aCC on hpita2 not assert)
2004-11-03 09:02:55 +01:00
joreland@mysql.com
8a6f87a289
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/jonas/src/mysql-4.1
2004-11-03 08:17:18 +01:00
tim@siva.hindu.god
b0510c7fd4
Portability fixes to mysqld_safe for non-Linux systems. Fix FIND_PROC
...
for Solaris test, and fix if @IS_LINUX@ test in mysqld_safe itself.
2004-11-02 17:53:25 -07: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
joreland@mysql.com
629f5b6b7e
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/jonas/src/mysql-4.1
2004-11-02 20:40:56 +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
ram@gw.mysql.r18.ru
86b33f360b
A fix (bug #6331 : INSERT IGNORE .. SELECT breaks subsequent inserts).
2004-11-02 19:48:37 +04: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
joreland@mysql.com
0f2d06abc4
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/jonas/src/mysql-4.1
2004-11-02 15:37:53 +01:00
joreland@mysql.com
08618e97c8
Make sure that Int8(16,32,64) is signed
...
Better fix for previous build issue
2004-11-02 15:37:26 +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
heikki@hundin.mysql.fi
22269d451a
ha_innodb.cc:
...
Backport Jan's fix of the LOAD DATA INFILE REPLACE duplicate key error bug (Bug #5835 ) to 4.0
2004-11-02 13:21: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