1
0
mirror of https://github.com/MariaDB/server.git synced 2025-11-30 05:23:50 +03:00
Commit Graph

24 Commits

Author SHA1 Message Date
Jacob Mathew
7afcee4cf6 MDEV-8954 unnecessary fetch of entire table
Merged fix into 10.2.
2017-05-01 16:04:47 -07:00
Sergei Golubchik
da4d71d10d Merge branch '10.1' into 10.2 2017-03-30 12:48:42 +02:00
iangilfillan
f0ec34002a Correct FSF address 2017-03-10 18:21:29 +01:00
Marko Mäkelä
89d80c1b0b Fix many -Wconversion warnings.
Define my_thread_id as an unsigned type, to avoid mismatch with
ulonglong.  Change some parameters to this type.

Use size_t in a few more places.

Declare many flag constants as unsigned to avoid sign mismatch
when shifting bits or applying the unary ~ operator.

When applying the unary ~ operator to enum constants, explictly
cast the result to an unsigned type, because enum constants can
be treated as signed.

In InnoDB, change the source code line number parameters from
ulint to unsigned type. Also, make some InnoDB functions return
a narrower type (unsigned or uint32_t instead of ulint;
bool instead of ibool).
2017-03-07 19:07:27 +02:00
Kentoku SHIBA
14eea2f8c2 merge spider-3.2.37 2015-10-29 07:34:53 +09:00
Kentoku SHIBA
cf3b51b1d5 Merge Spider 3.2.18 2015-02-20 00:41:26 +09:00
Kentoku SHIBA
391fddf660 Merge Spider 3.2.11 2014-09-18 09:26:30 +09:00
Kentoku SHIBA
29cf8fb348 merge Spider 3.2.4 2014-06-08 19:52:11 +09:00
Kentoku SHIBA
89441877e7 fix for MariaDB 10.0.9 2014-03-25 05:38:08 +09:00
Kentoku SHIBA
da522fc1cd fix for MariaDB 10.0.8 2014-03-25 05:32:12 +09:00
Kentoku SHIBA
f41f5f742f use handler no where clause 2014-03-25 05:24:16 +09:00
Kentoku SHIBA
3a931cdc5f casual search 2014-03-25 05:14:10 +09:00
Kentoku SHIBA
74195f40b4 current date 2014-03-25 05:10:40 +09:00
Kentoku SHIBA
51040beb6e handler clause 2014-03-25 05:00:34 +09:00
Kentoku SHIBA
993dd378b7 fix for MariaDB 10.0.7 building errors 2014-03-25 04:48:23 +09:00
Kentoku SHIBA
ad54787d55 append group by for no order by 2014-03-25 04:26:48 +09:00
Kentoku SHIBA
dc01d230ed add some direct aggregate feature. 2013-09-17 03:22:54 +09:00
Kentoku SHIBA
e9d53a384c fix a case of different linked table name for mrr. 2013-09-17 03:19:55 +09:00
Kentoku SHIBA
6458e115a0 add spider_bka_mode=2 2013-09-17 03:14:36 +09:00
Kentoku SHIBA
38c9476513 Change for mearging MariaDB 10.0.4. 2013-08-24 18:37:49 +09:00
Kentoku SHIBA
0a286927d9 Fulltext search optimization. Discard match fields. 2013-08-24 14:23:11 +09:00
Kentoku SHIBA
e48e717bef Revert change for 10.0.4. It's remerge later. 2013-08-24 14:11:23 +09:00
Sergey Vojtovich
43946c0888 MDEV4786 - merge 10.0-monty → 10.0
sql/sql_table.cc:
  Removed false assertion that HA_NO_COPY_ON_ALTER is merge specific.
  This flag is used at least by Spider and Connect.
storage/spider/ha_spider.cc:
  Renamed THD::stmt_da -> THD::get_stmt_da().
  Renamed KEY::key_parts -> KEY::user_defined_key_parts.
  Renamed ALTER_* flags -> Alter_info::ALTER_*.
storage/spider/spd_conn.cc:
  Renamed THD::stmt_da -> THD::get_stmt_da().
storage/spider/spd_db_conn.cc:
  Renamed MYSQL_ERROR -> Sql_condition.
  Renamed KEY::key_parts -> KEY::user_defined_key_parts.
storage/spider/spd_db_include.h:
  current_comment_start argument of generate_parition_syntax()
  was removed during merge.
storage/spider/spd_db_mysql.cc:
  Renamed KEY::key_parts -> KEY::user_defined_key_parts.
storage/spider/spd_ping_table.cc:
  Renamed THD::stmt_da -> THD::get_stmt_da().
storage/spider/spd_table.cc:
  Include my_getopt.h so that it exports my_defaults_file and
  my_defaults_extra_file.
  Renamed KEY::key_parts -> KEY::user_defined_key_parts.
2013-07-23 17:22:02 +04:00
Sergey Vojtovich
0b116de7c5 MDEV-4438 - Spider storage engine 2013-06-27 15:18:48 +04:00