Commit graph

8199 commits

Author SHA1 Message Date
unknown
7f8edcb5c2 BUG#15820 - Can create table with 1 partition, then doing ALTER .. ADD PARTITION crashes
It is ok for a partitioned table to have only 1 partition.  This test is just to show that
doing the ALTER TABLE ADD PARTITION doesn't crash the server.

partition_mgm_err.result:
  Added result block for test of bug #15820
partition_mgm_err.test:
  Added test block for bug #15820


mysql-test/t/partition_mgm_err.test:
  Added test block for bug #15820
mysql-test/r/partition_mgm_err.result:
  Added result block for test of bug #15820
2006-01-27 16:41:53 +01:00
unknown
5281729e8c Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/opt/local/work/mysql-5.1-merge1
2006-01-27 14:07:08 +03:00
unknown
16478e1a76 post-push fix of fix for bug #16401 (field should be char not varchar)
WL#1034 (Internal CRON)


mysql-test/lib/init_db.sql:
  fix for bug #16401, varchar -> char
mysql-test/r/system_mysql_db.result:
  fix the result of the test after pull (currently system_mysql_db is disabled)
2006-01-26 23:03:46 +01:00
unknown
cf54bc182d post-commit fix of fix for bug#16419
WL#1034 (Internal CRON)
(not interesting for the Changelog)


mysql-test/r/events.result:
  update result
mysql-test/t/events.test:
  update test after pull after comit of fix for bug 16419
2006-01-26 22:18:40 +01:00
unknown
bd2e11f571 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/opt/local/work/mysql-5.1-merge1
2006-01-27 00:08:48 +03:00
unknown
c0161265cc Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into lmy004.:/work/mysql-5.1-bug16419


mysql-test/r/events.result:
  Auto merged
mysql-test/t/events.test:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
2006-01-26 21:26:19 +01:00
unknown
3881218dc9 fix for bug#16419 (Events: can't use timestamp in the schedule)
WL #1034 (Internal CRON)


mysql-test/r/events.result:
  update test result
mysql-test/t/events.test:
  add tests
sql/event_timed.cc:
  - remove stupid check of val_int()
  - fix for bug #16419 (Events: can't use timestamp in the schedule)
    => don't use val_int() but only get_date() and use the date!
sql/share/errmsg.txt:
  - fix an error message, one more "einen"
sql/sql_yacc.yy:
  - handle new return value of event_timed::init_execute_at()
2006-01-26 21:21:21 +01:00
unknown
5c974cf184 Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into lmy004.:/work/mysql-5.1-bug16404
2006-01-26 20:47:08 +01:00
unknown
d50236f69e WL#2985 "Partition pruning": addition2: perform partition pruning for
single-table UPDATE/DELETE.


mysql-test/r/partition_pruning.result:
  WL#2985 "Partition pruning": addition2: perform partition pruning for UPDATE/DELETE:
  testcases added
mysql-test/t/partition_pruning.test:
  WL#2985 "Partition pruning": addition2: perform partition pruning for UPDATE/DELETE:
  testcases added
sql/sql_delete.cc:
  WL#2985 "Partition pruning": addition2: perform partition pruning for UPDATE/DELETE:
  Added partition pruning call in mysql_delete()
sql/sql_update.cc:
  WL#2985 "Partition pruning": addition2: perform partition pruning for UPDATE/DELETE:
  Added partition pruning call in mysql_update()
2006-01-26 20:17:17 +03:00
unknown
9853390f4c Merge mysql.com:/opt/local/work/mysql-5.0-for-merge
into  mysql.com:/opt/local/work/mysql-5.1-merge1


mysql-test/r/ps.result:
  Auto merged
mysql-test/t/ps.test:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
2006-01-26 16:36:33 +03:00
unknown
d85bdd5893 Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  april.(none):/home/svoj/devel/mysql/BUG16722/mysql-5.1-new
2006-01-26 15:23:08 +04:00
unknown
1d5185d6ec BUG#16722 - Fulltext: implicit limit for query word number (depends on length of the query)
Remove implicit limit for query word number.


mysql-test/r/fulltext.result:
  Reoder results.
storage/myisam/ft_boolean_search.c:
  Remove implicit limit for query word number. Instead compute
  number of elements and allocate exactly needed memory.
2006-01-26 15:12:59 +04:00
unknown
375afff3bd fixed test issues with bug #14354. I had mistakenly included
/var/tmp in my path when testing data diretory.  the var directory
exists in a src tree but may not exist in a different testing
build setup.


