mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-20 14:02:32 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
26142 commits 2781 branches 343 tags 1.6 GiB
Commit graph

8125 commits

Author SHA1 Message Date
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
SergeyV@selena.
e0e235c322 Fixes bug #12517. Clear user variables and replication events before 
closing temp tables in thread cleanup.
 2005-08-30 17:22:19 +04: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
bar@mysql.com
98581508c3 Bug #12829 
Cannot convert the charset of a GROUP_CONCAT result:

item_sum.cc:
  "result" character set was not set into proper value.

func_gconcat.result, func_gconcat.test:
  Fixing tests accordingly.
 2005-08-30 15:36:47 +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
ingo@mysql.com
5d41d5e0f4 Merge mysql.com:/home/mydev/mysql-4.1-4100 
into  mysql.com:/home/mydev/mysql-5.0-5000
 2005-08-29 18:18:30 +02:00
ingo@mysql.com
5845a6e553 Bug#10056 - PACK_KEYS option take values greater than 1 while creating table 
Added a switch to reject illegal values for PACK_KEYS.
 2005-08-29 17:24:07 +02:00
ingo@mysql.com
330eb04536 Bug#12296 - CHECKSUM TABLE reports 0 for the table 
Skipping deleted records instead of breaking the loop
during checksum calculation.
 2005-08-29 17:08:41 +02:00
ingo@mysql.com
32e3238da7 Bug#11816 - Truncate table doesn't work with temporary innodb tables 
Handle temporary tables like permanent tables: If the storage engine
cannot truncate, delete instead.
 2005-08-29 17:01:46 +02:00
ingo@mysql.com
674f8dfa7c Bug#11493 - Alter table rename to default database does not work without db name qualifying 
Supplied the default database name for ALTER TABLE ... RENAME 
for the new table instead of the old tables db like we do for 
other ALTERs.
 2005-08-29 16:54:33 +02:00
ingo@mysql.com
5c14b35a7f Bug#12565 - ERROR 1034 when running simple UPDATE or DELETE on large MyISAM table 
Changed end-space comparison so that the key is not used past
its end. This is due to the new end-space behaviour in 4.1.
See also bug 6151 and 9188.
 2005-08-29 16:50:09 +02:00
