1
0
mirror of https://github.com/MariaDB/server.git synced 2025-05-05 16:59:35 +03:00

1230 Commits

Author SHA1 Message Date
sergefp@mysql.com
280fda6093 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/psergey/mysql-5.0-bug8877-merge
2005-04-07 17:48:42 +04:00
sergefp@mysql.com
3f6cdec788 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/psergey/mysql-4.1-bug8877
2005-04-07 17:47:37 +04:00
sergefp@mysql.com
3005323e99 Merge mysql.com:/home/psergey/mysql-4.1-bug8877
into mysql.com:/home/psergey/mysql-5.0-bug8877-merge
2005-04-07 17:46:08 +04:00
sergefp@mysql.com
0cd5877b02 Post-review fixes: local variable renamed 2005-04-07 17:44:48 +04:00
sergefp@mysql.com
b591d3434a BUG#8877: Post-merge fixes. 2005-04-07 17:42:32 +04:00
konstantin@mysql.com
5f8d71710b Minor fix in cursors execution. 2005-04-06 22:09:43 +04:00
konstantin@mysql.com
70aecbb8a4 Refactor parts of do_select() (JOIN execution). 2005-04-06 21:48:16 +04:00
sergefp@mysql.com
ea43deb9e3 Merge mysql.com:/home/psergey/mysql-4.1-bug8877
into mysql.com:/home/psergey/mysql-5.0-bug8877-merge
2005-04-05 03:36:14 +04:00
sergefp@mysql.com
53e0b5b5db Removed extra comment 2005-04-05 03:34:39 +04:00
sergefp@mysql.com
99eb6814b2 Manually merged (will need a post-merge fix) 2005-04-05 03:07:37 +04:00
sergefp@mysql.com
d0c9b36224 Fix for BUG#8877: Implementation of
"Early NULL-values filtering for ref access" (attempt2+post-review fixes)
1. update_ref_and_keys() accumulates info about null-rejecting
predicates in in KEY_FIELD::null_rejecting, add_key_part saves
these to KEYUSE.
2. create_ref_for_key copies them to TABLE_REF.
3. add_not_null_conds adds "x IS NOT NULL" to join_tab->select_cond of
appropiate JOIN_TAB members.