mysql-test/r/partition_mgm_err.result:
  added a row insert just to make sure the data and index files are made
mysql-test/t/partition_mgm_err.test:
  removed the /var/tmp path elements since there is not guarantee that
  other build setups will include this path
2006-01-25 21:54:43 -06:00
unknown
679aef1ba1 fix for bug#16404 (Events: keyword is ENABLED rather than ENABLE)
WL#1034 (Internal CRON)


mysql-test/r/events.result:
  fix results file
mysql-test/t/events.test:
  change test for the fix of bug#16404
sql/lex.h:
  enabled/disabled were only for events, going back to enable/disable
  fix for bug#16404
sql/sql_yacc.yy:
  ENABLED -> ENABLE
  DISABLED -> DISABLE
  fix for bug#16404 (Events: keyword is ENABLED rather than ENABLE)
2006-01-24 16:04:35 +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
24b8a9828e Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/home/psergey/mysql-5.1-ppruning-r5-push


mysql-test/r/binlog_row_ctype_cp932.result:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
2006-01-24 15:34:02 +03:00
unknown
15645bf597 Merge jmiller@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/home/ndbdev/jmiller/clones/mysql-5.1-new
2006-01-24 13:27:16 +01:00
unknown
fb8376fa20 disabled.def:
Updated to remove ndb_dd_disk2memory
ndb_dd_disk2memory.result:
  Updated results to match change to show create table for NDB tables. WL 2604


mysql-test/r/ndb_dd_disk2memory.result:
  Updated results to match change to show create table for NDB tables. WL 2604
mysql-test/t/disabled.def:
  Updated to remove ndb_dd_disk2memory
2006-01-24 13:26:21 +01: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
ded8417d58 Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  linux.site:/home/reggie/work/mysql-5.1
2006-01-23 22:20:32 -06:00
unknown
913d34fd51 Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  linux.site:/home/reggie/work/mysql-5.1-bug16718
2006-01-23 22:13:12 -06:00
unknown
015157fd9b Fix for the test failure of binlog_row_ctype_cp932. Note that since we pushed row-based replication,
"make test" != "mysql-test-run && mysql-test-run --ps-protocol". "make test" is what should be used;
had it been, the failure would have been noticed earlier. Putting back cxx flags I had by accident removed.
Disclaimer: 5.1-new is in a sorry state: log_tables and some ndb* fail, mysqlslap test crashes randomly in a row-based replication assertion (sql_class.cc:2207). 


BUILD/SETUP.sh:
  Putting back flags which I, by accident, removed during the push of row-based replication (I had removed
  them in my tree because they cause tens of wrong warnings with my gcc4.0.0, and committed that by accident).
mysql-test/r/binlog_row_ctype_cp932.result:
  result update (people should run "make test" now, it tests row-based replication too).
2006-01-23 22:17:12 +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
796a36fb5a BUG# 15523 - ALTER TABLE ... PARTITION BY does not work
this was fixed by WL 2604


mysql-test/r/partition_mgm_err.result:
  result block for bug#15523
mysql-test/t/partition_mgm_err.test:
  test block for bug #15523
2006-01-23 10:39:32 -06: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
0e8d8eb7af BUG# 16534: just a change to the test suite showing that it's fixed.
This bug was fixed as part of the large WL 2604 push.


mysql-test/r/partition_mgm_err.result:
  results block for bug #16534
mysql-test/t/partition_mgm_err.test:
  test block for bug# 16534
2006-01-23 09:44:13 -06:00
unknown
03c2cc072b Bug# 16718 partitioning support status variable has incorrect name
change status variable from have_partition_engine to have_partitioning.


mysql-test/include/have_partition.inc:
  updated to use new status variable
mysql-test/r/have_partition.require:
  updated to use new status variable
sql/set_var.cc:
  change status variable from have_partition_engine to have_partitioning.
2006-01-23 08:42:32 -06:00
unknown
004d728acc Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into lmy004.:/work/mysql-5.1-bug16548


mysql-test/t/disabled.def:
  Auto merged
2006-01-23 15:02:42 +01:00
unknown
816b77516b Merge jmiller@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/home/ndbdev/jmiller/clones/mysql-5.1-new


mysql-test/t/disabled.def:
  Auto merged
