mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-02-01 11:31:51 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
25426 commits 2791 branches 343 tags 1.7 GiB
Commit graph

12132 commits

Author SHA1 Message Date
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
serg@serg.mylan
8e5b5d3be7 Merge bk-internal:/home/bk/mysql-5.0 
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
 2005-08-06 22:04:32 +02:00
serg@serg.mylan
154d4f8485 log_event.h: 
extra safety for OPTIONS_WRITTEN_TO_BIN_LOG
 2005-08-06 12:48:41 +02: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)
4aeded63fd Fix for bug #12281 (Geometry: crash in trigger) 
Field_geom lack size_of method
 2005-08-05 20:19:51 +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
patg@krsna.patg.net
518745abd4 Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-4.0 
into  krsna.patg.net:/home/patg/mysql-build/mysql-4.0
 2005-08-04 15:48:01 -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
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)
1311d4dc79 Merging 2005-08-04 16:27:53 +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
hf@deer.(none)
39ef54fd8e Fix for bug #12177 (errorlog file isn't closed) 
4.1 version of the patch
 2005-08-04 15:23:21 +05: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
georg@lmy002.wdf.sap.corp
aa044ab57a Changed/fixed error message from last commit 2005-08-04 02:06:21 +02:00
heikki@hundin.mysql.fi
7e588ac074 ha_innodb.cc: 
Fix compilation error in the fix of Bug #12263
 2005-08-03 18:53:22 +03:00
heikki@hundin.mysql.fi
353b3a2cad ha_innodb.cc: 
Fix compilation error in previous commit
 2005-08-03 18:47:50 +03:00
heikki@hundin.mysql.fi
c9c6b82404 ha_innodb.cc: 
Backport of Bug #9670 to 4.0: assertion failure in ut_a(cursor->old_stored == BTR_PCUR_OLD_STORED)
 2005-08-03 18:11:55 +03:00
heikki@hundin.mysql.fi
74fd4504bb Many files: 
Push the patch of Jan Lindstrom: better comments
ha_innodb.cc:
  Partial fix for Bug #12263 : we let InnoDB always to perform a rollback on the trx object if MySQL closes a connection; but we do print a warning to the .err log if an InnoDB transaction was active; we may remove that print later, since the situation really is not a bug; MySQL just is not aware that some cursor operation started an InnoDB transaction
 2005-08-03 17:09:21 +03: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
sergefp@mysql.com
0fc51d2003 Fixed comment 2005-08-03 10:12:31 +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
97797d91fb Merge mysql.com:/home/jimw/my/mysql-5.0-7003 
into  mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-08-02 16:50:09 -07:00
igor@rurik.mysql.com
2b70615913 Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.0 
into rurik.mysql.com:/home/igor/mysql-5.0
 2005-08-02 16:50:08 -07:00
reggie@fedora.(none)
316eff7a8e Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  fedora.(none):/home/reggie/bk/mysql-5.0
 2005-08-02 18:50:07 -05: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
reggie@fedora.(none)
3beab00b21 fix VC compile error 2005-08-02 17:25:40 -05: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
7322441dc7 Manual merge 2005-08-02 13:17:49 -07:00