Commit graph

28651 commits

Author SHA1 Message Date
unknown
78c0d5d59e Merge mysql.com:/home/alexi/innodb/mysql-4.1-ss17
into  mysql.com:/home/alexi/innodb/mysql-5.0-ss17


innobase/dict/dict0dict.c:
  Null merged
mysql-test/r/innodb.result:
  Null merged
mysql-test/t/innodb.test:
  Null merged
2006-01-30 15:50:53 +03:00
unknown
cc47eb7791 Fixed BUG#16387.
Applied innodb-4.1-ss17 snapshot.
  Do not mistake TABLENAME_ibfk_0 for auto-generated id.


innobase/dict/dict0dict.c:
  Applied innodb-4.1-ss17 snapshot.
    dict_table_get_highest_foreign_id(): Ignore foreign
    constraint identifiers starting with the pattern
    TABLENAME_ibfk_0 (BUG#16387).
mysql-test/r/innodb.result:
  Applied innodb-4.1-ss17 snapshot.
    Fixed results for added test case.
mysql-test/t/innodb.test:
  Applied innodb-4.1-ss17 snapshot.
    Added test case.
2006-01-30 15:17:33 +03:00
unknown
ef0cd2f58a information_schema_db.result, information_schema.result:
Fix test result.
table.h, sql_show.cc:
  Put I_S tables in lexical order.


sql/sql_show.cc:
  Put I_S tables in lexical order.
sql/table.h:
  Put I_S tables in lexical order.
mysql-test/r/information_schema.result:
  Fix test result.
mysql-test/r/information_schema_db.result:
  Fix test result.
2006-01-28 19:44:51 -06:00
unknown
6bfbba34c7 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.


mysql-test/r/join_nested.result:
  Added a test case for bug #16260.
mysql-test/t/join_nested.test:
  Added a test case for bug #16260.
sql/sql_select.cc:
  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.
  A table is never considered as a const table if it is used in a nested join 
  that serves as an inner operand of an outer join.
2006-01-27 21:20:28 -08:00
unknown
ae951e0f72 Merge svlasenko@bk-internal.mysql.com:/home/bk/mysql-5.0
into  selena.:H:/MYSQL/src/#11892-mysql-5.0
2006-01-25 20:04:27 +03:00
unknown
e43170419c Merge mysql.com:/users/lthalmann/bkroot/mysql-5.0
into  mysql.com:/users/lthalmann/bk/mysql-5.0-bug16487
2006-01-25 17:17:16 +01:00
unknown
a334c72371 BUG#16487: New test for ignored table and multi-update
mysql-test/r/rpl_ignore_table.result:
  New result file
mysql-test/t/rpl_ignore_table-slave.opt:
  New option file
mysql-test/t/rpl_ignore_table.test:
  New test for ignored table and multi-update
2006-01-25 16:14:27 +01:00
unknown
d9a008d970 Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.0
into  zim.tangent.org:/home/brian/mysql/mysql-5.0
2006-01-25 04:50:14 -08:00
unknown
0ab30e24e8 Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/M50/bug16730-5.0
2006-01-25 07:34:32 +01:00
unknown
6b2718d16f Complaint from a user who was getting sick of repairing their tables do to their lousy setup (their words). All crashed archive tables will now be repaired on open.
sql/ha_archive.cc:
  Fix for repair table.
2006-01-24 21:43:41 -08:00
unknown
8f395ebbfa Fix for the following bugs:
- BUG#15166: Wrong update permissions required to execute triggers
  - BUG#15196: Wrong select permission required to execute triggers

The idea of the fix is to check necessary privileges
in Item_trigger_field::fix_fields(), instead of having "special variables"
technique. To achieve this, we should pass to an Item_trigger_field instance
a flag, which will indicate the usage/access type of this trigger variable.


mysql-test/r/trigger-grant.result:
  Update the result file.
mysql-test/t/trigger-grant.test:
  Add test cases for BUG#15166 and BUG#15196
sql/item.cc:
  Item_trigger_field: check appropriate (SELECT/UPDATE) privilege in fix_fields().
sql/item.h:
  Add a flag to specify access type for trigger field.
sql/sql_trigger.cc:
  "Special variable" technique of checking privileges for NEW/OLD variables
  was replaced by checking table- and column-level privileges in
  Item_trigger_field::fix_fields().
sql/sql_trigger.h:
  "Special variable" technique of checking privileges for NEW/OLD variables
  was replaced by checking table- and column-level privileges in
  Item_trigger_field::fix_fields().
sql/sql_yacc.yy:
  Specify access type for trigger fields.
2006-01-24 20:15:12 +03:00
unknown
686bd7ee6f Merge mysql.com:/M41/bug16730-4.1 into mysql.com:/M50/bug16730-5.0
mysql-test/t/ctype_ucs.test:
  Auto merged
2006-01-24 18:00:23 +01:00
unknown
6cc16c5019 Test "ctype_ucs": Disable warnings if "InnoDB" is not configured ("classic" build) (bug#16730).
mysql-test/t/ctype_ucs.test:
  Disable warnings if "InnoDB" is not configured ("classic" build) (bug#16730).
2006-01-24 13:54:34 +01:00
unknown
9e0240d366 Merge aelkin@bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/usr_rh9/home/elkin.rh9/MySQL/mysql-5.0
2006-01-24 14:49:25 +02:00
unknown
333b1f8594 Fix for bug#15307 GROUP_CONCAT() with ORDER BY returns empty set on information_schema(2nd ver)
Fill schema tables with data before filesort if it's necessary


mysql-test/r/information_schema.result:
  Fix for bug#15307 GROUP_CONCAT() with ORDER BY returns empty set on information_schema(2nd ver)
    test result
mysql-test/t/information_schema.test:
  Fix for bug#15307 GROUP_CONCAT() with ORDER BY returns empty set on information_schema(2nd ver)
    test case
2006-01-24 16:48:19 +04:00
unknown
74f670f291 Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/gluh/MySQL/Merge/5.0
2006-01-24 16:00:20 +04:00
unknown
fbc24f3376 Fix for bug#15851 Unlistable directories yield no info from information_schema
to skip directories which are not allowed for read


mysql-test/r/information_schema.result:
  Fix for bug#15851 Unlistable directories yield no info from information_schema
    test result
mysql-test/t/information_schema.test:
  Fix for bug#15851 Unlistable directories yield no info from information_schema
    test case
2006-01-24 15:59:08 +04:00
unknown
794e94e4f7 Merge aelkin@bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/usr_rh9/home/elkin.rh9/MySQL/mysql-5.0
2006-01-24 13:47:24 +02:00
unknown
30382bee9b Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0
into  neptunus.(none):/home/msvensson/mysql/bug15020/my50-bug15020
2006-01-24 10:29:26 +01:00
unknown
3f216c7db0 Merge aelkin@bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/usr_rh9/home/elkin.rh9/MySQL/mysql-5.0
2006-01-23 22:32:05 +02:00
unknown
03ad365b00 Changes after initial patch to #15787
zlib/Makefile.am:
  Added a reference to ../include for my_config.h
zlib/README.MySQL:
  Updated a readme file to emphasize which files we what to keep an eye on
  in case of zlib upgrade.
zlib/zconf.h:
  restored a code for standard platform dependant definitions
2006-01-23 21:35:11 +03:00
unknown
4032f5acd5 Merge svlasenko@bk-internal.mysql.com:/home/bk/mysql-5.0
into  selena.:H:/MYSQL/src/#15787-mysql-5.0
2006-01-23 20:01:05 +03:00
unknown
dde3f7275b Merge april.(none):/home/svoj/devel/mysql/BUG16489/mysql-4.1
into  april.(none):/home/svoj/devel/mysql/BUG16489/mysql-5.0


myisam/ft_update.c:
  Auto merged
mysql-test/r/fulltext2.result:
  Auto merged
2006-01-23 20:07:26 +04:00
unknown
1dcfe028a7 BUG#15699, failure to apply ignore rule for unexisting table.
Since replication rules execute after `mysql_multi_update_prepare' returns we
delay to `break' in case this functions returns non-zero (some tables are not found) 
for to examine if there is an ignore rule for a not-found table. By doing that
it is guaranteed do/ignore replication rules logically preceed opening table routine.


sql/sql_parse.cc:
  BUG#15699. We delay to `break' in case of unexisted tables for multi-update.
  First it is checked whether an ignore rule for such a table exists.
  
  More to the fix:
  if (opt_readonly && ...' in two places got be idented because it were
  enclosed explicitly into corresponding `else' groups. For that 
  the preceding lines with `else' were changed in to be 
  `else 
   {'.
  This grouping is necessary to avoid any inattentive
  insertion in between of `else' and belonging to the else 
  `if (opt_readonly && ...' statement.
mysql-test/r/rpl_multi_update4.result:
  New BitKeeper file ``mysql-test/r/rpl_multi_update4.result''
mysql-test/t/rpl_multi_update4-slave.opt:
  New BitKeeper file ``mysql-test/t/rpl_multi_update4-slave.opt''
mysql-test/t/rpl_multi_update4.test:
  New BitKeeper file ``mysql-test/t/rpl_multi_update4.test''
2006-01-23 18:03:09 +02:00
unknown
0ee28e1a4d BUG#16489 - utf8 + fulltext leads to corrupt index file.
Fixed that UPDATE statement crashes multi-byte charset fulltext index.


myisam/ft_update.c:
  Fixed that UPDATE statement crashes multi-byte charset fulltext index.
  While updating, always rewrite multi-byte charset fulltext index.
mysql-test/r/fulltext2.result:
  Added a testcase for BUG#16489.
mysql-test/t/fulltext2.test:
  Added a testcase for BUG#16489.
2006-01-23 17:15:33 +04:00
unknown
2bdcc1714e Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0
into  neptunus.(none):/home/msvensson/mysql/bug14634/my50-bug14634


sql/sql_select.cc:
  Auto merged
2006-01-23 13:07:49 +01:00
unknown
4e69c153e3 Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.0
into  zim.tangent.org:/home/brian/mysql/mysql-5.0
2006-01-22 00:09:43 -08:00
unknown
49a09cc339 Merging
mysql-test/r/func_gconcat.result:
  merging
mysql-test/r/type_float.result:
  merging
2006-01-21 21:50:54 +04:00
unknown
494bccf044 Merging
mysql-test/ndb/ndbcluster.sh:
  Auto merged
mysql-test/r/func_gconcat.result:
  Auto merged
mysql-test/r/subselect.result:
  Auto merged
mysql-test/t/func_math.test:
  Auto merged
mysql-test/t/type_float.test:
  Auto merged
sql/spatial.h:
  Auto merged
mysql-test/r/type_float.result:
  merging
sql/item_func.cc:
  merging
2006-01-21 18:50:06 +04:00
unknown
ffe11393c9 Merge hf@192.168.21.12:work/mysql-4.1.15429
into eagle.intranet.mysql.r18.ru:/home/hf/work/mysql-4.1.mrg
2006-01-21 17:55:58 +04:00
unknown
a8e1b46834 Merge hf@192.168.21.12:work/mysql-4.1.14320
into eagle.intranet.mysql.r18.ru:/home/hf/work/mysql-4.1.mrg
2006-01-21 17:54:30 +04:00
unknown
32fc680089 Merge hf@192.168.21.12:work/mysql-4.1.9855
into eagle.intranet.mysql.r18.ru:/home/hf/work/mysql-4.1.mrg


sql/item_func.cc:
  Auto merged
2006-01-21 17:53:29 +04:00
unknown
a207c820e0 Turns out that the bulk interface was not well documented. I fixed the issue in archive and I will go and update the comments in handler next. I should probably also look through the other engines and see if this an issue elsewhere as well.
sql/ha_archive.cc:
  Fixed for bulk_insert
2006-01-21 04:49:26 -08:00
unknown
ff3079c8d0 Test case for BUG#16621: INSERTs in Stored Procedures causes data corruption
in the Binary Log.


mysql-test/r/rpl_sp.result:
  Update result file.
mysql-test/t/rpl_sp.test:
  Add test case for BUG#16621: INSERTs in Stored Procedures causes data corruption
  in the Binary Log.
2006-01-20 17:21:39 +03:00
unknown
b688b19697 Fix for BUG#15588: String overrun during sp-vars.test
The bug appears after implementation of WL#2984
(Make stored routine variables work according to the standard).


mysql-test/r/type_varchar.result:
  Update result file.
mysql-test/t/type_varchar.test:
  Add a test for BUG#15588.
sql/field.cc:
  - use memmove() instead of memcpy() -- after implementation of WL#2984
    (Make stored routine variables work according to the standard) it is
    possible to store in the field the value from this field. For instance,
    this can happen for the following statement:
      SET sp_var = SUBSTR(sp_var, 1, 3);
sql/sp_head.cc:
  - Work correctly with String:
    - String length has to be be reset before use;
    - qs_append() does not allocate memory, so the memory should
      be reserved beforehand.
sql/sql_select.cc:
  Polishing: should have been done in WL#2984.
2006-01-20 15:59:22 +03:00
unknown
1fe1288417 Fix of fix for BUG#15866. (Actually change the fib() call in sp.test)
mysql-test/r/sp.result:
  Updated results.
mysql-test/t/sp.test:
  Actually change the fib(20) into fib(10).  (Doh!)
2006-01-20 08:32:22 +01:00
unknown
7fc2604cd7 Fixed BUG#15866: Thread stack limit insufficient for recursive call "fib(20)"
Lowered the parameter to 10, and also renamed non-standard table names to t3.


mysql-test/r/sp.result:
  Updated results.
mysql-test/r/sp_trans.result:
  Updated results.
mysql-test/t/sp.test:
  Renamed fac, primes and fib tables to t3.
  Lowered fib() test parameter to 10 (20 hit the stack overrun check on some machines).
mysql-test/t/sp_trans.test:
  Added drop of t3 for safety. (Might be left from sp.test after certain test failures.)
2006-01-19 17:55:54 +01:00
unknown
217d905537 Merge mysql.com:/extern/mysql/bk/mysql-5.0
into  mysql.com:/extern/mysql/work/bug15658/mysql-5.0
2006-01-19 16:13:38 +01:00
unknown
b60fc2cee8 Post-review fixes (BUG#15658).
sql/sp_head.cc:
  Post-review fix.
sql/sp_head.h:
  Post-review fix.
sql/sql_yacc.yy:
  Post-review fix.
2006-01-19 16:13:04 +01:00
unknown
de93185567 Fix option type error, crashes on 64-bit big endian. 2006-01-19 15:36:41 +01:00
unknown
76c1f674c1 Merge mysql.com:/extern/mysql/bk/mysql-5.0
into  mysql.com:/extern/mysql/work/bug15658/mysql-5.0
2006-01-19 15:15:47 +01:00
unknown
8de1e4a847 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/opt/local/work/mysql-5.0-root
2006-01-19 17:02:53 +03:00
unknown
9a5522cad6 Merge mysql.com:/extern/mysql/bk/mysql-5.0
into  mysql.com:/extern/mysql/work/bug15658/mysql-5.0
2006-01-19 14:47:06 +01:00
unknown
f7eefc0200 reintroduce --no-defaults to ndb_mgmd
mysql-test/ndb/ndbcluster.sh:
  have made a real fix for mgmd not starting with --no-defaults. re-introduce it to the test suite
2006-01-20 00:08:26 +11:00
unknown
2e60e21d34 fix ndb_mgmd --no-defaults option processing
ndb/src/mgmsrv/main.cpp:
  fix --no-defaults option processing
2006-01-20 00:06:17 +11:00
unknown
5f37520a09 Merge mysql.com:/opt/local/work/mysql-4.1-root
into  mysql.com:/opt/local/work/mysql-5.0-root


mysql-test/ndb/ndbcluster.sh:
  Auto merged
2006-01-19 15:23:01 +03:00
unknown
52921923ab Merge ssmith@bk-internal.mysql.com:/home/bk/mysql-4.1
into  mysql.com:/home/stewart/Documents/MySQL/4.1/main
2006-01-19 22:52:22 +11:00
unknown
71f54b97cb small typo fixes
mysql-test/ndb/ndbcluster.sh:
  small fix to make ndb_mgmd run
ndb/tools/ndb_size.pl:
  small typo
2006-01-19 22:50:54 +11:00
unknown
a648d0b161 Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0
into  neptunus.(none):/home/msvensson/mysql/bug15020/my50-bug15020


sql/table.cc:
  Auto merged
2006-01-19 12:12:47 +01:00
unknown
c87bfd13ac Merge mysql.com:/opt/local/work/mysql-4.1-15613
into  mysql.com:/opt/local/work/mysql-5.0-root


sql/protocol.cc:
  Auto merged
tests/mysql_client_test.c:
  Manual merge.
2006-01-19 14:01:20 +03:00