Commit graph

29994 commits

Author SHA1 Message Date
unknown
6efc402201 Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into debian.(none):/M51/mysql-5.1
2006-01-25 12:58:23 +01:00
unknown
cbfc0f4c60 Merge perch.ndb.mysql.com:/home/jonas/src/51-new
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new
2006-01-25 11:06:36 +01:00
unknown
837723f652 bug#10987 - ndb - unable to find restorable replica
Add massive printout when failure detected


storage/ndb/src/kernel/blocks/dbdih/Dbdih.hpp:
  Add dumping of replica info
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Add dumping of replica info
2006-01-25 11:02:19 +01:00
unknown
a2fa3254e2 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new
2006-01-25 09:51:51 +01:00
unknown
8dc5a6c6eb bug#16771 - ndb dd - fix leak of extents
storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
  Add debug printouts
storage/ndb/src/kernel/blocks/dbtup/DbtupDiskAlloc.cpp:
  Add debug printouts
  Fix leak of extents
storage/ndb/src/kernel/blocks/pgman.cpp:
  Add debug printouts
2006-01-25 09:47:56 +01:00
unknown
0cb8c58e5b Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into debian.(none):/M51/mysql-5.1
2006-01-25 07:59:11 +01:00
unknown
516a6d9375 Compile failure fix for gcc 2.95x: Don't use unnamed union of unnamed
structs in PARTITION_ITERATOR
2006-01-25 06:01:54 +03:00
unknown
d1b9042d25 Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into debian.(none):/M51/mysql-5.1
2006-01-24 18:46:10 +01:00
unknown
a2f192f1ef Merge bk-internal:/home/bk/mysql-5.1-new
into  neptunus.(none):/home/msvensson/mysql/bug15020/my51-bug15020


sql/table.cc:
  Auto merged
2006-01-24 17:46:13 +01: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
8e35b68336 excess space caused "../scripts/mysql_create_system_tables: line 46: : command not found"
when I ran mysql-test-run
2006-01-24 15:50:04 +01:00
unknown
ae2abaef13 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/home/mysql_src/mysql-5.1-new
2006-01-24 15:38:52 +01:00
unknown
b455ba3f59 Fix for crash of "mysql-test-run --debug mysqldump": don't access dir->str if dir is null.
sql/parse_file.cc:
  since recently, the "dir" parameter can be 0.
2006-01-24 15:37:56 +01:00
unknown
1b77a01972 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/home/psergey/mysql-5.1-ppruning-r5-push
2006-01-24 16:54:48 +03:00
unknown
1dc1e2e66d Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/usr/home/bar/mysql-5.1-new.fscs
2006-01-24 17:34:48 +04:00
unknown
641405241d table.cc:
Try to open an old 5.0 table name
  if encoded name doesn't exist.
  This makes SELECT working without having
  to rename tables with tricky characters
  in name into 5.1 format (simpliefies upgrade).


sql/table.cc:
  Try to open an old 5.0 table name
  if encoded name doesn't exist.
  This makes SELECT working without having
  to rename tables with tricky characters
  in name into 5.1 format (simpliefies upgrade).
2006-01-24 17:33:39 +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
d5e109ea6a bug#16742 - ndb dd - round filesize upwards
storage/ndb/src/kernel/blocks/tsman.cpp:
  Round filesize upwards
2006-01-24 11:41:58 +01:00
unknown
5f7d84930d bug#16738 - ndb dd - out of diskspace
fix typo + add error code to printable list


storage/ndb/include/kernel/signaldata/Extent.hpp:
  Set correct error code
storage/ndb/src/kernel/blocks/dbtup/DbtupDiskAlloc.cpp:
  err is already negative
storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp:
  Set correct error code
storage/ndb/src/ndbapi/ndberror.c:
  Add error code to printable list
2006-01-24 10:47:04 +01:00
unknown
464ec791e7 Merge neptunus.(none):/home/msvensson/mysql/mysql-5.1
into  neptunus.(none):/home/msvensson/mysql/bug15020/my51-bug15020


sql/table.cc:
  Auto merged
2006-01-24 10:31:41 +01:00
unknown
5a2239ff49 Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into debian.(none):/M51/mysql-5.1
2006-01-24 08:35:15 +01:00
unknown
f37545521b bug #14354 - data directory and index directory not working for partitions
mysql-test/r/partition_mgm_err.result:
  only the single drop table since we have disabled query logging for the create table
