guilhem@mysql.com
3d33dc7c77
Merge gbichot@213.136.52.20:/home/bk/mysql-4.1
...
into mysql.com:/home/mysql_src/mysql-4.1-874
2004-06-10 16:42:07 +02:00
guilhem@mysql.com
e816a757db
WL#1689 "Map OPTIMIZE TABLE to ALTER TABLE for InnoDB"
...
exactly it's mapped to "ALTER TABLE t; ANALYZE TABLE t;"
2004-06-10 16:41:24 +02:00
pekka@mysql.com
f099d1d37c
merge ndb api blobs, ready
2004-06-10 16:25:13 +02:00
bar@mysql.com
34d413a6a0
Optimization to use less memory.
2004-06-10 19:10:21 +05:00
guilhem@mysql.com
73411a2ed5
WL#1595 "Optionally fsync() the binlog after every statement":
...
New option --sync-binlog=x (and global settable variable) which will fsync the binlog
after every x-th disk write to it. That is, if in autocommit mode, after every x-th statement
written to the binlog; if using transactions, after every x-th transaction written to the binlog.
x==0 means no fsync. x==1 is the slowest.
There is no test added for this, I have just checked that it works as --sync-binlog=1 dramatically
slows down mysqld.
Made sync-frm a global settable variable.
2004-06-10 15:56:13 +02:00
guilhem@mysql.com
ec5b55f8e1
Merge gbichot@213.136.52.20:/home/bk/mysql-4.1
...
into mysql.com:/home/mysql_src/mysql-4.1-1595
2004-06-10 15:10:44 +02:00
guilhem@mysql.com
10429acb8e
don't need to tag the slave SQL thread as "bootstrap". It causes duplicate
...
error messages when a query goes wrong.
Note that from now on, if you run with --slave-skip-error=xx, then nothing will
be printed to the error log when the slave is having this error xx and
skipping it (but you don't care as you want to skip it).
2004-06-10 14:03:25 +02:00
pekka@mysql.com
d556e70ca6
merge ndb api blobs
2004-06-10 14:02:31 +02:00
pekka@mysql.com
c15a866f6c
merged ndb api blobs
2004-06-10 14:02:30 +02:00
tomas@poseidon.ndb.mysql.com
8742612ad7
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-ndb
2004-06-10 12:02:29 +00:00
tomas@poseidon.ndb.mysql.com
d3543b7a6a
removed myVector from ndb restore
2004-06-10 12:01:47 +00:00
heikki@hundin.mysql.fi
4a5077a0dd
Added function
...
/***********************************************************************
This function stores binlog offset and flushes logs */
void innobase_store_binlog_offset_and_flush_log(char *binlog_name,longlong offset)
requested by Guilhem to ha_innodb.cc and ha_innodb.h.
Change made by Jan.Lindstrom@innodb.com
2004-06-10 15:01:16 +03:00
pem@mysql.com
8d520366f4
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/pem/work/mysql-4.1
2004-06-10 12:18:33 +02:00
pem@mysql.comhem.se
f467e0b354
Removed extra error messages (that were replaced).
2004-06-10 12:17:13 +02:00
pekka@mysql.com
699793ec95
ndb api blobs
2004-06-10 12:04:30 +02:00
bell@sanja.is.com.ua
ba82b9e7d5
cleunup() of count() and max()/min() added (BUG#2687)
2004-06-10 10:59:55 +03:00
tomas@mc05.(none)
0d8dab2929
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mc05.(none):/space2/tomas/mysql-4.1-ndb-test
2004-06-10 08:30:43 +02:00
tomas@poseidon.bredbandsbolaget.se
cc1d7aafdd
more ndb restore cleanup
2004-06-10 01:38:38 +00:00
konstantin@mysql.com
e64b38e8bc
Fix for Bug#3904 "COUNT DISTINCT performance anomaly in 4.1"
...
The bug was caused by error in hash calculation function: it
always returned hash value for last field in a composite key, so
for keys like (a text, b char(1)) we were always
getting bad hash values.
2004-06-10 01:30:39 +04:00
tomas@poseidon.bredbandsbolaget.se
f4a770ffc5
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
...
into poseidon.bredbandsbolaget.se:/home/tomas/mysql-4.1-ndb
2004-06-09 19:29:49 +00:00
tomas@poseidon.bredbandsbolaget.se
cdd76505b2
re-enginered ndb restore to remove new/deletes and data copy
2004-06-09 19:24:36 +00:00
hf@deer.(none)
da3667f63f
fix for bug #3974 ("SHOW FULL PROCESSLIST" crashes the embedded server)
...
server crashed checking thd->priv_user[0] and thd->priv_user is NULL
if NO_EMBEDDED_ACCESS_CHECKS is on.
Now i set it to be the same as thd->user
2004-06-09 23:10:09 +05:00
hf@deer.(none)
4506aba179
Fix for the bug #4014 (prepared SELECT in embedded server)
...
Problem is that store_string_aux calls 'wrong' net_store_data
2004-06-09 22:36:48 +05:00
guilhem@mysql.com
aa3c80fb7d
Merge gbichot@213.136.52.20:/home/bk/mysql-4.1
...
into mysql.com:/home/mysql_src/mysql-4.1-874
2004-06-09 16:24:35 +02:00
guilhem@mysql.com
2b20e84ff8
Making DROP TABLE IF EXISTS, DROP DATABASE IF EXISTS, DELETE FROM, UPDATE be logged to
...
binlog even if they changed nothing, and a test for this.
This is useful when users use these commands to clean up their master and slave by issuing
one command on master (assume master and slave have slightly different data for some
reason and you want to clean up both).
Note that I have not changed multi-table DELETE and multi-table UPDATE because their
error-reporting mechanism is more complicated.
2004-06-09 16:07:01 +02:00
paul@ice.snake.net
4643854b5b
Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into ice.snake.net:/Volumes/ice2/MySQL/bk/mysql-4.1
2004-06-09 06:46:30 -05:00
bar@mysql.com
1b76aa077f
charset.c:
...
Fix to be ANSI C complient
,
2004-06-09 12:33:30 +05:00
ndbdev@ndbmaster.mysql.com
83bde5f54b
3 retries for wait started
2004-06-09 06:09:13 +02:00
konstantin@mysql.com
f3e018f833
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/kostja/mysql/mysql-4.1-4026
2004-06-09 03:22:55 +04:00
konstantin@mysql.com
dc11d3cfa1
Proposed fix for Bug#4026 "Microseconds part of TIME/DATETIME types
...
is broken (prepared statements)": fixed date handling in many places
of prepared statements code.
2004-06-09 03:21:50 +04:00
paul@ice.snake.net
8e723734d8
Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into ice.snake.net:/Volumes/ice2/MySQL/bk/mysql-4.1
2004-06-08 14:31:33 -05:00
guilhem@mysql.com
c75b24a73a
Merge gbichot@213.136.52.20:/home/bk/mysql-4.1
...
into mysql.com:/home/mysql_src/mysql-4.1-874
2004-06-08 19:55:35 +02:00
guilhem@mysql.com
b514e6a8c5
Correction to replication of charsets in 4.1:
...
In mysqlbinlog, there was a problem with how we escaped the content of a string user variable.
To be perfect, we should have escaped with character_set_client. But this charset is unknown
to mysqlbinlog. So the simplest is to print the string in hex. This is unreadable but
100% safe with any charset (checked with Bar), no more need to bother with character_set_client.
2004-06-08 19:55:04 +02:00
ndbdev@ndbmaster.mysql.com
6846316818
Use LOGNAME instead of USER
2004-06-08 17:01:47 +02:00
bell@sanja.is.com.ua
6ab2d24ad8
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-06-08 17:09:59 +03:00
ram@gw.mysql.r18.ru
71eee450e0
a fix
...
(Bug #4035 GROUP_CONCAT with HAVING clause truncates field
Bug #4057 LEFT() function in HAVING clause truncates query result).
2004-06-08 18:01:15 +05:00
bar@bar.intranet.mysql.r18.ru
8962ed3c7d
WL#916: Unicode collations for some languages
2004-06-08 17:56:15 +05:00
jplindst@t41.(none)
d6e1e47bbe
Added function innobase_store_binlog_offset_and_flush_log requested by Guilhem
...
to ha_innodb.cc and ha_innodb.h
2004-06-08 15:38:22 +03:00
paul@ice.snake.net
5a7ed3e370
Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into ice.snake.net:/Volumes/ice2/MySQL/bk/mysql-4.1
2004-06-08 07:23:51 -05:00
bar@bar.intranet.mysql.r18.ru
500874b554
Bug #3717 ENCODE returns a character string, not a binary string
2004-06-08 15:36:44 +05:00
bar@bar.intranet.mysql.r18.ru
581ff1d900
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into bar.intranet.mysql.r18.ru:/usr/home/bar/mysql-4.1
2004-06-08 15:36:43 +05:00
tomas@mc05.(none)
2bb2af5b4c
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mc05.(none):/space2/tomas/mysql-4.1-ndb-test
2004-06-08 12:36:42 +02:00
tomas@poseidon.ndb.mysql.com
8599b630f6
fix for automake-1.5
2004-06-08 10:36:41 +00:00
tomas@poseidon.ndb.mysql.com
e7abc7b7d5
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-ndb
2004-06-08 09:32:52 +00:00
bar@bar.intranet.mysql.r18.ru
7d33346854
Bug #2077 Japanese characters in enum/default values are reported incorrectly
2004-06-08 14:26:16 +05:00
heikki@hundin.mysql.fi
d9dc42b5be
ha_innodb.cc:
...
Fix Bug #4047 : remove the improvement ported from 4.0 that made InnoDB to remember the original select_lock_type inside LOCK TABLES
2004-06-08 10:41:14 +03:00
tomas@mc05.(none)
9889669758
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mc05.(none):/space2/tomas/mysql-4.1-ndb-test
2004-06-08 08:33:17 +02:00
bar@bar.intranet.mysql.r18.ru
d04966e380
Sorry, forgot to commit together with the code change yesterday.
2004-06-08 11:33:16 +05:00
tomas@poseidon.bredbandsbolaget.se
23bf35987d
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
...
into poseidon.bredbandsbolaget.se:/home/tomas/mysql-4.1-ndb
2004-06-08 00:12:55 +00:00
tomas@poseidon.bredbandsbolaget.se
ce2619a6ed
some ndb printout cleanup
2004-06-08 00:12:11 +00:00