brian@zim.(none)
d15e92dc98
Merge zim.(none):/home/brian/mysql/mysql-4.1
...
into zim.(none):/home/brian/mysql/mysql-5.0
2005-09-07 10:43:22 -07:00
brian@zim.(none)
8a5c24536c
Small tweak for random read performance (we shouldn't always tell the OS that we will be doing a linear scan).
2005-09-07 10:30:06 -07:00
serg@serg.mylan
bc2d610723
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2005-09-07 18:16:51 +02:00
serg@serg.mylan
c8ae9f964e
don't crash when in XA PREPARE not all storage engines are 2pc-capable
2005-09-07 18:03:07 +02:00
sergefp@mysql.com
e5b4252481
Fix for BUG#12637: Make SPs+user variables replication work:
...
* Allocate thd->user_var_events elements on appropriate mem_root
* If several SP statements are binlogged as a single statement, collect all user var
accesses they make (grep for StoredRoutinesBinlogging for details)
2005-09-07 19:39:47 +04:00
aivanov@mysql.com
d6398c1aae
Merge mysql.com:/home/alexi/mysql-5.0
...
into mysql.com:/home/alexi/dev/mysql-5.0-0
2005-09-07 18:58:58 +04:00
aivanov@mysql.com
6ff3befd32
Merge mysql.com:/home/alexi/mysql-4.1
...
into mysql.com:/home/alexi/dev/mysql-4.1-0
2005-09-07 18:55:33 +04:00
aivanov@mysql.com
4b245a2803
join_outer.result, opt_range.cc, item_cmpfunc.cc:
...
Post merge changes
sql_yacc.yy:
Post merge changes
sql_select.cc:
Fixed bugs #12101 , #12102 : wrong calculation of not_null_tables()
for some expressions (post merge changes).
The function add_key_fields() is modified. There cannot be NOT before
BETWEEN/IN anymore. Rather Item_func_between/in objects can represent
now [NOT]BETWEEN/IN expressions.
2005-09-07 17:42:47 +04:00
bar@mysql.com
d261e1f5c5
Merge mysql.com:/usr/home/bar/mysql-4.1.b12611
...
into mysql.com:/usr/home/bar/mysql-5.0
2005-09-07 16:32:15 +05:00
bar@mysql.com
a0ddff9c6e
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/usr/home/bar/mysql-4.1.b12611
2005-09-07 16:29:53 +05:00
bar@mysql.com
33d1833994
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/usr/home/bar/mysql-5.0
2005-09-07 16:13:57 +05:00
gluh@eagle.intranet.mysql.r18.ru
f077477dca
Fix for bug#12905 show fields from view behaving erratically with current database
...
use saved view db name in case of view
2005-09-07 16:11:53 +05:00
SergeyV@selena.
784582b857
Merge selena.:H:/MYSQL/src/#05588-mysql-4.0
...
into selena.:H:/MYSQL/src/#05588-mysql-4.1
2005-09-07 14:59:41 +04:00
gluh@eagle.intranet.mysql.r18.ru
01afb3390b
Fix for bug#11775 Variable character_set_system does not exist (sometimes).
...
Variable character_set_system is selectable now
More accurate error message results during
update of character_set_system and some other read only variables
2005-09-07 15:38:09 +05:00
bar@mysql.com
cd5cd2bf79
Merge mysql.com:/usr/home/bar/mysql-4.1.b12829
...
into mysql.com:/usr/home/bar/mysql-5.0
2005-09-07 14:57:27 +05:00
sergefp@mysql.com
83b5f1a338
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/psergey/mysql-5.0-bug12941
2005-09-07 12:13:12 +04:00
bar@mysql.com
2ff61bd697
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/usr/home/bar/mysql-4.1.b12829
2005-09-07 13:12:29 +05:00
sergefp@mysql.com
99870f616d
Fix for BUG#12941: in create_tmp_field(), if the passed item is an Item_ref, put newly
...
created item into item->result_field, not *(item->ref)->result_field.
2005-09-07 11:50:41 +04:00
igor@rurik.mysql.com
af9740d0fd
func_gconcat.result, func_gconcat.test:
...
Added test cases for bug #12863 .
item_sum.cc, item_sum.h:
Fixed bug #12863 .
Added a flag to Item_func_group_concat set to FALSE after
concatenation of the first element of a group.
2005-09-06 22:20:11 -07:00
bell@sanja.is.com.ua
e3ce1a6171
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-mrg-5.0
2005-09-07 00:19:59 +03:00
aivanov@mysql.com
2165167200
Merge mysql.com:/home/alexi/dev/mysql-4.1-0
...
into mysql.com:/home/alexi/dev/mysql-5.0-0
2005-09-06 23:49:54 +04:00
eric@mysql.com
81948e621a
Merge eherman@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/Users/eric/bktmp/mysql-4.1
2005-09-06 11:38:52 -07:00
bell@sanja.is.com.ua
613c267cb0
Merge sanja.is.com.ua:/home/bell/mysql/bk/work-4.1
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-mrg-5.0
2005-09-06 21:20:19 +03:00
bell@sanja.is.com.ua
167bc61f37
postmerge fix
2005-09-06 21:18:44 +03:00
eric@mysql.com
289bdcffa9
Merge eherman@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/Users/eric/bktmp/mysql-5.0
2005-09-06 11:04:36 -07:00
bell@sanja.is.com.ua
352c7b9cbc
Merge sanja.is.com.ua:/home/bell/mysql/bk/work-4.1
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-mrg-5.0
2005-09-06 20:51:15 +03:00
anozdrin@mysql.com
b291090612
Fix for Bug#12953 "Stored procedures: crash if OPTIMIZE TABLE in function"
...
OPTIMIZE TABLE statement is forbidden from usage in stored procedures/functions.
NOTE: OPTIMIZE TABLE statement can be useful in stored procedures. The idea is
that the user/administrator can create a stored procedure for admin
tasks (optimizing, backing up, etc). This procedure can be scheduled to run
automatically (by mean of internal cron (WL#1034)). So, once we can make this
statement work, it is worth doing it.
2005-09-06 21:43:06 +04:00
SergeyV@selena.
68dee5cd27
Merge svlasenko@bk-internal.mysql.com:/home/bk/mysql-4.0
...
into selena.:H:/MYSQL/src/#05588-mysql-4.0
2005-09-06 19:46:11 +04:00
aivanov@mysql.com
fa51afedeb
item_cmpfunc.h:
...
Fixed bugs #12101 , #12102 : wrong calculation of not_null_tables()
for some expressions.
The classes Item_func_between, Item_func_if, Item_func_in are modified.
Item_func_between/in objects can represent now [NOT]BETWEEN/IN expressions.
The class Item_func_opt_neg is added to factor out the functionality
common for the modified classes Item_func_between and Item_func_in.
item_cmpfunc.cc:
Fixed bugs #12101 , #12102 : wrong calculation of not_null_tables()
for some expressions.
Added Item_func_between::fix_fields(), Item_func_if::fix_fields(),
Item_func_in::fix_fields(). They correct generic calculation of
the not_null_tables attribute when it is needed.
Modified Item_func_between::val_int(), Item_func_in::val_int().
opt_range.cc:
Fixed bugs #12101 , #12102 : wrong calculation of not_null_tables()
for some expressions.
The function get_mm_tree() is modified. There cannot be NOT before
BETWEEN/IN anymore. Rather Item_func_between/in objects can represent
now [NOT]BETWEEN/IN expressions.
sql_yacc.yy:
Fixed bugs #12101 , #12102 : wrong calculation of not_null_tables()
for some expressions.
Item_func_between/in objects can represent now [NOT]BETWEEN/IN expresions.
join_outer.result:
Fixed some testcases results (bugs #12101 , #12102 )
join_outer.test:
Added testcases for bugs #12101 , #12102
2005-09-06 18:03:08 +04:00
bell@sanja.is.com.ua
40956861b5
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-4.1
2005-09-06 17:01:23 +03:00
osku@127.(none)
084e37b88c
InnoDB: Reject foreign keys in temporary tables. Closes bug #12084 .
2005-09-06 14:38:21 +03:00
gluh@eagle.intranet.mysql.r18.ru
a5bd5e9af2
Bug #6172 RAND(a) should only accept constant values as arguments(2nd version)
...
Argument of RAND function can be constant value only
2005-09-06 16:19:59 +05:00
bar@mysql.com
d40278e041
func_like.result, func_like.test:
...
adding test case.
item_cmpfunc.cc:
Bug#12611
ESCAPE + LIKE do not work when the escape char is a multibyte one
Additional fix for 8bit character sets:
escape character must be converted into
operation character set.
2005-09-06 16:16:10 +05:00
bar@mysql.com
c71b5f4db6
mysqld.cc:
...
after merge fix
2005-09-06 15:23:03 +05:00
bar@mysql.com
cdf89955d9
item_cmpfunc.h:
...
Bug 12611 : ESCAPE + LIKE do not work when the escape char is a multibyte one
Forgot to commit this file in the previous changeset,
together with other files.
2005-09-06 14:48:18 +05:00
bar@mysql.com
51d0e0bc30
Merge mysql.com:/usr/home/bar/mysql-4.1.b9948
...
into mysql.com:/usr/home/bar/mysql-5.0
2005-09-06 14:35:36 +05:00
bell@sanja.is.com.ua
1bff548cb3
Merge sanja.is.com.ua:/home/bell/mysql/bk/work-4.0
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-4.1
2005-09-06 12:18:23 +03:00
bell@sanja.is.com.ua
10c0ef69e7
support of concurent query cache resizing (BUG#12848)
2005-09-06 11:16:53 +03:00
bar@mysql.com
6a5f00702d
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/usr/home/bar/mysql-4.1.b9948
2005-09-05 20:05:32 +05:00
bar@mysql.com
0eafb9572a
mysqld.cc, mysql_priv.h, sql_parse.cc:
...
bug#9948
changed client-charset behavior in 4.1.x libmysql, which issue BC prob
after review fixes
2005-09-05 20:00:11 +05:00
heikki@hundin.mysql.fi
4c68ccd949
row0mysql.c, ha_innodb.cc:
...
Fix bug #12308 : do not roll back the whhole transaction in a lock wait timeout error, just roll back the latest SQL statement; note that the locks set in the latest SQL statements remain, as InnoDB does not know what locks were set in which SQL statement
2005-09-05 01:13:44 +03:00
brian@zim.(none)
ffcc4ae4b1
This patch disables the query cache for the federated engine.
2005-09-04 11:25:13 -07:00
heikki@hundin.mysql.fi
bd00b6983d
ha_innodb.cc:
...
Better comments about auto-inc and SHOW TABLE STATUS
2005-09-04 13:00:03 +03:00
heikki@hundin.mysql.fi
7249c12a20
ha_innodb.cc:
...
Fix bug #12973 : set the table handle field auto_increment_value if ::info() is called with the flag HA_STATUS_AUTO
2005-09-04 12:04:21 +03:00
eric@mysql.com
5d00d56f17
Merge eherman@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/Users/eric/bktmp/mysql-5.0
2005-09-02 17:14:23 -07:00
eric@mysql.com
5a8af4cb9e
Backport of JimW's localhost patch to 4.1 tree.
...
Handle systems like default FC4 where 127.0.0.1 doesn't always map to 'localhost' first.
(Bug #11822 )
2005-09-02 17:07:05 -07:00
konstantin@mysql.com
aac74557db
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/kostja/mysql/mysql-5.0-dsql3
2005-09-03 03:25:59 +04:00
konstantin@mysql.com
38486e83c1
Implement WL#2661 "Prepared Statements: Dynamic SQL in Stored Procedures".
...
The idea of the patch is to separate statement processing logic,
such as parsing, validation of the parsed tree, execution and cleanup,
from global query processing logic, such as logging, resetting
priorities of a thread, resetting stored procedure cache, resetting
thread count of errors and warnings.
This makes PREPARE and EXECUTE behave similarly to the rest of SQL
statements and allows their use in stored procedures.
This patch contains a change in behaviour:
until recently for each SQL prepared statement command, 2 queries
were written to the general log, e.g.
[Query] prepare stmt from @stmt_text;
[Prepare] select * from t1 <-- contents of @stmt_text
The chagne was necessary to prevent [Prepare] commands from being written
to the general log when executing a stored procedure with Dynamic SQL.
We should consider whether the old behavior is preferrable and probably
restore it.
This patch refixes Bug#7115, Bug#10975 (partially), Bug#10605 (various bugs
in Dynamic SQL reported before it was disabled).
2005-09-03 03:13:18 +04:00
jimw@mysql.com
0e323e566d
Merge mysql.com:/home/jimw/my/mysql-4.1-clean
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-09-02 12:42:00 -07:00
eric@mysql.com
6e04afe8f9
delete row now pulls error message from remote server.
...
Added test cases with archive (where delete & update will always fail)
http://bugs.mysql.com/bug.php?id=12659
2005-09-02 11:40:21 -07:00
bell@sanja.is.com.ua
8553349638
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-09-02 17:06:15 +03:00
konstantin@mysql.com
a3ddcdf8fb
Rename:
...
- current_arena to stmt_arena: the thread may have more than one
'current' arenas: one for runtime data, and one for the parsed
tree of a statement. Only one of them is active at any moment.
- set_item_arena -> set_query_arena, because Item_arena was renamed to
Query_arena a while ago
- set_n_backup_item_arena -> set_n_backup_active_arena;
the active arena is the arena thd->mem_root and thd->free_list
are currently pointing at.
- restore_backup_item_arena -> restore_active_arena (with the same
rationale)
- change_arena_if_needed -> activate_stmt_arena_if_needed; this
method sets thd->stmt_arena active if it's not done yet.
2005-09-02 17:21:19 +04:00
bell@sanja.is.com.ua
d67c683404
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-09-02 15:56:14 +03:00
lars@mysql.com
198350d630
Merge mysql.com:/users/lthalmann/bk/mysql-4.1
...
into mysql.com:/users/lthalmann/bk/mysql-5.0
2005-09-02 11:01:00 +02:00
bar@mysql.com
98a5362c1e
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/usr/home/bar/mysql-4.1.b12363
2005-09-02 12:01:19 +05:00
bell@sanja.is.com.ua
2434c8af4b
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-09-02 09:51:32 +03:00
bell@sanja.is.com.ua
da64c1eab3
postmerge changes
2005-09-02 09:50:17 +03:00
bar@mysql.com
5e3eb3d21e
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/usr/home/bar/mysql-4.1.b12363
2005-09-02 11:19:43 +05:00
bar@mysql.com
50f622ab04
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/usr/home/bar/mysql-5.0
2005-09-02 10:40:06 +05:00
bar@mysql.com
252ed3a24c
sp_head.cc:
...
Fix crash reported in bug 12849.
It doesn't fix the whole problem though.
Let Pem fix it later.
2005-09-02 10:35:51 +05:00
lars@mysql.com
9d8f51fe3a
Merge mysql.com:/users/lthalmann/bkroot/mysql-4.1
...
into mysql.com:/users/lthalmann/bk/mysql-4.1-bug12542
2005-09-02 01:37:16 +02:00
dlenev@mysql.com
9dcae4c09b
Fixes after merging fix for bug #12423 "Deadlock when doing FLUSH PRIVILEGES
...
and GRANT in multi-threaded environment" into 5.0 tree.
2005-09-02 01:01:33 +04:00
bell@sanja.is.com.ua
dd7ab17059
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-09-01 22:42:37 +03:00
dlenev@mysql.com
d23732962f
Merge mysql.com:/home/dlenev/src/mysql-4.1-bg12423
...
into mysql.com:/home/dlenev/src/mysql-5.0-merges
2005-09-01 23:25:29 +04:00
lars@mysql.com
6a91b15b8e
Merge mysql.com:/users/lthalmann/bkroot/mysql-4.1
...
into mysql.com:/users/lthalmann/bk/mysql-4.1-bug12542
2005-09-01 19:03:09 +02:00
lars@mysql.com
9dd14fc381
BUG#12542: Added comments
2005-09-01 17:58:00 +02:00
dlenev@mysql.com
0683c122b6
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/dlenev/src/mysql-4.1-bg12423
2005-09-01 17:01:25 +04:00
dlenev@mysql.com
da2af0bb6d
Fix for bug #12423 "Deadlock when doing FLUSH PRIVILEGES and GRANT in
...
multi-threaded environment".
To avoid deadlocks between several simultaneously run account management
commands (particularly between FLUSH PRIVILEGES/SET PASSWORD and GRANT
commands) we should always take table and internal locks during their
execution in the same order. In other words we should first open and lock
privilege tables and only then obtain acl_cache::lock/LOCK_grant locks.
2005-09-01 16:52:59 +04:00
msvensson@neptunus.(none)
9782004002
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2005-09-01 14:49:11 +02:00
msvensson@neptunus.(none)
68778715ae
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/bug11286/my50-bug11286
2005-09-01 14:47:06 +02:00
pekka@mysql.com
cf626c2000
ndb - fix ha_ndb crash on ordered index on nullable varchar
2005-09-01 14:12:48 +02:00
msvensson@neptunus.(none)
8c0f7f82d9
Bug #11286 yassl incompatible with "load data infile"
...
- Make sure that mysqltest always uses ssl when connecting to the server.
- Pass a i32-bit int variable as argument to FIONREAD ioctl.
2005-09-01 11:46:43 +02:00
msvensson@neptunus.(none)
1efa3714aa
Bug10213 mysqldump crashes when dumping VIEWs
...
- Added testcase for this bug
- Check if compact view format can be used
- Clean up mysqld_show_create
2005-09-01 11:36:42 +02:00
msvensson@neptunus.(none)
211b78b6ee
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2005-09-01 09:05:45 +02:00
msvensson@neptunus.(none)
4b5ca92631
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into neptunus.(none):/home/msvensson/mysql/mysql-4.1
2005-09-01 09:01:15 +02:00
jimw@mysql.com
d6db387aea
Merge mysql.com:/home/jimw/my/mysql-4.1-clean
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-08-31 19:12:16 -07:00
jimw@mysql.com
c3f4ecb544
Merge mysql.com:/home/jimw/my/mysql-4.1-7156
...
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-08-31 18:34:16 -07:00
jimw@mysql.com
1d997477aa
Merge mysql.com:/home/jimw/my/mysql-4.1-clean
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-08-31 15:24:06 -07:00
evgen@moonbone.local
c23c1dc314
Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into moonbone.local:/work/12861-bug-4.1-mysql
2005-09-01 01:08:59 +04:00
evgen@moonbone.local
41fc00641c
create.test, create.result, sql_select.cc, item.cc:
...
After merge fix for bug #12537
2005-08-31 22:06:34 +04:00
evgen@moonbone.local
f917803e0c
Manual merged
2005-08-31 21:24:25 +04:00
jimw@mysql.com
37bf8394ab
Add test for madvise() being declared in C++ code, because it is not
...
on Solaris even though it is available, and declare it ourselves in
that case. (Bug #7156 )
2005-08-31 10:08:55 -07:00
lars@mysql.com
7fd89c85b7
BUG#12542: All set statements should be executed by slave thd
...
rpl_replicate_do.result:
New test case
sql_parse.cc:
All SET statements should be executed by slave thd
rpl_replicate_do.test:
New test case
2005-08-31 18:08:45 +02:00
SergeyV@selena.
341eac5d25
Merge svlasenko@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into selena.:H:/MYSQL/src/#11815-mysql-5.0
2005-08-31 18:44:02 +04:00
evgen@moonbone.local
f1fb30a15f
Fix bug #12861 client hang with group_concat insubquery FROM DUAL.
...
Item_func_group_concat::fix_fields() set maybe_null flag to 0, and set it to
1 only if some of it's arguments may be null. When used in subquery in tmp
table created field which can't be null. When no data retireved result field
have to be set to null and error mentioned in bug report occurs. Also this
bug can occur if selecting from not null field in empty table.
Function group_concat now marked maybe_null from the very beginning not only
if some of it's argument may be null.
2005-08-31 18:26:50 +04:00
heikki@hundin.mysql.fi
183feee465
ha_innodb.cc:
...
Fix bug #12410 : InnoDB was too permissive with LOCK TABLE ... READ LOCAL, and alowed new inserts to the table; we now make READ LOCAL equivalent to READ for InnoDB; note that this will cause slightly more locking in mysqldump, but makes the InnoDB table dumps consistent with MyISAM table dumps; note that the real code change patch was accidentally pushed with my another patch 5 minutes ago
2005-08-31 14:27:44 +03:00
heikki@hundin.mysql.fi
9aa5a86a80
ha_innodb.cc:
...
Fix bug #12852 : do not increment the open handle count to a table if the table does not have an .ibd file and InnoDB decides to return an error from the ::open() function; then the table can be dropped even if the user has tried to open it
2005-08-31 14:17:05 +03:00
bar@mysql.com
5d8c5e799e
Bug#12611: ESCAPE + LIKE do not work when the escape char is a multibyte one
...
item_cmpfunc.cc:
Pass unicode value as "escape" argument to my_wildcmp
if a multibyte character set is used.
For single byte character set nothing has changed:
native (non-unicode) character code is still passed.
ctype_utf8.result, ctype_utf8.test:
adding test case
2005-08-31 14:04:54 +05:00
bar@mysql.com
f2ea1ac8b8
bug#9948 changed client-charset behavior in 4.1.x libmysql, which issue BC prob
...
sql_parse.cc:
mysqld.cc:
Added --skip-client-character-set-handshake.
When this option is activated, client side character set
(which is sent in handshake) is ignored, and server side
default-character-set value is used for character_set_client
and character_set_results, thus reprodicing 4.0 behaviour.
2005-08-31 13:03:24 +05:00
ramil@mysql.com
a16da25e06
Merge mysql.com:/usr/home/ram/work/4.1.b9613
...
into mysql.com:/usr/home/ram/work/mysql-5.0
2005-08-31 10:25:00 +05:00
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
evgen@moonbone.local
6ed7255448
manual merge of bug fix#12537
2005-08-30 23:29:47 +04:00
jimw@mysql.com
513e24be9e
Merge mysql.com:/home/jimw/my/mysql-4.1-12828
...
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-08-30 12:25:50 -07:00
jimw@mysql.com
bdb2fa360a
Merge mysql.com:/home/jimw/my/mysql-4.1-12757
...
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-08-30 12:25:15 -07:00
jimw@mysql.com
0dc444ec4e
Fix incorrect spellings of "dropped" in source and tests. (Bug #12828 )
2005-08-30 12:24:37 -07:00
paul@kite-hub.kitebird.com
e55126d04d
Merge paul@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into kite-hub.kitebird.com:/src/extern/MySQL/bk/mysql-5.0
2005-08-30 13:49:46 -05:00
SergeyV@selena.
3fdd500288
Fixes bug #11815 . Convert file path to UNIX format to build correct query
...
string while replicating LOAD DATA INFILE statement.
2005-08-30 22:19:15 +04:00
paul@kite-hub.kitebird.com
dfc55d2142
ha_innodb.cc:
...
Reorder out-of-order status variables
2005-08-30 13:17:50 -05:00
paul@kite-hub.kitebird.com
16e879e837
mysqld.cc:
...
Reorder out-of-order status variables
2005-08-30 13:16:40 -05:00
paul@kite-hub.kitebird.com
939c7c687d
set_var.cc:
...
Reorder out-of-order system variables
2005-08-30 13:15:43 -05:00
brian@zim.(none)
2b0c81c984
Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into zim.(none):/home/brian/mysql/mysql-5.0
2005-08-30 11:07:48 -07:00
brian@zim.(none)
bd806f786e
Fix for bad merge.
2005-08-30 11:04:23 -07:00
paul@kite-hub.kitebird.com
19af7f8973
Manual merge.
2005-08-30 12:12:12 -05:00
paul@kite-hub.kitebird.com
9cedc58427
Merge kite-hub.kitebird.com:/tmp/merge-4.1
...
into kite-hub.kitebird.com:/tmp/merge-5.0
2005-08-30 12:11:11 -05: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.
e82e15b051
Fixes bug #5588 . vio_was_interrupted() function was added to detect
...
read timeout properly on win32.
2005-08-30 19:19:28 +04: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
osku@127.(none)
0848d8c366
Bug #11946 : Review fixes.
2005-08-30 12:39:20 +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
msvensson@neptunus.(none)
8c125455b2
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/bug12527/my50-bug12527
2005-08-30 10:46:07 +02:00
msvensson@neptunus.(none)
002eb51748
Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1
...
into neptunus.(none):/home/msvensson/mysql/bug12527/my41-bug12527
2005-08-30 10:42:41 +02:00
msvensson@neptunus.(none)
bb54b30524
Merge neptunus.(none):/home/msvensson/mysql/bug12527/my41-bug12527
...
into neptunus.(none):/home/msvensson/mysql/bug12527/my50-bug12527
2005-08-30 10:40:50 +02: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
ingo@mysql.com
3683432917
Merge mysql.com:/home/mydev/mysql-4.1
...
into mysql.com:/home/mydev/mysql-4.1-4100
2005-08-30 08:17:44 +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
pgalbraith@mysql.com
162353250e
ha_blackhole.cc:
...
Found one more missing DBUG_ENTER. compile-pentium-debug-max does not enable blackhole on 4.1!
2005-08-30 02:46:03 +02: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
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
pgalbraith@mysql.com
9f45c8f2fe
ha_blackhole.cc:
...
Added missing DBUG enter, compiled and tested on production with debug-max
build (my regular build missed the previous errors friday)
Changeset:
Added missing DBUG_ENTER, compiled and tested on production with debug-max
build!
2005-08-29 21:22:06 +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
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
paul@kite-hub.kitebird.com
4fe8e78df1
set_var.cc:
...
Reorder out-of-order system variables.
2005-08-29 12:08:04 -05:00
ingo@mysql.com
4368e9957d
After merge fix.
2005-08-29 18:41:39 +02:00
paul@frost.snake.net
6b265793c3
Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into frost.snake.net:/Volumes/frost2/MySQL/bk/mysql-4.1
2005-08-29 11:25:12 -05: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
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
msvensson@neptunus.(none)
5de2259263
Bug #12527 yassl causes errors in "repair" and "optimize"
...
- Use constant directly to check that enough number of bytes have been written as header of the archive.
2005-08-29 14:04:15 +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
sergefp@mysql.com
e13f67cd05
Fix for valgrind warning: Check for thd->binlog_evt_union.unioned_events only if
...
we were doing binlog union (i.e. need_binlog_call==TRUE)
2005-08-28 20:25:53 +04:00
paul@frost.snake.net
351c59cb5f
Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.0
...
into frost.snake.net:/Volumes/frost2/MySQL/bk/mysql-4.0
2005-08-27 22:00:22 -05:00
paul@frost.snake.net
39e5dafb91
Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into frost.snake.net:/Volumes/frost2/MySQL/bk/mysql-4.1
2005-08-27 21:52:26 -05:00
paul@frost.snake.net
848853ea5b
mysqld.cc:
...
Reorder out-of-order status variables.
2005-08-27 21:04:58 -05:00
paul@frost.snake.net
0f6a1f6565
set_var.cc:
...
Reorder out-of-order system variables.
2005-08-27 21:02:05 -05:00
paul@frost.snake.net
c0080aeba6
set_var.cc:
...
Reorder out-of-order system variables.
2005-08-27 19:20:10 -05:00
paul@frost.snake.net
458bc88563
mysqld.cc:
...
Reorder out-of-order status variables.
2005-08-27 19:18:53 -05: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)
23a51871d2
Merge deer.(none):/home/hf/work/mysql-5.0.11207
...
into deer.(none):/home/hf/work/mysql-5.0.clean
2005-08-27 18:53:54 +05:00
hf@deer.(none)
b2a1a5e7f2
Addition to the fix for #11207 (SET GLOBAL TRANSACTION ISOLATION LEVEL)
2005-08-27 18:51:11 +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
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
andrey@lmy004.
c9d9c74ac6
Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into lmy004.:/work/mysql-5.0-bug11904
2005-08-27 09:09:54 +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
057a98af4f
unireg.h:
...
Max index key length increased from 1024 to 3072
for 64 bit builds.
2005-08-27 01:50:38 +02:00
sergefp@mysql.com
5f231a5f49
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/psergey/mysql-5.0-rpl-bug
2005-08-27 02:34:05 +04:00
sergefp@mysql.com
ad9bfc251c
Slightly amended Monty's SP replication code cleanup patch
2005-08-27 02:33:06 +04:00
patg@radha.local
69114941cd
typo to DBUG_RETURN fixed
2005-08-26 20:29:26 +02:00
serg@sergbook.mysql.com
e0a7676757
Merge bk-internal:/home/bk/mysql-5.0
...
into sergbook.mysql.com:/usr/home/serg/Abk/mysql-5.0
2005-08-26 21:37:44 +04:00
serg@sergbook.mysql.com
0a0fc47ce4
bad blind change fixed
2005-08-26 21:33:13 +04: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
serg@sergbook.mysql.com
78a0585cea
after merge fix
2005-08-26 15:28:08 +04: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
serg@sergbook.mysql.com
4da4a66b64
Merge bk-internal:/home/bk/mysql-5.0
...
into sergbook.mysql.com:/usr/home/serg/Abk/mysql-5.0
2005-08-26 11:56:29 +04:00
andrey@lmy004.
7b1b3997a8
fix for bug #11904 (select statement, cursor, grouping wrong results)
2005-08-26 09:45:30 +02:00
patg@radha.local
6b4baf48a5
Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into radha.local:/Users/patg/mysql-build/mysql-4.1
2005-08-26 03:14:56 +02:00
patg@radha.local
efff75ed1a
ha_blackhole changes, same patch as http://lists.mysql.com/internals/27878 , per brian
2005-08-26 02:09:56 +02:00
kent@mysql.com
64c2d24978
libmysqld.vcproj:
...
Changed spelling "Commerical" to "Commercial"
mysqld.vcproj:
Aligned engines with Unix version
sql_class.cc:
VC7 needs my_free() cast of first arg to be (gptr)
my_global.h:
Can't assume macro set_timespec_nsec exists if set_timespec does
2005-08-25 23:24:43 +02:00
sergefp@mysql.com
2af2f47395
Merge mysqldev@production.mysql.com:my/mysql-5.0-release
...
into mysql.com:/home/psergey/mysql-5.0-bug12335-release2
2005-08-26 00:56:36 +04:00
sergefp@mysql.com
ec9768be18
Compiler error fix for ICC 8.1
2005-08-26 00:54:55 +04:00
jani@a193-229-222-105.elisa-laajakaista.fi
ff5d26d777
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-08-25 23:24:16 +03:00
joerg@mysql.com
598d0e7361
Include the new header file in an appropriate macro.
2005-08-25 21:41:50 +02:00
jimw@mysql.com
663d0bbdfb
Fix crash in DES_DECRYPT(NULL). (Bug #12757 )
2005-08-25 12:34:42 -07:00
bell@sanja.is.com.ua
e4733cc8b0
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 21:35:58 +03:00
jimw@mysql.com
f006319405
Merge mysql.com:/home/jimw/my/mysql-4.1-11707
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-08-25 09:36:51 -07: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
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
469e413f94
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/psergey/mysql-5.0-bug12335-release2
2005-08-25 18:16:20 +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