mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-19 13:32:33 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
31999 commits 2784 branches 343 tags 1.6 GiB
Commit graph

8748 commits

Author SHA1 Message Date
msvensson@neptunus.(none)
e4705ea4bf Merge bk-internal:/home/bk/mysql-5.1-new 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
 2006-03-06 11:51:46 +01:00
bar@mysql.com
e019d60536 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  mysql.com:/usr/home/bar/mysql-4.1.b15949
 2006-03-06 14:50:34 +04:00
gluh@mysql.com
69e8b9d06e 4.1 -> 5.0 merge 2006-03-06 14:38:31 +04:00
mskold@mysql.com
def9e36fea Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new
 2006-03-06 11:25:47 +01:00
gluh@eagle.intranet.mysql.r18.ru
f1eaf7e8ec Fix for bug#14385 GRANT and mapping to correct user account problems 
Check if the host of table hash record exactly matches host from GRANT command
 2006-03-06 14:03:40 +04:00
pekka@mysql.com
710326f1da ndb - enable rpl_ndb_charset Bug#17246 for test 2006-03-06 10:57:57 +01:00
mskold@mysql.com
92eb0acd26 Added test for Bug#17888 DD: ADD INDEX causes error 756 'Index on disk column is not supported 2006-03-06 10:55:44 +01:00
timour@mysql.com
593bd1d3b8 Merge mysql.com:/home/timka/mysql/src/5.0-virgin 
into  mysql.com:/home/timka/mysql/src/5.0-bug-15229
 2006-03-06 11:41:19 +02:00
mskold@mysql.com
a34be87ff3 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new
 2006-03-06 10:30:36 +01:00
mskold@mysql.com
7380a4dd22 Fix for Bug#17888 DD: ADD INDEX causes error 756 'Index on disk column is not supported 2006-03-06 10:24:06 +01:00
gluh@eagle.intranet.mysql.r18.ru
33e7d20f37 Fix for bug#16678 FORMAT gives wrong result if client run with default-character-set=utf8 
calculate Item_func_format::max_length using charset->mbmaxlen
 2006-03-06 12:52:38 +04:00
holyfoot@deer.(none)
a920d0df86 bug #15745 (COUNT(DISTINCT CONCAT(x,y)) returns wrong result 2006-03-05 20:48:31 +04:00
dlenev@mysql.com
0fb4a6645e Merge mysql.com:/home/dlenev/src/mysql-5.0-bg17866-2 
into  mysql.com:/home/dlenev/src/mysql-5.0-merges
 2006-03-04 23:58:48 +03:00
konstantin@mysql.com
40b368af16 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into  mysql.com:/opt/local/work/mysql-4.1-root
 2006-03-04 22:33:19 +03:00
dlenev@mysql.com
efe0900669 Fix for bug #17866 "Problem with renaming table with triggers with fully 
qualified subject table" which was introduced during work on bug #13525
"Rename table does not keep info of triggers".

The bug was caused by the fact that during reconstruction of CREATE TRIGGER
statement stored in .TRG file which happened during RENAME TABLE we damaged
trigger definition in case when it contained fully qualified name of subject
table (see comment for sql_yacc.yy for more info).
 2006-03-04 16:55:06 +03:00
cmiller@zippy.(none)
e5e1760292 Merge mysqldev@production.mysql.com:my/mysql-5.0-release 
into  zippy.(none):/home/cmiller/work/mysql/mysql-5.0.19-tbr
 2006-03-03 16:27:43 -05:00
cmiller@zippy.(none)
599c710a5b Bug#16859 involves truncating column data at NUL characters. Instead, the 
client will now substitute spaces for NULs, so that the grid isn't messed up
due to silently consumed NULs and that the full field is shown.
 2006-03-03 16:26:38 -05:00
pem@mysql.com
2b6f510350 Merge mysql.com:/extern/mysql/5.0/bug16887/mysql-5.0-runtime 
into  mysql.com:/extern/mysql/5.0/bug16887/mysql-5.0
 2006-03-03 19:18:17 +01:00
pem@mysql.com
b66567f619 Merge mysql.com:/extern/mysql/5.0/bug16887/mysql-5.0-runtime 
into  mysql.com:/extern/mysql/5.0/bug16887/mysql-5.0-release
 2006-03-03 18:51:13 +01:00
msvensson@neptunus.(none)
3c2221b54d Merge bk-internal:/home/bk/mysql-5.0 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
 2006-03-03 15:44:38 +01:00
bar@mysql.com
f516d1f9f2 Bug#16318: XML: extractvalue() incorrectly returns last() = 1 
xml.result, xml.test:
  Adding test case.
item_xmlfunc.cc:
  - adding "size" member into MY_XPATH_FLT struct,
  to pass parent's context size when iterating
  in a predicate. Previously, temporaty context
  size was calculated instead, which is always 1.
  As a result, things like last() and count() 
  didn't work fine.
  - adding iteration into Item_func_xpath_elementbyindex:
  similar to Item_func_xpath_predicate.
  This is to make things like last() and count()
  work inside square brackets.
 2006-03-03 18:36:14 +04:00
msvensson@neptunus.(none)
b56857d152 Merge bk-internal:/home/bk/mysql-5.1-new 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
 2006-03-03 15:13:10 +01:00
msvensson@neptunus.(none)
4e55197ce3 Merge bk-internal:/home/bk/mysql-5.1-new 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
 2006-03-03 15:02:46 +01:00
pem@mysql.com
9e001880df Merge mysql.com:/extern/mysql/bk/mysql-5.1-new 
into  mysql.com:/extern/mysql/5.1/generic/mysql-5.1-new
 2006-03-03 15:02:37 +01:00
evgen@moonbone.local
62a266f114 Fixed bug#17726: Not checked empty list caused endless loop 
When the Item_cond::fix_fields() function reduces cond tree, it in loop
scans it's own list and when it founds Item_cond with same function (AND
or OR) it does next things: 1) replaces that item with item's list. 2)
empties item's list. Due to this operation is done twice - for update and
for view, at the update phase cond's list of lower view is already empty.
Empty list returns ref to itself, thus making endless loop by replacing
list with itself, emptying, replacing again and so on. This results in
server hung up.

To the Item_cond::fix_fields() function added check that ensures that
list being replaced with isn't empty.
 2006-03-03 16:19:57 +03:00
bar@mysql.com
7dc12415e9 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/usr/home/bar/mysql-5.1-new.b16316
 2006-03-03 17:00:03 +04:00
msvensson@neptunus.(none)
e2827d97ea Merge bk-internal:/home/bk/mysql-5.1-new 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
 2006-03-03 13:33:01 +01:00
joerg@debian.(none)
e5b149d1e7 Merge joerg@trift2:/M50/patch-17595 into debian.(none):/M50/clone-5.0 2006-03-03 12:50:15 +01:00
gluh@mysql.com
ab67605976 Merge mysql.com:/home/gluh/MySQL/Merge/mysql-5.0-release 
into mysql.com:/home/gluh/MySQL/Merge/5.0
 2006-03-03 15:39:38 +04:00
