dlenev@mysql.com
8a924ac456
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/dlenev/src/mysql-5.0-bg11394
2005-07-06 10:21:27 +04:00
jimw@mysql.com
060a53ab25
Update test results
2005-07-05 18:23:55 -07:00
jimw@mysql.com
af5f5ab3ed
Merge mysql.com:/home/jimw/my/mysql-5.0-6903
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-07-05 17:05:31 -07:00
jimw@mysql.com
a2244a9094
Merge jwinstead@production.mysql.com:my/mysql-5.0-10844
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-07-05 15:24:35 -07:00
jimw@mysql.com
2669b86612
Merge mysql.com:/home/jimw/my/mysql-4.1-clean
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-07-05 15:23:13 -07:00
kent@mysql.com
b6d3eec4f8
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/Users/kent/mysql/bk/mysql-4.1-distcheck
2005-07-06 00:19:26 +02:00
jimw@mysql.com
ac8f9d3864
Fix test cases
2005-07-05 15:19:04 -07:00
kent@mysql.com
ca420edc21
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/Users/kent/mysql/bk/mysql-4.1-distcheck
2005-07-06 00:15:55 +02:00
kent@mysql.com
8e3b393d5c
Merge
2005-07-06 00:06:11 +02:00
kent@mysql.com
a7be42163a
Makefile.am:
...
Added -I$(top_builddir)/include for searching
generated header files, when builddir != srcdir
2005-07-05 23:24:48 +02:00
jimw@mysql.com
81e50844b3
Merge mysql.com:/home/jimw/my/mysql-4.1-11330
...
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-07-05 12:51:16 -07:00
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