mysql-test/t/partition_mgm_err.test:
  test for bug #14354
  first make sure /tmp/bug14354 is not there, then make the dir
  create a partitioned table with the partition using
  /tmp/bug14354 as it's data dir
  we are disabling query logging since we are using $MYSQL_TEST_DIR
  and we are not certain where the tmp files will be created.
sql/ha_partition.cc:
  pass partition filename with pathname into 
  set_up_table_before_create.
  
  remove the path from the passed in value and then append the filename
  to the data_file_name or index_file_name if those values were
  specified.
sql/ha_partition.h:
  added partition_name_with_path to set_up_table_before_create
sql/mysql_priv.h:
  move append_file_to_dir to mysql_priv.h
sql/sql_parse.cc:
  moving append_file_to_dir to mysql_priv.h
sql/sql_partition.cc:
  add_keyword_string was not writing keyword value with quotes
2006-01-23 23:20:23 -06: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
9a8432a2a7 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 01:13:20 +01:00
unknown
7cf0b1d4e5 disabled.def:
Updated with new bug number


mysql-test/t/disabled.def:
  Updated with new bug number
2006-01-24 01:12:23 +01:00
unknown
1fb23ad7ca Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/home/cps/mysql/trees/5.1/5.1-virgin-no-debug
2006-01-24 01:28:26 +03:00
unknown
83401c5209 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/home/mysql_src/mysql-5.1-new
2006-01-23 22:18:30 +01: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
a0f5be2a1d fix for bug #16401 Events: mysql.event.comment is varchar(64)
scripts/mysql_fix_privilege_tables.sql:
  varchar -> char
  fix for bug #16401
2006-01-23 22:09:53 +01:00
unknown
3c80db1549 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 18:25:19 +01:00
unknown
41d5685f1a disabled.def:
Disabled ndb_dd_disk2memory


mysql-test/t/disabled.def:
  Disabled ndb_dd_disk2memory
2006-01-23 18:24:12 +01: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
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
130ce1b784 Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into debian.(none):/M51/mysql-5.1
2006-01-23 16:15:39 +01:00
unknown
ea09d626a5 Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into lmy004.:/work/mysql-5.1-tt-copy-works


sql/event.cc:
  Auto merged
sql/event_executor.cc:
  Auto merged
sql/event_timed.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
2006-01-23 16:13:46 +01: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
8a373fc3c4 Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/home/cps/mysql/trees/5.1/5.1-virgin-no-debug


mysql-test/t/log_tables.test:
  Auto merged
2006-01-23 17:28:37 +03:00
unknown
f3fd2ace35 disable ps_protocol in log_tables test.
The log content is obviously different in two modes,
as Queries are translated into Prepare and Execute
commands. Thus we should use test only in one mode
to get the match with result.


mysql-test/t/log_tables.test:
  disable ps-protocol in log_tables test
2006-01-23 17:27:16 +03: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
ef55f642ca 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-23 14:51:44 +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
69238a7071 disabled.def:
updated


mysql-test/t/disabled.def:
  updated
2006-01-23 14:46:56 +01:00
unknown
949197ad71 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new
2006-01-23 14:16:35 +01:00
unknown
8af5860ee4 ndb - Fix strange SR problems
uninit variable


storage/ndb/include/kernel/signaldata/LqhFrag.hpp:
  Correct signal length
2006-01-23 14:15:35 +01:00
unknown
02de80335c rpl_foreign_key.test:
Added comments on 1022 per Lars request


mysql-test/extra/rpl_tests/rpl_foreign_key.test:
  Added comments on 1022 per Lars request
2006-01-23 14:07:58 +01:00
unknown
1204456bb1 - disable events for now (again) 2006-01-23 13:56:34 +01:00
unknown
cb823b0f88 Bug#15904 --tmpdir requires trailing slash '/'
- Use same code for creating the temptable filename both from "mysql_create_table" and "mysql_create_like_table"


sql/sql_table.cc:
  Move common functionality to crate a temptable name 
  into "build_tmptable_filename", call it both from 
  "mysql_create_table" and "mysql_create_like_table"
2006-01-23 13:28:42 +01:00