igor@rurik.mysql.com
dbec0c6e95
null_key.test, null_key.result:
...
Modified the test case for patch of the bug #12144
to display status of Handler_read_next before and
after the tested query.
2005-07-28 16:04:47 -07:00
igor@rurik.mysql.com
f31625e613
Manual merge
2005-07-28 13:39:06 -07:00
igor@rurik.mysql.com
bcbde8af22
sql_select.cc:
...
Fixed bug #12144 .
Added an optimization that avoids key access with null keys for the 'ref'
method when used in outer joins. The regilar optimization with adding
IS NOT NULL expressions is not applied for outer join on expressions as
the predicates of these expressions are not pushed down in 4.1.
null_key.result, null_key.test:
Added a test case for bug #12144 .
2005-07-28 13:31:15 -07:00
bell@sanja.is.com.ua
0cd54564bf
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-trigger-5.0
2005-07-28 22:39:59 +03:00
bell@sanja.is.com.ua
b220fc47ef
store/restore sql_mode which was in force during ctrigger creation (BUG#5891)
...
other sql_mode fixes
2005-07-28 22:39:11 +03:00
monty@mysql.com
ef1de7da1d
After merge fixes
2005-07-28 21:39:24 +03:00
jimw@mysql.com
2cb78727f6
Merge mysql.com:/home/jimw/my/mysql-5.0-10351
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-07-28 10:40:44 -07:00
monty@mysql.com
15d48525af
Merge mysql.com:/home/my/mysql-4.1
...
into mysql.com:/home/my/mysql-5.0
2005-07-28 17:09:54 +03:00
monty@mysql.com
b3cbd0048f
Cleanups during review of new code
...
Ensure mysql_close() is called if mysql_set_character_set() fails
2005-07-28 16:10:14 +03:00
marko@hundin.mysql.fi
4b0d6a3877
row_sel_store_mysql_rec(): Convert NULL true VARCHAR columns
...
correctly.
2005-07-28 12:30:52 +03:00
gluh@mysql.com
c878d14933
Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/gluh/MySQL/Merge/5.0
2005-07-28 12:02:42 +05:00
monty@mysql.com
3c12d0ae54
Added end marker for tests to make future merges easier
2005-07-28 03:22:47 +03:00
gluh@eagle.intranet.mysql.r18.ru
ef2c7812f3
Fix for bug#12127 triggers do not show in info_schema before they are used if set to the database(2nd version)
...
use db name of table which trigger belongs to
instead of thd->db name during trigger body parsing
2005-07-27 16:17:05 +05:00
ramil@mysql.com
5ac378ba15
after-merge fix
2005-07-27 15:57:00 +05:00
monty@mysql.com
af6863e7d0
Moved test for 'show full processlist' to not_embedded_server.test becasue it could fail on a slow computer where previous connections has not yet disconnected
2005-07-27 13:45:06 +03:00
ramil@mysql.com
e43dff67f5
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/usr/home/ram/work/mysql-5.0
2005-07-27 15:09:06 +05:00
jimw@mysql.com
0536bd6679
Increase allowed size of stored procedure bodies to 4GB, and
...
produce a sensible error when that limit is exceeded. (Bug #11602 )
2005-07-26 18:08:49 -07:00
igor@rurik.mysql.com
ffd08ef790
Merge rurik.mysql.com:/home/igor/mysql-5.0
...
into rurik.mysql.com:/home/igor/dev/mysql-5.0-0
2005-07-26 08:25:25 -07:00
bar@mysql.com
991e344285
Bug#10201 group_concat returns string with binary collation
...
item.cc:
After merge fixes.
func_gconcat.result:
After merge fixes
2005-07-26 14:52:33 +05:00
bar@mysql.com
0255803b4e
Merge mysql.com:/usr/home/bar/mysql-4.1.b10201
...
into mysql.com:/usr/home/bar/mysql-5.0
2005-07-26 13:25:18 +05:00
bar@mysql.com
31b1bdc52a
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/usr/home/bar/mysql-4.1.b10201
2005-07-26 12:53:06 +05:00
bar@mysql.com
0c2035b7bd
func_gconcat.result, func_gconcat.test:
...
Adding test
item_sum.cc:
Adding a call for collation/charset aggregation,
to collect attributes from the arguments. The actual bug fix.
item_func.h, item_func.cc, item.h, item.cc:
- Removing collation aggrgation functions from Item_func class
in item.cc, and adding it as non-class functions in item.cc
to be able to reuse this code for group_concat.
- Adding replacement for these functions into Item_func class
as wrappers for moved functions, to minizize patch size,
2005-07-26 12:52:02 +05:00
ramil@mysql.com
9f2624ee51
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/usr/home/ram/work/5.0.b11546
2005-07-26 12:19:35 +05:00
ramil@mysql.com
afb1ad8415
a fix (bug #11546 : Bad error message from inserting out of range values, SQL_MODE='tradition').
2005-07-26 12:18:35 +05:00
joreland@mysql.com
1b31399774
ndb - changed config
2005-07-26 09:06:37 +02:00
joreland@mysql.com
3b8275d062
Merge mysql.com:/home/jonas/src/mysql-5.0
...
into mysql.com:/home/jonas/src/mysql-5.0-push
2005-07-26 08:09:38 +02:00
joreland@mysql.com
122758e5c8
Merge mysql.com:/home/jonas/src/mysql-4.1
...
into mysql.com:/home/jonas/src/mysql-5.0
2005-07-26 08:05:06 +02:00
joreland@mysql.com
d3567611c6
Merge mysql.com:/home/jonas/src/mysql-4.1
...
into mysql.com:/home/jonas/src/mysql-4.1-push
2005-07-26 08:02:23 +02:00
joreland@mysql.com
be8d46028f
ndb_config test requires ndb
2005-07-26 07:59:10 +02:00
igor@rurik.mysql.com
62cf03f8f0
Merge rurik.mysql.com:/home/igor/mysql-5.0
...
into rurik.mysql.com:/home/igor/dev/mysql-5.0-0
2005-07-25 18:46:24 -07:00
igor@rurik.mysql.com
24d148d025
sql_select.cc:
...
Fixed bug #11412 .
Reversed the patch of cs 1.1934 for the function
create_tmp_table. Modified the function to support
tem_ref objects created for view fields.
item_buff.cc:
Fixed bug #11412 .
Modified implementation of new_Cached_item to support
cacheing of view fields.
item.h:
Fixed bug #11412 .
Changed implementation of Item_ref::get_tmp_table_field and
added Item_ref::get_tmp_table_item to support Item_ref objects
created for view fields.
view.test, view.result:
Added a test case for bug #11412 .
2005-07-25 12:57:23 -07:00
jimw@mysql.com
3409537f2a
Don't force column header to @@session.var_name if @@local.var_name
...
was used. (Bug #10724 )
2005-07-25 11:25:28 -07:00
joreland@mysql.com
01f5d4effd
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/jonas/src/mysql-4.1-push
2005-07-25 12:48:24 +02:00
joreland@mysql.com
7040b3277a
Merge mysql.com:/home/jonas/src/mysql-4.1
...
into mysql.com:/home/jonas/src/mysql-4.1-push
2005-07-25 12:42:32 +02:00
ramil@mysql.com
efc8404a40
fix (bug #11964 : ALTER TABLE gives wrong error message with sql-mode TRADITIONAL (timestamp)).
2005-07-25 14:36:07 +05:00
joreland@mysql.com
4fbc43abc1
Merge mysql.com:/home/jonas/src/mysql-5.0
...
into mysql.com:/home/jonas/src/mysql-5.0-push
2005-07-24 21:16:21 +02:00
joreland@mysql.com
0345998f5d
Merge mysql.com:/home/jonas/src/mysql-4.1
...
into mysql.com:/home/jonas/src/mysql-5.0
2005-07-24 20:41:38 +02:00
joreland@mysql.com
b285050e52
ndb - add mysql-test-run test case for ndb_config
2005-07-24 17:35:39 +02:00
georg@lmy002.wdf.sap.corp
35b66a40c2
Merge grichter@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into lmy002.wdf.sap.corp:/home/georg/work/mysql/prod/mysql-5.0
2005-07-24 08:12:20 +02:00
bell@sanja.is.com.ua
f5833989ba
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-07-23 07:55:07 +03:00
bell@sanja.is.com.ua
bfdb6ca3cf
store SERVER_MORE_RESULTS_EXISTS in key of query cache (BUG#6897)
2005-07-23 07:51:25 +03:00
jimw@mysql.com
72a6c71d08
Fix value returned from SELECT of unsigned long system
...
variables. (Bug #10351 )
2005-07-22 16:18:34 -07:00
jimw@mysql.com
d6d1a9aae2
Merge mysql.com:/home/jimw/my/mysql-5.0-11227
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-07-22 12:39:47 -07:00
jimw@mysql.com
49e5636410
Merge mysql.com:/home/jimw/my/mysql-4.1-clean
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-07-22 12:35:15 -07:00
jimw@mysql.com
535ba76b98
Merge mysql.com:/home/jimw/my/mysql-4.1-10407
...
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-07-22 11:57:34 -07:00
jimw@mysql.com
e26a344d19
Fix calculation for length of LPAD() and RPAD() reported to
...
client via mysql_fetch_fields(). (Bug #11311 )
2005-07-22 11:46:29 -07:00
bar@mysql.com
daab2160a0
Merge mysql.com:/usr/home/bar/mysql-4.1.b11987
...
into mysql.com:/usr/home/bar/mysql-5.0
2005-07-22 21:13:15 +05:00
bar@mysql.com
44a446dc07
ctype-gbk.c:
...
Bug #11987
mysql will truncate the text when the text contain GBK char:"0xA3A0" and "0xA1"
Allow to store and retrieve even unassigned GBK codes.
Like we did in Big5 earlier.
have_gbk.inc, have_gbk.require, ctype_gbk.result, ctype_gbk.test:
new file
2005-07-22 21:06:02 +05:00
georg@lmy002.wdf.sap.corp
36b9af2d02
Merge grichter@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into lmy002.wdf.sap.corp:/home/georg/work/mysql/prod/mysql-5.0
2005-07-22 15:48:07 +02:00
bar@mysql.com
894dc2fdb0
Merge mysql.com:/usr/home/bar/mysql-4.1.b11754
...
into mysql.com:/usr/home/bar/mysql-5.0
2005-07-22 14:47:13 +05:00