gluh@eagle.intranet.mysql.r18.ru
f3e993d9a6 Fix for bug#17826 'type_decimal' fails with ps-protocol 
removed unnecessary calculation of cache value 
 otherwise Join::preapre tries to calculate 
 undefined values(filed values)
 2006-03-03 15:29:39 +04:00
pem@mysql.com
015ab71a50 Merge mysql.com:/extern/mysql/5.0/bug17476/mysql-5.0 
into  mysql.com:/extern/mysql/5.1/generic/mysql-5.1-new
 2006-03-03 12:03:27 +01:00
msvensson@neptunus.(none)
5b9b34bd85 Bug#17728 tests that fails are: ndb_gis rpl_ndb_multi_update2 
- Fix for ndb_gis to run with all types of logging
 2006-03-03 11:52:52 +01:00
mats@mysql.com
e0f5d35ceb Merge mysql.com:/home/bkroot/mysql-5.1-new 
into  mysql.com:/home/bk/w3023-mysql-5.1-new
 2006-03-03 09:57:42 +01:00
ramil@mysql.com
1a07140515 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/usr/home/ram/work/5.0.b17615
 2006-03-03 09:35:25 +04:00
cmiller@zippy.(none)
c672c119e3 Expanding a binary field should result in 0x00-filled positions, not 0x20 
(ASCII space).  For Bug#16857.
 2006-03-02 20:49:10 -05:00
cmiller@zippy.(none)
5147bb8e9b Expanding a binary field should result in 0x00-filled positions, not 0x20 
(ASCII space).  For Bug#16857.
 2006-03-02 19:59:49 -05:00
andrey@lmy004.
3c67b8039e fix for bug #16396: Events: Distant-future dates become past dates 
WL#1034 (Internal CRON)
timestamps does not support > y2038
 2006-03-03 01:39:11 +01:00
andrey@lmy004.
c7837821e1 update test 2006-03-02 23:40:51 +01:00
msvensson@neptunus.(none)
7a18f35b49 Merge bk-internal:/home/bk/mysql-5.0 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
 2006-03-02 20:46:37 +01:00
SergeyV@selena.
1bacdef0a7 Merge svlasenko@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  selena.:H:/MYSQL/src/#17595-mysql-5.0
 2006-03-02 20:52:58 +03:00
msvensson@neptunus.(none)
d8153d4449 Merge bk-internal:/home/bk/mysql-5.1-new 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
 2006-03-02 18:37:08 +01:00
msvensson@neptunus.(none)
729196f0b9 Merge bk-internal:/home/bk/mysql-5.0 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
 2006-03-02 17:53:38 +01:00
msvensson@neptunus.(none)
52d51e5e26 Make the "system" command become executed in a bash shell in cygwin. 2006-03-02 16:28:45 +01:00
andrey@lmy004.
42a93d2390 Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into lmy004.:/work/mysql-5.1-bug17494
 2006-03-02 16:25:05 +01:00
pem@mysql.com
d85e929547 Fixed BUG#17476: Stored procedure not returning data when it is called first 
time per connection
  Removed const_string() method from Item_string (it was only used in one
  place, in a bad way). Defer possible SP variable, and access data directly
  instead, in date_format item.
 2006-03-02 14:54:04 +01:00
anozdrin@mysql.com
c4cbe46bc7 Fix for BUG#13198: SP executes if definer does not exist. 
Basically, this fix contains a test case and removing of a workaround
for replication. This fix became possible after pushing WL#2897
(Complete definer support in stored routines).
 2006-03-02 16:23:42 +03:00
anozdrin@mysql.com
fbb5920399 Implementation of WL#2897: Complete definer support in the stored routines. 
The idea is to add DEFINER-clause in CREATE PROCEDURE and CREATE FUNCTION
statements. Almost all support of definer in stored routines had been already
done before this patch.

NOTE: this patch changes behaviour of dumping stored routines in mysqldump.
Before this patch, mysqldump did not dump DEFINER-clause for stored routines
and this was documented behaviour. In order to get full information about stored
routines, one should have dumped mysql.proc table. This patch changes this
behaviour, so that DEFINER-clause is dumped.

Since DEFINER-clause is not supported in CREATE PROCEDURE | FUNCTION statements
before this patch, the clause is covered by additional version-specific comments.
 2006-03-02 15:18:49 +03:00
anozdrin@mysql.com
302239f388 Fix for BUG#16777: Can not create trigger nor view w/o definer 
if --skip-grant-tables specified.

The problem is that there is a check that prevents creating a definer
with empty host name.

In --skip-grant-tables mode this check prevents the user from creating a
trigger/view without explicitly specifying its definer. This happens, because
in --skip-grant-tables mode CURRENT_USER is ''@''. According to Sanja this
check was implemented intentionally.

However, according to the MySQL manual it is possible to specify empty host
name (as well as empty user name). Moreover, the behaviour for stored routines
is different in this aspect -- we allow them to be created with implicit
definer.

Based on this, we believe it is OK to change the behaviour for views to be
similar with the behaviour for stored routines.
 2006-03-02 14:17:13 +03:00
ramil@mysql.com
72da0c6091 Fix for bug #17615: invalid handling of function results in UPDATE...SET statement. 2006-03-02 15:05:55 +04:00
bar@mysql.com
5e2ab5f4a0 Bug#16316: XML: extractvalue() is case-sensitive with contains() 
xml.result, xml.test:
  Adding test case.
item_xmlfunc.cc:
  Fixed that Item_nodeset_func derived classes
  didn't take into account charset of the XML value
  and always worked using "binary" charset.
 2006-03-02 14:05:38 +04:00
msvensson@neptunus.(none)
9c91f8034c Bug#17279 user with no global privs and with create priv in db can create 
database
 - Fix test case for systems with "lowercase names"
 2006-03-02 11:01:58 +01:00
timour@mysql.com
103604ed06 Fix for BUG#15229. 
The cause of this bug was a design flaw due to which the list of natural
join columns was incorrectly computed and stored for nested joins that
are not natural joins, but are operands (possibly indirect) of nested joins.

The patch corrects the flaw in a such a way, that the result columns of a
table reference are materialized only if it is a leaf table (that is, only
if it is a view, stored table, or natural/using join).
 2006-03-02 11:50:15 +02:00
bar@mysql.com
3072df1632 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/usr/home/bar/mysql-5.1-new.b14527
 2006-03-02 13:43:26 +04:00
andrey@lmy004.
9509b440a6 Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into lmy004.:/work/mysql-5.1-bug17494
 2006-03-02 10:05:24 +01:00
holyfoot@mysql.com
12e0e7c281 Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into mysql.com:/home/hf/work/mysql-5.1.mrg
 2006-03-02 12:36:56 +04:00
holyfoot@mysql.com
5cbcf9388c Merge bk@192.168.21.1:mysql-5.0 
into mysql.com:/home/hf/work/mysql-5.0.9088
 2006-03-02 12:34:05 +04:00
