Commit graph

6203 commits

Author SHA1 Message Date
dlenev@mysql.com
0c38d33507 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/home/dlenev/src/mysql-5.0-is
2005-08-09 11:43:55 +04:00
igor@rurik.mysql.com
253883803b Merge rurik.mysql.com:/home/igor/mysql-4.1
into rurik.mysql.com:/home/igor/dev/mysql-4.1-0
2005-08-08 16:55:29 -07:00
igor@rurik.mysql.com
73be194f96 subselect.test, subselect.result:
Added a test case for bug #12392.
item_cmpfunc.cc:
  Fixed bug #12392.
  Missing handling of rows containing NULL components
  when evaluating IN predicates caused a crash.
2005-08-08 16:51:12 -07:00
sergefp@mysql.com
c6db76b076 Fix for BUG#12228: SP cache code:
* Cleanup SP Cache code, now SP Cache only deletes sp_head objects in 
  sp_cache_flush_obsolete() invalidates all pointers to routines in the cache.
* Use new SP Cache use contract in the code.

There is no test case because it doesn't seem to be possible to cause thread races to end
the same way they end in heavy-load test. This patch removes the crash in heavy test.
2005-08-08 23:23:34 +00:00
monty@mysql.com
7b1aed3fba Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into  mysql.com:/home/my/mysql-4.1
2005-08-09 00:15:27 +03:00
monty@mysql.com
99cb083549 Review of new pushed code
- Fixed some error condtion when handling dates with 'T'
- Added extra test for bug #11867 (Wrong result with "... WHERE ROW( a, b ) IN ( SELECT DISTINCT a, b WHERE ...)" to show it's not yet fixed
- Safety fixes and cleanups
2005-08-09 00:13:49 +03:00
patg@krsna.patg.net
6128521b5b item_strfunc.cc:
BUG #11104 
      Took out the offset-=delimiter_length-1 out of the for loop. It was causing
      basically this: 
      select substring_index('the king of the the hill', 'the', -2) to not work.
      The first iteration, offset would be initialised to 24, then strstr would 
      point at 'the king of the the* hill' ('*'means right before the 
      character following), returning a offset of 16. The for loop would then 
      decrement offset by two (3 - 1), to 14, now pointing at 
      "the king of th*e the hill", _skipping_ past the 'e' in the second to last
      'the', and therefore strstr would never have a chance of matching the 
      second to last 'the', then moving on to the 'the' at the begginning of the 
      string!
      In a nutshell, offset was being decremented by too great a value, preventing
      the second to last 'the' from being ever found, hence the result of 
      'king of the the hill' from the query that is reported in the bug report
func_str.test:
  BUG #11104
  Added tests to make sure fix addresses issues in original bug report
func_str.result:
  BUG #11104 
  New results for new tests
2005-08-08 13:46:13 -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
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
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
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
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
hf@deer.(none)
176bfcab13 Merge bk@192.168.21.1:/usr/home/bk/mysql-4.1
into deer.(none):/home/hf/work/mysql-4.1.clean
2005-08-04 18:22:53 +05:00
hf@deer.(none)
293cfafd37 Merge deer.(none):/home/hf/work/mysql-4.1.clean
into deer.(none):/home/hf/work/mysql-5.0.clean
2005-08-04 16:36:14 +05:00
hf@deer.(none)
0a3a6137d8 Merge deer.(none):/home/hf/work/mysql-4.1.clean
into deer.(none):/home/hf/work/mysql-4.1.9508
2005-08-04 16:33:28 +05:00
hf@deer.(none)
b16812e6ca Merge deer.(none):/home/hf/work/mysql-4.1.clean
into deer.(none):/home/hf/work/mysql-4.1.11083
2005-08-04 16:30:36 +05:00
bar@mysql.com
1b40adcb06 grant.result, grant.test:
fixing tests accordingly
item.cc:
  Bug #10892 user variables not auto cast for comparisons
  When mixing strings with different character sets,
  and coercibility is the same, we allow conversion
  if one character set is superset for other character set.
