serg@serg.mylan
ae3d815b41
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2006-01-16 18:09:04 +01:00
aivanov@mysql.com
442dcf8be7
Restore fix for bug #15108 (by ramil) erroneously erased
...
by applying innodb-5.0-ss115 snapshot.
2006-01-16 15:23:02 +03:00
aivanov@mysql.com
708f9b3ceb
Changes from the innodb-5.0-ss115 snapshot.
...
Fixed bugs:
BUG#15991: "innodb-file-per-table + symlink database + rename = crash"
BUG#15650: "DELETE with LEFT JOIN crashes server"
BUG#15308: "Problem of Order with Enum Column in Primary Key"
BUG#14189: "VARBINARY and BINARY variables: trailing space ignored"
2006-01-16 14:32:43 +03:00
konstantin@mysql.com
0a64381cee
Merge mysql.com:/opt/local/work/mysql-4.1-12734
...
into mysql.com:/opt/local/work/mysql-5.0-root
2006-01-14 19:12:07 +03:00
konstantin@mysql.com
48d48bc936
A fix and a test case for Bug#12734 " prepared statement may
...
return incorrect result set for a select SQL request"
2006-01-14 04:55:07 +03:00
sergefp@mysql.com
86daf2d493
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/psergey/mysql-5.0-bug16393-r2
2006-01-14 01:28:42 +03:00
sergefp@mysql.com
dc14d007db
BUG#16393: post-review fixes: fix comments.
2006-01-14 01:26:42 +03:00
sergefp@mysql.com
e58314d482
BUG#16393: Let the 'ref' optimizer use ON condition of nested join to construct
...
'ref' accesses to all tables that are direct children of the nested join and are
not inner wrt their siblings.
2006-01-13 23:55:30 +03:00
svoj@april.(none)
d0a5e3db9f
Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into april.(none):/home/svoj/devel/mysql/BUG13835/mysql-5.0
2006-01-13 21:30:05 +04:00
svoj@april.(none)
5581ef960a
BUG#13835: max key length is 1000 bytes when trying to create a fulltext index
...
Allow fulltext index on VARCHAR columns longer than max key length.
2006-01-13 21:25:12 +04:00
evgen@moonbone.local
cea01c7387
Merge
2006-01-13 16:27:38 +03:00
evgen@moonbone.local
02570c20bf
Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into moonbone.local:/work/15538-bug-5.0-mysql
2006-01-13 14:30:20 +03:00
evgen@moonbone.local
8dbedc9ffd
Merge
2006-01-13 12:13:50 +03:00
dlenev@mysql.com
f9ea947bdc
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/dlenev/src/mysql-5.0-bg12198-2
2006-01-13 01:56:57 +03:00
dlenev@mysql.com
d14e701446
Fix for bug #12198 "Temporary table aliasing does not work inside stored
...
functions".
We should ignore alias when we check if table was already marked as temporary
when we calculate set of tables to be prelocked. Otherwise we will erroneously
treat tables which are used in same routine and have same name but different
alias as non-temporary.
2006-01-13 01:51:56 +03:00
jani@ua141d10.elisa.omakaista.fi
4d59111a1c
Fixed a bug in merge.
2006-01-12 20:49:47 +02:00
jani@ua141d10.elisa.omakaista.fi
617585eb33
Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1
...
into ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0
2006-01-12 20:28:23 +02:00
jani@ua141d10.elisa.omakaista.fi
8c6a32b997
Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.0
...
into ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1
2006-01-12 17:47:58 +02:00
jani@ua141d10.elisa.omakaista.fi
af845f6eff
NetWare specific change to increase thread stack size.
...
Changes to Netware specific mysqld_safe.c
2006-01-12 15:10:12 +02:00
monty@mysql.com
4d0fd66bdd
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/my/mysql-4.1
2006-01-12 14:40:39 +02:00
bar@mysql.com
6301568290
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/usr/home/bar/mysql-5.0
2006-01-12 16:07:06 +04:00
bar@mysql.com
5f17cbaba4
sql_show.cc:
...
after-merge fix for
bug#15581 COALESCE function truncates mutli-byte TINYTEXT values
2006-01-12 16:05:46 +04:00
sergefp@mysql.com
40b7fab55d
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/psergey/mysql-5.0-bug16166-r2
2006-01-12 11:55:34 +03:00
sergefp@mysql.com
aa00d65ead
Fix typo bug in previous cset
2006-01-12 11:11:16 +03:00
sergefp@mysql.com
e40759e370
BUG#16166, "Can't use index_merge with FORCE INDEX": adjust the heurstics check to take into
...
account that "FORCE INDEX" disables full table scans, and not range/index_merge scans.
(with post-review fixes)
2006-01-12 10:48:27 +03:00
bar@mysql.com
0e9c8395c7
Merge mysql.com:/usr/home/bar/mysql-4.1.b15581
...
into mysql.com:/usr/home/bar/mysql-5.0
2006-01-12 11:38:09 +04:00
bar@mysql.com
45c84d0aa9
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/usr/home/bar/mysql-4.1.b15581
2006-01-12 11:13:34 +04:00
anozdrin@mysql.com
dae00c191f
Fix for BUG#15103: SHOW TRIGGERS: small output alignment problem.
2006-01-12 03:02:52 +03:00
evgen@moonbone.local
41ef34356c
Fixed bug #15538 : unchecked table absence caused server crash.
...
Absence of table in left part of LEFT/RIGHT join wasn't checked before
name resolution which resulted in NULL dereferencing and server crash.
Modified rules:
"table_ref LEFT opt_outer JOIN_SYM table_ref" and "table_ref RIGHT opt_outer
JOIN_SYM table_ref"
NULL check is moved before push_new_name_resolution_context()
2006-01-11 23:39:09 +03:00
evgen@moonbone.local
3e23d458f9
Fixed bug #15347 : Wrong result of subselect when records cache and set
...
functions are involved.
When subselect is a join with set functions and no record have been found in
it, end_send_group() sets null_row for all tables in order aggregate functions
to calculate their values correctly. Normally this null_row flag is cleared for
each table in sub_select(), but flush_cached_records() doesn't do so.
Due to this all fields from the table processed by flush_cached_records() are
always evaluated as nulls and whole select produces wrong result.
flush_cached_records() now clears null_row flag at the very beginning.
2006-01-11 23:16:21 +03:00
evgen@moonbone.local
605f62fce8
Fixed bug #15633 : Evaluation of Item_equal for non-const table caused wrong
...
select result
Item equal objects are employed only at the optimize phase. Usually they are not
supposed to be evaluated. Yet in some cases we call the method val_int() for
them. Here we have to take care of restricting the predicate such an object
represents f1=f2= ...=fn to the projection of known fields fi1=...=fik.
Added a check for field's table being const in Item_equal::val_int().
If the field's table is not const val_int() just skips that field when
evaluating Item_equal.
2006-01-11 22:49:43 +03:00
konstantin@mysql.com
4d272aba67
Merge mysql.com:/opt/local/work/mysql-4.1-root
...
into mysql.com:/opt/local/work/mysql-5.0-root
2006-01-11 17:49:56 +03:00
konstantin@mysql.com
9105d06dd6
A fix for Bug#13944 "libmysqlclient exporting sha1_result function":
...
rename sha1_* to mysql_sha1_*
2006-01-11 17:31:52 +03:00
anozdrin@mysql.com
e5d26fc446
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/alik/MySQL/devel/5.0-bug15110
2006-01-11 02:10:59 +03:00
anozdrin@mysql.com
b04b851ef9
Fix for BUG#15110: mysqldump --triggers: does not include DEFINER clause
...
There are two main idea of this fix:
- introduce a common function for server and client to split user value
(<user name>@<host name>) into user name and host name parts;
- dump DEFINER clause in correct format in mysqldump.
2006-01-11 02:07:40 +03:00
jani@ua141d10.elisa.omakaista.fi
d9d6dfea3a
Changed function prototype.
2006-01-10 19:19:56 +02:00
monty@mysql.com
2970e71ce8
Re-run fix-fields on condition if table was reopened in HANDLERREAD
2006-01-10 19:13:12 +02:00
jani@ua141d10.elisa.omakaista.fi
df801decef
Fixed refresh_status function.
2006-01-10 18:56:23 +02:00
monty@mysql.com
3143daf8ac
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/my/mysql-4.1
2006-01-10 18:03:54 +02:00
igor@rurik.mysql.com
32c7a0b62f
Merge rurik.mysql.com:/home/igor/mysql-5.0
...
into rurik.mysql.com:/home/igor/dev/mysql-5.0-0
2006-01-09 21:46:33 -08:00
igor@rurik.mysql.com
a3a2f065fb
Ajustement after merge
2006-01-09 21:44:42 -08:00
igor@rurik.mysql.com
e4b1399b5a
Merge rurik.mysql.com:/home/igor/mysql-4.1
...
into rurik.mysql.com:/home/igor/dev/mysql-4.1-0
2006-01-09 15:20:01 -08:00
monty@mysql.com
3c808fe928
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/my/mysql-4.1
2006-01-09 18:52:22 +02:00
msvensson@neptunus.(none)
33d5dc041d
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/bug15598/my50-bug15598
2006-01-09 17:18:49 +01:00
msvensson@neptunus.(none)
7bda1e9191
Merge neptunus.(none):/home/msvensson/mysql/bug15598/my41-bug15598
...
into neptunus.(none):/home/msvensson/mysql/bug15598/my50-bug15598
2006-01-09 11:16:29 +01:00
msvensson@devsrv-b.mysql.com
175a946e55
Merge msvensson@10.100.68.5:/home/msvensson/mysql/bug15598/my41-bug15598
...
into devsrv-b.mysql.com:/space/magnus/my41-bug15598
2006-01-09 10:57:28 +01:00
msvensson@neptunus.(none)
2a05a6ba87
Bug #15598 Server crashes in specific case during setting new password
...
- When acl_user->host.hostname is NULL compare it as ""
2006-01-09 10:31:07 +01:00
monty@mysql.com
1378eda3c4
After merge fix (Lines lost in manual merge)
2006-01-09 11:10:49 +02:00
monty@mysql.com
c44d6124ed
Merge mysql.com:/home/my/mysql-4.0
...
into mysql.com:/home/my/mysql-4.1
2006-01-08 19:07:49 +02:00
igor@rurik.mysql.com
bf78fd5438
Merge rurik.mysql.com:/home/igor/dev/mysql-4.1-0
...
into rurik.mysql.com:/home/igor/dev/mysql-5.0-0
2006-01-07 23:10:08 -08:00