bar@mysql.com
abf1fc9bd5 Bug#14527: Partitions: table unreadable if partition name = c-cedilla 
sql_partition.cc:
  Changeing THD charset to utf8 when parsing a frm file.
partition_charset.test, partition_charset.result:
  new file
 2006-03-02 12:25:02 +04:00
bar@mysql.com
64461db10f Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/usr/home/bar/mysql-5.1-new.16315
 2006-03-02 11:44:12 +04:00
tomas@poseidon.ndb.mysql.com
a8250e1bf2 fixed order by in test 2006-03-02 08:44:11 +01:00
bar@mysql.com
9e47ae44a0 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/usr/home/bar/mysql-5.1-new.16315
 2006-03-02 10:42:08 +04:00
holyfoot@mysql.com
7af2495b6a Merge mysql.com:/home/hf/work/mysql-5.0.9088 
into mysql.com:/home/hf/work/mysql-5.1.mrg
 2006-03-02 09:17:11 +04:00
msvensson@neptunus.(none)
b0a868bcfd Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
 2006-03-01 21:20:26 +01:00
msvensson@neptunus.(none)
f8600f25cc Bug#17279 user with no global privs and with create priv in db can create database 
- Fix test case for systems with "lowercase names"
 2006-03-01 21:19:23 +01:00
lars@mysql.com
46e6914d82 BUG#17783: Removed redundant ctype_cp932_notembedded.test in 5.1 
This test is being performed by:
1. ctype_cp932_binlog_row.test  and  2. ctype_cp932_binlog_stm.test
Both of these source the file extra/binlog_tests/ctype_cp932_binlog.test
 2006-03-01 17:31:43 +01:00
tkatchaounov@lsmy3.wdf.sap.corp
95fe35437a Merge lsmy3.wdf.sap.corp:/data/users/tkatchaounov/mysql/src/5.0-virgin 
into  lsmy3.wdf.sap.corp:/data/users/tkatchaounov/mysql/src/5.0-bug-17523
 2006-03-01 17:27:39 +01:00
andrey@lmy004.
6e94ad1d65 fix for bug #16413 (Events: statements don't appear in the general query log) 
WL#1034
 2006-03-01 16:27:57 +01:00
msvensson@shellback.(none)
278802615c Merge shellback.(none):/home/msvensson/mysql/mysql-5.0 
into  shellback.(none):/home/msvensson/mysql/mysql-5.1
 2006-03-01 15:49:50 +01:00
msvensson@shellback.(none)
513bf35424 Merge shellback.(none):/home/msvensson/mysql/bug17728/my51-bug17728 
into  shellback.(none):/home/msvensson/mysql/mysql-5.1
 2006-03-01 15:44:07 +01:00
msvensson@shellback.(none)
c26674d7a0 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  shellback.(none):/home/msvensson/mysql/mysql-5.0
 2006-03-01 15:43:57 +01:00
tkatchaounov@lsmy3.wdf.sap.corp
6a44bb6403 Merge lsmy3.wdf.sap.corp:/data/users/tkatchaounov/mysql/src/5.0-virgin 
into  lsmy3.wdf.sap.corp:/data/users/tkatchaounov/mysql/src/5.0-dbg
 2006-03-01 15:43:57 +01:00
timour@mysql.com
0408f2bfc7 Merge mysql.com:/home/timka/mysql/src/5.0-virgin 
into  mysql.com:/home/timka/mysql/src/5.0-bug-17523
 2006-03-01 16:43:56 +02:00
msvensson@shellback.(none)
ac8a25fb7d Bug#17728 tests that fails are: ndb_gis rpl_ndb_multi_update2 
- Run ndb_gis only if we have binlog_format_row
 2006-03-01 15:41:28 +01:00
msvensson@shellback.(none)
371c986746 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  shellback.(none):/home/msvensson/mysql/mysql-5.1
 2006-03-01 15:29:38 +01:00
tomas@poseidon.ndb.mysql.com
44e54ed1a9 Bug #16385 Partitions: crash when updating a range partitioned NDB table 
Bug #17806 Update on NDB table with list partition causes mysqld to core
- modified complemented_pk_read to be complemented_read, and handle also hidden key
 2006-03-01 15:24:46 +01:00
msvensson@shellback.(none)
b802826fc9 Dont' run the mysql_protocols on Windows 2006-03-01 15:22:47 +01:00
bar@mysql.com
a6973ceed0 Bug#15949 union + illegal mix of collations (IMPLICIT + COERCIBLE) 
union.result, union.test:
  Adding test case.
item.cc:
  Allow safe character set conversion in UNION
  - string constant to column's charset
  - to unicode
  Thus, UNION now works the same with CONCAT (and other string functions)
  in respect of aggregating arguments with different character sets.
 2006-03-01 17:58:01 +04:00
tomas@poseidon.ndb.mysql.com
df6bb1994b Bug #17805 Cluster_replication database should be renamed to just cluster 2006-03-01 13:31:21 +01:00
holyfoot@deer.(none)
dc052a3a00 bug #9088 (bigint WHERE fails) 2006-03-01 15:50:15 +04:00
anozdrin@mysql.com
e03e522201 Fix for BUG#16266: Definer is not fully qualified error during replication. 
The idea of the fix is to extend support of non-SUID triggers for backward
compatibility. Formerly non-SUID triggers were appeared when "new" server
is being started against "old" database. Now, they are also created when
"new" slave receives updates from "old" master.
 2006-03-01 14:13:07 +03:00
tomas@poseidon.ndb.mysql.com
70718ac25a Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
 2006-03-01 10:48:15 +01:00
bar@mysql.com
47b4f00720 Bug#16315 XML: extractvalue() handles self badly 
xml.result, xml.test:
  Adding test case.
item_xmlfunc.cc:
  Adding a special function to handle "self" axis.
  Previously "child" and "self" were handled the same.
 2006-03-01 13:16:12 +04:00
msvensson@shellback.(none)
03d436d3fa Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  shellback.(none):/home/msvensson/mysql/mysql-5.1
 2006-03-01 10:07:14 +01:00
tomas@poseidon.ndb.mysql.com
7c6ed2d681 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
 2006-03-01 09:57:36 +01:00
gluh@eagle.intranet.mysql.r18.ru
5d8956309c Fix for bug#14363 Partitions: failure if create in stored procedure 
store copy of partition function string
 2006-03-01 12:42:33 +04:00
msvensson@neptunus.(none)
7d595d6488 Merge bk-internal:/home/bk/mysql-5.1-new 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
 2006-03-01 09:33:34 +01:00
gluh@eagle.intranet.mysql.r18.ru
701110c943 Bug#16320 XML: extractvalue() won't accept names containing underscores 
added '_' to allowed tag body symbols
 2006-03-01 10:36:22 +04:00
andrey@lmy004.
e054588421 Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into lmy004.:/work/mysql-5.1-bug17494
 2006-03-01 03:50:56 +01:00
andrey@lmy004.
fc6afaaef9 fix for bug #16426, post fixes 2006-03-01 03:49:31 +01:00
kent@mysql.com
bc5c186828 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into mysql.com:/Users/kent/mysql/bk/mysql-5.1-new
 2006-03-01 03:18:59 +01:00