2006-01-23 14:48:12 +01: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
81ce24a948 Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into lmy004.:/work/mysql-5.1-bug16548
2006-01-23 12:38:54 +01:00
unknown
f2e749dd7b Merge
sql/sql_yacc.yy:
  Auto merged
mysql-test/t/disabled.def:
  SCCS merged
2006-01-23 11:06:12 +01:00
unknown
793a8bb7c3 Merge bk@192.168.21.1:mysql-5.1-new into mysql.com:/home/hf/work/5.1.emb
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
2006-01-23 11:59:31 +04:00
unknown
823ec15c65 Fixes about the embedded-server in 5.1
libmysqld/lib_sql.cc:
  logger initialization added
mysql-test/mysql-test-run.pl:
  ndbcluster and ssl disabled in embedded server
mysql-test/mysql-test-run.sh:
  ndbcluster disabled in embedded server
mysql-test/r/mysqltest.result:
  result fixed
mysql-test/r/sp_notembedded.result:
  result fixed
mysql-test/t/log_tables.test:
  test disabled in embedded server
mysql-test/t/sp_notembedded.test:
  test fixed
2006-01-23 11:58:14 +04: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
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
1a6dc1488d rpl_foreign_key_innodb.result, rpl_foreign_key.test:
had to add order by


mysql-test/extra/rpl_tests/rpl_foreign_key.test:
  had to add order by
mysql-test/r/rpl_foreign_key_innodb.result:
  had to add order by
2006-01-20 23:39:13 +01:00
unknown
e885b1af6c Updated test
BitKeeper/deleted/.del-not_ndb_table.inc~86f167fc49e34d38:
  Delete: mysql-test/include/not_ndb_table.inc
BitKeeper/deleted/.del-not_ndb_table.require~1e81af954dbb864a:
  Delete: mysql-test/r/not_ndb_table.require
mysql-test/extra/rpl_tests/rpl_foreign_key.test:
  Cleanup test for NDB
mysql-test/t/rpl_foreign_key_innodb.test:
  Cleanup test for NDB
mysql-test/r/rpl_foreign_key_innodb.result:
  Cleanup test for NDB
mysql-test/t/rpl_optimize.test:
  setting back to orginal values
2006-01-20 23:28:52 +01:00
unknown
3a8e50e082 fix for bug#16431 (Events: An event which alters itself disappears)
WL#1034 (Internal CRON)


mysql-test/r/events.result:
  add a test for to test bug #16431
mysql-test/t/events.test:
  results of new tests
sql/event.cc:
  - more debug info
  - pass info to evex_remove_from_cache() whether the operation 
    was drop or alter. this fixes possible bug that may lead to dropping
    of an event when it's altered. also fix for bug#16431
sql/event_executor.cc:
  be more verbose and throw more errors
sql/event_timed.cc:
  - add ` around the names of the db and the event_name and not
  their concatenation. remove ; from the end - unneeded. this fixes bug #16431,
  which was failing because after some recursion the query was ending on ;;
  which is normally an error in the parser because that's the delimiter
  
  - more debug info
  - don't execute lex_end() two times when there's a parse error or thd->is_fatal_error
2006-01-20 22:24:58 +01:00
unknown
8037ac58f5 Update test result to include final DROP TABLE stmt 2006-01-20 19:38:12 +03:00
unknown
64416b1d89 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/home/psergey/mysql-5.1-ppruning-r5


sql/handler.h:
  Auto merged
sql/item.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
2006-01-20 19:38:11 +03:00
unknown
2dc2a43006 fix for bug#16548 (Events: can't alter clause for preserve)
WL #1034 (Internal CRON)


mysql-test/r/events.result:
  fix the results
mysql-test/t/disabled.def:
  make it enabled
mysql-test/t/events.test:
  - comment out some tests (having problems now)
  - add test for fix for bug#16548
sql/sql_yacc.yy:
  - fix for bug#16548 (Events: can't alter clause for preserve)
  - prefix optional non-terminals with opt_
2006-01-20 16:12:44 +01: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
9e59b396dd Updated with feedback omer provided
mysql-test/t/ndb_dd_ddl.test:
  Updated test case with suggestions from omer
mysql-test/r/ndb_dd_ddl.result:
  Updated test case with suggestions from omer
2006-01-20 04:00:10 +01:00
unknown
fd40509ce3 Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  c-0c0be253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/mysql-5.1-new
2006-01-19 13:33:50 -05:00