timour@mysql.com
e62c877748 Fix for BUG#12672. 2005-08-29 17:13:42 +03:00
andrey@lmy004.
235cde55fb fix for bug #12841 
(Server crash on DO IFNULL(NULL,NULL)
(fixes also "SELECT CAST(IFNULL(NULL,NULL) as DECIMAL)" unreported
 crash)
(new revampled fix with suggestions from Igor)
 2005-08-29 15:45:03 +02:00
bar@mysql.com
96e0cb8cbf ctype_utf8.result, ctype_utf8.test, item.cc: 
Bug#12371 executing prepared statement fails (illegal mix of collations)
  After review fixes.
 2005-08-29 16:49:01 +05:00
bar@mysql.com
be470c38c6 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  mysql.com:/usr/home/bar/mysql-4.1.b12371
 2005-08-29 15:44:49 +05:00
andrey@lmy004.
d7d307fbdd Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.0 
into lmy004.:/work/mysql-5.0-ready4
 2005-08-29 12:20:36 +02:00
andrey@lmy004.
ed0bac2116 fix for bug #12490 (all-in-one patch) 
(Packets out of order if calling HELP CONTENTS from Stored Procedure)
 2005-08-29 12:19:08 +02:00
osku@127.(none)
caf74b7cdd Merge osalerma@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  127.(none):/home/osku/mysql-5.0
 2005-08-29 09:06:43 +03:00
igor@rurik.mysql.com
c19d2c1e89 Merge rurik.mysql.com:/home/igor/mysql-5.0 
into rurik.mysql.com:/home/igor/dev/mysql-5.0-0
 2005-08-27 16:30:39 -07:00
hf@deer.(none)
093789aabd gis.test corrected with Pem's wishes 2005-08-27 20:06:35 +05:00
hf@deer.(none)
63d6bc34e0 Merge deer.(none):/home/hf/work/mysql-5.0.10499 
into deer.(none):/home/hf/work/mysql-5.0.clean
 2005-08-27 18:13:26 +05:00
hf@deer.(none)
418a7bfcde Merge deer.(none):/home/hf/work/mysql-4.1.clean 
into deer.(none):/home/hf/work/mysql-5.0.clean
 2005-08-27 18:10:46 +05:00
hf@deer.(none)
5b35789d12 Merge deer.(none):/home/hf/work/mysql-4.1.9645 
into deer.(none):/home/hf/work/mysql-4.1.clean
 2005-08-27 18:06:09 +05:00
andrey@lmy004.
950a277988 retest the fix for bug #10362 (SHOW PROCEDURE always qualifies name with database) 
(already approved)
 2005-08-27 12:29:36 +02:00
acurtis@xiphis.org
bebe182885 Merge acurtis@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  xiphis.org:/usr/home/antony/work2/p3-bug9048.2
 2005-08-27 07:28:45 +01:00
acurtis@xiphis.org
23c19b21d6 Bug#9048 
"Creating a function with char binary IN parameter fails"
  Parse BINARY as part of type declaration, not as 
  a column attribute.
 2005-08-27 07:26:14 +01:00
igor@rurik.mysql.com
f93e7cc77a func_str.result, null.result: 
Corrected results after the fix for bug #12791.
func_test.result, func_test.test:
  Added test cases for bug #12791.
item_func.h, item_func.cc:
  Fixed bug #12791.
  Made LEAST/GREATES fully Oracle compliant.
  LEAST/GREATEST did not return NULL if only some
  arguments were NULLs. This did not comply with Oracle.
 2005-08-26 22:25:45 -07:00
kent@mysql.com
0c3c6f8003 Merge mysql.com:/Users/kent/mysql/bk/mysql-5.0-release 
into mysql.com:/Users/kent/mysql/bk/mysql-5.0
 2005-08-27 02:05:35 +02:00
kent@mysql.com
fb690a5e04 2005-08-27 01:45:50 +02:00
kent@mysql.com
8dd0a47da0 mtr_timer.pl: 
Simplified and corrected mtr_timer_stop_all()
 2005-08-27 00:52:52 +02:00
kent@mysql.com
7a45cd2dad Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/Users/kent/mysql/bk/mysql-5.0
 2005-08-26 18:45:16 +02:00
jani@a193-229-222-105.elisa-laajakaista.fi
7b7188cea6 Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.1 
into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0
 2005-08-26 15:56:52 +03:00
kent@mysql.com
abfbd9f9ba Merge mysql.com:/Users/kent/mysql/bk/mysql-5.0-release 
into mysql.com:/Users/kent/mysql/bk/mysql-5.0
 2005-08-26 14:32:38 +02:00
kent@mysql.com
207d159845 mysql-test-run.sh, mtr_report.pl: 
Corrected typo
 2005-08-26 12:37:35 +02:00
serg@sergbook.mysql.com
d591705e69 merged 2005-08-26 13:24:59 +04:00
ramil@mysql.com
120dd92b03 workaround (bug #9613: Some read-only variables are selectable, others are not). 2005-08-26 13:23:32 +05:00
bell@sanja.is.com.ua
97ad1cba62 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0 
into  sanja.is.com.ua:/home/bell/mysql/bk/work-bug1-5.0
 2005-08-25 19:14:43 +03:00
bell@sanja.is.com.ua
5963573c05 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0 
into  sanja.is.com.ua:/home/bell/mysql/bk/work-bug1-5.0
 2005-08-25 17:47:18 +03:00
kent@mysql.com
fd98c4bfc6 Merge mysqldev@production.mysql.com:my/mysql-5.0-release 
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-release
 2005-08-25 16:28:35 +02:00
kent@mysql.com
af2b5f3bae mtr_process.pl: 
Call mtr_timer_stop_all() at exit
mtr_report.pl, mysql-test-run.pl:
  Added default/ps-protocol/embedded to abort and summary line
mtr_timer.pl:
  Added function mtr_timer_stop_all()
 2005-08-25 16:25:54 +02:00
petr@mysql.com
05fe0b2247 Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/cps/mysql/devel/mysql-5.0-sp11333
 2005-08-25 18:16:21 +04:00
sergefp@mysql.com
6d25f56297 BUG#12335: merging: temporarily removed a test case that demonstrates wrong behaviour and does it in non-deterministic way. 2005-08-25 18:13:56 +04:00
petr@mysql.com
56882c61bb Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/cps/mysql/devel/mysql-5.0-sp11333
 2005-08-25 18:05:49 +04:00
sergefp@mysql.com
c78ce16681 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/psergey/mysql-5.0-bug12335-release2
 2005-08-25 17:39:02 +04:00
sergefp@mysql.com
95c3afc5d9 Fix for BUG#12335 (SP replication) : New binlogging strategy for stored PROCEDUREs/FUNCTIONs. 
"Interleaved SPs execution is now binlogged properly, "SELECT spfunc()" is binlogged too.
The known remaining issue is binlogging/replication of "a routine is deleted while it is executed" scenario.
 2005-08-25 17:34:34 +04:00
petr@mysql.com
db5acc18ed Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/cps/mysql/devel/mysql-5.0-sp11333
 2005-08-25 16:06:49 +04:00
petr@mysql.com
8dfa469729 Fix Bug#11333 "Stored Procedure: Memory blow up on repeated SELECT ... INTO query" 2005-08-25 15:34:14 +04:00
osku@127.(none)
ce22788bdd Merge osalerma@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  127.(none):/home/osku/mysql-5.0
 2005-08-25 14:15:31 +03:00
joerg@mysql.com
fea0745ba8 Merge mysql.com:/M50/clone-5.0 into mysql.com:/M50/push-5.0 2005-08-25 11:46:17 +02:00
monty@mishka.mysql.com
aa18382680 Make test predictable 2005-08-25 12:03:19 +03:00
monty@mishka.mysql.com
848c936693 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mishka.mysql.com:/home/my/mysql-5.0
 2005-08-25 10:44:08 +03:00
andrey@lmy004.
d4a25c1b36 Merge lmy004.:/work/mysql-5.0-clean 
into lmy004.:/work/mysql-5.0-bug12533-2
 2005-08-25 09:38:59 +02:00
andrey@lmy004.
dde57f082b fix for bug #12533 (crash on DESCRIBE <view> after renaming base table column) 2005-08-25 09:24:21 +02:00
monty@mishka.mysql.com
9605c5dba2 Add back changes lost in merge 
(Faster test)
 2005-08-25 10:19:06 +03:00
monty@mishka.local
b90d7fe3b6 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mishka.local:/home/my/mysql-5.0
 2005-08-25 09:40:40 +03:00
monty@mishka.local
f16c7b3c5c After merge fixes 2005-08-25 09:38:06 +03:00
andrey@lmy004.
f6a9ff90d0 Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.0 
into lmy004.:/work/mysql-5.0-clean
 2005-08-25 08:36:40 +02:00
georg@lmy002.wdf.sap.corp
adc603a930 Merge lmy002.wdf.sap.corp:/home/georg/work/mysql/bugs/mysql-5.0-master 
into lmy002.wdf.sap.corp:/home/georg/work/mysql/bugs/mysql-5.0_5501
 2005-08-25 07:02:37 +02:00
monty@mishka.local
f384e08277 Merge mishka.local:/home/my/mysql-4.1 
into  mishka.local:/home/my/mysql-5.0
 2005-08-25 06:55:48 +03:00
kent@mysql.com
bd2901a250 disabled.def: 
Disabled unstable tests, bugs filed
 2005-08-25 02:27:52 +02:00
jimw@mysql.com
9e4a9e23c6 Make SYSDATE() behave as in Oracle: always the current datetime, not the 
datetime of when the current statement began. This also makes SYSDATE()
not safe in replication. (Bug #12562)
 2005-08-24 15:50:58 -07:00
serg@sergbook.mysql.com
714b27c71c merged 2005-08-25 00:08:02 +04:00
monty@mishka.local
17654cd7af Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into  mishka.local:/home/my/mysql-4.1
 2005-08-24 20:55:54 +03:00
monty@mishka.local
842de6ea45 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into  mishka.local:/home/my/mysql-4.1
 2005-08-24 19:53:40 +03:00
monty@mishka.local
8e6aa0e7ea Review fixes 2005-08-24 19:37:27 +03:00
jimw@mysql.com
006e5b770b Merge mysql.com:/home/jimw/my/mysql-4.1-12302 
into  mysql.com:/home/jimw/my/mysql-4.1-clean
 2005-08-24 08:50:12 -07:00
igor@rurik.mysql.com
b610c0972f Merge rurik.mysql.com:/home/igor/mysql-5.0 
into rurik.mysql.com:/home/igor/dev/mysql-5.0-0
 2005-08-24 08:19:02 -07:00
igor@rurik.mysql.com
17d6c734f4 Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.0 
into rurik.mysql.com:/home/igor/mysql-5.0
 2005-08-24 08:15:46 -07:00
heikki@hundin.mysql.fi
4bedb3091c subselect2.result: 
Update test result to reflect the fix of Bug #12779 : EXPLAIN SELECT of a subquery is now different
 2005-08-24 18:05:54 +03:00
georg@lmy002.wdf.sap.corp
254db48603 Fix for bug#5501 (SHOW TABLE STATUS should show "view" in upper case) 2005-08-24 12:51:00 +02:00
petr@mysql.com
2df4914e11 fix test for a bug to use correct tables 2005-08-24 12:25:57 +04:00
osku@127.(none)
55c752fb37 Merge osalerma@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  127.(none):/home/osku/mysql-5.0
 2005-08-24 09:25:32 +03:00
igor@rurik.mysql.com
4adc90bdd6 Merge rurik.mysql.com:/home/igor/mysql-5.0 
into rurik.mysql.com:/home/igor/dev/mysql-5.0-0
 2005-08-23 23:22:52 -07:00
igor@rurik.mysql.com
5810291c2f Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.0 
into rurik.mysql.com:/home/igor/mysql-5.0
 2005-08-23 23:19:45 -07:00
bell@sanja.is.com.ua
144c847da6 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0 
into  sanja.is.com.ua:/home/bell/mysql/bk/work-bug3-5.0
 2005-08-23 23:17:36 +03:00
timour@mysql.com
f58315f80a Test for BUG#6495. 
The bug itself is fixed by WL#2486.
 2005-08-23 22:29:05 +03:00
timour@mysql.com
5f9d05d306 Test for BUG#4889 - inconsistent resilts of more than 2-way natural join 
due to incorrect transformation to JOIN ... ON.

The bug itself is fixed by WL#2486.
 2005-08-23 20:24:29 +03:00
timour@mysql.com
9a6aefab3a Fix for BUG#6276. 2005-08-23 20:03:32 +03:00
kent@mysql.com
4d2cc6e503 Merge 2005-08-23 18:06:24 +02:00
timour@mysql.com
2f2347e556 Test case for BUG#10972 - Natural join of view and underlying table gives wrong result. 
The bug itself is fixed by WL#2486.
 2005-08-23 19:00:28 +03:00
timour@mysql.com
f5655423aa Merge mysql.com:/home/timka/mysql/src/5.0-virgin 
into  mysql.com:/home/timka/mysql/src/5.0-2486
 2005-08-23 18:43:12 +03:00
timour@mysql.com
b87154fc02 Merge mysql.com:/home/timka/mysql/src/5.0-virgin 
into  mysql.com:/home/timka/mysql/src/5.0-dbg
 2005-08-23 18:40:57 +03:00
timour@mysql.com
bf8563ae1d Merge mysql.com:/home/timka/mysql/src/5.0-virgin 
into  mysql.com:/home/timka/mysql/src/5.0-2486
 2005-08-23 18:15:51 +03:00
timour@mysql.com
e040300393 WL#2486 - natural and using join according to SQL:2003 
* Provide backwards compatibility extension to name resolution of
  coalesced columns. The patch allows such columns to be qualified
  with a table (and db) name, as it is in 4.1.
  Based on a patch from Monty.

* Adjusted tests accordingly to test both backwards compatible name
  resolution of qualified columns, and ANSI-style resolution of
  non-qualified columns.
  For this, each affected test has two versions - one with qualified
  columns, and one without.
 2005-08-23 18:08:04 +03:00
andrey@lmy004.
8f04f71d81 Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.0 
into lmy004.:/work/mysql-5.0-clean
 2005-08-23 16:41:28 +02:00
andrey@lmy004.
398392cdcc tests fixes 2005-08-23 13:57:12 +02:00
serg@sergbook.mysql.com
1fbb96ea97 Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/ 
into sergbook.mysql.com:/usr/home/serg/Abk/mysql-4.1
 2005-08-23 14:16:17 +04:00
dlenev@mysql.com
603dddfdb4 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/dlenev/src/mysql-5.0-bg11896
 2005-08-23 09:15:05 +04:00
igor@rurik.mysql.com
21b63441f5 Merge rurik.mysql.com:/home/igor/mysql-5.0 
into rurik.mysql.com:/home/igor/dev/mysql-5.0-0
 2005-08-22 17:46:21 -07:00
igor@rurik.mysql.com
bbd04e6bcf Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.0 
into rurik.mysql.com:/home/igor/mysql-5.0
 2005-08-22 17:33:59 -07:00
igor@rurik.mysql.com
94166de5f3 sql_show.cc: 
Database name was set incorrectly for any show command
  that used sunqueries in its where condition.
information_schema.test, information_schema.result:
  Added a test case for bug #12636.
 2005-08-22 17:32:02 -07:00
jimw@mysql.com
f70beef6c7 Use the hostname with which the user authenticated when determining which 
user to update with 'SET PASSWORD = ...'. (Bug #12302)
 2005-08-22 15:48:50 -07:00
jimw@mysql.com
247e9421fa Merge bk-internal:/home/bk/mysql-5.0 
into  mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-08-22 11:54:33 -07:00
jimw@mysql.com
bb4af4f176 Merge mysql.com:/home/jimw/my/mysql-5.0-12689 
into  mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-08-22 10:19:09 -07:00
monty@mishka.local
7767828b81 Don't write first even that contains server version 2005-08-22 19:56:36 +03:00
igor@rurik.mysql.com
8c34d8e578 Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.0 
into rurik.mysql.com:/home/igor/mysql-5.0
 2005-08-22 09:40:10 -07:00
timour@mysql.com
310afc80dd Test case for BUG#10646 
The bug itself is fixed by WL #2486.
 2005-08-22 17:34:08 +03:00
timour@mysql.com
c04138ec94 Test case for BUG#6558 - Views: create fails with JOIN ... USING 
The bug is non-view specific, and it resulted from incorrect
name resolution of natural join result columns. The bug is
fixed by WL#2486.
 2005-08-22 17:04:55 +03:00
hf@deer.(none)
bded7c984b Merge bk@192.168.21.1:/usr/home/bk/mysql-4.1 
into deer.(none):/home/hf/work/mysql-4.1.9645
 2005-08-22 18:24:17 +05:00
monty@mishka.local
49413542bd Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mishka.local:/home/my/mysql-5.0
 2005-08-22 16:06:00 +03:00
evgen@moonbone.local
f5f6ed8b78 Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into moonbone.local:/work/11398-bug-5.0-mysql
 2005-08-22 15:46:09 +04:00
osku@127.(none)
216227d8a2 Merge osalerma@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  127.(none):/home/osku/mysql-5.0
 2005-08-22 12:53:54 +03:00
jonas@eel.(none)
f4f63f0351 ndb - 
Fix merge error
 2005-08-22 11:34:33 +02:00
serg@sergbook.mysql.com
eadb86d56f after pull cleanup 2005-08-22 13:20:02 +04:00
hf@deer.(none)
45b07fd422 Merge bk@192.168.21.1:/usr/home/bk/mysql-4.1 
into deer.(none):/home/hf/work/mysql-4.1.9645
 2005-08-22 13:08:44 +05:00
jonas@eel.(none)
a58c0e7dae Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  eel.(none):/home/jonas/src/mysql-4.1-push
 2005-08-21 16:35:27 +02:00
jonas@eel.(none)
daec6e5ebd Merge eel.(none):/home/jonas/src/mysql-4.1-push 
into  eel.(none):/home/jonas/src/mysql-5.0-push
 2005-08-21 16:24:53 +02:00
jonas@eel.(none)
5823c91f88 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  eel.(none):/home/jonas/src/mysql-5.0-push
 2005-08-21 16:22:08 +02:00
monty@mishka.local
ba2ace25a9 Merge mishka.local:/tmp/skr99/mysql-5.0 
into  mishka.local:/home/my/mysql-5.0
 2005-08-21 13:05:15 +03:00
elliot@mysql.com
d9e3ad09e5 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into  mysql.com:/Users/emurphy/src/bk-clean/mysql-4.1
 2005-08-20 22:33:45 -04:00
sasha@asksasha.com
e038bfe8ff Merge spachev@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  asksasha.com:/reiser-data/mysql-dev/mysql-4.1
 2005-08-20 16:09:59 -06:00
pappa@c-4a09e253.1238-1-64736c10.cust.bredbandsbolaget.se
4084c13605 Merge c-4a09e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/mysql-4.1 
into  c-4a09e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/mysql-5.0
 2005-08-20 16:38:55 -04:00
monty@mishka.local
1c1f26d5e2 Fixes during review of new pushed code 
Fixed new bug when running a SP without a default database
 2005-08-20 11:00:00 +03:00
igor@rurik.mysql.com
1730f26caf Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.0 
into rurik.mysql.com:/home/igor/mysql-5.0
 2005-08-19 22:06:43 -07:00
igor@rurik.mysql.com
c4f677feb5 Manual merge 2005-08-19 20:21:09 -07:00
jimw@mysql.com
6240210305 Merge bk-internal:/home/bk/mysql-5.0 
into  mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-08-19 17:53:48 -07:00
elliot@mysql.com
00fd26baeb Add test that got dropped in automerge 2005-08-19 19:08:47 -04:00
jimw@mysql.com
a3c893e0b8 Fix cases where SLEEP() calls would get optimized away or cached. (Bug #12689) 2005-08-19 15:51:40 -07:00
elliot@mysql.com
bbbb56df8f Fix ctype_cp932 test to be deterministic on different machines. 2005-08-19 17:55:28 -04:00
elliot@mysql.com
55b81af671 Merge mysql.com:/home/emurphy/src/bk-clean/mysql-4.1 
into  mysql.com:/home/emurphy/src/work/mysql-5.0
 2005-08-19 15:29:30 -04:00
igor@rurik.mysql.com
55fd68ccd7 Merge rurik.mysql.com:/home/igor/mysql-4.1 
into rurik.mysql.com:/home/igor/dev/mysql-4.1-0
 2005-08-19 12:10:34 -07:00
elliot@mysql.com
d9efe655ed Bug#11338 Fixes from review (identical functionality). 2005-08-19 14:49:34 -04:00
jimw@mysql.com
dd1e0fb8c7 Merge mysql.com:/home/jimw/my/mysql-5.0-11711 
into  mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-08-19 11:40:39 -07:00
timour@mysql.com
a53d283481 Merge mysql.com:/home/timka/mysql/src/5.0-virgin 
into  mysql.com:/home/timka/mysql/src/5.0-2486
 2005-08-19 16:05:58 +03:00
konstantin@mysql.com
887fba4736 A fix and a test case for "Bug #12168 'DECLARE CONTINUE HANDLER FOR 
NOT FOUND ...' in conditional handled incorrectly".

Whenever we remove an instruction during optimization, we need to
adjust instruction numbers (ip - instruction pointer) stored in all
instructions. In addition to that, sp_instr_hpush_jump, which 
corresponds to DECLARE CONTINUE HANDLER needs adjustment for m_handler,
which holds the number of instruction with the continue handler.
In the bug report, a wrong ip stored in m_handler was pointing at 
FETCH, which resulted in an error message and abnormal SP termination.
The fix is to just remove m_handler member from sp_instr_hpush_jump,
as it's always points to the instruction next to the DECLARE
statement itself (m_ip+1).
 2005-08-19 17:03:21 +04:00
timour@mysql.com
d053a23034 Merge mysql.com:/home/timka/mysql/src/5.0-virgin 
into  mysql.com:/home/timka/mysql/src/5.0-2486
 2005-08-19 15:32:00 +03:00
timour@mysql.com
f5fc1543aa WL#2486 - natural and using join according to SQL:2003 
- Corrected problem with N-way nested natural joins in PS mode.
- Code cleanup
- More asserts to check consistency of name resolution contexts
- Fixed potential memory leak of name resolution contexts
 2005-08-19 15:22:30 +03:00
jonas@eel.(none)
4575678ff1 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  eel.(none):/home/jonas/src/mysql-5.0-push
 2005-08-19 13:40:40 +02:00
igor@rurik.mysql.com
2d32b77693 distinct.test, distinct.result: 
Added test cases for bug #12625.
sql_select.cc:
  Fixed bug #12625.
  Fixed invalid removal of constant items from the DISTINCT
  list in the function create_distinct_group.
 2005-08-19 01:57:22 -07:00
jonas@eel.(none)
c962896744 Merge eel.(none):/home/jonas/src/mysql-5.0-push 
into  eel.(none):/home/jonas/tmp/kkk/mysql-5.0
 2005-08-19 10:50:51 +02:00
bell@sanja.is.com.ua
20a052880f fixed test after merge 2005-08-19 11:38:14 +03:00
osku@127.(none)
70be812365 Merge osalerma@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  127.(none):/home/osku/mysql-5.0
 2005-08-19 11:34:04 +03:00
bell@sanja.is.com.ua
376c5307df Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0 
into  sanja.is.com.ua:/home/bell/mysql/bk/work-bug2-5.0
 2005-08-19 10:40:46 +03:00
andrey@lmy004.
a5ecf5f4b1 Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.0 
into lmy004.:/work/mysql-5.0-clean
 2005-08-19 09:14:59 +02:00
andrey@lmy004.
7f9e97f70c test fix for fix of 12591 2005-08-19 09:08:41 +02:00
bell@sanja.is.com.ua
69476be2d1 changes in row operation 2005-08-19 09:46:59 +03:00
bell@sanja.is.com.ua
a3724d2546 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0 
into  sanja.is.com.ua:/home/bell/mysql/bk/work-bug2-5.0
 2005-08-19 08:55:38 +03:00
jonas@eel.(none)
1b1d1d8d5c Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  eel.(none):/home/jonas/src/mysql-5.0-push
 2005-08-19 07:52:42 +02:00
jonas@eel.(none)
290cfe313c Merge eel.(none):/home/jonas/src/mysql-4.1-push 
into  eel.(none):/home/jonas/src/mysql-4.1
 2005-08-19 07:51:47 +02:00
jonas@eel.(none)
523039c832 ndb 
rename config.cpp -> ndb_config.cpp for case insesitive filesystems
why wasn't this done in 4.1 directly
 2005-08-19 07:48:59 +02:00
sasha@asksasha.com
c594ab7921 updated patch for BUG#4680 (incomplete DROP DATABASE breaking replication). 
We binlog the DROP TABLE for each table that was actually dropped. Per Sergei's 
suggestion a fixed buffer for the DROP TABLE query is pre-allocated from THD pool, and 
logging now is done in batches - new batch is started if the buffer becomes full.
Reduced memory usage by reusing the table list instead of accumulating a list of 
dropped table names. Also fixed the problem if the table was not actually dropped, eg
due to permissions. Extended the test case to make sure batched query 
logging does work.
 2005-08-18 21:40:14 -06:00
igor@rurik.mysql.com
6fae8f6c8d Manual merge 2005-08-18 15:18:26 -07:00
igor@rurik.mysql.com
743917759c Manual merge 2005-08-18 15:17:04 -07:00
andrey@lmy004.
0e6606c8da Merge lmy004.:/work/mysql-5.0-clean 
into lmy004.:/work/mysql-5.0-bug12591
 2005-08-18 23:40:04 +02:00
kent@mysql.com
86e5ddeb52 ps_conv.inc: 
Adjustment of float results for Windows
mysql-test-run.pl:
  Added --port to make MYSQL_DUMP and MYSQL_SHOW work on windows
have_lowercase0.inc:
  new file
 2005-08-18 22:27:12 +02:00
evgen@moonbone.local
1fc33b0533 Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into moonbone.local:/work/10624-bug-5.0-mysql
 2005-08-18 22:46:17 +04:00
dlenev@mysql.com
6c39364f85 Fix for bug #11896 "Partial locking in case of recursive trigger definitions". 
If we are in stored function or trigger we should ensure that we won't change
table that is already used by calling statement (this can damage table or
easily cause infinite loops). Particularly this means that recursive triggers
should be disallowed.
 2005-08-18 19:07:23 +04:00
jimw@mysql.com
6c3dafd07c Merge bk-internal:/home/bk/mysql-5.0 
into  mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-08-18 07:59:43 -07:00
igor@rurik.mysql.com
b5e7bfa9f2 Merge rurik.mysql.com:/home/igor/mysql-5.0 
into rurik.mysql.com:/home/igor/dev/mysql-5.0-0
 2005-08-18 05:36:22 -07:00
jonas@eel.(none)
7c70be87b7 Merge eel.(none):/home/jonas/src/mysql-5.0 
into  eel.(none):/home/jonas/src/mysql-5.0-push
 2005-08-18 14:28:13 +02:00
jonas@eel.(none)
6399a93ac2 Merge eel.(none):/home/jonas/src/mysql-4.1 
into  eel.(none):/home/jonas/src/mysql-5.0
 2005-08-18 14:25:00 +02:00
jonas@eel.(none)
96f719818c Merge eel.(none):/home/jonas/src/mysql-4.1 
into  eel.(none):/home/jonas/src/mysql-4.1-push
 2005-08-18 14:07:31 +02:00
jonas@eel.(none)
3b68047235 bug#12118 - ndb alter table data loss 
Split table version into 2 (major, minor)
  Impl. signaling to API when table has been altered
  Allow running transactions to use any minor number for transactions
 2005-08-18 14:02:25 +02:00
petr@mysql.com
cb71626268 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/usersnfs/pchardin/mysql-5.0
 2005-08-18 11:25:32 +02:00
petr@mysql.com
4fb6f4dddf Fix for Bug#11247 Stored procedures: Function calls in long loops leak memory 
and Bug#12297 SP crashes the server if data inserted inside a lon loop
Third commit attempt. With fixes to the issues, showed up after full rebuild and
tests on other hosts.
 2005-08-18 11:23:54 +02:00
bell@sanja.is.com.ua
fc070c2bcb stop on NULL comparison only if it is allowed (BUG#12509) 2005-08-18 12:07:14 +03:00
igor@rurik.mysql.com
fd5461ac12 Merge rurik.mysql.com:/home/igor/mysql-5.0 
into rurik.mysql.com:/home/igor/dev/mysql-5.0-0
 2005-08-17 22:24:20 -07:00
igor@rurik.mysql.com
5ac7d86793 view.test: 
Added a test case for bug #10970.
view.result:
  Added a test case for bug #10970.
  Modified the error messages for error ER_VIEW_SELECT_TMPTABLE.
sql_view.cc:
  Fixed bug #10970.
  In the function mysql_create_view if a view does not refer
  any tables directly the variable table must be updated
  after the call of open_and_lock_tables.
errmsg.txt:
  Modified the error messages for error ER_VIEW_SELECT_TMPTABLE
  (when fixing bug #10970).
 2005-08-17 22:19:12 -07:00
jimw@mysql.com
15f97778ff Revert patch for Bug #12595, it causes the sql_mode test to fail. 2005-08-17 19:56:14 -07:00
monty@mysql.com
c726451abb Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/my/mysql-5.0
 2005-08-18 03:41:11 +03:00
monty@mysql.com
3eaa953529 Cleanups and optimization during review of new code 2005-08-18 03:12:42 +03:00
kent@mysql.com
1476a52433 mtr_timer.pl, mysql-test-run.pl, mtr_report.pl, mtr_process.pl: 
Added suite and test case timeout
mtr_timer.pl:
  new file
 2005-08-18 00:16:44 +02:00
kent@mysql.com
adb94df296 mtr_process.pl: 
Bug#11792: Create a shell like 'mysqltest' exit status
 2005-08-18 00:07:17 +02:00
kent@mysql.com
1dddccb8e9 mtr_process.pl: 
Longer shutdown timeout, slave may be in reconnect
  HUP seem to disturb exit(), added sleep to make sure
  output is flushed
 2005-08-17 23:47:03 +02:00
bell@sanja.is.com.ua
7f48830f9e sql_view.cc: 
correct exit from mysql_create_view to restore ennvironment (BUG#12468)
view.result, view.test:
  test of CRETE VIEW in SP
 2005-08-17 22:42:53 +03:00
sasha@asksasha.com
76a59be6fb Merge spachev@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  asksasha.com:/reiser-data/mysql-dev/mysql-4.1
 2005-08-17 12:39:30 -06:00
andrey@lmy004.
4ff51a5743 fix for bug #12591 (SHOW TABLES FROM dbname produces wrong error message) 2005-08-17 17:51:10 +02:00
aivanov@mysql.com
c3de1aa84a Merge mysql.com:/home/alexi/mysql-5.0 
into  mysql.com:/home/alexi/dev/mysql-5.0-1
 2005-08-17 18:46:20 +04:00
timour@mysql.com
a55786ca70 WL#2486 - natural and using join according to SQL:2003 
- fixed a problem with RIGHT JOIN ON and enabled corresponding tests in select.test
- fixed a memory leak
 2005-08-17 17:19:31 +03:00
kent@mysql.com
e1351afcca mysql-test-run.pl, mtr_misc.pl: 
Bug#12615: Host name might not resolve, use short host name
 2005-08-17 14:40:23 +02:00