andrey@lmy004.
e38822d29b Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into lmy004.:/work/mysql-5.1-bug17494
 2006-03-01 02:36:15 +01:00
andrey@lmy004.
a9884c4c0a fix for bug #16426 
Events: Event-caused statements don't appear in the slow query log
WL#1034
 2006-03-01 02:34:22 +01:00
paul@snake-hub.snake.net
21f0adc7c6 Merge paul@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.0
 2006-02-28 18:48:58 -06:00
paul@snake-hub.snake.net
591db4980d Merge snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.0 
into  snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.1
 2006-02-28 18:12:29 -06:00
paul@snake-hub.snake.net
5ac33e8eb8 Merge snake-hub.snake.net:/src/extern/MySQL/bk/mysql-4.1 
into  snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.0
 2006-02-28 17:54:50 -06:00
paul@snake-hub.snake.net
7f7f5969c0 mysqltest.test: 
Add real_sleep tests.
 2006-02-28 17:54:11 -06:00
kent@mysql.com
5d722a8491 Merge 2006-02-28 23:29:58 +01:00
tomas@poseidon.ndb.mysql.com
5a46fbfbd8 Bug #17499 continued 
- moved initialization of used_partitions
- more tests

+ removed reference to fixed bugs
 2006-02-28 17:51:27 +01:00
jmiller@mysql.com
a8d76e59e5 Merge jmiller@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/home/ndbdev/jmiller/clones/mysql-5.1-new
 2006-02-28 16:13:43 +01:00
msvensson@shellback.(none)
7d1c5609a4 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  shellback.(none):/home/msvensson/mysql/mysql-5.1
 2006-02-28 14:45:31 +01:00
andrey@lmy004.
d1056a7cd7 Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into lmy004.:/work/mysql-5.1-bug16537
 2006-02-28 14:45:25 +01:00
bar@mysql.com
3fb0e543c8 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/usr/home/bar/mysql-5.1-new.16313
 2006-02-28 17:29:49 +04:00
msvensson@shellback.(none)
fe850cdc20 Merge 5.0 -> 5.1 2006-02-28 13:54:32 +01:00
msvensson@shellback.(none)
aac14ae4a1 Merge neptunus://home/msvensson/mysql/bug16795/my51-bug16795 
into  shellback.(none):/home/msvensson/mysql/mysql-5.1
 2006-02-28 13:04:48 +01:00
msvensson@neptunus.(none)
0c44abbb47 Merge neptunus.(none):/home/msvensson/mysql/bug16795/my50-bug16795 
into  neptunus.(none):/home/msvensson/mysql/bug16795/my51-bug16795
 2006-02-28 13:03:26 +01:00
msvensson@shellback.(none)
916f763b9e Merge neptunus:/home/msvensson/mysql/bug16795/my50-bug16795 
into  shellback.(none):/home/msvensson/mysql/mysql-5.0
 2006-02-28 13:03:00 +01:00
tomas@poseidon.ndb.mysql.com
4dee17f159 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
 2006-02-28 12:40:19 +01:00
tomas@poseidon.ndb.mysql.com
fecfbb4834 Bug#16385, Partitions: crash when updating a range partitioned NDB table 
- too little space was allocated for receiving events, partition uses extra column in table
 2006-02-28 12:28:52 +01:00
tomas@poseidon.ndb.mysql.com
9850332741 Bug #17763 mysqld cores with list partitioning if update to missing partition 
- error string wrongly formatted
 2006-02-28 12:27:53 +01:00
andrey@lmy004.
8fe55c09db manual merge 2006-02-28 12:08:13 +01:00
andrey@lmy004.
483a6d06fa fix for bug#16537 (Events: mysql.event.starts is null) 
- now when the event is created and STARTS is omitted then STARTS is implicitly
  CURRENT_TIMESTAMP
- This CS also fixed incorrect presentation of STARTS/ENDS in I_S.EVENTS
(incorporated review changes)
 2006-02-28 11:43:10 +01:00
msvensson@devsrv-b.mysql.com
f2444c50fc Bug#17377 Federated Engine returns wrong Data, always the rows with the highest ID 
- Always make rnd_pos reposition the cursor in the fetched result set.
 2006-02-28 11:17:40 +01:00
msvensson@shellback.(none)
a79c6b60d2 Merge neptunus:mysql/mysql-5.1 
into  shellback.(none):/home/msvensson/mysql/mysql-5.1
 2006-02-28 11:03:18 +01:00
msvensson@shellback.(none)
318bee862a Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  shellback.(none):/home/msvensson/mysql/mysql-5.0
 2006-02-28 11:00:35 +01:00
bar@mysql.com
bcc72ad04f Bug#16313 XML: extractvalue() ignores '!' in names 
xml.result, xml.test:
  Adding test case.
item_xmlfunc.cc:
  Fixed that the "!" character written at the end was ignored.

  Now if we try to scan "!=", and if "!" is not
  followed by "=", we rollback lex scanner back 
  to "!" token, so the parser will start to check
  the next rule from the "!" character again.

  Previously parser started from the next character,
  which was EOF in the example in xml.test,
  which led to query being successfully parsed,
  instead of producing a syntax error.
 2006-02-28 13:59:16 +04:00
msvensson@neptunus.(none)
2e401e202d Merge msvensson@devsrv-b.mysql.com:/space/magnus/bug17279/my51-bug17279/ 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
 2006-02-28 10:55:05 +01:00
msvensson@neptunus.(none)
7551c8d7f8 Merge msvensson@devsrv-b.mysql.com:/space/magnus/bug17279/my50-bug17279/ 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
 2006-02-28 10:52:36 +01:00
msvensson@devsrv-b.mysql.com
ef8b5b47e8 Merge devsrv-b.mysql.com:/space/magnus/bug17279/my50-bug17279 
into  devsrv-b.mysql.com:/space/magnus/bug17279/my51-bug17279
 2006-02-28 10:44:48 +01:00
mats@mysql.com
1e66bc0d16 Merge mysql.com:/home/bkroot/mysql-5.1-new 
into  mysql.com:/home/bk/w3023-mysql-5.1-new
 2006-02-28 10:06:58 +01:00
SergeyV@selena.
2c8a6fadf9 Postfix for #17595. few lines in a test were accidentally commented. 
Comments removed.
 2006-02-27 22:14:48 +03:00
dlenev@mysql.com
88a583da1d Merge mysql.com:/home/dlenev/src/mysql-5.0-bg13525 
into  mysql.com:/home/dlenev/src/mysql-5.1-merges2
 2006-02-27 20:38:45 +03:00
dlenev@mysql.com
db1ecaa1a2 Fix for trigger.test failures on pushbuild hosts introduced by fix for 
bug #13525 "Rename table does not keep info of triggers".

Now we use MYSQLTEST_VARDIR in order to be able to run this test in different
vardir. Also improved cleanup after the test.
 2006-02-27 20:32:32 +03:00
