Commit graph

28845 commits

Author SHA1 Message Date
aivanov@mysql.com
bba8155516 Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/home/alexi/innodb/mysql-5.0-ss162
2006-01-31 21:49:20 +03:00
aivanov@mysql.com
9296fb241d Fixed: BUG#15653, BUG#16157, BUG#16229, BUG#16298, BUG#16387, BUG#16582.
Applied innodb-5.0-ss149/162 snapshots.
2006-01-31 21:41:48 +03:00
msvensson@devsrv-b.mysql.com
04d6b7fa54 Merge msvensson@msvensson.mysql.internal:/home/msvensson/mysql/bug15302/my41-bug15302
into  devsrv-b.mysql.com:/space/magnus/my41-bug15302
2006-01-31 18:51:15 +01:00
pem@mysql.com
b3ebd755cc Added test case for BUG#15091: Sp Returns Unknown error in order clause....and there is
no order by clause
which was fixed by earlier changesets.
The error message is now the more generic "Unknown table ... in field list".
2006-01-31 17:00:50 +01:00
msvensson@devsrv-b.mysql.com
e899ab07c2 Merge msvensson@bk-internal.mysql.com:/home/bk/mysql-5.0
into  devsrv-b.mysql.com:/space/magnus/my50-bug15302
2006-01-31 16:42:25 +01:00
pem@mysql.com
af11dc3cbe Added test case for BUG#14270: Stored procedures: crash if load index
which was fixed by earlier changesets; LOAD INDEX is not allowed in functions.
  Also testing CACHE INDEX, while OPTIMIZE and CHECK were covered by existing tests already.
2006-01-31 16:27:57 +01:00
knielsen@mysql.com
a6b86d8962 Merge bk-internal:/home/bk/mysql-5.0
into  mysql.com:/usr/local/mysql/mysql-5.0
2006-01-31 16:24:25 +01:00
msvensson@devsrv-b.mysql.com
b844f62614 Merge msvensson@msvensson.mysql.internal:/home/msvensson/mysql/bug15302/my50-bug15302
into  devsrv-b.mysql.com:/space/magnus/my50-bug15302
2006-01-31 15:14:46 +01:00
dlenev@mysql.com
7715538018 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/home/dlenev/src/mysql-5.0-bg16829
2006-01-31 15:51:55 +03:00
msvensson@neptunus.(none)
ba81b1dd52 Merge neptunus.(none):/home/msvensson/mysql/bug15302/my41-bug15302
into  neptunus.(none):/home/msvensson/mysql/bug15302/my50-bug15302
2006-01-31 12:52:25 +01:00
pem@mysql.com
e2360cf745 Merge mysql.com:/extern/mysql/bk/mysql-5.0
into  mysql.com:/extern/mysql/work/bug15737/mysql-5.0
2006-01-31 12:47:36 +01:00
msvensson@neptunus.(none)
b758b690a1 Bug #15302 LOAD DATA FROM MASTER -> Packets out of order (Found: 2, expected 1)
- Change "mysql_create_db" to not call "send_ok" if in silent mode i.e. called from "load_master_data"
 - Change mysqltest to detect when there aren't as many warnings available as was reported.
2006-01-31 12:47:22 +01:00
dlenev@mysql.com
a25ca5fa63 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/home/dlenev/src/mysql-5.0-bg16829
2006-01-31 14:43:41 +03:00
msvensson@neptunus.(none)
10036d354c Check std_data_ln already created
Add / to std_data in ln command
2006-01-31 10:48:40 +01:00
pem@mysql.com
c9476999ef Merge mysql.com:/extern/mysql/bk/mysql-5.0
into  mysql.com:/extern/mysql/work/bug15737/mysql-5.0
2006-01-31 09:49:54 +01:00
msvensson@neptunus.(none)
6b136726b3 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
2006-01-31 09:39:51 +01:00
msvensson@neptunus.(none)
a71de6bfe2 Bug #16919 some tests fail in 5.0
- Use "../tmp" as --slave-load-tmpdir. Same as in mysql-test-run.pl
2006-01-31 09:38:40 +01:00
knielsen@mysql.com
a002d316ed Fix missing --replace_result on $SLAVE_MYPORT in federated. 2006-01-31 09:15:28 +01:00
msvensson@neptunus.(none)
b7c3d5ef86 Update trigger-grant-test to use MYSQLTEST_VARDIR 2006-01-31 08:51:21 +01:00
pekka@mysql.com
7e5108392d ndb - testBlobs 'perf test' fix 2006-01-31 08:13:42 +01:00
ramil@mysql.com
a2bd0c6de8 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/usr/home/ram/work/5.0.b16511
2006-01-31 10:53:37 +04:00
patg@govinda.patg.net
808bcce589 Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0
into  govinda.patg.net:/home/patg/mysql-build/mysql-5.0
2006-01-30 14:34:41 -08:00
aivanov@mysql.com
05621b5d58 Merge mysql.com:/home/alexi/innodb/mysql-4.1-ss20
into  mysql.com:/home/alexi/innodb/mysql-5.0-ss20
2006-01-30 22:52:15 +03:00
aivanov@mysql.com
f4d76d845a Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-4.1
into  mysql.com:/home/alexi/innodb/mysql-4.1-merged
2006-01-30 22:43:51 +03:00
aivanov@mysql.com
c21eaa3085 Fixed BUG#15653, BUG#16582.
Applied innodb-4.1-ss20 snapshot.
2006-01-30 22:33:02 +03:00
patg@govinda.patg.net
1ab24c0b55 Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0
into  govinda.patg.net:/home/patg/mysql-build/mysql-5.0
2006-01-30 10:55:24 -08:00
pem@mysql.com
f19bd0639b Merge mysql.com:/extern/mysql/bk/mysql-5.0
into  mysql.com:/extern/mysql/work/bug15737/mysql-5.0
2006-01-30 16:27:35 +01:00
pem@mysql.com
1043e1ba84 Merge mysql.com:/extern/mysql/bk/mysql-5.0
into  mysql.com:/extern/mysql/work/bug15737/mysql-5.0
2006-01-30 15:06:33 +01:00
pem@mysql.com
67f34be961 Post-review fix for BUG#15737 (corrected typo in sp-code.test comment) 2006-01-30 15:04:00 +01:00
SergeyV@selena.
624eec4f58 Merge svlasenko@bk-internal.mysql.com:/home/bk/mysql-5.0
into  selena.:H:/MYSQL/src/#15634-mysql-5.0
2006-01-30 17:03:09 +03:00
aivanov@mysql.com
779df9d95e Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/home/alexi/innodb/mysql-5.0-ss17
2006-01-30 15:57:50 +03:00
aivanov@mysql.com
6aa5ad47ca Merge mysql.com:/home/alexi/innodb/mysql-4.1-ss17
into  mysql.com:/home/alexi/innodb/mysql-5.0-ss17
2006-01-30 15:50:53 +03:00
aivanov@mysql.com
efe8b884e5 Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-4.1
into  mysql.com:/home/alexi/innodb/mysql-4.1-merged
2006-01-30 15:31:35 +03:00
aivanov@mysql.com
fe518520be Fixed BUG#16387.
Applied innodb-4.1-ss17 snapshot.
  Do not mistake TABLENAME_ibfk_0 for auto-generated id.
