Commit graph

11568 commits

Author SHA1 Message Date
evgen@moonbone.local
dc5949b336 Fix bug #11399 Column alias was lost during view preraration.
New item created in find_field_in_table() to fix view's item, was created 
without taking into account original item's alias. This patch checks if alias 
is set to the original item and if so sets it to newly created item.
2005-07-12 20:45:34 +04:00
monty@mysql.com
75ff7d8085 After merge fixes
Better fix for ON DUPLICATE KEY UPDATE
2005-07-04 03:24:25 +03:00
monty@mysql.com
86d7b02199 Merge with 4.1 2005-07-03 14:17:52 +03:00
bell@sanja.is.com.ua
2941da3971 do not register changes of stack variable 2005-07-03 00:51:02 +03:00
monty@mysql.com
2735d7dcf6 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/my/mysql-4.1
2005-07-02 16:13:35 +03:00
bell@sanja.is.com.ua
6201504db9 fixed difference between ps-protocol and usual execution 2005-07-02 13:16:30 +03:00
heikki@hundin.mysql.fi
a9cf7ad0d1 Merge heikki@bk-internal.mysql.com:/home/bk/mysql-5.0
into hundin.mysql.fi:/home/heikki/mysql-5.0
2005-07-01 23:16:28 +03:00
heikki@hundin.mysql.fi
4fe03b705a Many files:
Fix Bug #3300 : if innodb_locks_unsafe_for_binlog is set, release locks on rows that we do not UPDATE or DELETE
2005-07-01 20:44:35 +03:00
bell@sanja.is.com.ua
b6dc32a755 fixed create_distinct_group() to make references via ref_pointer_array 2005-07-01 20:13:07 +03:00
pem@mysql.com
549399ee9e Merge mysql.com:/usr/local/bk/mysql-5.0
into  mysql.com:/home/pem/work/mysql-5.0
2005-07-01 17:01:03 +02:00
konstantin@mysql.com
88603a0edc Fix a crash I introduced by the last push. 2005-07-01 19:01:02 +04:00
pem@mysql.com
8a85dcd1cc Merge mysql.com:/usr/local/bk/mysql-5.0
into  mysql.com:/home/pem/work/mysql-5.0
2005-07-01 15:52:42 +02:00
konstantin@mysql.com
f09b4b969c Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/opt/local/work/mysql-5.0-11172-new
2005-07-01 17:52:41 +04:00
konstantin@mysql.com
402df62bf7 Fix a valgrind warning. 2005-07-01 17:51:04 +04:00
igor@rurik.mysql.com
b46b232f3f Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.0
into rurik.mysql.com:/home/igor/mysql-5.0
2005-07-01 06:42:39 -07:00
pem@mysql.com
481bb717d7 Disabled the GOTO feature. (It's non-standard and undocumented.)
We want to have the defacto standard syntax for labels ("L:" instead of "label L;"),
and fix some known bugs, before we enable this again.
The code is left intact (#ifdef'ed SP_GOTO) and the test cases are kept in
sp-goto.test, for the future...
2005-07-01 15:25:51 +02:00
konstantin@mysql.com
b590f0dec0 - fix -ansi -pedantic error 2005-07-01 16:23:05 +04:00
konstantin@mysql.com
6cc847d0e8 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/opt/local/work/mysql-5.0-11172-new
2005-07-01 15:50:32 +04:00
konstantin@mysql.com
0efa6f86be A fix and a test case for Bug#11172 "mysql_stmt_attr_set
CURSOR_TYPE_READ_ONLY date/datetime filter server crash".
The fix adds support for Item_change_list in cursors (proper rollback
of the modified item tree).
2005-07-01 15:47:45 +04:00
igor@rurik.mysql.com
3d06031887 Merge rurik.mysql.com:/home/igor/mysql-5.0
into rurik.mysql.com:/home/igor/dev/mysql-5.0-0
2005-07-01 03:50:48 -07:00
bar@mysql.com
cff1c9c3af Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/usr/home/bar/mysql-5.0
2005-07-01 15:46:53 +05:00
igor@rurik.mysql.com
347687f71e view.result:
Fixed the results of a test for group_concat.
  After the fix foor bug #11639 the results became
  correct.
olap.result, olap.test:
  Added a test case for bug #11639.
sql_select.cc:
  Fixed bug #11639: a wrong result set when using a view
  instead of the underlying table in a rollup query 
  executed through filesort.
  The old code did not take into account that we always
  use an Item_ref object when referring to a view column.
item.h:
  Fixed bug #11639.
  Now if two Item_ref items ref1 and ref2 refer to the same field
  then ref1->eq(ref2) returns 1.
2005-07-01 03:46:08 -07:00
bell@sanja.is.com.ua
faebc3148f fix bugs found by gcc 3.4 compiler 2005-07-01 13:27:23 +03:00
bar@mysql.com
48f34a0bc5 sql_table.cc:
Bug#11657 Creation of secondary index fails:

  If TINYBLOB key part length is 255, it is equal
  to field length. For BLOB, unlike for CHAR/VARCHAR,
  we should keep a non-zero key part length, otherwise
  "BLOB/TEXT column used in key specification without a key length"
  error is produced afterwards.

type_blob.result, type_blob.test:
  fixing tests accordinly
2005-07-01 15:07:06 +05:00
monty@mysql.com
3d02b808ba Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/my/mysql-4.1
2005-07-01 10:07:01 +03:00
monty@mysql.com
e3a4c1a6b2 Optimization during review
Add extra check to delete [] to ensure we are not deleting not allocated data
2005-07-01 09:40:05 +03:00
bell@sanja.is.com.ua
d3905f3d0e Name resolution context added (BUG#6443) 2005-07-01 07:05:42 +03:00
pem@mysql.comhem.se
d8cb0cbc3f Fixing comment format in sp_head.cc. 2005-06-30 18:36:13 +02:00
pem@mysql.comhem.se
fda325b943 Fixed BUG#11529: crash server after use stored procedure
Make sure to cleanup the items for a cursor query after each open, otherwise
it's done too late, after the run-time mem_root is freed.
2005-06-30 18:07:06 +02:00
jani@ua141d10.elisa.omakaista.fi
b60175f9c4 Fixed Bug#11226 and reverted fix for Bug#6993.
Using 8 bytes for data pointer does not work at least on
all computers. The result may become 0 or negative number.
(mysqld, myisamchk)
2005-06-30 16:13:22 +03:00
konstantin@mysql.com
f60ebc4815 A fix and a test case for Bug#10794 "mysql_stmt_attr_set no
open cursor after mysql_stmt_execute" + post-review fixes.
The bug was caused by wrong flags in stmt->server_status on the client
side: if there was no cursor, the server didn't send server_status
flags to the client, and the old flags were used to set up the
fetch function of a statement. Consequently, stmt_read_row_from_cursor was
used when there was no cursor. The fix fixes the server to always
send server flags to the client.
2005-06-30 16:17:10 +04:00
marty@linux.site
e4aedcc2c1 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
into  linux.site:/home/marty/MySQL/mysql-5.0
2005-06-30 12:20:52 +02:00
ramil@mysql.com
2eea2f5208 a fix.
bug #10617: Insert from same table to same table give incorrect result for bit(4) column.
bug #11091: union involving BIT: assertion failure in Item::tmp_table_field_from_field_type
bug #11572: MYSQL_TYPE_BIT not taken care of in temp. table creation for VIEWs
2005-06-30 13:38:29 +05:00
heikki@hundin.mysql.fi
f9bc3cb53b Merge heikki@bk-internal.mysql.com:/home/bk/mysql-5.0
into hundin.mysql.fi:/home/heikki/mysql-5.0
2005-06-29 20:59:21 +03:00
heikki@hundin.mysql.fi
c73914977c ha_innodb.cc:
Let InnoDB use a consistent read when it initializes the auto-inc counter for a table: this will eliminate spurious deadlocks, but will ignore an UPDATE if that happens at the same time that we init the auto-inc counter; this has to be documented; this path also fixes most of Bug #11633, but not all: if ::external_lock() is not called on the table in SHOW TABLE STATUS, that might cause a crash if someone simultaneously DROPs the table
2005-06-29 20:52:22 +03:00
jani@a193-229-222-105.elisa-laajakaista.fi
3df73db1cf Applied some Netware related patches. 2005-06-29 14:02:11 +03:00
igor@rurik.mysql.com
ce53a3f229 Merge rurik.mysql.com:/home/igor/mysql-4.1
into rurik.mysql.com:/home/igor/dev/mysql-4.1-0
2005-06-29 02:44:41 -07:00
igor@rurik.mysql.com
4b8f2e9bb4 func_str.test:
Added test cases for bug #11469.
item_strfunc.h:
  Fixed bug #11469: wrong implementation of the not_null_tables
  method for CONCAT_WS.
2005-06-29 02:40:25 -07:00
bell@sanja.is.com.ua
f2e358d9db Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0
into sanja.is.com.ua:/home/bell/mysql/bk/work-bug7-5.0
2005-06-29 11:52:41 +03:00
bell@sanja.is.com.ua
a01f9d5bcd fixed SP parameter execution 2005-06-29 11:50:29 +03:00
ramil@mysql.com
5e61821944 a fix (bug #11215: BIGINT: can't set DEFAULT to minimum end-range) 2005-06-29 12:03:38 +05:00
bell@sanja.is.com.ua
9283e3e3e8 fixed not_null_tables() for IN() (BUG#9393)
(IN() remove NULL rows only for tables from first argument (value which we looking for in IN() list) but not for tables from IN() list)
Also it will be better change Item::not_null_tables() to prohibit this optimisation by default for new created items in 5.0 or 5.1.
2005-06-28 22:20:25 +03:00
igor@rurik.mysql.com
230fe0d77e Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.0
into rurik.mysql.com:/home/igor/mysql-5.0
2005-06-28 12:04:46 -07:00
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
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