dlenev@mysql.com
8dbdf5237e Merge mysql.com:/home/dlenev/src/mysql-5.0-bg13525 
into  mysql.com:/home/dlenev/src/mysql-5.1-merges2
 2006-02-27 20:00:07 +03:00
dlenev@mysql.com
6137476427 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/dlenev/src/mysql-5.0-bg13525
 2006-02-27 20:00:05 +03:00
dlenev@mysql.com
6cb5c38c14 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/dlenev/src/mysql-5.0-bg13525
 2006-02-27 20:00:03 +03:00
SergeyV@selena.
763475754a Merge svlasenko@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  selena.:H:/MYSQL/src/#15943-mysql-5.0
 2006-02-27 20:00:03 +03:00
tomas@poseidon.ndb.mysql.com
bfc43d5745 Bug #17499 Alter table of ndb partitioned tables causes mysqld to core 2006-02-27 17:04:49 +01:00
msvensson@devsrv-b.mysql.com
706070fbf8 Bug#17279 user with no global privs and with create priv in db can create databases 
- Use binary charset in acl_cache, to make searches case sensitive
 - Add testcase
 2006-02-27 16:41:58 +01:00
jmiller@mysql.com
c800a13762 New test case fro replication between ndb and other storage engines. 2006-02-27 15:09:03 +01:00
SergeyV@selena.
78b33e1835 Fixes bug #17595. UDFs are not initialized when running mysqld with 
--skip-grant-tables. However when deleting functions UDFs list was checked
regardless of whther UDFs are initialized or not. Additional check is added
into free_udf() and find_udf() functions to prevent possible runtime errors.
 2006-02-27 16:27:34 +03:00
msvensson@neptunus.(none)
4bbf5eb01c Bug#16795 ndb_cache_multi2 
- Change && to ||
 - Check for return value != 0 in "ndb->init()"
 2006-02-27 10:29:55 +01:00
sergefp@mysql.com
0048ea9bb3 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/psergey/mysql-5.0-bug17314
 2006-02-27 11:36:41 +03:00
bar@mysql.com
1f30b1525a xml.test: 
xml.result:
  Adding test for Bug #16312 XML: extractvalue() crash if angle brackets,
  A fix for #16234 fixed this bug automatically.
 2006-02-27 11:21:20 +04:00
monty@mysql.com
a95cabcb6b Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/home/my/mysql-5.1
 2006-02-26 23:31:03 +02:00
guilhem@mysql.com
e5d450eeca var/tmp does not work (same fix as knielsen did for rpl_row_UUID a few days ago) 2006-02-26 21:30:39 +01:00
dlenev@mysql.com
4ca3409390 Merge bk-internal.mysql.com:/home/bk/mysql-5.0-runtime 
into  mysql.com:/home/dlenev/src/mysql-5.0-bg13525
 2006-02-26 21:20:13 +03:00
monty@mysql.com
386276d89d Cleanups 
Don't run upgrade.test with embedded server as it requires mysqlcheck
 2006-02-26 16:03:43 +02:00
dlenev@mysql.com
0b422c635d Merge bk-internal.mysql.com:/home/bk/mysql-5.0-runtime 
into  mysql.com:/home/dlenev/src/mysql-5.0-bg13525
 2006-02-26 16:38:48 +03:00
monty@mysql.com
e6a98314a7 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/home/my/mysql-5.1
 2006-02-26 15:12:56 +02:00
monty@mysql.com
e3796c924f After merge fixes 2006-02-26 15:11:56 +02:00
guilhem@mysql.com
eb4688330d Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/home/mysql_src/mysql-5.1-new
 2006-02-25 22:22:12 +01:00
guilhem@mysql.com
0071749595 WL#2977 and WL#2712 global and session-level variable to set the binlog format (row/statement), 
and new binlog format called "mixed" (which is statement-based except if only row-based is correct,
in this cset it means if UDF or UUID is used; more cases could be added in later 5.1 release):
SET GLOBAL|SESSION BINLOG_FORMAT=row|statement|mixed|default;
the global default is statement unless cluster is enabled (then it's row) as in 5.1-alpha.
It's not possible to use SET on this variable if a session is currently in row-based mode and has open temporary tables (because CREATE
TEMPORARY TABLE was not binlogged so temp table is not known on slave),  or if NDB is enabled (because
NDB does not support such change on-the-fly, though it will later), of if in a stored function (see below).
The added tests test the possibility or impossibility to SET, their effects, and the mixed mode,
including in prepared statements and in stored procedures and functions.
Caveats:
a) The mixed mode will not work for stored functions: in mixed mode, a stored function will
always be binlogged as one call and in a statement-based way (e.g. INSERT VALUES(myfunc()) or SELECT myfunc()).
b) for the same reason, changing the thread's binlog format inside a stored function is
refused with an error message.
c) the same problems apply to triggers; implementing b) for triggers will be done later (will ask
Dmitri).
Additionally, as the binlog format is now changeable by each user for his session, I remove the implication
which was done at startup, where row-based automatically set log-bin-trust-routine-creators to 1
(not possible anymore as a user can now switch to stmt-based and do nasty things again), and automatically
set --innodb-locks-unsafe-for-binlog to 1 (was anyway theoretically incorrect as it disabled
phantom protection).
Plus fixes for compiler warnings.
 2006-02-25 22:21:03 +01:00
monty@mysql.com
1e2e9e2856 Merge mysql.com:/home/my/mysql-5.0 
into  mysql.com:/home/my/mysql-5.1
 2006-02-25 21:54:34 +02:00
kent@mysql.com
7018ab293d drop-on-restart.inc: 
Drop 'mysqlslap'
  Added database name 'ndbsynctest'
sql_table.cc, create.test, create.result:
  Patch for bug#17530 done by evgen, extracted from 5.0
 2006-02-25 20:17:07 +01:00
monty@mysql.com
6fd52639c0 Merge monty@192.168.0.9:/my/mysql-5.0 
into  mysql.com:/home/my/mysql-5.0
 2006-02-25 13:26:05 +02:00
monty@mysql.com
dd1d40f8f8 Fixed new introduced bug in binlog.test with --ps-protocol 2006-02-25 13:24:18 +02:00
brian@zim.(none)
f40705eb9b Merge zim.(none):/home/brian/mysql/mysql-5.0 
into  zim.(none):/home/brian/mysql/dep-5.1
 2006-02-24 23:31:57 -08:00
brian@zim.(none)
a6041bdba8 Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  zim.(none):/home/brian/mysql/dep-5.1
 2006-02-24 13:41:38 -08:00
brian@zim.(none)
cb07d52a7e This patch cleans up two tests which were a bit fragile from other failing tests. It also removes some variables associated with removed RAID support. 2006-02-24 13:20:51 -08:00
dlenev@mysql.com
0c15039e74 Fix for bug #13525 "Rename table does not keep info of triggers". 
Let us transfer triggers associated with table when we rename it (but only if
we are not changing database to which table belongs, in the latter case we will
emit error).
 2006-02-24 23:50:36 +03:00
