hf@deer.(none)
50a8dbc8c2
Merge deer.(none):/home/hf/work/mysql-5.0.13820
...
into deer.(none):/home/hf/work/mysql-5.0.12267
2005-10-25 21:10:58 +05:00
hf@deer.(none)
8cd0241439
Merge deer.(none):/home/hf/work/mysql-5.0.13667
...
into deer.(none):/home/hf/work/mysql-5.0.12267
2005-10-25 21:09:37 +05:00
hf@deer.(none)
bcebef8958
Merge bk@192.168.21.1:/usr/home/bk/mysql-5.0
...
into deer.(none):/home/hf/work/mysql-5.0.12267
2005-10-25 21:08:22 +05:00
hf@deer.(none)
86e358f1c8
Merge bk@192.168.21.1:/usr/home/bk/mysql-5.0
...
into deer.(none):/home/hf/work/mysql-5.0.12267
2005-10-25 19:08:33 +05:00
ramil@mysql.com
c88f0e9c19
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/usr/home/ram/work/5.0.b14207
2005-10-25 16:06:46 +05:00
anozdrin@mysql.com
afb50a5de1
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/alik/Documents/AllProgs/MySQL/devel/5.0-bug13037
2005-10-25 13:04:46 +04:00
anozdrin@mysql.com
831de41ca6
Fix for BUG#13037: undefined variable in IF cause erroneous error-message.
2005-10-25 13:02:48 +04:00
ramil@mysql.com
70ba090d27
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/usr/home/ram/work/5.0.b10303
2005-10-25 12:19:13 +05:00
timour@mysql.com
d24027fa79
Merge mysql.com:/home/timka/mysql/src/5.0-virgin
...
into mysql.com:/home/timka/mysql/src/5.0-bug-13832
2005-10-25 09:01:47 +03:00
timour@mysql.com
f5354eba90
Fix for BUG#13832 - Unknown column t1.a in 'on clause'.
...
The cause for the bug is that the priorities of all rules/terminals
that process the FROM clause are not fully specified, and the
parser generator produces a parser that doesn't always parse
the FROM clause so that JOINs are left-associative. As a result
the final join tree produced by the parser is incorrect, which
is the cause for subsequent name resolution to fail.
2005-10-25 09:00:57 +03:00
lars@mysql.com
a9d03b67c4
Merge mysql.com:/users/lthalmann/bkroot/mysql-5.0
...
into mysql.com:/users/lthalmann/bk/mysql-5.0-enum-logtype
2005-10-25 00:23:14 +02:00
lars@mysql.com
8124629c51
Fixed enum numbering, patch 2
2005-10-24 23:09:14 +02:00
anozdrin@mysql.com
6d2934cb69
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/alik/Documents/AllProgs/MySQL/devel/5.0-bug13095
2005-10-25 00:55:31 +04:00
anozdrin@mysql.com
6105040ac4
Fix for BUG#13095: Cannot create VIEWs in prepared statements
...
- allow CREATE VIEW as well as DROP VIEW to use in prepared statements;
- fix CREATE VIEW implementation to make it work in prepared statements.
2005-10-25 00:54:04 +04:00
sergefp@mysql.com
9a101971cf
BUG#11704: Make InnoDB not to convert TL_WRITE_ONLY locks to TL_WRITE_ALLOW_WRITE in
...
OPTIMIZE TABLE.
2005-10-25 00:27:15 +04:00
lars@mysql.com
4ce4068442
Reducing risk for incorrect merges. Since we are multiple teams working on
...
different features, adding numbering to enums reduce the risk that code will
be merged incorrectly. This particular enum must have fixed values to ensure
that an upgraded server always can read old logs. I added this, since I
noticed the incorrect order in the RBR clone.
2005-10-24 19:06:32 +02:00
lars@mysql.com
fbcf26777e
Merge mysql.com:/users/lthalmann/bkroot/mysql-5.0
...
into mysql.com:/users/lthalmann/bk/mysql-5.0-hexdump
2005-10-24 17:23:45 +02:00
msvensson@neptunus.mysql.com
bb15425235
Fix for dropping a table with frm file consisting of "junk"
2005-10-24 15:05:06 +02:00
ramil@mysql.com
02c0fe62d8
a fix (bug #14207 : strange change of values CHARACTER_OCTET_LENGTH and CHARACTER_MAXIMUM_LENGTH).
2005-10-24 16:45:27 +05:00
ramil@mysql.com
de26178f75
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/usr/home/ram/work/5.0.b10303
2005-10-24 11:36:29 +05:00
pem@mysql.com
1d5aeb51da
Merge mysql.com:/usr/local/bk/mysql-5.0
...
into mysql.com:/usr/home/pem/bug13941/mysql-5.0
2005-10-21 13:24:41 +02:00
bar@mysql.com
fc771accbf
Merge abarkov@bk-internal:/home/bk/mysql-5.0
...
into mysql.com:/usr/home/bar/mysql-5.0.b12371
2005-10-21 16:24:40 +05:00
pem@mysql.com
c865f491ef
Post-review fix.
2005-10-21 13:08:00 +02:00
gluh@mysql.com
f921ca2830
Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/gluh/MySQL/Bugs/5.0.14089
2005-10-21 14:42:00 +05:00
gluh@eagle.intranet.mysql.r18.ru
e8d52711ad
fix for bug#14089 FROM list subquery always fails when
...
information_schema is current database
skip the check of I_S tables if table is derived table
2005-10-21 13:14:54 +05:00
bar@mysql.com
612c0560a4
Merge abarkov@bk-internal:/home/bk/mysql-5.0
...
into mysql.com:/usr/home/bar/mysql-5.0.b12371
2005-10-21 11:55:46 +05:00
andrey@lmy004.
991b6f1440
fix for bug #12595 (ESCAPE must be exactly 1 character long)
...
ESCAPE has length of 1 if specified and sql_mode is NO_BACKSLASH_ESCAPES
or has length of 0 or 1 in every other situation.
(approved patch applied on a up-to-date tree re-commit)
2005-10-21 04:01:52 +03:00
bar@mysql.com
7671bc00c4
Bug#12371: executing prepared statement fails (illegal mix of collations)
...
ctype_utf8.test, ctype_utf8.result:
Adding test case.
item.h:
item.cc:
Adding Item_param::safe_charset_converter
2005-10-20 11:56:27 +05:00
jimw@mysql.com
2c90e2f7a6
Merge mysql.com:/home/jimw/my/mysql-4.1-clean
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-10-19 13:47:05 -07:00
elliot@mysql.com
9b62dd1545
Merge mysql.com:/home/emurphy/src/bk-innodb/mysql-5.0
...
into mysql.com:/home/emurphy/src/bk-clean/mysql-5.0
2005-10-19 14:40:05 -04:00
lars@mysql.com
1aae3e1da1
Merge mysql.com:/users/lthalmann/bkroot/mysql-5.0
...
into mysql.com:/users/lthalmann/bk/mysql-5.0-hexdump
2005-10-19 19:42:14 +02:00
lars@mysql.com
4ccb1c6e36
mysqlbinlog --hexdump patch 4:
...
Rename last_event_info to print_event_info to better reflect the new semantics
2005-10-19 19:31:24 +02:00
elliot@mysql.com
0955163bb1
BUG#14056 Column prefix index on UTF-8 primary key column causes 'Can't find record..'
...
Applying InnoDB patch from Jan Lindstrom
2005-10-19 12:06:29 -04:00
pem@mysql.com
ca5e435f82
Fixed BUG#13941: replace() string fuction behaves badly inside stored
...
procedure
For some functions returning strings (like "replace" and "ifnull" - where
val_str() is returning a pointer into one of the parameters) - we ended
up with a dangling pointer after the new operator destroyed the reuse item
in the eval function.
A working, if not very elegant, solution is to simply copy the string in
such cases.
2005-10-19 14:54:54 +02:00
konstantin@mysql.com
bee76b78a2
A fix and a test case for Bug#13587 "Server crash when SP is created
...
without database"
2005-10-19 14:46:32 +04:00
sergefp@mysql.com
867e790dc8
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/psergey/mysql-5.0-bug12915-merge
2005-10-19 12:42:50 +04:00
sergefp@mysql.com
841a2abde0
Post-merge fixes
2005-10-19 12:41:30 +04:00
patg@krsna.patg.net
c35d32a04d
Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into krsna.patg.net:/home/patg/mysql-build/mysql-5.0.test1
2005-10-18 16:31:12 -07:00
patg@krsna.patg.net
4b71f1762e
Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into krsna.patg.net:/home/patg/mysql-build/mysql-5.0.test1
2005-10-18 16:02:24 -07:00
patg@krsna.patg.net
85f12e97c8
Re-application of earlier patch for create_where_from_key and and delete_all_rows
2005-10-18 15:54:50 -07:00
brian@zim.(none)
3cde418f27
Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into zim.(none):/home/brian/mysql/mysql-5.0
2005-10-18 15:01:50 -07:00
brian@zim.(none)
6ab502e523
Per a user request there is now support for "CHECK TABLE" where the table is an archive file.
2005-10-18 14:52:38 -07:00
sergefp@mysql.com
e7065d355c
BUG#121915: Merge 4.1->5.0
2005-10-19 01:52:06 +04:00
bell@sanja.is.com.ua
408f2619e5
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-bug4-5.0
2005-10-18 21:50:00 +03:00
bell@sanja.is.com.ua
f95489f91b
check of ACL initialization in is_acl_user() (BUG#13504)
2005-10-18 21:42:26 +03:00
jimw@mysql.com
746251a47c
Merge bk-internal:/home/bk/mysql-4.1
...
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-10-18 10:49:28 -07:00
jimw@mysql.com
e284a57c88
Merge mysql.com:/home/jimw/my/mysql-4.1-13334
...
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-10-18 09:45:12 -07:00
jimw@mysql.com
162b3de29a
Merge mysql.com:/home/jimw/my/mysql-4.1-13064
...
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-10-18 09:44:29 -07:00
jani@ua141d10.elisa.omakaista.fi
1b7a4abf59
Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1
2005-10-18 18:04:00 +03:00
jani@ua141d10.elisa.omakaista.fi
8e1dac44b4
Some fixes to avoid compiler warnings.
2005-10-18 18:03:26 +03:00