035e03c1f6
merged
2004-06-11 20:55:08 +02:00
683a8893a8
mysqltest.c: don't hardcode variables to be taken from environment.
...
use MYSQL_TCP_PORT instead of 3306 in tests
2004-06-11 18:26:13 +02:00
0b8d7d8371
test suite for bug Bug#3969 (commited separetely because it took too long time to parse it on 3.23)
2004-06-11 16:25:18 +03:00
78fa465b92
bug#3964 and related issues: FTB problems with charsets where one byte can match many
...
correct prefix compare with my_strnncoll
2004-06-10 21:18:57 +02:00
be642b9bcd
EXISTS(SELECT * ...)
...
close table before opening in optimize
2004-06-10 21:33:15 +03:00
d28895d042
After merge fix
2004-06-10 16:44:39 +03:00
ff223db0fe
Merge with 3.23 to get latest bug fixes
2004-06-10 11:59:45 +03:00
ba82b9e7d5
cleunup() of count() and max()/min() added (BUG#2687)
2004-06-10 10:59:55 +03:00
98a7b49dc5
do not unlock tables early if we have subquery in HAVING clause (BUG#3984)
2004-06-09 23:32:20 +03:00
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
a8a8da3920
different (simpler and more compatible) fix for bug#4046
2004-06-09 00:08:24 +02:00
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
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
500874b554
Bug #3717 ENCODE returns a character string, not a binary string
2004-06-08 15:36:44 +05:00
7d33346854
Bug #2077 Japanese characters in enum/default values are reported incorrectly
2004-06-08 14:26:16 +05:00
d04966e380
Sorry, forgot to commit together with the code change yesterday.
2004-06-08 11:33:16 +05:00
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
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
7108e4b017
updating test's result now that SHOW BINLOG EVENTS quotes and escapes user variables.
2004-06-07 18:55:53 +02:00
5725831c73
Fix for bug #4036 multiple SELECT DATE_FORMAT, incorrect results
2004-06-07 20:35:05 +04:00
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
d381736c31
Fix for bug#3946: Error in LPAD() when padstring is longer than 1 character
2004-06-07 17:39:17 +04:00
5d947f7b97
Merge bk-internal:/home/bk/mysql-4.0/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
2004-06-07 12:39:26 +02:00
86e9dc29b0
BUG#3987 - if(int, aggregate(int))
2004-06-07 12:38:35 +02:00
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
916579e3fd
Merged
2004-06-07 12:21:26 +04:00
1e05e6cb82
Post review fixes for "SQL Syntax for Prepared Statements".
2004-06-07 12:09:10 +04:00
b30b1ccc6a
Bug #3928 regexp [[:>:]] and UTF-8
2004-06-07 12:51:18 +05:00
e24e1350a3
Merge baker@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into brian-akers-computer.local:/Users/brian/mysql/mysql-4.1
2004-06-05 10:43:22 -07:00
a0464b8563
one more ndb-isolating fix
2004-06-05 13:16:29 +02:00
bec20d1fd7
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/dbdata/psergey/mysql-4.1-ps-merge
2004-06-04 05:37:14 +04:00
da835a0a06
Merge gbichot@213.136.52.20:/home/bk/mysql-4.1
...
into mysql.com:/home/mysql_src/mysql-4.1
2004-06-03 23:19:01 +02:00
86e8ecc965
Implementation of WL#1824 "Add replication of character set variables in 4.1",
...
by binlogging some SET ONE_SHOT CHARACTER_SETetc,
which will be enough until we have it more compact and more complete in 5.0. With the present patch,
replication will work ok between 4.1.3 master and slaves, as long as:
- master and slave have the same GLOBAL.COLLATION_SERVER
- COLLATION_DATABASE and CHARACTER_SET_DATABASE are not used
- application does not use the fact that table is created with charset of the USEd db (BUG#2326).
all of which are not too hard to fulfill.
ONE_SHOT is reserved for internal use of mysqlbinlog|mysql and works only for charsets,
so we give error if used for non-charset vars.
Fix for BUG#3875 "mysqlbinlog produces wrong ouput if query uses
variables containing quotes" and BUG#3943 "Queries with non-ASCII literals are not replicated
properly after SET NAMES".
Detecting that master and slave have different global charsets or server ids.
2004-06-03 23:17:18 +02:00
bd04f52552
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/dbdata/psergey/mysql-4.1-ps-merge
2004-06-03 20:54:46 +04:00
bf644e1785
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mc05.(none):/space2/tomas/mysql-4.1-ndb-test
2004-06-03 13:15:55 +02:00
b8cf9f6afe
Merging
2004-06-02 19:17:35 +05:00
7cf1d2596b
wl 1562 (To improve RTree indexes)
...
some changes to make code nicer
2004-06-02 19:11:57 +05:00
783c4f0873
fixed naming error
2004-06-02 12:37:43 +02:00
d58d6e2b1c
collapsed ndb start/stop scripts in mysql-test-run + ndb bin name changes
2004-06-02 10:37:42 +00:00
d369c2f241
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
...
into poseidon.bredbandsbolaget.se:/home/tomas/mysql-4.1-ndb
2004-06-02 00:56:59 +00:00
8d7d4c077b
several ndb make changes, see respective file
2004-06-02 00:54:58 +00:00
70c2256d2f
Merge with 4.0 to get fixes for netware
2004-06-02 00:09:14 +03:00
4971ce3ec2
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mc05.(none):/space2/tomas/mysql-4.1-ndb-test
2004-06-01 22:39:40 +02:00
53d05f4adb
Removed compiler warnings
2004-06-01 23:39:39 +03:00
197fcf1ee4
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/my/mysql-4.1
2004-06-01 22:30:03 +03:00
017096695a
Update version number
...
Fixed serbian error messages
Fix for windows regarding changed variable name
2004-06-01 22:29:46 +03:00
7650da7711
README:
...
Update README URL. (Bug #3678 )
2004-06-01 14:18:34 -05:00
39f69a2126
Merge bk@192.168.21.1:/usr/home/bk/mysql-4.1
...
into deer.(none):/home/hf/work/mysql-4.1.ftr
2004-06-01 22:37:39 +05:00
308f40bb98
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mc05.(none):/space2/tomas/mysql-4.1-ndb-test
2004-06-01 18:05:43 +02:00
dc38512390
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/dbdata/psergey/mysql-4.1-ps-merge
2004-06-01 17:29:13 +04:00