mats@mysql.com
c33a64a0e3 Merge mysqldev@production.mysql.com:my/mysql-5.1-release 
into  mysql.com:/home/bk/mysql-5.1-release-bug13418-lars
 2006-02-24 20:27:51 +01:00
monty@mysql.com
aa4128f811 Merge monty@192.168.0.9:/my/mysql-5.0 
into  mysql.com:/home/my/mysql-5.0
 2006-02-24 18:36:09 +02:00
monty@mysql.com
82b77cdd90 Fixes to embedded server to be able to run tests with it 
(Needed for "list of pushes" web page and autopush)
 2006-02-24 18:34:15 +02:00
reggie@linux.site
52fbc7a1cd BUG# 17430 Partitoins: crash on SELECT * FROM t1 WHERE f_int1 IS NULL 
BUG# 17432: Partitions: wrong result, SELECT ... WHERE <column> is null
 2006-02-24 10:10:41 -06:00
msvensson@neptunus.(none)
7d29ace754 Bug #17443 mysqldump test failure 2006-02-24 17:10:40 +01:00
mats@mysql.com
13a61982a9 Merge mysqldev@production.mysql.com:my/mysql-5.1-release 
into  mysql.com:/home/bk/w3023-mysql-5.1-new
 2006-02-24 16:31:38 +01:00
lars@mysql.com
b4953f12a2 Merge mysqldev@production.mysql.com:my/mysql-5.1-release 
into  mysql.com:/users/lthalmann/bk/mysql-5.1-release-bug13418
 2006-02-24 16:22:06 +01:00
mats@mysql.com
101edab125 WL#3023 (RBR: Use locks in a statement-like manner): 
Adaptions to make it work with NDB.
 2006-02-24 16:19:55 +01:00
lars@mysql.com
32a8a469a7 BUG#13418 (V2): Bit columns should replicate correctly when using RBR 2006-02-24 15:38:20 +01:00
andrey@lmy004.
79c9ba9ee5 last second additions for bug#16411 2006-02-24 15:28:20 +01:00
andrey@lmy004.
b8941aec8f add this file to revision control. there was not new line at the end of the file 
fix for bug#16411
 2006-02-24 14:10:24 +01:00
evgen@moonbone.local
776b05ea43 Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into moonbone.local:/work/17530-bug-5.0-mysql
 2006-02-24 15:57:36 +03:00
knielsen@mysql.com
436587e997 Fix mysqldump.test to work with non-standard --vardir. 
(Backported from mysql-5.1-new)
 2006-02-24 13:51:04 +01:00
evgen@moonbone.local
bcff10f1fb Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into moonbone.local:/work/17530-bug-5.0-mysql
 2006-02-24 14:29:41 +03:00
knielsen@mysql.com
97229ca7fc Fix mysqldump.test to work with non-standard --vardir. 2006-02-24 10:15:39 +01:00
elliot@mysql.com
5753dfe73d BUG#17521 alter database crashes slave 
Problem was a null pointer
Fixed by passing correct database name to slave filtering mechanism
Added test.
 2006-02-23 23:20:29 -05:00
konstantin@mysql.com
af62c4a959 Merge mysql.com:/opt/local/work/mysql-4.1-13134 
into  mysql.com:/opt/local/work/mysql-5.0-runtime
 2006-02-24 00:00:15 +03:00