2006-01-30 15:17:33 +03:00
msvensson@neptunus.(none)
a6c508dbf3 Merge neptunus.(none):/home/msvensson/mysql/bug15719/my50-bug15719
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
2006-01-30 11:02:09 +01:00
msvensson@neptunus.(none)
ae9b056d9b Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0
into  neptunus.(none):/home/msvensson/mysql/mysqltest_var/my50-mysqltest_var-integration
2006-01-30 10:45:45 +01:00
paul@snake-hub.snake.net
b4f8b1b376 information_schema_db.result, information_schema.result:
Fix test result.
table.h, sql_show.cc:
  Put I_S tables in lexical order.
2006-01-28 19:44:51 -06:00
dlenev@mysql.com
737084b229 Fix for bug #16829 "Firing trigger with RETURN crashes the server"
We should disallow usage of RETURN statement in triggers and emit
error at parsing time (instead of crashing when trigger is fired).
2006-01-28 12:50:16 +03:00
igor@rurik.mysql.com
eb8507208e Fixed bug #16260.
The problem has manifested itself in the cases when we have a nested outer join
for which it can be inferred that one of the inner tables is a single row table.
2006-01-27 21:20:28 -08:00
patg@govinda.patg.net
15ec4431bc BUG# 14768
Added fixes to make last_insert_id() to work.
2006-01-27 15:43:44 -08:00
msvensson@neptunus.(none)
d18006173f Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into  neptunus.(none):/home/msvensson/mysql/mysql-4.1
2006-01-27 19:11:59 +01:00
pappa@c-5c0be253.1238-1-64736c10.cust.bredbandsbolaget.se
6ec2bd2a93 Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-4.1
into  c-5c0be253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug12796
2006-01-27 13:11:58 -05:00
pappa@c-5c0be253.1238-1-64736c10.cust.bredbandsbolaget.se
173a8ad4ed Added comments to specify why no much mutex is needed. 2006-01-27 12:44:33 -05:00
pappa@c-5c0be253.1238-1-64736c10.cust.bredbandsbolaget.se
a69827f152 Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-4.1
into  c-5c0be253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug12796
2006-01-27 09:29:59 -05:00
msvensson@neptunus.(none)
9c255c4025 Enable kill test 2006-01-27 13:23:10 +01:00
kent@mysql.com
1318e790bc configure.in:
Cloned off 4.1.18, new release number 4.1.19
2006-01-27 12:10:40 +01:00
msvensson@neptunus.(none)
61659a138a Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0
into  neptunus.(none):/home/msvensson/mysql/mysqltest_var/my50-mysqltest_var-integration
2006-01-27 11:53:14 +01:00
msvensson@neptunus.(none)
54af4e6d0c Merge neptunus.(none):/home/msvensson/mysql/mysqltestrun_check_testcases/my50-mysqltestrun_check_testcases
into  neptunus.(none):/home/msvensson/mysql/mysqltest_var/my50-mysqltest_var-integration
2006-01-27 10:49:07 +01:00
msvensson@neptunus.(none)
a98ede7edc Use MYSQLTEST_VARDIR 2006-01-27 09:24:45 +01:00
kent@mysql.com
4ad32690af configure.in:
Generated "libmysql.ver" will be in \$(top_builddir)
2006-01-27 01:38:05 +01:00