database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-11-19 19:03:26 +03:00
Code Activity
25,695 Commits 3,280 Branches 1,098 Tags
1668c45d30066331c2062c2b75ced02fbfc9e5eb
Commit Graph

7917 Commits

Author SHA1 Message Date
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
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
kent@mysql.com
468c3ad532 mysql-test-run.pl: 
Back ported ndbcluster_support() from 5.0
  Corrected the server id handling
 2005-08-04 13:54:39 +02: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
sasha@asksasha.com
c44fe70d02 patch for BUG#4680 - drop database breaking replication if there were extra files 
in the database directory on the master
 2005-08-03 18:08:20 -06: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
48ded4ab3d 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 16:15:05 -04:00
elliot@mysql.com
fc5829d651 BUG#12330 Adding updated result file which I missed in last changeset. 
Adds --replace_column to make test results deterministic.
 2005-08-03 16:12:06 -04: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