konstantin@mysql.com
7178f247f5 Remove 'delayed' to make the test deterministic (already 
fixed in 5.0).
A post-review fix (Bug#13134)
 2006-02-23 23:41:15 +03:00
msvensson@neptunus.(none)
3fbf02d869 After merge fix 2006-02-23 10:57:33 +01:00
msvensson@neptunus.(none)
3ece1f3eda Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
 2006-02-23 10:54:56 +01:00
msvensson@neptunus.(none)
71ef9102c1 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
 2006-02-23 10:45:39 +01:00
msvensson@neptunus.(none)
8d78cd3e3c Merge bk-internal:/home/bk/mysql-5.1-new 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
 2006-02-23 10:41:37 +01:00
msvensson@neptunus.(none)
f80555880a Merge neptunus.(none):/home/msvensson/mysql/mysqltest_replace/my50-mysqltest_replace 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
 2006-02-23 10:30:31 +01:00
msvensson@neptunus.(none)
ec91a79c9f Add new parameter to do_eval so that only unescaped variables in input string is expanded and rest of string is left untouched. 2006-02-23 10:11:57 +01:00
knielsen@mysql.com
776dd75fac Merge bk-internal:/home/bk/mysql-5.1-new 
into  mysql.com:/usr/local/mysql/tmpbuild-5.1
 2006-02-23 09:07:30 +01:00
pekka@mysql.com
c9353db37d ndb - enable rpl_ndb_blob* again, disabled by accident 2006-02-23 00:35:32 +01:00
pekka@mysql.com
a2edc49ecd Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/space/pekka/ndb/version/my51
 2006-02-22 23:18:45 +01:00
jmiller@mysql.com
28cbeb7374 rpl_row_mysqlbinlog.result, rpl_row_mysqlbinlog.test: 
Updated with echos for the results file requested by lars
 2006-02-22 23:11:42 +01:00
pekka@mysql.com
e4fd28a74f Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/space/pekka/ndb/version/my51
 2006-02-22 22:59:29 +01:00
pekka@mysql.com
5eed3319e9 ndb - ndb_restore.test: fix backup id in result 2006-02-22 22:04:46 +01:00
jmiller@mysql.com
5bed48392b New test for wl2321 2006-02-22 22:03:55 +01:00
konstantin@mysql.com
5d07195888 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/home/kostja/mysql/mysql-5.1-merge
 2006-02-22 20:15:24 +03:00
jmiller@mysql.com
ef1b1e406f Merge jmiller@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/home/ndbdev/jmiller/clones/mysql-5.1-new
 2006-02-22 15:50:26 +01:00
konstantin@mysql.com
a27e32b565 Merge mysql.com:/home/kostja/mysql/mysql-5.0-root 
into  mysql.com:/home/kostja/mysql/mysql-5.1-merge
 2006-02-22 14:04:24 +03:00
anozdrin@mysql.com
a77cc69e62 Fix for BUG#7787: Stored procedures: improper warning for "grant execute" statement. 
The problem was that error flag was not reset.
 2006-02-22 13:44:04 +03:00
knielsen@mysql.com
49fda2c931 Merge mysql.com:/usr/local/mysql/mysql-5.1-varfix2 
into  mysql.com:/usr/local/mysql/tmpbuild-5.1
 2006-02-22 10:17:59 +01:00
knielsen@mysql.com
da296394e3 Fix test cases to work with non-standard --vardir. 
Rename mix_innodb_myisam_binlog-master.opt; when the test was moved to
separate stm/row test cases, the .opt were not moved along with it,
causing a 60-second test duration because of default lock timeout :-(
 2006-02-22 10:07:54 +01:00
mskold@mysql.com
f56016ee66 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new
 2006-02-22 09:10:55 +01:00
timour@mysql.com
465745a200 Fix for BUG#17523: natural join and information schema. 
The cause of the bug was an ASSERT that checked the consistency
of TABLE_SHARE::db and TABLE_LIST::db and failed for I_S tables.
The fix relaxes the requirement for consistency for I_S.
 2006-02-22 10:04:10 +02:00
msvensson@neptunus.(none)
3f39d25e93 Merge bk-internal:/home/bk/mysql-5.1-new 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
 2006-02-22 08:55:19 +01:00
reggie@linux.site
cb10b77c31 BUG #15408 - Partitions: subpartition names are not unique 2006-02-21 17:40:07 -06:00
konstantin@mysql.com
f0abdf1ebe Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/opt/local/work/mysql-5.0-runtime
 2006-02-22 01:20:47 +03:00
jmiller@mysql.com
eafd514e1a Merge jmiller@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/home/ndbdev/jmiller/clones/mysql-5.1-new
 2006-02-21 18:24:44 +01:00
konstantin@mysql.com
442c2ba8af A fix and a test case for Bug#13134 "Length of VARCHAR() utf8 
column is increasing when table is recreated with PS/SP":
make use of create_field::char_length more consistent in the code.
Reinit create_field::length from create_field::char_length
for every execution of a prepared statement (actually fixes the 
bug).
 2006-02-21 19:52:20 +03:00
reggie@linux.site
336c0ba4cb Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  linux.site:/home/reggie/work/mysql-5.1-bug15408
 2006-02-21 10:29:41 -06:00
msvensson@neptunus.(none)
6efee6c42c Merge neptunus.(none):/home/msvensson/mysql/bug16878/my51-bug16878 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
 2006-02-21 17:25:21 +01:00
msvensson@neptunus.(none)
e35e380072 Merge bk-internal:/home/bk/mysql-5.1-new 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
 2006-02-21 17:21:21 +01:00
msvensson@neptunus.(none)
334b9c7a27 Merge neptunus.(none):/home/msvensson/mysql/bug16878/my50-bug16878 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
 2006-02-21 17:19:46 +01:00
msvensson@neptunus.(none)
d722c5c60d Merge neptunus.(none):/home/msvensson/mysql/bug16878/my50-bug16878 
into  neptunus.(none):/home/msvensson/mysql/bug16878/my51-bug16878
 2006-02-21 17:15:37 +01:00
msvensson@neptunus.(none)
b0b002e4f5 Bug#14354 Partitions: data directory clause fails 
- Use "system" to execute rm, mkdir etc
 - Use MYSQLTEST_VARDIR
 2006-02-21 17:09:09 +01:00
evgen@moonbone.local
e6924206cd Fixed bug#17530: Incorrect key truncation on table creation caused server crash. 
When a too long field is used for a key, only a prefix part of the field is 
used. Length is reduced to the max key length allowed for storage. But if the
field have a multibyte charset it is possible to break multibyte char
sequence. This leads to the failed assertion in the innodb code and 
server crash when a record is inserted.

The make_prepare_table() now aligns truncated key length to the boundary of
multibyte char.
 2006-02-21 18:09:32 +03:00
msvensson@neptunus.(none)
d35ba92a24 Merge neptunus.(none):/home/msvensson/mysql/bug14871/my51-bug14871 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
 2006-02-21 15:57:56 +01:00
msvensson@neptunus.(none)
a699a2ea1b Merge neptunus.(none):/home/msvensson/mysql/bug14871/my50-bug14871 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
 2006-02-21 15:05:58 +01:00
msvensson@neptunus.(none)
f64effb570 Merge neptunus.(none):/home/msvensson/mysql/bug14871/my50-bug14871 
into  neptunus.(none):/home/msvensson/mysql/bug14871/my51-bug14871
 2006-02-21 15:03:15 +01:00
mskold@mysql.com
043a16e34a Merge mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new-ndb_improved_on-line_discover 
into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new
 2006-02-21 13:54:58 +01:00
msvensson@neptunus.(none)
e50d43b41a Bug#14857 Reading dump files with single statement stored routines fails.Bug #14857 Reading dump files with single statement stored routines fails. 
- Add tests, fixed by patch for 16878
 2006-02-21 13:43:29 +01:00
msvensson@neptunus.(none)
c293324eb0 Bug#14871 mysqldump: invalid view dump output 
- Add comments with embeded veriosn info around the parts of the view syntax that are only supported by a certain version of MySQL Server
 2006-02-21 13:21:17 +01:00
andrey@lmy004.
85236db1f1 disable tests. failures happen from time to time and stop people from 
pushing. the code needs to be more stable.
 2006-02-21 13:07:25 +01:00
msvensson@neptunus.(none)
8e760bc6cc Merge neptunus.(none):/home/msvensson/mysql/mysqltest_replace/my51-mysqltest_replace 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
 2006-02-21 10:37:10 +01:00
msvensson@neptunus.(none)
40fe710394 Merge neptunus.(none):/home/msvensson/mysql/mysqltest_replace/my50-mysqltest_replace 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
 2006-02-21 09:40:18 +01:00
msvensson@neptunus.(none)
751d625865 Merge neptunus.(none):/home/msvensson/mysql/bug17382/my51-bug17382 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
 2006-02-21 09:28:36 +01:00
pekka@mysql.com
73d75104af ndb - enable ndb_dd_backuprestore 2006-02-21 09:27:20 +01:00
msvensson@neptunus.(none)
3764d3dab1 Merge neptunus.(none):/home/msvensson/mysql/bug16795/my50-bug16795 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
 2006-02-21 08:55:13 +01:00
msvensson@neptunus.(none)
ac336241b3 Merge neptunus.(none):/home/msvensson/mysql/bug16795/my50-bug16795 
into  neptunus.(none):/home/msvensson/mysql/bug16795/my51-bug16795
 2006-02-21 08:54:08 +01:00
msvensson@neptunus.(none)
8d6ffa86e5 Merge neptunus.(none):/home/msvensson/mysql/bug2845/my51-bug2845 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
 2006-02-21 08:45:17 +01:00
msvensson@neptunus.(none)
674ee5987c Merge neptunus.(none):/home/msvensson/mysql/bug2845/my50-bug2845 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
 2006-02-21 08:44:27 +01:00
pekka@mysql.com
11a7a3ea63 Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/space/pekka/ndb/version/my51
 2006-02-21 05:08:18 +01:00
pekka@mysql.com
54074472e5 ndb - fix event created by ndb_restore bug#17045 (not really) 2006-02-21 02:27:23 +01:00
andrey@lmy004.
a1fdeb1386 manual merge 2006-02-21 00:01:39 +01:00
andrey@lmy004.
22ba4ca3a3 fix for bug#16407 (Events: Changes in sql_mode won't be taken into account) 
WL#1032
sql_mode setting was disregarded during create/alter event and wasn't set during
event execution.
(post-review small fixes)
 2006-02-20 23:52:22 +01:00
andrey@lmy004.
7ef557ed49 Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into lmy004.:/work/mysql-5.1-bug16406
 2006-02-20 23:29:55 +01:00
konstantin@mysql.com
07db5ac8b1 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/home/kostja/mysql/mysql-5.1-vanilla
 2006-02-20 23:00:50 +03:00
andrey@lmy004.
e5e7066e26 Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into lmy004.:/work/mysql-5.1-bug16406
 2006-02-20 20:57:44 +01:00
konstantin@mysql.com
b58345d8c4 A new error message for deprecated statements. 
Fixes failing sp.test
 2006-02-20 22:51:32 +03:00
pekka@mysql.com
93db514db6 ndb - enable rpl_ndb_blob2 bug#17505 2006-02-20 17:20:54 +01:00
msvensson@neptunus.(none)
40fca5ca11 Merge neptunus.(none):/home/msvensson/mysql/mysqltest_replace/my50-mysqltest_replace 
into  neptunus.(none):/home/msvensson/mysql/mysqltest_replace/my51-mysqltest_replace
 2006-02-20 15:06:18 +01:00
msvensson@neptunus.(none)
1119defd8f Escape \ in "exec" 2006-02-20 15:03:16 +01:00
msvensson@neptunus.(none)
4cde1d1259 Bug#17382 mysql-test-run mysqldump fails with mysqlimport 2006-02-20 13:04:40 +01:00
pekka@mysql.com
6287081587 disabled.def: merge 2006-02-20 12:37:28 +01:00
knielsen@mysql.com
ddc2da9c09 post-merge fixes. 2006-02-20 10:30:32 +01:00
knielsen@mysql.com
4e378f7f72 Merge mysql.com:/usr/local/mysql/mysql-5.0-fixtest 
into  mysql.com:/usr/local/mysql/mysql-5.0
 2006-02-20 09:37:26 +01:00
knielsen@mysql.com
c15158e108 Remove hard-coded ../var/.. path in test mix_innodb_myisam_binlog, 
fails with --vardir option.
 2006-02-20 09:34:02 +01:00
igor@rurik.mysql.com
1e437a1fda Merge rurik.mysql.com:/home/igor/mysql-5.1 
into  rurik.mysql.com:/home/igor/dev/mysql-5.1-0
 2006-02-19 19:26:25 -08:00
igor@rurik.mysql.com
a3093f7e1e Merge rurik.mysql.com:/home/igor/mysql-5.0 
into  rurik.mysql.com:/home/igor/dev/mysql-5.0-0
 2006-02-19 17:26:06 -08:00
kent@mysql.com
544e07ba78 Merge 2006-02-19 23:57:49 +01:00
kent@mysql.com
4c81413932 Merge 2006-02-19 23:47:00 +01:00
brian@zim.tangent.org
70b70e43d9 We had a number of tests where there were no bugs related to disabling of tests, bugs were fixed, or no clear discription or plan. 2006-02-19 10:52:12 -08:00
guilhem@mysql.com
af149459ed Fix after merge of 5.0, fix of a result file which somebody hadn't updated. 
"mysqldump" test fails (mysqlimport related, Brian aware), ndb_cache2 ndb_cache_multi2
partition_mgm_err fail (unrelated to my changes), rpl_row_view01 (known crash BUG#17265)
 2006-02-18 23:37:56 +01:00
guilhem@mysql.com
32a5692733 In previous push, a DROP TABLE at the end of test was missing. 2006-02-18 21:08:41 +01:00
guilhem@mysql.com
473cfdfcb2 Merge mysql.com:/home/mysql_src/mysql-5.0 
into  mysql.com:/home/mysql_src/mysql-5.1-new; will fix manually sp_head.cc and mysqld.cc later soon.
 2006-02-18 19:07:32 +01:00
guilhem@mysql.com
37c1744a03 Fix for BUG#13897 "failure to do SET SQL_MODE=N where N is a number > 31" (the original bug's title isn't the simplest 
symptom). sys_var::check_set() was wrong. mysqlbinlog makes use of such SET SQL_MODE=N
(where N is interpreted like if SQL_MODE was a field of type SET), so
this bug affected recovery from binlogs if the server was running with certain SQL_MODE values,
for example the default values on Windows (STRICT_TRANS_TABLES); to work around this bug people
had to edit mysqlbinlog's output.
 2006-02-18 17:32:15 +01:00
guilhem@mysql.com
56bed24c92 Fix for BUG#14769 "Function fails to replicate if fails half-way (slave stops)": 
if the function, invoked in a non-binlogged caller (e.g. SELECT, DO), failed half-way on the master,
slave would stop and complain that error code between him and master mismatch. 
To solve this, when a stored function is invoked in a non-binlogged caller (e.g. SELECT, DO), we binlog the function
call as SELECT instead of as DO (see revision comment of sp_head.cc for more).
And: minor wording change in the help text.
This cset will cause conflicts in 5.1, I'll merge.
 2006-02-18 17:26:30 +01:00
guilhem@mysql.com
4c5d18b150 Fix for BUG#16559 "Replication Problems with Non transactional tables inside an interrupted trans.": 
problem was: when a connection disconnects having an open transaction affecting MyISAM and InnoDB, the ROLLBACK event stored in the binary log
contained a non-zero error code (1053 because of the disconnection), so when slave applied the transaction, slave complained that its ROLLBACK succeeded
(error_code=0) while master's had 1053, so slave stopped. But internally generated binlog events such as this ROLLBACK
should always have 0 as error code, as is true in 4.1 and was accidentally broken in 5.0,
so that there is no false alarm.
 2006-02-18 17:19:16 +01:00
petr@mysql.com
d6a36615d6 Merge mysql.com:/home/cps/mysql/devel/im/5.0-im-add-error-message 
into  mysql.com:/home/cps/mysql/trees/5.1/5.1-virgin-debug
 2006-02-18 18:00:22 +03:00
petr@mysql.com
db7b6ef56f Merge mysql.com:/home/cps/mysql/trees/5.0/mysql-5.0-virgin-debug 
into  mysql.com:/home/cps/mysql/devel/im/5.0-im-add-error-message
 2006-02-18 02:50:50 +03:00
kent@mysql.com
c56a4b1eb6 mysql-test-run.sh: 
Set the ndbcluster slave port (bug#16780)
disabled.def:
  Disabled 'mysqldump' until bug 17443 is closed
 2006-02-17 21:55:27 +01:00
jimw@mysql.com
4d483fa2d1 Merge bk-internal:/home/bk/mysql-5.1-new 
into  mysql.com:/home/jimw/my/mysql-5.1-clean
 2006-02-17 12:42:08 -08:00
elliot@mysql.com
649d64d7f9 BUG#17385 Re-enabling test case as it passes now. Wrong results were 
corrected by Ingo when pushing WL#1563
 2006-02-17 15:01:27 -05:00
jmiller@mysql.com
14b60467b9 Updated 2006-02-17 20:34:47 +01:00
jmiller@mysql.com
8545383824 Test updates to use with a default engine of ndb 2006-02-17 20:29:46 +01:00
jimw@mysql.com
bf0b775859 Merge mysql.com:/home/jimw/my/mysql-5.0-7955 
into  mysql.com:/home/jimw/my/mysql-5.1-clean
 2006-02-17 11:03:34 -08:00