Commit graph

24281 commits

Author SHA1 Message Date
igor@rurik.mysql.com
2310050488 opt_range.cc:
Fixed a compilation error.
2005-06-28 12:00:38 -07:00
konstantin@mysql.com
f7fd222384 Fixed comments. 2005-06-28 22:49:14 +04:00
igor@rurik.mysql.com
89cabf04ba Merge rurik.mysql.com:/home/igor/mysql-5.0
into rurik.mysql.com:/home/igor/dev/mysql-5.0-0
2005-06-28 10:40:29 -07:00
konstantin@mysql.com
8b0cee88f0 A fix and a test case for Bug#10736 "mysql_stmt_attr_set
CURSOR_TYPE_READ_ONLY select within select".
The bug was caused by the reset of thd->mem_root to thd->main_mem_root in 
Item_subselect::exec, which in turn triggered too early free_root() for
data which was needed on subsequent fetches from a cursor.
This reset also caused a memory leak in stored procedures, as 
subsequent executions of instructions containing a subselect
were allocating memory in thd->main_mem_root, which is not freed
until the end of the entire SP, instead of the per-call mem_root,
which is freed in the end of execution of the instruction.
2005-06-28 20:52:15 +04:00
igor@rurik.mysql.com
451faae3c9 range.result, range.test:
Added a test case for bug #10031.
opt_range.cc:
  Fixed bug #10031: range condition was not used with
  views. Range analyzer did not take into account that
  view columns were always referred through Item_ref.
2005-06-28 07:27:00 -07:00
marko@hundin.mysql.fi
f230d35c64 Merge marko@bk-internal.mysql.com:/home/bk/mysql-4.1
into hundin.mysql.fi:/home/marko/mysql-4.1
2005-06-28 15:33:41 +03:00
igor@rurik.mysql.com
1776464568 Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-4.1
into rurik.mysql.com:/home/igor/mysql-4.1
2005-06-28 05:33:40 -07:00
monty@mysql.com
10c4678def Move reset of insert_values to ensure it's done also during error conditions
This fixed a failure of insert_update.test on some platforms
2005-06-28 15:06:16 +03:00
igor@rurik.mysql.com
04e6f472dd Merge rurik.mysql.com:/home/igor/mysql-4.1
into rurik.mysql.com:/home/igor/dev/mysql-4.1-0
2005-06-28 03:24:06 -07:00
igor@rurik.mysql.com
42bb0eaf9f Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-4.1
into rurik.mysql.com:/home/igor/mysql-4.1
2005-06-28 03:20:00 -07:00
igor@rurik.mysql.com
be1478f6f9 group_by.result, group_by.test:
Added a test case for bug #11414.
sql_select.cc:
  Fixed bug #11414: crash on Windows with some simple
  GROUP BY queries.
  It happened to an allocation of an array containing
  0 Copy_field elements in setup_copy_fields.
  The bug had been already fixed in 5.0.
2005-06-28 03:18:37 -07:00
bar@mysql.com
46536c3a60 ctype_ucs.result, ctype_ucs.test, ctype_utf8.result, ctype_utf8.test:
Fixing tests accordingly.
ctype-ucs2.c:
  The same fix for UCS2.
ctype-utf8.c:
  Bug #9557
  MyISAM utf8 table crash
  The problem was that my_strnncollsp_xxx could
  return big value in the range 0..0xffff.
  for some constant pairs it could return 32738,
  which is defined as MI_FOUND_WRONG_KEY in
  myisamdef.h. As a result, table considered to
  be crashed. 
  Fix to return -1,0 or 1.
