lenz@mysql.com
8826b086d5
Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/space/my/mysql-5.0
2005-07-07 19:31:28 +02:00
hf@deer.(none)
5f62765d90
Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into deer.(none):/home/hf/work/mysql-5.0.clean
2005-07-07 21:49:12 +05:00
hf@deer.(none)
c7940aeb86
Fix for bug #8449(Silent column changes)
2005-07-07 21:47:18 +05:00
msvensson@neptunus.(none)
d48c95f1ba
Merge neptunus.(none):/home/msvensson/mysql/bug11635/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2005-07-07 18:23:22 +02:00
lenz@mysql.com
d8ede693d2
Merge mysql.com:/space/my/mysql-5.0.9-clone
...
into mysql.com:/space/my/mysql-5.0
2005-07-07 18:22:43 +02:00
msvensson@neptunus.(none)
a8efd33aec
Merge neptunus.(none):/home/msvensson/mysql/bug11635/my41-bug11635
...
into neptunus.(none):/home/msvensson/mysql/mysql-4.1
2005-07-07 18:21:20 +02:00
lenz@mysql.com
fa69727d3f
- fixed the "sp-security" test case: drop any possible already existing table to
...
avoid failing if a previous test failure left the t1 table around
2005-07-07 17:44:10 +02:00
hf@deer.(none)
3ddd2771d6
Fix for bug #11708 (real function returns wrongly rounded decimal)
2005-07-07 20:28:47 +05:00
msvensson@neptunus.(none)
f0548a15ba
Manual merge of BUG#11635 whihc is already in 5.0
2005-07-07 15:48:43 +02:00
hf@deer.(none)
bf7515c302
Fix for bug #10891 (string->decimal conversion crashes server)
2005-07-07 18:23:30 +05:00
msvensson@neptunus.(none)
50133499b5
BUG#11635 mysqldump exports TYPE instead of USING for HASH Cluster indexes
...
- Change output from SHOW CREATE TABLE to use USING instead of TYPE
2005-07-07 14:44:28 +02:00
pem@mysql.com
312ea035ba
Merge mysql.com:/usr/local/bk/mysql-5.0
...
into mysql.com:/home/pem/work/mysql-5.0
2005-07-07 09:13:49 +02:00
bell@sanja.is.com.ua
9f30fa2ce5
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-bug4-5.0
2005-07-06 23:24:51 +03:00
igor@igor-inspiron.creware.com
e5bd22ff06
view.result, view.test:
...
Added a test case for bug #6120 .
sql_view.cc:
Fixed bug #6120 .
The SP cache must be invalidated when a view is altered.
2005-07-06 09:00:17 -07:00
pem@mysql.com
18d6dd56ef
Fixed BUG#7088: Stored procedures: labels won't work if character set is utf8.
...
We used 'IDENT' for labels as a temporary fix for the parser conflicts
introduced if the proper rule 'ident' was used. Now a specially tailored
'label_ident' rule is used for labels instead.
2005-07-06 16:37:57 +02:00
bell@sanja.is.com.ua
8b71793766
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-bug4-5.0
2005-07-06 16:59:56 +03:00
bar@mysql.com
d563de7f86
ctype_innodb_like.inc:
...
New BitKeeper file ``mysql-test/include/ctype_innodb_like.inc''
Many files:
bug#11650: LIKE pattern matching using prefix index doesn't return correct result
min and max values were too long in the case of prefix key.
Fix my_like_range functions not to exceed prefix length.
ctype_innodb_like.inc:
new file
2005-07-06 17:16:22 +05:00
bell@sanja.is.com.ua
c41c8accd7
Merge
2005-07-06 11:36:27 +03:00
dlenev@mysql.com
d9d20a82d0
After merge fix.
2005-07-06 11:34:53 +04:00
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
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
jimw@mysql.com
ac8f9d3864
Fix test cases
2005-07-05 15:19:04 -07: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
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
igor@rurik.mysql.com
343e8effa9
olap.result, olap.test:
...
Added a test case for bug #11543 .
sql_select.cc:
Fixed bug #11543 .
A ROLLUP query could return a wrong result set when
its GROUP BY clause contained references to the same
column.
2005-07-01 07:40:22 -07:00