kent@mysql.com
f29a853ad7
Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1-tmp2
...
into mysql.com:/Users/kent/mysql/bk/mysql-5.0
2005-07-05 20:49:04 +02:00
kent@mysql.com
37dd997d8b
lowercase_table2.test, lowercase_table2.result:
...
Use IF EXISTS in initiation section
2005-07-05 17:27:37 +02:00
mats@mysql.com
0449ee1ca8
Merging 4.1 into 5.0
2005-07-05 16:02:03 +02:00
mats@mysql.com
3c42734174
Merge mysql.com:/home/bkroot/mysql-4.1
...
into mysql.com:/home/bk/b11401-mysql-4.1
2005-07-05 14:08:22 +02:00
mats@mysql.com
6d924c8286
Bug#11401: Setting thd->lex so that engines (i.e., InnoDB) recognizes
...
this as a LOAD DATA ... REPLACE INTO .. statement.
2005-07-05 13:55:54 +02:00
bell@sanja.is.com.ua
4bc6bd38ec
Merge
2005-07-05 13:42:19 +03:00
bell@sanja.is.com.ua
5eb8404c57
Merge sanja.is.com.ua:/home/bell/mysql/bk/work-bug5-5.0
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-bug4-5.0
2005-07-05 13:39:20 +03:00
bell@sanja.is.com.ua
cee0f3f608
fixed environment creation and cleaning up for processing view one by one during checking (BUG#11337)
2005-07-05 13:37:02 +03:00
bell@sanja.is.com.ua
bfbd0e241b
added processing of view grants to table grants (BUG#9795)
2005-07-05 13:36:36 +03:00
bell@sanja.is.com.ua
6f2fb9ea71
Merge sanja.is.com.ua:/home/bell/mysql/bk/work-bug2-5.0
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-bug8-5.0
2005-07-05 12:24:04 +03:00
bell@sanja.is.com.ua
2e96c47a82
post-merge fixes
2005-07-05 12:23:13 +03:00
bell@sanja.is.com.ua
15d02e60e1
merge
2005-07-05 11:38:05 +03:00
bell@sanja.is.com.ua
a8e9ca1b51
merge
2005-07-05 11:21:47 +03:00
gbichot@production.mysql.com
2f367fee25
Merge gbichot@bk-internal:/home/bk/mysql-5.0
...
into production.mysql.com:/nfstmp1/guilhem/mysql-5.0-prod-gcc
2005-07-05 01:40:37 +02:00
sergefp@mysql.com
a5019cc39c
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/psergey/mysql-5.0-jul4
2005-07-04 23:40:36 +00:00
sergefp@mysql.com
4a90f7d04f
Fix for BUG#9814: Clear thd->net.no_send_error before each SP instruction
...
execution. Failure to do so caused the erroneous statements to send nothing
and hang the client.
2005-07-04 23:00:23 +00:00
gbichot@production.mysql.com
9cfdf2861a
Making rpl_until more robust if machine is slow. Removing rpl_trunc_binlog
...
which is wrong now that slave recovers gracefully from a crashed binlog (thx Serg).
stat -> my_stat in my_copy.c so that failing stat() does not hang client connection.
2005-07-04 22:27:16 +02:00
monty@mysql.com
5b8683db74
After merge fixes
2005-07-04 16:01:04 +03:00
monty@mysql.com
fe30ec9032
manual merge
2005-07-04 03:50:04 +03:00
monty@mysql.com
ec420bfb43
Fixes during review of new code
...
- Mostly indentation fixes
- Added missing test
- Ensure that Item_func_case() checks for stack overruns
- Use real_item() instead of (Item_ref*) item
- Fixed wrong error handling
2005-07-04 03:42:33 +03:00
monty@mysql.com
75ff7d8085
After merge fixes
...
Better fix for ON DUPLICATE KEY UPDATE
2005-07-04 03:24:25 +03:00
bell@sanja.is.com.ua
67c9df1eb8
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-bug_qc-4.1
2005-07-04 01:36:55 +03:00
bell@sanja.is.com.ua
54662b4487
merge
2005-07-04 01:36:06 +03:00
monty@mysql.com
86d7b02199
Merge with 4.1
2005-07-03 14:17:52 +03:00
bell@sanja.is.com.ua
40abfc1b6f
fixed var_samp printing (BUG#10651)
2005-07-02 16:12:32 +03:00
bell@sanja.is.com.ua
6201504db9
fixed difference between ps-protocol and usual execution
2005-07-02 13:16:30 +03: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
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
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
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
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
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
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
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
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
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
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
ramil@mysql.com
8846baa682
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/usr/home/ram/work/mysql-5.0
2005-06-29 12:20:33 +05: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
dlenev@brandersnatch.localdomain
0e85b8e333
Added test for bug #5893 "Triggers with dropped functions cause crashes"
...
(The bug itself was fixed earlier by the patch that fixed bug #5860
"Multi-table UPDATE does not activate update triggers" and several
other bugs).
2005-06-29 10:35:49 +04: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
bell@sanja.is.com.ua
0e30eea141
fixed substring() length calculation in case of constant negative argument (BUG#10269)
2005-06-28 21:45:11 +03:00