Commit graph

9387 commits

Author SHA1 Message Date
pekka@mysql.com
7b892368c3 ndb - bugfix: tinyblob + replace => mysqld crash (no bug#) 2006-02-03 14:35:29 +01:00
igor@rurik.mysql.com
66b6c988f5 Merge rurik.mysql.com:/home/igor/mysql-5.0
into  rurik.mysql.com:/home/igor/dev/mysql-5.0-0
2006-02-03 00:07:57 -08:00
igor@rurik.mysql.com
7b58b91fe4 Fixes after manual merge 2006-02-02 23:56:08 -08:00
igor@rurik.mysql.com
f61517d60b Merge rurik.mysql.com:/home/igor/dev/mysql-4.1-0
into  rurik.mysql.com:/home/igor/dev/mysql-5.0-0
2006-02-02 21:23:36 -08:00
igor@rurik.mysql.com
3f9bb37461 Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.0
into  rurik.mysql.com:/home/igor/mysql-5.0
2006-02-02 17:39:38 -08:00
konstantin@mysql.com
cb7118edcd One more post-merge fix. 2006-02-03 02:01:01 +03:00
igor@rurik.mysql.com
b32ce5ac79 Merge rurik.mysql.com:/home/igor/mysql-5.0
into  rurik.mysql.com:/home/igor/dev/mysql-5.0-0
2006-02-02 13:47:21 -08:00
konstantin@mysql.com
303ad65fb2 Post-merge fixes. 2006-02-03 00:07:36 +03:00
konstantin@mysql.com
98091b152a Merge mysql.com:/opt/local/work/mysql-4.1-root
into  mysql.com:/opt/local/work/mysql-5.0-root
2006-02-02 18:17:18 +03:00
msvensson@neptunus.(none)
264640c532 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
2006-02-02 08:23:24 +01:00
igor@rurik.mysql.com
86606615ab Fixed bug #16382.
When an ambiguous field name is used in a group by clause a warning is issued
in the find_order_in_list function by a call to push_warning_printf.
An expression that was not always valid was passed to this call as the field
name parameter.
2006-02-01 20:43:43 -08:00
pem@mysql.com
526a974460 Merge mysql.com:/extern/mysql/bk/mysql-5.0
into  mysql.com:/extern/mysql/work/bug15011/mysql-5.0
2006-02-01 16:01:22 +01:00
msvensson@neptunus.(none)
df5a947ba7 Merge neptunus.(none):/home/msvensson/mysql/mysqltest_float_result/my50-mysqltest_float_result
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
2006-02-01 15:02:36 +01:00
pem@mysql.com
a84c7e1c29 Added new test case for BUG#14533: 'desc tbl' in stored procedure causes error 1142
which is no longer repeatable. (Unclear when this was fixed.)
2006-02-01 14:46:30 +01:00
pem@mysql.com
d37570daf4 Merge mysql.com:/extern/mysql/bk/mysql-5.0
into  mysql.com:/extern/mysql/work/cantrepeat/mysql-5.0
2006-02-01 12:31:48 +01:00
msvensson@neptunus.(none)
102aa5a79f Use common function 'append_field' to output the value of one field to the result.
Fix for extra zero in exponent of double values on windows.
2006-02-01 11:36:32 +01:00
igor@rurik.mysql.com
d6370b48a7 FIxed bug #14927.
A query with a group by and having clauses could return a wrong
result set if the having condition contained a constant conjunct 
evaluated to FALSE.
It happened because the pushdown condition for table with
grouping columns lost its constant conjuncts.
Pushdown conditions are always built by the function make_cond_for_table
that ignores constant conjuncts. This is apparently not correct when
constant false conjuncts are present.
2006-01-31 21:48:32 -08:00
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
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
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
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
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
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
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
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
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)
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
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
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
bell@sanja.is.com.ua
8eee147e0f Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into  sanja.is.com.ua:/home/bell/mysql/bk/work-bug8-4.1
2006-01-26 19:01:54 +02:00
msvensson@neptunus.(none)
9304785c10 Add new option "check-testcases" to mysql-test-run.pl
Cleanup the sideeffects from most of the  testcases with sideeffects.
2006-01-26 17:54:34 +01:00
bell@sanja.is.com.ua
43e281d79c Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into  sanja.is.com.ua:/home/bell/mysql/bk/work-bug8-4.1
2006-01-26 16:00:49 +02:00
msvensson@neptunus.(none)
169f1ecee6 Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0
into  neptunus.(none):/home/msvensson/mysql/mysqltest_var/my50-mysqltest_var-integration
2006-01-26 12:51:27 +01:00