Commit graph

2832 commits

Author SHA1 Message Date
ram@gw.mysql.r18.ru
5647996784 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
into gw.mysql.r18.ru:/usr/home/ram/work/4.1.b4035
2004-06-15 16:03:16 +05:00
bar@mysql.com
6342e06cb2 utf8 contraction fix.
Polish collation fix.
Slovak collation fix.
Testing all language orders.
2004-06-14 21:55:36 +05:00
bell@sanja.is.com.ua
d2c585df31 fixed field resolving mode fo INSERT/REPLACE and CRETE with SELECT (BUG#4090) 2004-06-13 22:39:09 +03:00
serg@serg.mylan
035e03c1f6 merged 2004-06-11 20:55:08 +02:00
serg@serg.mylan
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
bell@sanja.is.com.ua
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
serg@serg.mylan
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
bell@sanja.is.com.ua
be642b9bcd EXISTS(SELECT * ...)
close table before opening in optimize
2004-06-10 21:33:15 +03:00
monty@mysql.com
ff223db0fe Merge with 3.23 to get latest bug fixes 2004-06-10 11:59:45 +03:00
bell@sanja.is.com.ua
ba82b9e7d5 cleunup() of count() and max()/min() added (BUG#2687) 2004-06-10 10:59:55 +03:00
bell@sanja.is.com.ua
98a7b49dc5 do not unlock tables early if we have subquery in HAVING clause (BUG#3984) 2004-06-09 23:32:20 +03: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
serg@serg.mylan
a8a8da3920 different (simpler and more compatible) fix for bug#4046 2004-06-09 00:08:24 +02: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
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
7d33346854 Bug #2077 Japanese characters in enum/default values are reported incorrectly 2004-06-08 14:26: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
gluh@gluh.mysql.r18.ru
5725831c73 Fix for bug #4036 multiple SELECT DATE_FORMAT, incorrect results 2004-06-07 20:35:05 +04: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
serg@serg.mylan
86e9dc29b0 BUG#3987 - if(int, aggregate(int)) 2004-06-07 12:38:35 +02: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
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
monty@mysql.com
70c2256d2f Merge with 4.0 to get fixes for netware 2004-06-02 00:09:14 +03:00
monty@mysql.com
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
monty@mysql.com
017096695a Update version number
Fixed serbian error messages
Fix for windows regarding changed variable name
2004-06-01 22:29:46 +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
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
monty@mysql.com
518019f511 Remove some code from sql_yacc.cc that doesn't do anything except produce warnings on VC++ 2004-05-28 00:03:19 +03:00
monty@mysql.com
e9b7e3baa8 merge with 4.0 to get fix to VC++ project files 2004-05-27 23:45:22 +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
monty@mysql.com
c342318c6e Fixed test to not crash when ndb is not in use 2004-05-26 20:56:39 +03:00
monty@mysql.com
98741a50df Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/my/mysql-4.1
2004-05-26 19:13:12 +03:00
monty@mysql.com
7d8f8bc77b Changed prototype of killed_ptr() to make it more portable
Applied patches for Netware
2004-05-26 19:12:49 +03: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