pem@mysql.com
5b8bfd4d95
Merge mysql.com:/usr/local/bk/mysql-5.0
...
into mysql.com:/usr/home/pem/mysql-5.0
2005-09-13 15:40:04 +02:00
pem@mysql.com
b145ca0694
Fixed BUG#12379: PROCEDURE with HANDLER calling FUNCTION with error
...
get strange result
according to Monty's suggestions, fixing the SELECT behaviour on errors
with SP handlers. Note that some warnings from SELECT still shows up when
the handler has caught - this is an effect of another known bug (BUG#7049).
2005-09-13 15:32:42 +02:00
ramil@mysql.com
9a64991030
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/usr/home/ram/work/mysql-5.0
2005-09-13 16:54:08 +05:00
ramil@mysql.com
f402871a5e
Print a dummy section in order not to interference
...
with /etc/my.cnf and ~/.my.cnf [client] section.
2005-09-13 16:41:39 +05:00
pem@mysql.com
2865184ea2
Merge mysql.com:/usr/local/bk/mysql-5.0
...
into mysql.com:/usr/home/pem/mysql-5.0
2005-09-13 12:53:12 +02:00
timour@mysql.com
dc935404c3
Merge mysql.com:/home/timka/mysql/src/5.0-virgin
...
into mysql.com:/home/timka/mysql/src/5.0-2486
2005-09-13 13:51:25 +03:00
pem@mysql.com
c76d5768a7
Fixed BUG#13133: Local variables in stored procedures are not initialized correctly.
...
Have to init. all local variables in their frames, not just once at the beginning
of invocation.
2005-09-13 12:50:21 +02:00
jimw@mysql.com
a60ed0b75d
Merge mysql.com:/home/jimw/my/mysql-4.1-clean
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-09-12 17:00:50 -07:00
kent@mysql.com
b5dbd1c7a1
mysql-test-run.pl:
...
Corrected typo
2005-09-13 01:41:15 +02:00
jani@a193-229-222-105.elisa-laajakaista.fi
e760a58f07
Merged from 4.1 to 5.0.
2005-09-13 01:44:50 +03:00
jani@a193-229-222-105.elisa-laajakaista.fi
cb55497bdb
Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0
2005-09-13 01:11:55 +03:00
jmiller@mysql.com
9f573f0ac8
Adding comment for force manual merge 5.0 -> wl1012
2005-09-12 22:47:15 +02:00
jimw@mysql.com
7efd9582a2
Update test result
2005-09-12 12:45:03 -07:00
jani@a193-229-222-105.elisa-laajakaista.fi
01ce8a8aa9
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-09-12 20:18:49 +03:00
timour@mysql.com
d0f585f11f
BUG#12943 - post-merge fix
2005-09-12 19:18:17 +03:00
timour@mysql.com
54db60c080
Merge mysql.com:/home/timka/mysql/src/5.0-virgin
...
into mysql.com:/home/timka/mysql/src/5.0-bug-12943
2005-09-12 19:05:55 +03:00
gluh@mysql.com
c398940326
Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/gluh/MySQL/Bugs/4.1.6008
2005-09-12 20:49:48 +05:00
monty@mishka.mysql.com
bdc33e2356
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mishka.mysql.com:/home/my/mysql-4.1
2005-09-12 18:49:47 +03:00
monty@mishka.mysql.com
0965bfa832
Review fixes since last pull
...
Fix for bug #13025 ; Server crash in filesort because wrong call to handler::position()
2005-09-12 18:48:17 +03:00
bar@mysql.com
2315c4f224
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/usr/home/bar/mysql-5.0
2005-09-12 19:38:53 +05:00
bar@mysql.com
833bccfe57
Many files:
...
Adding esperanto collation
2005-09-12 19:35:50 +05:00
timour@mysql.com
9d862db743
Fix for BUG#6808.
...
The problem was in that add_table_to_list was testing for duplicate tables
in a list of tables that included the created view.
2005-09-12 17:01:17 +03:00
gluh@mysql.com
d91fb61b37
Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/gluh/MySQL/Bugs/4.1.6008
2005-09-12 17:33:21 +05:00
tulin@dl145c.mysql.com
e382a0fb12
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into dl145c.mysql.com:/home/ndbdev/tomas/mysql-5.0
2005-09-12 14:11:28 +02:00
gluh@eagle.intranet.mysql.r18.ru
d9bd3c11e4
Fix for bug #6008 : MySQL does not create warnings when creating database and using IF NOT EXISTS
...
produce warning for 'create database if not exists' if database exists
do not update database options in this case
produce warning for 'create table if not exists' if table exists
2005-09-12 17:09:19 +05:00
lars@mysql.com
fd85a82559
Merge mysql.com:/users/lthalmann/bkroot/mysql-4.1
...
into mysql.com:/users/lthalmann/bk/mysql-4.1-magnus
2005-09-12 13:00:55 +02:00
ramil@mysql.com
fa2cb2ae82
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/usr/home/ram/work/5.0.b12917
2005-09-12 15:38:21 +05:00
gluh@eagle.intranet.mysql.r18.ru
2a07350854
ps_6bdb, ps_7ndb tests failure fix
2005-09-12 14:21:38 +05:00
bar@mysql.com
2f13c5c12c
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/usr/home/bar/mysql-5.0.b12891
2005-09-12 14:09:44 +05:00
lars@mysql.com
683edc6599
Reverted old fix with sync_slave_with_master and added a replace commands
...
to eliminate nondeterminism in slave start
2005-09-12 10:50:42 +02:00
ramil@mysql.com
c4ea0e2bf8
merging
2005-09-12 12:09:44 +05:00
timour@mysql.com
7205d3716c
Merge mysql.com:/home/timka/mysql/src/5.0-virgin
...
into mysql.com:/home/timka/mysql/src/5.0-dbg
2005-09-12 09:34:58 +03:00
timour@mysql.com
6a528590d9
Fix for BUG#13067 "JOIN ... USING is case sensitive".
2005-09-12 08:28:53 +03:00
jani@a193-229-222-105.elisa-laajakaista.fi
afb613bd8e
Merged from 4.1
2005-09-11 22:10:04 +03:00
lars@mysql.com
e5503c277f
Merge mysql.com:/users/lthalmann/bkroot/mysql-4.1
...
into mysql.com:/users/lthalmann/bk/mysql-4.1-magnus
2005-09-11 13:46:36 +02:00
jani@a193-229-222-105.elisa-laajakaista.fi
91b6fe2679
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-09-11 11:07:56 +03:00
lars@mysql.com
f8594113cf
Merge mysql.com:/users/lthalmann/bk/mysql-4.1-one_shot
...
into mysql.com:/users/lthalmann/bk/mysql-5.0
2005-09-11 01:23:08 +02:00
jani@a193-229-222-105.elisa-laajakaista.fi
2917515afc
Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.1
2005-09-10 18:41:37 +03:00
timour@mysql.com
7d24bdac22
Fix for BUG#12943.
...
The problem was that in the first production in rule 'join_table', that
processes simple cross joins, the parser was processing the second join operand
before the first one due to unspecified priorities of JOINs. As a result in the
case of cross joins the parser constructed a tree with incorrect nesting:
the expression "t1 join t2 join t3 on some_cond" was interpreted as
"t1 join (t2 join t3 on some_cond)" instead of
"(t1 join t2) join t3 on some_cond".
Because of this incorrect nesting the method make_join_on_context picked an
incorrect table as the first table of the name resolution context.
The solution assignes correct priorities to the related production.
2005-09-10 15:01:54 +03:00
patg@radha.local
a237d20152
BUG #12597 after merge, needed to produce results
2005-09-10 01:50:39 +02:00
patg@radha.local
f41aa04b59
Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into radha.local:/Users/patg/mysql-build/mysql-5.0.bug12597
2005-09-10 01:50:38 +02:00
evgen@moonbone.local
94f5e80c86
Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into moonbone.local:/work/12695-bug-4.1-mysql
2005-09-10 02:31:42 +04:00
evgen@moonbone.local
99c0bf333c
insert_select.result, insert_select.test:
...
Customer's test case for bug#12695 Item_func_isnull::update_used_tables() did
not update const_item_cache.
2005-09-10 02:30:26 +04:00
patg@radha.local
15bbf4d215
Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into radha.local:/Users/patg/mysql-build/mysql-5.0.bug12597
2005-09-09 21:03:11 +02:00
jani@a193-229-222-105.elisa-laajakaista.fi
ac95c9096b
Fixed Bug#10716, Procedure Analyse results in wrong values for optimal field type
...
Added test case.
2005-09-09 20:02:13 +03:00
patg@radha.local
9faaeb2508
Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into radha.local:/Users/patg/mysql-build/mysql-5.0.bug9056
2005-09-09 18:19:47 +02:00
gluh@eagle.intranet.mysql.r18.ru
1a9cf5b63b
after merge fix
2005-09-09 17:51:13 +05:00
gluh@mysql.com
729829f3b2
manual merge
2005-09-09 16:52:44 +05:00
serg@serg.mylan
78590ad53b
aftermerge
2005-09-09 12:47:57 +02:00
serg@serg.mylan
3d7844ca89
merged
2005-09-09 12:43:25 +02:00