msvensson@neptunus.(none)
ced32517c7
Bug #3131 mysqltest fails on $2=$1 assignment in test
2005-09-01 10:53:33 +02:00
msvensson@neptunus.(none)
906f7c4481
Bug #12471 mysqltest, --error within loop affects wrong statement
...
- Move clearing of expected errors
2005-09-01 09:34:40 +02:00
jimw@mysql.com
d6db387aea
Merge mysql.com:/home/jimw/my/mysql-4.1-clean
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-08-31 19:12:16 -07:00
jimw@mysql.com
0ebf1576dc
Merge mysql.com:/home/jimw/my/mysql-4.1-12325
...
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-08-31 18:32:45 -07:00
jimw@mysql.com
00b17c1c17
Fix handling of filenames that start the same as reserved filenames
...
on Windows. (Bug #12325 )
2005-08-31 18:32:15 -07:00
jimw@mysql.com
1d997477aa
Merge mysql.com:/home/jimw/my/mysql-4.1-clean
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-08-31 15:24:06 -07:00
evgen@moonbone.local
41fc00641c
create.test, create.result, sql_select.cc, item.cc:
...
After merge fix for bug #12537
2005-08-31 22:06:34 +04:00
evgen@moonbone.local
f917803e0c
Manual merged
2005-08-31 21:24:25 +04:00
msvensson@neptunus.(none)
d692f0c045
Remove syntax !$<err_no> to set an expected error code
...
Use !<err_no> instead
2005-08-31 18:10:26 +02:00
lars@mysql.com
7fd89c85b7
BUG#12542: All set statements should be executed by slave thd
...
rpl_replicate_do.result:
New test case
sql_parse.cc:
All SET statements should be executed by slave thd
rpl_replicate_do.test:
New test case
2005-08-31 18:08:45 +02:00
msvensson@neptunus.(none)
2fc6ef3a40
BUG#11316: mysqltest, problems when assigning value with '#' to $variable
...
- Add stricter checking of syntax in mysqltest
2005-08-31 17:16:05 +02:00
kent@mysql.com
16eecea22e
mtr_timer.pl, mtr_report.pl, mtr_process.pl, mysql-test-run.pl:
...
Backporting from 5.0
2005-08-31 16:28:47 +02:00
evgen@moonbone.local
f1fb30a15f
Fix bug #12861 client hang with group_concat insubquery FROM DUAL.
...
Item_func_group_concat::fix_fields() set maybe_null flag to 0, and set it to
1 only if some of it's arguments may be null. When used in subquery in tmp
table created field which can't be null. When no data retireved result field
have to be set to null and error mentioned in bug report occurs. Also this
bug can occur if selecting from not null field in empty table.
Function group_concat now marked maybe_null from the very beginning not only
if some of it's argument may be null.
2005-08-31 18:26:50 +04:00
sergefp@mysql.com
04d75ab6e8
Fix group_min_max.test - myisam may return slightly row count estimate on amd64
2005-08-31 13:23:24 +04:00
ramil@mysql.com
a16da25e06
Merge mysql.com:/usr/home/ram/work/4.1.b9613
...
into mysql.com:/usr/home/ram/work/mysql-5.0
2005-08-31 10:25:00 +05:00
kent@mysql.com
5f7ce18fb1
mysql-test-run.pl:
...
Put back unused old manager dummy arguments, some scripts use them
2005-08-31 03:38:33 +02:00
kent@mysql.com
85ed1e8da7
Makefile.am:
...
Make dist copy of .imtest files not fail the make target, as there are no files yet
2005-08-31 02:25:28 +02:00
jimw@mysql.com
b5c01d7971
Merge bk-internal:/home/bk/mysql-4.1
...
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-08-30 14:36:07 -07:00
evgen@moonbone.local
14d0c25fc5
Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into moonbone.local:/work/12489-bug-5.0-mysql
2005-08-31 01:07:19 +04:00
evgen@moonbone.local
dc53ac6d1f
Fix bug #12489 wrongly printed strcmp() function results in creation of broken
...
view.
For Item_func_strcmp print() was not defined and for this class was called
print_op of it's parent class. Because of this strcmp() was printed wrongly
and this results int creation of broken view.
Added function Item_func_strcmp::print() which correctly prints strcmp()
function.
2005-08-31 00:54:41 +04:00
anozdrin@mysql.com
e7305b8cab
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/alik/Documents/AllProgs/MySQL/devel/5.0-im-tests-fw
2005-08-31 00:29:29 +04:00
evgen@moonbone.local
6ed7255448
manual merge of bug fix#12537
2005-08-30 23:29:47 +04:00
jimw@mysql.com
0dc444ec4e
Fix incorrect spellings of "dropped" in source and tests. (Bug #12828 )
2005-08-30 12:24:37 -07:00
brian@zim.(none)
bd806f786e
Fix for bad merge.
2005-08-30 11:04:23 -07:00
brian@zim.(none)
3091eb3fa4
Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into zim.(none):/home/brian/mysql/mysql-5.0
2005-08-30 08:28:55 -07:00
brian@zim.(none)
16e30aaf68
Merge baker@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into zim.(none):/home/brian/mysql/mysql-4.1
2005-08-30 08:28:34 -07:00
sergefp@mysql.com
f29bebe216
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/psergey/mysql-5.0-bug12720
2005-08-30 16:34:40 +04:00
ramil@mysql.com
dba11de02a
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/usr/home/ram/work/4.1.b9613
2005-08-30 17:32:53 +05:00
evgen@moonbone.local
d76f9471cb
Fix bug #12537 UNION produces longtext instead of varchar
...
Item::tmp_table_field_from_field_type() and create_tmp_field_from_item()
was converting string field to blob depending on byte-wise length instead of
character length, which results in converting valid varchar string with
length == 86 to longtext.
Made that functions above take into account max width of character when
converting string fields to blobs.
2005-08-30 16:19:53 +04:00
bar@mysql.com
3ff1acb8db
Bug#12363
...
character_set_results is nullable, but value_ptr returns string "NULL"
set_var.cc:
Create Item_null instead of Item_string for NULL values
variables.result, variables.test:
adding test case
2005-08-30 17:11:59 +05:00
ingo@mysql.com
3e06800b7f
Merge mysql.com:/home/mydev/mysql-5.0
...
into mysql.com:/home/mydev/mysql-5.0-5000
2005-08-30 12:35:37 +02:00
sergefp@mysql.com
c9aacbf943
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/psergey/mysql-5.0-bug12720
2005-08-30 14:15:05 +04:00
timour@mysql.com
309c40012d
Merge mysql.com:/home/timka/mysql/src/5.0-virgin
...
into mysql.com:/home/timka/mysql/src/5.0-bug-12672
2005-08-30 12:50:09 +03:00
timour@mysql.com
32907c421e
Merge mysql.com:/home/timka/mysql/src/5.0-virgin
...
into mysql.com:/home/timka/mysql/src/5.0-bug-12672
2005-08-30 11:52:27 +03:00
osku@127.(none)
312b161409
Merge osalerma@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into 127.(none):/home/osku/mysql-5.0
2005-08-30 10:42:51 +03:00
ramil@mysql.com
00e066e201
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/usr/home/ram/work/4.1.b9613
2005-08-30 12:33:58 +05:00
ingo@mysql.com
9b11c9a822
Merge mysql.com:/home/mydev/mysql-5.0
...
into mysql.com:/home/mydev/mysql-5.0-5000
2005-08-30 08:18:27 +02:00
brian@zim.(none)
333a5662fd
Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into zim.(none):/home/brian/mysql/mysql-5.0
2005-08-29 18:03:56 -07:00
brian@zim.(none)
ab126a8130
Merge baker@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into zim.(none):/home/brian/mysql/mysql-4.1
2005-08-29 17:41:09 -07:00
sergefp@mysql.com
5d336fbbe1
Fix for BUG#12720: In QUICK_RANGE_SELECT::reset(), reset in_range so next get_next() call
...
doesn't continue reading the last range.
2005-08-30 03:14:39 +04:00
brian@zim.(none)
b4208c569a
Update for delete_all_rows() which will be used for TRUNCATE and DELETE support.
2005-08-29 15:26:05 -07:00
brian@zim.(none)
4e9931752e
Added support for delete_all_rows() for archive. This fixes bug #12836 .
2005-08-29 15:05:16 -07:00
jimw@mysql.com
4c5faed094
Merge bk-internal:/home/bk/mysql-5.0
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-08-29 14:41:00 -07:00
andrey@lmy004.
f479c3a48f
Merge lmy004.:/work/mysql-5.0-clean into lmy004.:/work/mysql-5.0-ready5
2005-08-29 22:28:01 +02:00
ingo@mysql.com
4b0ac126cd
Merge mysql.com:/home/mydev/mysql-5.0
...
into mysql.com:/home/mydev/mysql-5.0-5000
2005-08-29 21:11:05 +02:00
ingo@mysql.com
ae7e8b1de6
Merge mysql.com:/home/mydev/mysql-4.1
...
into mysql.com:/home/mydev/mysql-4.1-4100
2005-08-29 21:10:25 +02:00
ingo@mysql.com
b2b93f0abc
After merge fix.
2005-08-29 21:06:45 +02:00
andrey@lmy004.
1668c45d30
fix for bug 12207 (alter table discard tablespace on MyISAM table
...
causes ERROR 2013).
(all-in-one approved patch)
2005-08-29 21:00:43 +02:00
anozdrin@mysql.com
d30534c953
Implement WL#2789 "Instance Manager: test using mysql-test-run testing framework"
2005-08-29 22:28:42 +04:00
jimw@mysql.com
25adba36b1
Merge mysql.com:/home/jimw/my/mysql-5.0-11523
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-08-29 10:02:23 -07:00