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
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
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
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
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
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
sergefp@mysql.com
916579e3fd
Merged
2004-06-07 12:21:26 +04:00
sergefp@mysql.com
1e05e6cb82
Post review fixes for "SQL Syntax for Prepared Statements".
2004-06-07 12:09:10 +04:00
bar@bar.intranet.mysql.r18.ru
b30b1ccc6a
Bug #3928 regexp [[:>:]] and UTF-8
2004-06-07 12:51:18 +05:00
brian@brian-akers-computer.local
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
sergefp@mysql.com
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
guilhem@mysql.com
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
guilhem@mysql.com
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
sergefp@mysql.com
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
hf@deer.(none)
b8cf9f6afe
Merging
2004-06-02 19:17:35 +05:00
hf@deer.(none)
7cf1d2596b
wl 1562 (To improve RTree indexes)
...
some changes to make code nicer
2004-06-02 19:11:57 +05:00
monty@mysql.com
70c2256d2f
Merge with 4.0 to get fixes for netware
2004-06-02 00:09:14 +03:00
monty@mysql.com
53d05f4adb
Removed compiler warnings
2004-06-01 23:39:39 +03:00
hf@deer.(none)
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
sergefp@mysql.com
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
bell@sanja.is.com.ua
9f51e30054
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-05-28 21:34:09 +03:00
bell@sanja.is.com.ua
266dd53da2
if exists should not be used inside test
...
removed influence of some tests on other tests
2004-05-28 21:31:51 +03:00
ram@gw.mysql.r18.ru
8297e4b4a0
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.0
...
into gw.mysql.r18.ru:/usr/home/ram/work/4.0.b3738
2004-05-28 16:38:06 +05:00
ram@gw.mysql.r18.ru
605962a938
a fix.
...
(Bug#3738: SQL_CALC_FOUND_ROWS ignores WHERE if LIMIT used,
Bug#3845: wrong FOUND_ROWS result)
2004-05-28 15:01:16 +05:00
monty@mysql.com
ccc4171276
Portability fix (using 'char' as argument to C functions may give warnings)
2004-05-28 02:36:43 +03:00
monty@mysql.com
be7f1a3570
merge with 4.0 to get fix for hpux
2004-05-28 02:04:07 +03:00
monty@mysql.com
a7c17eee46
Portability fix for 32 bit file systems
2004-05-28 00:32:55 +03:00
serg@serg.mylan
1998dd786e
backport bug#2708 fix from 4.1
2004-05-27 21:14:59 +02:00
hf@deer.(none)
15ea09b79d
WL#1163 (Make spatial code separable for other parts)
...
--with-geometry and
--with-embedded-privilege-control
configure switches added
2004-05-27 20:31:30 +05:00
magnus@neptunus.(none)
c5d388f150
Small fix, addin order by to get predicatble output from select
2004-05-26 14:34:40 +02:00
magnus@neptunus.(none)
2daebc70cc
Fix after running on a 4-node system.
2004-05-26 14:22:49 +02:00
brian@brian-akers-computer.local
fee4ed7f1c
Merge baker@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into brian-akers-computer.local:/Users/brian/mysql/mysql-4.1
2004-05-25 14:53:55 -07:00
brian@avenger.(none)
72e7d69674
Added tests for archive. Cleaned up a merge mistake and added some information on how well archive compresses.
2004-05-25 13:27:01 -07:00
magnus@neptunus.(none)
28c8ac884b
Corrected index_flags returned when index are created with USING HASH
...
Updated ndb_ test cases
2004-05-25 14:40:51 +02:00
magnus@neptunus.(none)
2bee88a4c2
Merge msvensson@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into neptunus.(none):/home/magnus/mysql-4.1
2004-05-25 12:25:22 +02:00
sergefp@mysql.com
ef260fa754
Merge
2004-05-24 21:13:38 +04:00
sergefp@mysql.com
b142c8edd0
Added replication tests
2004-05-24 21:12:05 +04:00
monty@mysql.com
eca917b79c
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/my/mysql-4.1
2004-05-24 15:00:12 +03:00
monty@mysql.com
56c0258536
After merge fixes
...
Remove compiler warnings
Update windows project files
2004-05-24 14:42:34 +03:00
dlenev@brandersnatch.localdomain
8966ff8e73
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into brandersnatch.localdomain:/home/dlenev/src/mysql-4.1-bcut
2004-05-21 20:55:09 +04:00
sergefp@mysql.com
f75b1adece
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/dbdata/psergey/mysql-4.1-ps-merge
2004-05-21 04:31:07 +04:00
sergefp@mysql.com
fb17025b3e
WL#1622 "SQL Syntax for Prepared Statements": Post-review fixes (1 of 2)
2004-05-21 04:27:50 +04:00
ram@gw.mysql.r18.ru
98c10ced6a
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into gw.mysql.r18.ru:/usr/home/ram/work/4.1.b3728
2004-05-20 14:22:49 +05:00
monty@mysql.com
a4b0ec1ede
Merge with 4.0, mainly to get changes to windows project files
2004-05-20 00:54:52 +03:00
sergefp@mysql.com
8e2ff7d135
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.0
...
into mysql.com:/dbdata/psergey/mysql-4.0-root
2004-05-19 23:20:42 +04:00
bell@sanja.is.com.ua
bd010b1ec3
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-explain-4.1
2004-05-19 17:09:40 +03:00
bell@sanja.is.com.ua
d42d709171
after review changes
2004-05-19 17:07:28 +03:00
dlenev@brandersnatch.localdomain
067b2e3bb0
Moved testing of binlog_cache_use/binlog_cache_disk_use statistical variables from
...
rpl_relayrotate.test to innodb.test since this test requires innodb support.
2004-05-19 17:43:50 +04:00