Includes code cleanups: 
* add_key_field() params: s/COND/Item_func/ (as only Item_funcs are
passed to it)
* add_key_fields() params: JOIN_TAB *stat removed (wasn't used)
2005-04-05 02:42:23 +04:00
jimw@mysql.com
c2cfa5e435 Merge 2005-04-04 08:54:36 -07:00
jimw@mysql.com
5865330a9e Merge embedded server testing changes from 4.1. 2005-04-01 19:17:15 -08:00
jimw@mysql.com
16efc3e333 Merge embedded-server testing changes. 2005-04-01 16:43:35 -08:00
bell@sanja.is.com.ua
05c9defefa Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0
into sanja.is.com.ua:/home/bell/mysql/bk/work-multi-5.0
2005-04-01 13:02:29 +03:00
pekka@mysql.com
5b9bd8c0c8 Merge 2005-04-01 10:13:37 +02:00
sergefp@mysql.com
7ace3f1362 Better comment 2005-04-01 11:05:17 +04:00
bell@sanja.is.com.ua
05d4ed14e4 merge 4.1->5.0 2005-03-31 10:39:48 +03:00
jimw@mysql.com
aa4f352230 Remove result.es files and support for them, which requires splitting
up a couple of tests and adjusting the output of others. Exposes two
bugs (9472 and 9508).
2005-03-30 17:32:44 -08:00
bell@sanja.is.com.ua
c64efa6062 merge 2005-03-30 22:11:08 +03:00
ramil@mysql.com
e9dbf09dfc Merge 2005-03-30 17:07:40 +05:00
sergefp@mysql.com
86e3a378ea Fix for BUG#9213: GROUP BY returns wrong query results:
Make test_if_skip_sort_order() rebuild tab->ref if it decides to use an index
different from the index join optimizer has choosen.
2005-03-30 15:57:42 +04:00
ramil@mysql.com
1a25c55e49 A fix (bug #9401: type_timestamp segfaults mysqld) 2005-03-30 14:43:56 +05:00
bell@sanja.is.com.ua
dcdda90a11 Merge 2005-03-30 10:27:36 +03:00
bell@sanja.is.com.ua
1659dacab1 fixed mechanism of detection selection from table wich we update
(BUG##9398, BUG#8703)
fixed wrong join view detection in multi-delete which lead to server crash
2005-03-28 15:13:31 +03:00
gluh@gluh.mysql.r18.ru
6ec480910d Bug #9317: Wrong count for tables in INFORMATION_SCHEMA
there was no check of result of 
  table->file->write_row() function. When count of rows was
  more than table max_rows(HEAP table) the following recodrs
  were not inserted to the table
  -'schema_table_store_record' function is added. 
    The function checks result of write_row function
    and convert HEAP table to MyISAM if necessary
  - Result check after write_row is added into all 
    I_S function which store the records to I_S tables
2005-03-24 16:32:11 +03:00
bell@sanja.is.com.ua
4554b1f263 fixed union types merging and table related metadata (BUG#8824) 2005-03-23 08:36:48 +02:00
monty@mysql.com
f849ac68a5 Fixed newly introduced bug in ROLLUP 2005-03-22 02:36:31 +02:00
monty@mysql.com
d8b078e423 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/my/mysql-5.0
2005-03-21 23:46:11 +02:00
monty@mysql.com
a1ab786091 Cleanups during review of code
Fixed newly introduced bug in rollup
2005-03-21 23:41:28 +02:00
dlenev@mysql.com
ea8adbff36 Manual merge of csets from -build tree into main 5.0 tree. 2005-03-21 11:39:47 +03:00
igor@rurik.mysql.com
df12e29955 func_group.test, func_group.result:
Added a test case for bug #9210.
sql_select.cc:
  Fixed bug #9210.
  The function calc_group_buffer did not cover the case
  when the GROUP BY expression was decimal.
  Slightly optimized the other code.
2005-03-19 23:12:50 -08:00
jimw@mysql.com
ee2b4ec959 Eliminate warnings noticed by VC7. This includes fixing my_mmap() on
Windows to call CreateFileMapping() with correct arguments, and
propogating the introduction of query_id_t to everywhere query ids are
passed around. (Bug #8826)
2005-03-18 16:12:25 -08:00
igor@rurik.mysql.com
d53423383b Manual merge 2005-03-17 21:47:46 -08:00
igor@rurik.mysql.com
6f5fbaad59 olap.test:
Added a test case for bug #8617.
sql_select.cc:
  Fixed bug #8617.
  Queries with ROLLUP and LIMIT n returned more than n rows
  if SQL_CALC_FOUND_ROWS was used.
2005-03-17 20:18:19 -08:00
jimw@mysql.com
dcd336d79d Fix merge of sql/sql_select.cc using Igor's patch (Bug #9254) 2005-03-17 17:22:40 -08:00
gluh@gluh.mysql.r18.ru
edb4dd5366 after merge fix 2005-03-17 18:44:24 +03:00
gluh@gluh.mysql.r18.ru
b435d6e862 Merge 4.1 -> 5.0 2005-03-17 16:51:07 +03:00
igor@rurik.mysql.com
45ba13889d olap.result, olap.test:
Added a test for bug #8615.
sql_select.cc:
  Fixed bug #8615.
  This fix only removed the cause of the reported crash.
  It does not resolve other problems of rollup queries
  with DISTINCT. They were fixed in the previous patch 
  for bug 8616.
2005-03-16 15:55:04 -08:00
monty@mysql.com
594ef41b2d Cleanup during reviews
Removed some optional arguments
Fixed portability problem in federated tests
2005-03-16 16:11:01 +02:00
igor@rurik.mysql.com
ce6c390c39 olap.result, olap.test:
Added a test case for bug #8616.
item.h:
  Fixed bug #8616.
  Added class Item_null_result used in rollup processing.
sql_select.h, sql_select.cc:
  Fixed bug #8616.
  Added JOIN::rollup_write_data to cover rollup queries
  with DISTINCT. Modified other rollup methods.
2005-03-15 22:50:54 -08:00
monty@mysql.com
05acaf060c Merge with global tree 2005-03-15 16:21:08 +02:00
mskold@mysql.com
f2db341abe Removed unnecessary current_thd 2005-03-14 15:53:44 +01:00
mskold@mysql.com
7092c7dec2 WL#2353 EXPLAIN support for condition pushdown 2005-03-14 15:26:10 +01:00
konstantin@mysql.com
22915b3ad5 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/media/sda1/mysql/mysql-5.0-926
2005-03-13 23:53:30 +03:00
konstantin@mysql.com
983c75f05e WL#926 "SUM(DISTINCT) and AVG(DISTINCT)": improvement of SUM(DISTINCT) and
implementation of AVG(DISTINCT) which utilizes the approach with Fields.
The patch implemented in October is portede to the up-to-date tree 
containing DECIMAL type.
Tests for AVG(DISTINCT) (although there is not much to test provided
that SUM(DISTINCT) works), cleanups for COUNT(DISTINCT) and GROUP_CONCAT()
will follow in another changeset.
2005-03-13 23:50:43 +03:00
serg@serg.mylan
956682de1a merged 2005-03-09 14:09:06 +01:00
serg@serg.mylan
9272081ebb BUG#6635 - test_if_skip_sort_order() thought it can skip filesort
for fulltext searches too
2005-03-08 19:45:55 +01:00
monty@mysql.com
03a2302202 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/my/mysql-5.0
2005-03-04 10:48:32 +02:00
konstantin@mysql.com
fe2d63a060 Fixes for bug#8115 "Server Crash with prepared statement"
and bug#8849 "problem with insert statement with table alias's": 
make equality propagation work in stored procedures and prepared 
statements.
Equality propagation can change AND/OR structure of ON expressions,
so the fix is to provide each execution of PS/SP with it's own
copy of AND/OR tree. We have been doing that already for WHERE clauses,
now ON clauses are also copied.
2005-03-03 17:38:59 +03:00