joreland@mysql.com
5c112aa64c
BUG#4088 - Multiple mixed index/normal reads
2004-06-10 17:26:26 +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
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
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
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
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
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
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
bell@sanja.is.com.ua
273b74c836
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-07 23:43:04 +03:00
sergefp@mysql.com
26a5650d1b
SQL Syntax for Prepared Statements: post-merge fixes
2004-06-08 00:43:03 +04:00
sergefp@mysql.com
7e0455f333
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/dbdata/psergey/mysql-4.1-ps-merge
2004-06-07 23:50:59 +04:00
joreland@mysql.com
f90ea9986a
Merge mysql.com:/home/jonas/src/mysql-4.1
...
into mysql.com:/home/jonas/src/mysql-4.1-ndb
2004-06-07 21:17:29 +02:00
joreland@mysql.com
469acb9e5c
BUG#4034
2004-06-07 21:16:53 +02:00
joreland@mysql.com
a77d621a4e
Merge mysql.com:/home/jonas/src/mysql-4.1
...
into mysql.com:/home/jonas/src/mysql-4.1-ndb
2004-06-07 21:01:19 +02:00
joreland@mysql.com
4817cde45e
BUG#4037 fix printout of limits
2004-06-07 20:57:28 +02:00
bell@sanja.is.com.ua
415e7c6fd2
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-07 21:31:54 +03:00
tomas@poseidon.bredbandsbolaget.se
71d7838fae
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
...
into poseidon.bredbandsbolaget.se:/home/tomas/mysql-4.1-ndb
2004-06-07 18:26:12 +00:00
tomas@poseidon.ndb.mysql.com
20a42316ae
ndb source tree cleanup, see respective file
2004-06-07 17:31:32 +00:00
guilhem@mysql.com
3786538112
Merge gbichot@213.136.52.20:/home/bk/mysql-4.1
...
into mysql.com:/home/mysql_src/mysql-4.1-874
2004-06-07 18:56:33 +02:00
guilhem@mysql.com
7108e4b017
updating test's result now that SHOW BINLOG EVENTS quotes and escapes user variables.
2004-06-07 18:55:53 +02:00
tomas@mc05.(none)
52143c65bb
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mc05.(none):/space2/tomas/mysql-4.1
2004-06-07 17:58:35 +02:00
gluh@gluh.mysql.r18.ru
147c2988cc
Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into gluh.mysql.r18.ru:/home/gluh/MySQL-BUGS/mysql-4.1
2004-06-07 19:58:34 +04:00
gluh@gluh.mysql.r18.ru
d381736c31
Fix for bug#3946: Error in LPAD() when padstring is longer than 1 character
2004-06-07 17:39:17 +04:00
bar@bar.intranet.mysql.r18.ru
7d17da9018
mysqld.cc:
...
WL#1160.
Adding variable-conformant startup options for --default-character-set and --default-collation
2004-06-07 18:33:17 +05:00
bar@bar.intranet.mysql.r18.ru
0860e3bfe4
mysqldump.c:
...
Dump could fail to load because of --default-character-set command line option.
More safe dump is now produces, --default-character-set doesn't matter.
2004-06-07 18:12:23 +05:00
bar@bar.intranet.mysql.r18.ru
acbb3096b2
client.c:
...
Bug #3990 `--with-charset' ./configure's switch doesn'taffect mysql client library.
2004-06-07 17:28:31 +05:00
brian@brian-akers-computer.local
f50066bdb9
Merge baker@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into brian-akers-computer.local:/Users/brian/mysql/mysql-4.1
2004-06-07 02:08:36 -07:00