Commit graph

31623 commits

Author SHA1 Message Date
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
andrey@lmy004.
9228a1c51d Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into lmy004.:/work/mysql-5.1-bug16406
2006-03-02 18:48:25 +01: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)
f601d26961 Remove superfluous DBUG_PRINT 2006-03-02 17:33:34 +01:00
pem@mysql.com
fef5cf16c8 Merge mysql.com:/extern/mysql/bk/mysql-5.0
into  mysql.com:/extern/mysql/5.0/bug17476/mysql-5.0
2006-03-02 16:39:43 +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
aivanov@mysql.com
02c6cf631b Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/home/alexi/bugs/mysql-5.1-merged
2006-03-02 18:25:04 +03:00
aivanov@mysql.com
1eb5021ad1 Merge mysql.com:/home/alexi/bugs/mysql-5.0-16175
into  mysql.com:/home/alexi/bugs/mysql-5.1-16175
2006-03-02 18:16:07 +03: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
bpontz@mysql.com
7410560baf configure.in:
cloned
2006-03-02 12:24:07 +01: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
msvensson@neptunus.(none)
ece00d93c9 Merge bk-internal:/home/bk/mysql-5.0
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
2006-03-02 11:17:07 +01:00
msvensson@neptunus.(none)
e4b6f64a16 Make do_block return void, return value never used. 2006-03-02 11:10:29 +01:00
joerg@mysql.com
053a56c751 Merge mysql.com:/M50/mysql-5.0 into mysql.com:/M50/merge-5.0 2006-03-02 11:09:16 +01:00
msvensson@neptunus.(none)
ff391e9fe1 Fix unsigned warning on windows 2006-03-02 11:08:43 +01:00
joerg@mysql.com
0a90a424fe Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/M50/mysql-5.0
2006-03-02 11:07:48 +01: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
joerg@mysql.com
ff4b093d3a Merge mysql.com:/M41/merge-4.1 into mysql.com:/M50/merge-5.0 2006-03-02 11:04:05 +01: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
msvensson@neptunus.(none)
4697536963 Make the define start at "start of line" 2006-03-02 10:55:55 +01:00
serg@serg.mylan
0022bb67cb Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
into serg.mylan:/usr/home/serg/Abk/mysql-5.1
2006-03-02 10:53:01 +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
serg@serg.mylan
c7513d18db crazy - for the last week mysqlslap.test was generating 400 sigsegvs
per run, failing ALL mysql_real_connect() calls - nobody noticed,
the test always appeared to "pass".
2006-03-02 10:48:54 +01:00
joerg@mysql.com
6838660267 Merge mysql.com:/M40/mysql-4.0 into mysql.com:/M41/merge-4.1 2006-03-02 10:48:46 +01: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
joerg@mysql.com
a454821d12 Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/M50/mysql-5.0
2006-03-02 10:31:42 +01: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
andrey@lmy004.
d0b6c85411 Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into lmy004.:/work/mysql-5.1-bug16406
2006-03-02 10:03:48 +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
d25c2e9d41 Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/hf/work/mysql-5.0.9088
2006-03-02 12:35:42 +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
ingo@mysql.com
9239beafe0 Merge mysql.com:/home/mydev/mysql-5.1
into  mysql.com:/home/mydev/mysql-5.1-bug11527
2006-03-02 09:33:05 +01: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
tomas@poseidon.ndb.mysql.com
8f26bb552f 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-02 08:34:21 +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
paul@snake-hub.snake.net
fc7ca83a90 Merge snake-hub.snake.net:/src/extern/MySQL/bk/mysql-4.1
into  snake-hub.snake.net:/src/extern/MySQL/bk/mysql-4.1-r1.2478
2006-03-01 18:51:33 -06:00
paul@snake-hub.snake.net
26caa52c01 Merge snake-hub.snake.net:/src/extern/MySQL/bk/mysql-4.0
into  snake-hub.snake.net:/src/extern/MySQL/bk/mysql-4.0-r1.2173
2006-03-01 18:44:44 -06:00
paul@snake-hub.snake.net
fc6cdbded4 Merge snake-hub.snake.net:/src/extern/MySQL/bk/mysql-4.1-r1.2478
into  snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.0
2006-03-01 18:39:18 -06:00
paul@snake-hub.snake.net
31d7f7b0b5 Merge snake-hub.snake.net:/src/extern/MySQL/bk/mysql-4.0-r1.2173
into  snake-hub.snake.net:/src/extern/MySQL/bk/mysql-4.1-r1.2478
2006-03-01 18:38:19 -06:00
paul@snake-hub.snake.net
fe613502af README:
revise README.
2006-03-01 18:37:41 -06:00
paul@snake-hub.snake.net
6bdd4993a8 Merge snake-hub.snake.net:/src/extern/MySQL/bk/mysql-4.1-r1.2478
into  snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.0
2006-03-01 17:57:47 -06:00
paul@snake-hub.snake.net
32bdb2cc72 Merge snake-hub.snake.net:/src/extern/MySQL/bk/mysql-4.0-r1.2173
into  snake-hub.snake.net:/src/extern/MySQL/bk/mysql-4.1-r1.2478
2006-03-01 17:55:41 -06:00
paul@snake-hub.snake.net
be887ea830 README.gcov:
Revise README.gcov.
2006-03-01 17:55:10 -06:00
paul@snake-hub.snake.net
a3797344a2 Merge snake-hub.snake.net:/src/extern/MySQL/bk/mysql-4.1-r1.2478
into  snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.0
2006-03-01 17:48:17 -06:00