Commit graph

24347 commits

Author SHA1 Message Date
msvensson@neptunus.(none)
ead7b076dc Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-1.2310.2.2
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2005-07-01 15:40:42 +02:00
msvensson@neptunus.(none)
11d3c28575 Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-1.2310.2.2
into neptunus.(none):/home/msvensson/mysql/mysql-4.1
2005-07-01 15:40:29 +02:00
msvensson@neptunus.(none)
9613c434e0 Win port fixes 2005-07-01 15:39:36 +02: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
d8fef65119 tests/mysql_client_test.c
Add a test case for Bug#11656 "Server crash with mysql_stmt_fetch 
    (cursors)", the bug itself is no longer present.
2005-07-01 17:11:39 +04: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
marko@hundin.mysql.fi
4eba989290 InnoDB: Optimize [and clarify] a condition in build_template() 2005-07-01 13:20:16 +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
lars@mysql.com
4120003926 BUG#11678: mysqldump --master-data should fail if master binlog disabled 2005-07-01 12:01:00 +02:00
dlenev@brandersnatch.localdomain
56ff9f1653 "Fix" for bug #11394 "Recursion in SP crash server" and bug #11600
"Stored procedures: crash with function calling itself".

Disallow recursive stored routines until we either make Item's and LEX
reentrant safe or will use spearate sp_head instances (and thus separate
LEX objects and Item trees) for each routine invocation.
2005-07-01 13:01:46 +04: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
a921d083cb 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-07-01 07:06:26 +03:00
bell@sanja.is.com.ua
d3905f3d0e Name resolution context added (BUG#6443) 2005-07-01 07:05:42 +03:00
msvensson@neptunus.(none)
ba2a0328d1 Tests readded for bug 10927 2005-06-30 20:44:31 +02:00
msvensson@neptunus.(none)
bf3449074f Cset exclude: msvensson@neptunus.(none)|ChangeSet|20050630172241|15421 2005-06-30 19:24:34 +02:00
msvensson@neptunus.(none)
4fd33dd2b6 Should not be here, same procedure every time.. 2005-06-30 19:22:41 +02:00
msvensson@neptunus.(none)
ca2ad9cdf6 Merge 2005-06-30 19:21:38 +02:00
msvensson@neptunus.(none)
14e778e43a After review fixes 2005-06-30 19:15:39 +02: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
lenz@mysql.com
59b5c9bf66 - backport of a compile fix from 4.1 (ChangeSet@1.2260.23.2 2005/05/19 from reggie)
"changed dl_name to udf->dl in mysql_create_function"
2005-06-30 17:33:23 +02:00
jani@ua141d10.elisa.omakaista.fi
15d4217c58 Don't allow 8bytes for data file pointers for now. 2005-06-30 17:55:47 +03: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
marko@hundin.mysql.fi
d115c0d629 InnoDB: Fix a bug in BLOB handling; optimize null flag handling. 2005-06-30 13:20:38 +03: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
marko@hundin.mysql.fi
efba4c3e9e InnoDB: Optimize page_cur_search_with_match(). 2005-06-30 11:15:06 +03: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
msvensson@neptunus.(none)
0d894f3d3b Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2005-06-29 16:42:44 +02:00
msvensson@neptunus.(none)
289553f3ec Bump required version of autoconf to 2.58 2005-06-29 16:41:49 +02:00
mskold@mysql.com
569a846120 Changed delete_row to always get key from record argument, removed unused function 2005-06-29 16:17:47 +02:00
mskold@mysql.com
ec4bb86379 Changed delete_row to always get key from record argument 2005-06-29 16:13:50 +02:00
mskold@mysql.com
ff764e2b5a Moved connections first in test, to reduce risk of connecting before servers are fully connected 2005-06-29 15:31:43 +02:00
pem@mysql.comhem.se
6fd1e8227e Fixed compiler errors (i.e. changed C++-isms into C) 2005-06-29 14:23:43 +02:00
jani@a193-229-222-105.elisa-laajakaista.fi
3df73db1cf Applied some Netware related patches. 2005-06-29 14:02:11 +03:00
petr@mysql.com
1ac5889329 Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/cps/mysql/trees/mysql-5.0
2005-06-29 13:46:52 +04: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
monty@mysql.com
e4bb8377c7 Simple optimization
nsure that delete works not only on table->record[0] for federated tables
2005-06-29 12:44:40 +03: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
petr@mysql.com
5e72092eb7 post review fixes (second review) 2005-06-29 13:27:27 +04: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