jimw@mysql.com
2b04134439
Report 'SYSTEM VIEW' as table_type of INFORMATION_SCHEMA views. (Bug #11711 )
2005-08-08 12:59:04 -07:00
jimw@mysql.com
a17fa23332
Merge mysql.com:/home/jimw/my/mysql-5.0-11570
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-08-08 11:43:07 -07:00
jimw@mysql.com
253d528b14
Fix error code in some tests because of merge
2005-08-08 11:42:09 -07:00
jimw@mysql.com
4cdca3486d
Merge mysql.com:/home/jimw/my/mysql-5.0-6080
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-08-08 10:12:24 -07:00
jimw@mysql.com
0a7b2963d6
Merge mysql.com:/home/jimw/my/mysql-5.0-3094
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-08-08 10:10:04 -07:00
bar@mysql.com
e6f96b4939
func_system.result, func_system.test:
...
adding test case
item_strfunc.cc:
Bug#12351
CONCAT with USER()/DATEBASE() and
a column gets strange results.
Mark created Item_str as constant, so CONCAT
cannot reuse it for optimization purposes.
2005-08-08 19:09:54 +05:00
bar@mysql.com
d7bbabf989
grant.result:
...
After merge fix
2005-08-08 19:04:11 +05:00
bar@mysql.com
27dacdc532
Merge mysql.com:/usr/home/bar/mysql-4.1.b10892
...
into mysql.com:/usr/home/bar/mysql-5.0
2005-08-08 19:04:10 +05:00
dlenev@mysql.com
615baa9f23
Fix for bug #10055 "Using stored function with information_schema causes empty
...
result set".
To enable full access to contents of I_S tables from stored functions
or statements that use them, we manipulate with thread's open tables
state and ensure that we won't cause deadlock when we open tables by
ignoring flushes and name-locks.
Building of contents of I_S.TABLES no longer requires locking of tables
since we use use handler::info() method with HA_STATUS_AUTO flag instead
of handler::update_auto_increment() for obtaining information about
auto-increment values. But this also means that handlers have to implement
support for HA_STATUS_AUTO flag (particularly InnoDB needs it).
2005-08-08 17:46:06 +04:00
bar@mysql.com
0ff109f170
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/usr/home/bar/mysql-4.1.b10892
2005-08-08 17:49:13 +05:00
bar@mysql.com
8545cf92d0
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/usr/home/bar/mysql-4.1.b10892
2005-08-08 16:22:17 +05:00
monty@mishka.local
9a422fc3e9
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mishka.local:/home/my/mysql-4.1
2005-08-08 13:19:13 +03:00
monty@mishka.local
701703824f
Fix for BUG #11642 : [Patch]es x86 Assembler and text relocations
...
Changed assembler functions to not access global variables or variables in text segement
Added wrapper function in C to longlong2str() to pass _dig_vec_upper as an argument
2005-08-08 13:18:18 +03:00
monty@mysql.com
30a51b5323
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/my/mysql-4.1
2005-08-08 13:14:29 +03:00
igor@rurik.mysql.com
88d7973da4
Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into rurik.mysql.com:/home/igor/mysql-5.0
2005-08-07 15:56:48 -07:00
ingo@mysql.com
806b5468b8
Merge mysql.com:/home/mydev/mysql-4.1-4100
...
into mysql.com:/home/mydev/mysql-5.0-5000
2005-08-08 00:10:07 +02:00
igor@rurik.mysql.com
dafbb34dfe
subselect.result:
...
Correction after manual merge.
2005-08-07 15:10:07 -07:00
ingo@mysql.com
b3eed0e49c
Merge mysql.com:/home/mydev/mysql-5.0
...
into mysql.com:/home/mydev/mysql-5.0-5000
2005-08-08 00:10:06 +02:00
igor@rurik.mysql.com
c6d1a05aa0
Manual merge
2005-08-07 15:10:06 -07:00
sergefp@mysql.com
e554e61734
Post-merge fixes
2005-08-07 22:10:05 +00:00
sergefp@mysql.com
65566e449d
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/psergey/mysql-5.0-bug11869-part3
2005-08-07 21:32:26 +00:00
sergefp@mysql.com
0dba629a5e
Manual merge
2005-08-07 21:30:46 +00:00
sergefp@mysql.com
d9ce6e8f25
BUG#11869:part 2: post-review fixes: merging into 5.0
...
We're out of bits in st_select_lex->options so make TMP_TABLE_FORCE_MYISAM ==
OPTION_FOUND_COMMENT (the latter is not used by create_tmp_table).
2005-08-07 21:21:30 +00:00
igor@rurik.mysql.com
245b4beb49
Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into rurik.mysql.com:/home/igor/mysql-4.1
2005-08-07 14:03:47 -07:00
ingo@mysql.com
fd946d42a8
Merge mysql.com:/home/mydev/mysql-4.1
...
into mysql.com:/home/mydev/mysql-4.1-4100
2005-08-07 23:03:46 +02:00
igor@rurik.mysql.com
b2a189ab07
subselect.result:
...
Added test case for bug #11867 .
Fixed results for two existing test cases.
subselect.test:
Added test case for bug #11867 .
item_subselect.cc:
Fixed bug #11867 .
Added missing code in Item_in_subselect::row_value_transformer
that caused problems for queries with
ROW(elems) IN (SELECT DISTINCT cols FROM ...).
2005-08-07 14:03:46 -07:00
sergefp@mysql.com
d820a09a68
BUG#11869: part2: post-review fixes:
...
In init_prepare_fake_select_lex() don't empty ftfunc_list. UNION's ORDER BY clause may
contain MATCH(...), for which fix_index() should be called.
2005-08-07 21:03:45 +00:00
ingo@mysql.com
1147e00274
Bug#10473 - Can't set 'key_buffer_size' system variable to ZERO
...
Give the user a warning if he tries to destroy the default key cache.
2005-08-07 20:39:17 +02:00
ingo@mysql.com
ec0c854cfa
Merge mysql.com:/home/mydev/mysql-4.1
...
into mysql.com:/home/mydev/mysql-4.1-4100
2005-08-07 18:28:08 +02:00
sergefp@mysql.com
047c34e5c8
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/psergey/mysql-4.1-bug11869-part2
2005-08-07 11:05:25 +00:00
sergefp@mysql.com
c3bac658be
Manual merge
2005-08-07 11:03:54 +00:00
acurtis@xiphis.org
015447b211
Bug#10109
...
"INSERT .. SELECT ... ON DUPLICATE KEY UPDATE fails"
Ensure that check_insert_fields() is only called once when
doing an INSERT..SELECT
2005-08-07 03:16:15 +01:00
sergefp@mysql.com
5e9545d4c4
BUG#11869 (cont'd, eliminating "table type doesn't support FULLTEXT" error):
...
When creating temporary table for UNION, pass TMP_TABLE_FORCE_MYISAM flag to
create_tmp_table if we will be using fulltext function(s) when reading from the
temp. table.
2005-08-06 21:08:28 +00:00
jimw@mysql.com
268a68ad08
Fix error message when creating a non-string field with a display
...
width beyond the maximum. (Bug #6080 )
2005-08-05 17:22:53 -07:00
igor@rurik.mysql.com
73db3fdf46
mysql_priv.h:
...
Fixed bug #12154 : a query returned: Column <name> cannot be null.
The problem was due to a bug in the function setup_table_map:
the flag maybe_null was set up incorrectly for inner tables of
nested outer joins.
join_nested.result, join_nested.test:
Added a test case for bug #12154 .
2005-08-05 16:43:35 -07:00
jimw@mysql.com
47a6320657
Always report row type of 'Fixed' for MEMORY tables. (Bug #3094 )
2005-08-05 13:19:48 -07:00
hf@deer.(none)
56b91a8c15
testcase added to fix for bug #12281 (Geometry & trigger crash)
2005-08-05 20:26:55 +05:00
ingo@mysql.com
c9e04f4642
Bug#9459 - deadlock with flush with lock, and lock table write
...
Added a check before taking a global read lock if
the own thread has a write locked table.
2005-08-05 15:37:24 +02:00
andrey@lmy004.
3a52916436
fix for bug #12315 - SHOW TABLE STATUS FROM information_schema; does not sort tablenames
2005-08-05 11:01:29 +02:00
jimw@mysql.com
995b5dd02d
Fix out-of-order results in view results file
2005-08-04 16:33:29 -07:00
jimw@mysql.com
b0c5b625d1
Merge bk-internal:/home/bk/mysql-5.0
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-08-04 14:41:16 -07:00
jimw@mysql.com
2da798c991
Update test results
2005-08-04 14:38:48 -07:00
evgen@moonbone.local
de158e94a0
Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into moonbone.local:/work/mysql-4.1-bug-12266
2005-08-05 01:03:21 +04:00
evgen@moonbone.local
1894cff045
Manual merge of #11335 bugfix
2005-08-05 00:34:42 +04:00
jimw@mysql.com
fa94e5389a
Merge mysql.com:/home/jimw/my/mysql-4.1-clean
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-08-04 12:49:23 -07:00
jimw@mysql.com
b9da417688
Update test to deal with more relaxed datetime parsing.
2005-08-04 12:45:32 -07:00
jimw@mysql.com
5ad0c87dd0
Merge mysql.com:/home/jimw/my/mysql-4.1-12328
...
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-08-04 11:00:07 -07:00
jimw@mysql.com
d0c8e929c8
Merge mysql.com:/home/jimw/my/mysql-4.1-7308
...
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-08-04 10:48:53 -07:00
evgen@moonbone.local
697836c77f
Fix bug#12266 GROUP BY DATE(LEFT(column,8)) returns result strings with reduced
...
length.
When temporary field created for DATE(LEFT(column,8)) expression, max_length
value is taken from Item_date_typecast, and it is getting it from underlaid
Item_func_left and it's max_length is 8 in given expression. And all this
results in stripping last 2 digits.
To Item_date_typecast class added its own fix_length_and_dec() function
that sets max_length value to 10, which is proper for DATE field.
2005-08-04 18:05:33 +04:00
hf@deer.(none)
570c754993
Merge bk@192.168.21.1:/usr/home/bk/mysql-5.0
...
into deer.(none):/home/hf/work/mysql-5.0.clean
2005-08-04 18:24:18 +05:00