2005-08-04 15:25:03 +05:00
jimw@mysql.com
f58e5033fb Skip two tests that fail on Windows that just reflect limitations of
that platform, not real failures. (Bug #12328, Bug #11569)
2005-08-03 17:38:55 -07:00
georg@lmy002.wdf.sap.corp
e5514f361a 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-08-04 02:07:53 +02:00
elliot@mysql.com
68b9b8802b Merge mysql.com:/Users/emurphy/src/bk-clean/mysql-4.1
into  mysql.com:/Users/emurphy/src/bk-clean/mysql-5.0
2005-08-03 15:30:33 -04:00
elliot@mysql.com
fcaff839de BUG#12330 Add --replace_column in order to make test deterministic. 2005-08-03 15:08:03 -04:00
evgen@moonbone.local
05d4c0c748 Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0
into moonbone.local:/work/mysql-5.0-bug-11934
2005-08-03 14:14:02 +04:00
sergefp@mysql.com
31a73da815 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/psergey/mysql-5.0-sp-no-lock-r7
2005-08-03 10:14:01 +00:00
georg@lmy002.wdf.sap.corp
812ea21748 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-08-03 07:36:06 +02:00
georg@lmy002.wdf.sap.corp
7251e9dbd8 Fix for bug #6859 (after Sanja's review)
Added check which throws ER_WRONG_OBJECT error in case the .frm
doesn't contain a valid table type (e.g. view or trigger)
2005-08-03 07:29:48 +02:00
sergefp@mysql.com
f595847ec0 Manual merge 2005-08-03 03:47:07 +00:00
sergefp@mysql.com
b6a6fe0849 Prelocking-free SPs, post-review fixes:
* Don't activate prelocking mode for evaluating procedure arguments when it is not necessary.
* Code structure simplification and cleanup.
* Cleanup in .test files
2005-08-03 03:37:32 +00:00
jimw@mysql.com
de46ae18c2 Merge mysql.com:/home/jimw/my/mysql-5.0-11602
into  mysql.com:/home/jimw/my/mysql-5.0-clean
2005-08-02 16:50:12 -07:00
jimw@mysql.com
42b5135c84 Merge mysql.com:/home/jimw/my/mysql-5.0-11568
into  mysql.com:/home/jimw/my/mysql-5.0-clean
2005-08-02 16:50:11 -07:00
jimw@mysql.com
698f209917 Fix test to avoid spurious failure message. (Bug #11233) 2005-08-02 16:50:10 -07:00
jimw@mysql.com
71a0d0ad4c Make lowercase_table3 get skipped on Windows, as intended. (Bug #11568) 2005-08-02 15:58:41 -07:00
jimw@mysql.com
fac058502b Generate a warning/error when DATE_SUB/ADD() functions calculate a date
that is outside the acceptable date range. (Bug #10627)
2005-08-02 15:28:09 -07:00
evgen@moonbone.local
706247caae Fix bug #11934 Two sequential FLUSH TABLES WITH READ LOCK hangs client
Bug was introduced by cset 1.1659.14.1. Before it server was silently
ignoring that lock can't be acquired because it already acquired.

This patch makes make_global_read_lock_block_commit() return without error
if lock already acquired.
2005-08-03 02:01:27 +04:00
igor@rurik.mysql.com
b5f33d2bc4 Manual merge 2005-08-02 12:09:49 -07:00
jimw@mysql.com
4340fa114e Fix parsing of dates with 'T' between date and time, as in ISO-8601
date format. (Bug #7308)
2005-08-02 11:31:01 -07:00
svoj@mysql.com
007de019ce Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-4.1
into  mysql.com:/home/svoj/devel/mysql/BUG12075/mysql-4.1
2005-08-02 14:28:30 +05:00
svoj@mysql.com
315e4efc3f Fix for BUG#12075.
FULLTEXT non-functional for big5 strings
2005-08-02 14:27:52 +05:00
svoj@mysql.com
0f98bf44ef Merge mysql.com:/home/svoj/devel/mysql/BUG11684/mysql-4.0
into  mysql.com:/home/svoj/devel/mysql/BUG11684/mysql-4.1
2005-08-02 12:12:37 +05:00
svoj@mysql.com
19fe33e16c BUG#11684 fix.
Repair crashes mysql when table has fulltext index.
2005-08-02 11:33:26 +05:00
jimw@mysql.com
48d111c8c2 Merge mysql.com:/home/jimw/my/mysql-4.1-clean
into  mysql.com:/home/jimw/my/mysql-5.0-clean
2005-08-01 17:54:57 -07:00
jimw@mysql.com
c3e40306b7 Merge mysql.com:/home/jimw/my/mysql-4.1-11402
into  mysql.com:/home/jimw/my/mysql-4.1-clean
2005-08-01 17:11:49 -07:00
jimw@mysql.com
9a5560683f Merge mysql.com:/home/jimw/my/mysql-4.1-10724
into  mysql.com:/home/jimw/my/mysql-4.1-clean
2005-08-01 17:10:35 -07:00
jimw@mysql.com
8d591d0189 Merge mysql.com:/home/jimw/my/mysql-4.1-clean
into  mysql.com:/home/jimw/my/mysql-5.0-clean
2005-08-01 17:08:38 -07:00
jimw@mysql.com
4cf8696eae Fix crash in 'INSERT DELAYED' statement that failed due to a
conflict in a unique key. (Bug #12226)
2005-08-01 17:00:03 -07:00
sasha@asksasha.com
3055ce9ecc Merge spachev@bk-internal.mysql.com:/home/bk/mysql-4.1
into  asksasha.com:/reiser-data/mysql-dev/mysql-4.1
2005-08-01 13:34:04 -06:00
mskold@mysql.com
5d3b406799 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
2005-08-01 12:05:52 +02:00
mskold@mysql.com
cc62018ff6 Merge mysql.com:/usr/local/home/marty/MySQL/mysql-5.0-release
into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
2005-08-01 11:52:07 +02:00
mskold@mysql.com
d969a9ab68 Fix for bug#12021 2005-07-31 21:33:46 +02:00
monty@mishka.local
585da2f6fd Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  mishka.local:/home/my/mysql-5.0
2005-07-31 21:09:18 +03:00
igor@rurik.mysql.com
9ee6e8c147 Merge rurik.mysql.com:/home/igor/dev/mysql-4.1-0
into rurik.mysql.com:/home/igor/dev/mysql-5.0-0
2005-07-31 04:29:34 -07:00
igor@rurik.mysql.com
620f865cbb null_key.result, null_key.test:
Modified test case for bug #12144.
2005-07-31 04:28:01 -07:00
monty@mishka.local
e73d6c25fd Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  mishka.local:/home/my/mysql-5.0
2005-07-31 12:56:02 +03:00
monty@mishka.local
8437e9c1be Fixes during review of new pushed code
Change bool in C code to my_bool
Added to mysqltest --enable_parsning and --disable_parsing to avoid to have to comment parts of tests
Added comparison of LEX_STRING's and use this to compare file types for view and trigger files.
2005-07-31 12:49:55 +03:00
igor@rurik.mysql.com
37212c07ad Merge rurik.mysql.com:/home/igor/mysql-5.0
into rurik.mysql.com:/home/igor/dev/mysql-5.0-0
2005-07-31 00:39:34 -07:00
sergefp@mysql.com
de02193bdd Added Non-prelocked SP execution: Now a PROCEDURE doesn't enter/leave prelocked mode for
its body, but lets each statement to get/release its own locks. This allows a broader set
of statements to be executed inside PROCEDUREs (but breaks replication)
This patch should fix BUG#8072, BUG#8766, BUG#9563, BUG#11126
2005-07-30 08:19:57 +00:00
bell@sanja.is.com.ua
ec3396aab3 postmerge-fix 2005-07-30 09:24:51 +03:00
sasha@asksasha.com
fa7897c62a updates for BUG#10780 - fixed slave I/O thread running status to No while attempting
to connect
2005-07-29 21:00:28 -06:00
evgen@moonbone.local
fa0ea36507 Fix bug #11335 View redefines TinyInt(1) column definition
Item_type_holder doesn't store information about length and exact type of
original item which results in redefining length to max_length and geometry 
type to longtext.

Changed the way derived tables except unions are built. Now they are created
from original field list instead of list of Item_type_holder.
2005-07-30 05:53:35 +04:00
bell@sanja.is.com.ua
4a0d64af89 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-29 23:43:07 +03:00
bell@sanja.is.com.ua
36f250a240 Added sql_mode saving to mysql_dump (BUG#5891, part 2) 2005-07-29 23:39:08 +03:00
jimw@mysql.com
4bef050cd4 Merge mysql.com:/home/jimw/my/mysql-5.0-10351
into  mysql.com:/home/jimw/my/mysql-5.0-clean
2005-07-29 09:25:11 -07:00