pem@mysql.comhem.se
9c21006f81
Fixed BUG#7185: Stored procedure crash if identifier is AVG
2005-04-12 15:43:24 +02:00
ramil@mysql.com
3b1c3d8c68
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/usr/home/ram/work/5.0.bit_class
2005-04-12 12:30:09 +05:00
ramil@mysql.com
c4376b2bc6
Bit type support for non-MyISAM tables.
2005-04-12 12:27:43 +05:00
reggie@mdk10.(none)
4bb4a285ab
Merge mdk10.(none):/home/reggie/bk/mysql-4.1
...
into mdk10.(none):/home/reggie/bk/mysql-5.0
2005-04-11 09:29:49 -05:00
bar@mysql.com
71f530c4ea
merge
2005-04-11 15:11:52 +05:00
dlenev@mysql.com
b0dd388190
Merge mysql.com:/home/dlenev/src/mysql-4.0-bg9796
...
into mysql.com:/home/dlenev/src/mysql-4.1-merges
2005-04-11 09:53:54 +04:00
dlenev@mysql.com
06e3647274
Fix for bug #9796 "Query Cache caches queries with CURRENT_USER()
...
function".
We should not cache queries using CURRENT_USER() function as we do it
for some other functions, e.g. USER() function.
2005-04-11 00:30:23 +04:00
bar@mysql.com
16e186779f
ctype_collate.result, ctype_collate.test, union.result, union.test:
...
fixing tests accordingly
item.cc:
Allow mixing non-binary collation and binary collation
even if coercibility is the same.
For easier 4.0 -> 4.1 migrating.
2005-04-10 12:40:33 +05:00
pem@mysql.comhem.se
2038ced40c
Fixed BUG#9073: Able to declare two handlers for same condition in same scope
2005-04-08 19:58:04 +02:00
pem@mysql.com
e6d72f1c48
Merge mysql.com:/usr/local/bk/mysql-5.0
...
into mysql.com:/home/pem/work/mysql-5.0
2005-04-08 17:32:50 +02:00
pem@mysql.comhem.se
ce2e40ac19
Fixed BUG#6900: Stored procedure inner handler ignored
...
and BUG#9074: STORED PROC: The scope of every handler declared is not properly applied
2005-04-08 17:31:37 +02:00
pem@mysql.comhem.se
e99da54fd5
Fixed BUG#7299: Stored procedures: exception handler catches not-found conditions
2005-04-08 16:05:16 +02:00
mskold@mysql.com
20a82a1a6a
Fixed broken auto_increment
2005-04-08 12:34:52 +02:00
mskold@mysql.com
7c38f9d8e7
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
2005-04-08 11:50:01 +02:00
mskold@mysql.com
817f2c6a13
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
2005-04-08 11:39:22 +02:00
mskold@mysql.com
813cc0eaf0
Added more tests for auto_increment
2005-04-08 11:38:40 +02:00
hf@deer.(none)
eae3f5ba1d
Test result fixed
2005-04-08 09:23:10 +05:00
hf@deer.(none)
33cd3168fb
Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into deer.(none):/home/hf/work/mysql-5.0.errmsg
2005-04-08 08:31:53 +05:00
monty@mysql.com
211638f539
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/my/mysql-5.0
2005-04-08 00:56:29 +03:00
msvensson@neptunus.(none)
f9dd856d9e
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2005-04-07 21:29:33 +02:00
monty@mysql.com
551ebb8a60
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/my/mysql-5.0
2005-04-07 22:02:24 +03:00
msvensson@neptunus.(none)
960410274c
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into neptunus.(none):/home/msvensson/mysql/mysql-4.1
2005-04-07 20:21:17 +02:00
msvensson@neptunus.(none)
7a0e28feb5
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2005-04-07 20:19:25 +02:00
msvensson@neptunus.(none)
12b6252145
BUG#6762 ALTER TABLE gives weird results and error message
...
- Removed hardcoded error message from 4.1
2005-04-07 20:17:37 +02:00
mskold@mysql.com
8327593bfd
Merge
2005-04-07 19:48:00 +02:00
mskold@mysql.com
e66eaaa2a0
Merge
2005-04-07 18:37:04 +02:00
monty@mysql.com
780202f130
Moved some old test and added a new test to only be run with mysql-test-run --big
...
Fixed warnings by valgrind for sum_distinct.test
Enable buffered-record-reads after filesort for InnoDB tables with short primary key
Enabled sort-with-data for MyISAM temporary files
2005-04-07 19:24:14 +03:00
mskold@mysql.com
89b140340c
Fix for Bug #9675 Auto-increment not working with INSERT..SELECT and NDB storage
2005-04-07 17:44:09 +02:00
hf@deer.(none)
a8f80a8001
Merge bk@192.168.21.1:/usr/home/bk/mysql-5.0
...
into deer.(none):/home/hf/work/mysql-5.0.errmsg
2005-04-07 19:30:14 +05:00
hf@deer.(none)
345b6d476a
Merge bk@192.168.21.1:/usr/home/bk/mysql-5.0
...
into deer.(none):/home/hf/work/mysql-5.0.errmsg
2005-04-07 19:25:13 +05:00
jani@ua141d10.elisa.omakaista.fi
18354f4570
A small fix to Makefile.am
2005-04-07 13:20:15 +03:00
dlenev@brandersnatch.localdomain
8d05aa0f02
Moved test for bug #9566 "explicit LOCK TABLE and store procedures result in illegal
...
state" to sp-error.test.
According to Per-Erik all SP related tests which should result in error
should go into sp-error.test and not in sp.test, because we want to be
able to run sp.test using normal client.
2005-04-07 11:57:47 +04:00
dlenev@mysql.com
f374b21d07
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/dlenev/src/mysql-5.0-bg9566
2005-04-07 10:41:07 +04:00
dlenev@brandersnatch.localdomain
d85bed1121
Fix for bug #9566 "explicit LOCK TABLE and store procedures result in
...
illegal state".
We should not assume that mysql.proc table does not exist if we are
unable to open it under LOCK TABLES or in prelocked mode (and
remember this fact by setting mysql_proc_table_exists to zero).
2005-04-07 01:40:29 +04:00
serg@serg.mylan
a4025168c7
Merge bk-internal:/home/bk/mysql-5.0
...
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2005-04-06 23:13:29 +02:00
serg@serg.mylan
5cd866610d
after merge fix
2005-04-06 23:12:10 +02:00
serg@serg.mylan
e1e5b97dea
manually merged
...
Gluh's SESSION/GLOBAL for @variables fix in sql_yacc.yy and
Bar's well_formed_len() changes in ndb code
did not make it and should be re-applied manually
2005-04-06 21:19:20 +02:00
jani@a193-229-222-105.elisa-laajakaista.fi
288eff45cb
Added missing file to Makefile.am
2005-04-06 21:55:34 +03:00
kent@mysql.com
053d3b2897
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-compile
2005-04-06 19:18:47 +02:00
monty@mysql.com
a7c6348192
Fixed errors found during review
2005-04-06 19:43:35 +03:00
kent@mysql.com
2aa8253f70
Merge
2005-04-06 18:19:05 +02:00
hf@deer.(none)
51f0963b8e
Merge bk@192.168.21.1:/usr/home/bk/mysql-5.0
...
into deer.(none):/home/hf/work/mysql-5.0.errmsg
2005-04-06 21:05:45 +05:00
monty@mysql.com
beb28b27e0
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/my/mysql-5.0
2005-04-06 17:23:34 +03:00
monty@mysql.com
49e721677f
Fixed errors descovered by valgrind 2.4
...
Added suppression file for some valgrind warnings that are not real errors
2005-04-06 17:22:21 +03:00
kent@mysql.com
34284d9354
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/Users/kent/mysql/bk/mysql-4.1
2005-04-06 13:45:14 +02:00
hf@deer.(none)
b552ed8fd3
Merge bk@192.168.21.1:/usr/home/bk/mysql-5.0
...
into deer.(none):/home/hf/work/mysql-5.0.errmsg
2005-04-06 15:51:24 +05:00
hf@deer.(none)
7cd0e43437
Stupid error message for 'insert "aaa"' into decimal column fixed
2005-04-06 15:49:55 +05:00
kent@mysql.com
57d8914287
Makefile.am:
...
Include the Perl version of mysql-test-run
rpl_rewrite_db.test, rpl_rewrite_db.result:
Added missing database cleanup
mysql-test-run.pl:
Embedded result files no longer needed
2005-04-06 12:20:55 +02:00
gluh@eagle.intranet.mysql.r18.ru
6f18d7d26f
Fix for bug #9286 : SESSION/GLOBAL should be disallowed for user variables
2005-04-06 14:13:06 +05:00
msvensson@neptunus.(none)
a47bc28876
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2005-04-06 10:56:02 +02:00