Commit graph

6055 commits

Author SHA1 Message Date
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
bell@sanja.is.com.ua
ec3396aab3 postmerge-fix 2005-07-30 09:24:51 +03: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
hf@deer.(none)
ceb75aed65 Fix for bug #12173 (show create table crash) 2005-07-29 14:39:11 +05:00
igor@rurik.mysql.com
b66ebe504c Manual merge 2005-07-28 21:29:45 -07:00
igor@rurik.mysql.com
64e53ec5c4 Manual merge 2005-07-28 21:28:20 -07:00
igor@rurik.mysql.com
a5f2c7528c func_gconcat.result, func_gconcat.test:
Added a test case for bug #12095.
sql_class.h:
  Fixed bug #12095: a join query with GROUP_CONCAT over a single row table.
  Added a flag to the TMP_TABLE_PARAM class forcing to put constant
  items generated after elimination of a single row table into temp table
  in some cases (e.g. when GROUP_CONCAT is calculated over a single row
  table).
  bk ci sql/item_sum.cc
  Fixed bug #12095: a join query with GROUP_CONCAT over a single row table.
  If GROUP_CONCAT is calculated we always put its argument into a temp
  table, even when the argument is a constant item.
sql_select.cc:
  Fixed bug #12095: a join query with GROUP_CONCAT over one row table.
  If temp table is used to calculate GROUP_CONCAT the argument should
  be always put into this table, even when it is a constant item.
2005-07-28 19:11:29 -07:00
jimw@mysql.com
90924fcb6a Fix for handling of unsigned long options on 32-bit platforms that
allowed unintended overflows. (Bug #10351)
2005-07-28 18:22:49 -07:00
igor@rurik.mysql.com
f503c4152d null_key.test, null_key.result:
Made the test case for bug #12144 independent on other tests.
2005-07-28 17:53:51 -07:00
monty@mysql.com
8427dfd46e Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/home/my/mysql-5.0
2005-07-29 03:33:04 +03:00
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
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
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
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
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
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
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