2005-06-28 15:00:22 +05:00
marko@hundin.mysql.fi
d4901de808 Merge hundin.mysql.fi:/home/marko/mysql-4.1
into hundin.mysql.fi:/home/marko/mysql-5.0-current
2005-06-28 10:51:01 +03:00
kent@mysql.com
d16e1cafa7 make_win_src_distribution.sh:
Bug#11009, some more cleanup of unneded files from bootstrap
2005-06-28 05:25:29 +02:00
kent@mysql.com
eaec18bda6 Makefile.am:
Bug#9873, reenabled --without-man option to work
2005-06-28 04:49:03 +02:00
kent@mysql.com
7817b69d80 configure.in:
Enable build with CXX=gcc and gcc version 4
2005-06-28 04:44:27 +02:00
kent@mysql.com
fab90ce856 mysqld.dsp:
Corrected quoting of string "pro-nt"
2005-06-28 04:37:01 +02:00
kent@mysql.com
b3a00568fb opt_range.cc:
Added missing `;' to DBUG_RETURN()
2005-06-28 04:33:06 +02:00
jimw@mysql.com
3dd28e98e6 Fix typo in --default-store-engine help. (Bug #11534) 2005-06-27 10:49:40 -07:00
monty@mysql.com
ec35d6bfca Fix test after last push 2005-06-27 20:31:02 +03:00
monty@mysql.com
f23603ffeb Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/my/mysql-4.1
2005-06-27 20:31:01 +03:00
monty@mishka.local
7398252d02 Portability fixes
Fixes while reviewing new pushed code
NULL as argument to encrypt/decrypt should return NULL without a warning
2005-06-27 20:31:00 +03:00
heikki@hundin.mysql.fi
b3f1c60ed9 Many files:
Remove compiler warnings on Windows - Bug #11580
2005-06-27 18:58:32 +03:00
marko@hundin.mysql.fi
99efe90098 InnoDB: After review fixes 2005-06-27 17:25:37 +03:00
marko@hundin.mysql.fi
8064ee217f InnoDB: Optimize the extension of files. This will greatly speed
up CREATE TABLE in innodb_file_per_table=1 mode.
2005-06-27 17:04:57 +03:00
monty@mysql.com
4f5f33473c Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/my/mysql-4.1
2005-06-27 16:49:55 +03:00
monty@mishka.local
6db013ef86 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into  mishka.local:/home/my/mysql-4.1
2005-06-27 16:47:44 +03:00
monty@mishka.local
83f90e060e Better bug fix for:
#9728  'Decreased functionality in "on duplicate key update
#8147  'a column proclaimed ambigous in INSERT ... SELECT .. ON DUPLICATE'

This ensures fields are uniquely qualified and also that one can't update other tables in the ON DUPLICATE KEY UPDATE part
2005-06-27 16:46:41 +03:00
heikki@hundin.mysql.fi
1fdca62a16 Merge heikki@bk-internal.mysql.com:/home/bk/mysql-5.0
into hundin.mysql.fi:/home/heikki/mysql-5.0
2005-06-27 16:14:24 +03:00
msvensson@neptunus.(none)
7d42249bf1 Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2005-06-27 15:14:23 +02:00
msvensson@neptunus.(none)
87d681c7bb Include <sys/wait.h> to get WEXITSTATUS 2005-06-27 15:11:40 +02:00
msvensson@neptunus.(none)
5e703ebbbb Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2005-06-27 15:02:39 +02:00
msvensson@neptunus.(none)
f8472c0e49 Add "#include <stdlib.h>" to define WEXITSTATUS 2005-06-27 15:01:49 +02:00
msvensson@neptunus.(none)
dee0be6eed Simpler impl. 2005-06-27 14:26:07 +02:00
msvensson@neptunus.(none)
88c96026af Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0
into neptunus.(none):/home/msvensson/mysql/bug10466
2005-06-27 13:12:10 +02:00
msvensson@neptunus.(none)
dcb4789dcb Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2005-06-27 12:26:24 +02:00
msvensson@neptunus.(none)
58980a2cbe Merge problem fixes 2005-06-27 12:25:15 +02:00
konstantin@mysql.com
526af17380 Fix the broken test suite in -debug build. 2005-06-27 14:10:56 +04:00
msvensson@neptunus.(none)
eb41ba25e3 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2005-06-27 10:53:08 +02:00
heikki@hundin.mysql.fi
8414902ab6 Merge heikki@bk-internal.mysql.com:/home/bk/mysql-5.0
into hundin.mysql.fi:/home/heikki/mysql-5.0
2005-06-27 11:01:03 +03:00
msvensson@neptunus.(none)
13a02cfad2 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into neptunus.(none):/home/msvensson/mysql/mysql-4.1
2005-06-27 09:53:11 +02:00
georg@lmy002.wdf.sap.corp
813b077105 Fix for Intel compiler 2005-06-27 09:36:43 +02:00
igor@rurik.mysql.com
7994f27c43 Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-4.1
into rurik.mysql.com:/home/igor/mysql-4.1
2005-06-25 05:45:50 -07:00
kent@mysql.com
8771dbf4cb Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/Users/kent/mysql/bk/mysql-5.0
2005-06-25 02:01:34 +02:00
konstantin@mysql.com
9b2d517b79 Free unused JOINs early even if using subqueries. 2005-06-25 00:27:40 +04:00
konstantin@mysql.com
153861fa50 Remove an unrelevant assert. 2005-06-24 23:29:00 +04:00
konstantin@mysql.com
d725562f79 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/opt/local/work/mysql-5.0-join_free2push
2005-06-24 23:14:08 +04:00
konstantin@mysql.com
aa300fa71b Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/opt/local/work/mysql-5.0-join_free2push
2005-06-24 22:48:46 +04:00
konstantin@mysql.com
56a37f8e07 - don't call JOIN::join_free(1) twice for every join in JOIN::cleanup().
The reason it happened was that both, JOIN::cleanup() and JOIN::join_free(),
went over all nested joins and called cleanup/join_free for them.
For that:
- split recursive and non-recursive parts of JOIN::cleanup() and
JOIN::join_free()
- rename JOIN::cleanup to JOIN::destroy, as it actually destroys its
  argument
- move the recursive part of JOIN::cleanup to st_select_lex::cleanup
- move the non-recursive part of JOIN::join_free to the introduced
  method JOIN::cleanup().
2005-06-24 22:48:12 +04:00
ingo@mysql.com
ef6d371113 Merge mysql.com:/home/mydev/mysql-5.0
into mysql.com:/home/mydev/mysql-5.0-bug8321
2005-06-24 19:47:20 +02:00