Commit graph

46817 commits

Author SHA1 Message Date
unknown
62c807a72d Merge weblab.(none):/home/marcsql/TREE/mysql-5.0-runtime
into  weblab.(none):/home/marcsql/TREE/mysql-5.1-rt-merge50


sql/item_timefunc.cc:
  Auto merged
sql/unireg.h:
  Auto merged
2007-06-11 10:49:26 -06:00
unknown
97cf2694a1 Follow up after work on Bug 4968
Coding style: classes start with a capital letter.
Rename some classes related to parsing:
create_field -> Create_field
foreign_key -> Foreign_key
key_part_spec -> Key_part_spec


sql/field.cc:
  create_field -> Create_field
sql/field.h:
  create_field -> Create_field
sql/item.h:
  create_field -> Create_field
sql/item_sum.cc:
  create_field -> Create_field
sql/mysql_priv.h:
  create_field -> Create_field
sql/sp_head.cc:
  create_field -> Create_field
sql/sp_head.h:
  create_field -> Create_field
sql/sp_pcontext.cc:
  create_field -> Create_field
sql/sp_pcontext.h:
  create_field -> Create_field
sql/sp_rcontext.cc:
  create_field -> Create_field
sql/sql_class.cc:
  create_field -> Create_field
  key_part_spec -> Key_part_spec
  foreign_key -> Foreign_key
sql/sql_class.h:
  create_field -> Create_field
  key_part_spec -> Key_part_spec
  foreign_key -> Foreign_key
sql/sql_insert.cc:
  create_field -> Create_field
sql/sql_lex.cc:
  Coding style: classes start with a capital, create_field -> Create_field
sql/sql_lex.h:
  create_field -> Create_field
  key_part_spec -> Key_part_spec
sql/sql_parse.cc:
  create_field -> Create_field
  key_part_spec -> Key_part_spec
sql/sql_select.cc:
  create_field -> Create_field
sql/sql_table.cc:
  create_field -> Create_field
sql/sql_yacc.yy:
  create_field -> Create_field
  key_part_spec -> Key_part_spec
  foreign_key -> Foreign_key
sql/unireg.cc:
  create_field -> Create_field
2007-06-10 14:43:57 +04:00
unknown
75abceb2fe Fix for Bug#28963 "Missing DBUG_RETURN message when stopping event
scheduler".
Add missing DBUG_VOID_RETURN


sql/event_scheduler.cc:
  Fix for Bug#28963 "Missing DBUG_RETURN message when stopping event scheduler"
2007-06-10 13:16:02 +04:00
unknown
0e958122e1 Fix Windows failure. 2007-06-07 20:46:35 +04:00
unknown
d0f60308dd Merge bk-internal.mysql.com:/home/bk/mysql-5.0-runtime
into  ibm.:/home/alik/Documents/MySQL/devel/5.0-rt-bug275920-2
2007-06-07 19:36:15 +04:00
unknown
2412446cd4 Add test case for BUG#27592: stack overrun when storing datetime
value using prepared statements.


tests/mysql_client_test.c:
  Test case.
2007-06-07 19:35:29 +04:00
unknown
727757d299 Fix for BUG#27592: stack overrun when storing datetime value
using prepared statements.


sql/field.cc:
  Using MAX_DATETIME_WIDTH or MAX_DATETIME_COMPRESSED_WIDTH
  constants for the length of DATETIME fields.
  
  Using MAX_DATE_STRING_REP_LENGTH for allocating buffers
  for date/time/... string representation.
sql/item_timefunc.cc:
  Using MAX_DATETIME_WIDTH or MAX_DATETIME_COMPRESSED_WIDTH
  constants for the length of DATETIME fields.
  
  Using MAX_DATE_STRING_REP_LENGTH for allocating buffers
  for date/time/... string representation.
sql/unireg.h:
  Introduce a constant for length of datetime compressed
  format (YYYYMMDDHHMMSS).
2007-06-07 13:50:22 +04:00
unknown
0484d44eeb Merge bodhi.(none):/opt/local/work/mysql-5.0-runtime
into  bodhi.(none):/opt/local/work/mysql-5.1-runtime


mysql-test/t/mysqltest.test:
  Auto merged
mysql-test/t/strict.test:
  Auto merged
2007-06-01 20:06:13 +04:00
unknown
e21076463c Fix more mysqltest warnings. 2007-06-01 20:05:34 +04:00
unknown
3df461e5e1 Merge bodhi.(none):/opt/local/work/mysql-5.0-runtime
into  bodhi.(none):/opt/local/work/mysql-5.1-runtime


BitKeeper/etc/ignore:
  auto-union
mysql-test/t/rpl_loaddata.test:
  Use local.
mysql-test/r/rpl_loaddata.result:
  Use local.
2007-06-01 18:11:21 +04:00
unknown
a00e5c6896 Do not ignore mysqltest language interpreter warnings. 2007-06-01 18:06:40 +04:00
unknown
68cc0a34b7 Fix a typo in the test case.
mysql-test/r/rpl_loaddata.result:
  Update result.
mysql-test/t/rpl_loaddata.test:
  Fix a typo in the test file.
2007-06-01 18:04:25 +04:00
unknown
82047fab57 A post-merge fix. 2007-06-01 17:53:38 +04:00
unknown
b21f87e8b6 Merge bodhi.(none):/opt/local/work/mysql-5.0-runtime
into  bodhi.(none):/opt/local/work/mysql-5.1-runtime


mysql-test/t/mysql.test:
  Auto merged
mysql-test/t/mysqltest.test:
  Auto merged
mysql-test/t/order_by.test:
  Auto merged
mysql-test/t/sp.test:
  Auto merged
mysql-test/r/sp.result:
  Use local
2007-06-01 17:50:24 +04:00
unknown
d8cd88cd2a Fix some mysqltest warnings.
mysql-test/r/sp.result:
  Update results.
mysql-test/t/mysql.test:
  Fix a typo.
mysql-test/t/mysqltest.test:
  Fix a typo.
mysql-test/t/order_by.test:
  Fix a typo.
mysql-test/t/row.test:
  Remove an unsupported command.
mysql-test/t/sp.test:
  Fix a typo.
mysql-test/t/subselect3.test:
  Fix  mysqltest warnings - now it warns when sees some suspicious --
  comment
2007-06-01 17:49:01 +04:00
unknown
108429c99e Fix a warning.
sql/sp.cc:
  Fix a warning "field precision should have type "int", 
  but argument 2 has type "size_t"
2007-06-01 14:17:23 +04:00
unknown
0519057a87 A post-merge fix. 2007-06-01 13:33:57 +04:00
unknown
63791f4cc4 Merge bk-internal.mysql.com:/home/bk/mysql-5.1
into  bodhi.(none):/opt/local/work/mysql-5.1-runtime


client/mysqlbinlog.cc:
  Auto merged
include/config-win.h:
  Auto merged
include/my_global.h:
  Auto merged
include/my_pthread.h:
  Auto merged
mysql-test/lib/mtr_report.pl:
  Auto merged
mysql-test/t/disabled.def:
  Auto merged
sql/event_data_objects.cc:
  Auto merged
sql/event_queue.cc:
  Auto merged
sql/field.h:
  Auto merged
sql/filesort.cc:
  Auto merged
sql/handler.cc:
  Auto merged
sql/handler.h:
  Auto merged
sql/item_func.h:
  Auto merged
sql/item_xmlfunc.cc:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/log_event.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sp.h:
  Auto merged
sql/sp_head.cc:
  Auto merged
sql/sp_head.h:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_db.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_list.h:
  Auto merged
sql/sql_load.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_partition.cc:
  Auto merged
sql/sql_prepare.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_test.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged
sql/sql_view.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
storage/heap/hp_hash.c:
  Auto merged
tests/mysql_client_test.c:
  Auto merged
sql/item_func.cc:
  Manual merge.
sql/sp.cc:
  Manual merge.
sql/sql_cache.cc:
  Manual merge.
sql/sql_table.cc:
  Manual merge.
strings/my_vsnprintf.c:
  Manual merge.
2007-06-01 12:12:06 +04:00
unknown
c6ff8a6500 Added casts to avoid compiler warnings and fixed a wrong type.
---
Added casts and fixed wrong type.
---
Added casts and fixed wrong type.
---
Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1-marvel
into  a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-marvel
---
Don't give warning that readonly variable is forced to be readonly
mysql-test-run run now fails if we have [Warning] and [ERROR] as tags in .err file
Fixed wrong reference to the mysql manual
Fixed wrong prototype that caused some tests to fail on 64 bit platforms
---
Disabled compiler warnings mainly for Win 64.
---
Added casts to remove compiler warnings on windows
Give warnings also for safe_mutex errors found by test system
Added some warnings from different machines in pushbuild
---
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-marvel
into  mysql.com:/home/my/mysql-5.1
---
Added escapes for double quotes and parenthesis.
---
Archive db fix plus added non-critical warnings
in ignore list.
---
Fixed previously added patch and added new ignored warning.


client/mysqltest.c:
  Added casts to avoid compiler warnings.
  ---
  Added casts to avoid compiler warnings.
mysql-test/lib/mtr_report.pl:
  Test run now fails if we have [Warning] and [ERROR] as tags in .err file
  Added list of all common 'not fatal' errors to ignore error list
  ---
  Give warnings also for safe_mutex errors
  Added some warnings from different machines in pushbuild
  ---
  Added escapes for double quotes and parenthesis.
  ---
  Added non-critical warnings to be ignored.
  ---
  Fixed a wrong regexp
  Added new non-critical warning
mysql-test/mysql-test-run-shell.sh:
  Fixed some wrong startup options
mysql-test/r/func_misc.result:
  Test case for archive db fix.
mysql-test/t/disabled.def:
  Disable instance manager tests because they generate warnings (and probably don't read the option files correctly)
mysql-test/t/func_misc.test:
  Test case for archive db fix.
mysys/array.c:
  Added casts to avoid compiler warnings.
mysys/hash.c:
  Added casts to avoid compiler warnings.
mysys/my_compress.c:
  Added casts to remove compiler warnings on windows
mysys/my_conio.c:
  To avoid a warning from compiler.
mysys/my_pread.c:
  Archive db fix.
mysys/my_quick.c:
  Added cast to avoid compiler warning.
  ---
  Added cast to avoid compiler warning.
sql/ha_ndbcluster_binlog.cc:
  Ensure we log all binglog errors with the "NDB Binlog" tag
sql/ha_partition.cc:
  result is type bool, so calculation should be forced to
  that also.
sql/log.cc:
  Fixed compiler problem on Solaris.
sql/slave.cc:
  Make errors uniform
sql/sql_class.cc:
  Added cast to remove compiler warnings on windows
sql/sql_map.cc:
  Added casts to avoid compiler warnings.
  ---
  Added casts to avoid compiler warnings.
sql/sql_plugin.cc:
  Fixed wrong type.
  ---
  Don't give warning that readonly variable is forced to be readonly
sql/stacktrace.c:
  Corrected manual reference
storage/archive/azio.c:
  Archive db fix.
  ---
  Fixed previously added patch.
storage/blackhole/ha_blackhole.cc:
  Fixed wrong prototype that caused test to fail on 64 bit platforms
storage/example/ha_example.cc:
  Fixed wrong prototype that caused test to fail on 64 bit platforms
strings/ctype-ucs2.c:
  Fixed wrong type.
  ---
  Fixed wrong type.
support-files/compiler_warnings.supp:
  Added new disabled warnings for Win 64.
2007-05-31 17:45:22 +03:00
unknown
80af30efe1 Disabled due to valgrind failure (talked to Tomas) 2007-05-31 10:34:22 +02:00
unknown
baa8bdad29 Merge mysql.com:/nfsdisk1/lars/bk/mysql-5.0-rpl
into  mysql.com:/nfsdisk1/lars/bk/mysql-5.1-new-rpl


mysql-test/t/disabled.def:
  Manual merge
2007-05-31 10:27:53 +02:00
unknown
f527c0c9dd Merge lthalmann@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime
into  mysql.com:/nfsdisk1/lars/bk/mysql-5.1-new-rpl


include/config-win.h:
  Auto merged
mysql-test/t/disabled.def:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged
2007-05-31 10:23:37 +02:00
unknown
eb056fb82b Merge lthalmann@bk-internal.mysql.com:/home/bk/mysql-5.0-runtime
into  mysql.com:/nfsdisk1/lars/bk/mysql-5.0-rpl


mysql-test/t/disabled.def:
  Auto merged
2007-05-31 10:20:58 +02:00
unknown
0e78deec27 Build warning cleanup 2007-05-30 17:46:28 -06:00
unknown
fec3d7c6ae Merge aelkin@bk-internal.mysql.com:/home/bk/mysql-5.0-rpl
into  dsl-hkibras1-ff5dc300-70.dhcp.inet.fi:/tmp/merge_5.0


mysql-test/t/binlog_killed.test:
  manual merge bug#22725 test
2007-05-30 22:33:54 +03:00
unknown
dd190b0e6b bug#22725
refining the test because of Bug #28786 'reset master' does not reset binlogging on embeded server


mysql-test/t/binlog_killed.test:
  the test can not pass on embedded server. Setting the include-guard.
2007-05-30 22:29:15 +03:00
unknown
a4c625604f Merge kpettersson@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime
into  adventure.(none):/home/thek/Development/cpp/mysql-5.1-runtime


sql/mysqld.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_view.cc:
  Auto merged
2007-05-30 17:34:27 +02:00
unknown
e1dec83b4a Merge adventure.(none):/home/thek/Development/cpp/bug24988/my51-bug24988
into  adventure.(none):/home/thek/Development/cpp/mysql-5.1-runtime


sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
2007-05-30 17:17:46 +02:00
unknown
a10cc71801 Changed to vertical output for rpl_row_until.test 2007-05-30 17:00:48 +02:00
unknown
44f2d02d7f Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.1-new-rpl
into  mysql.com:/nfsdisk1/lars/bk/mysql-5.1-new-rpl
2007-05-30 15:58:48 +02:00
unknown
647923f9e9 Masking out error that is not generated by the test (rpl_ndb_basic.test) itself
mysql-test/r/rpl_ndb_basic.result:
  Masking out error that is not generated by the test itself
mysql-test/t/rpl_ndb_basic.test:
  Masking out error that is not generated by the test itself
2007-05-30 15:56:05 +02:00
unknown
9b13368deb Merge aelkin@bk-internal.mysql.com:/home/bk/mysql-5.1-rpl
into  dsl-hkibras1-ff5dc300-70.dhcp.inet.fi:/home/elkin/MySQL/TEAM/BARE/mysql-5.1-new-rpl
2007-05-30 16:32:36 +03:00
unknown
45a6e67fd5 bug#22725
the test is not supposed for row format. the include-guard is set.


mysql-test/t/binlog_killed.test:
  the test does not apply to rbr
2007-05-30 16:14:55 +03:00
unknown
c963c25688 Merge aelkin@bk-internal.mysql.com:/home/bk/mysql-5.1-rpl
into  dsl-hkibras1-ff5dc300-70.dhcp.inet.fi:/home/elkin/MySQL/TEAM/BARE/mysql-5.1-new-rpl
2007-05-30 15:59:21 +03:00
unknown
3c6a4bc5b2 CMakeLists.txt:
Adding strnlen.c into the list of source files.


strings/CMakeLists.txt:
  Adding strnlen.c into the list of source files.
2007-05-30 17:29:05 +05:00
unknown
9e25cfba00 1. Fix memory leak.
2. Use multibyte-safe constant.


sql/sp.cc:
  Fix memory leak.
sql/sp_head.cc:
  Use multibyte-safe constant.
2007-05-30 16:24:21 +04:00
unknown
db8df69cbc bug#17654 --read-from-remote-server causes core
fixing FD event issue that showed up on pb.


client/mysqlbinlog.cc:
  resetting temp_buf specially for FD event to avoid double-freeing
2007-05-30 14:29:34 +03:00
unknown
d08ec272d3 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.1-rpl
into  mysql.com:/home/bar/mysql-5.1.b28558
2007-05-30 16:04:52 +05:00
unknown
2eba937835 Define HAVE_STRNLEN correctly.
include/config-win.h:
  strnlen() presents in the build in library only starting from
  Visual Studio 2005, identified by _MSC_VER 1400.
  Previous versions of Visual Studio didn't have this
  function, so they need the MySQL replacement function to be compiled.
2007-05-30 16:02:54 +05:00
unknown
d57f3bbbe1 Added extra parenthesis to remove compiler warning
Fixed test case rpl_incident.test (synchronize drop table, masked IO thread behaviour)


mysql-test/r/rpl_incident.result:
  Masking master_log_file since IO thread is not synchronized in rpl_incident.test
mysql-test/t/rpl_incident.test:
  Masking master_log_file since IO thread is not synchronized in rpl_incident.test
  Correcting drop of table so it is synchronized
sql/log_event.cc:
  Added extra parenthesis to remove compiler warning
2007-05-30 11:55:56 +02:00
unknown
42eab5a2b1 Fixing wrong memory read problem detected by Valgrind in "xml" test.
The source of the problem was in my_vsnprintf() implementation.


strings/my_vsnprintf.c:
  Fixing a problem in vsnprintf('%.*s', len, ptr)
  When processing the above format, it's incorrect
  to use strlen() because the string is not necessarily
  a null terminated string.
  Changing strlen() followed by set_if_smaller()
  to strnlen() - which covers both cases - limiting
  by '\0' and by "len".
2007-05-30 14:03:35 +05:00
unknown
b3949122b1 Merge dsl-hkibras1-ff5dc300-70.dhcp.inet.fi:/home/elkin/MySQL/TEAM/FIXES/5.1/bug27044_slave_dup2unique
into  dsl-hkibras1-ff5dc300-70.dhcp.inet.fi:/tmp/merge_5.0


sql/log_event.cc:
  Auto merged
2007-05-30 11:22:07 +03:00
unknown
73acdb3569 bug#22725
merge 5.0 with 5.1


mysql-test/t/binlog_killed.test:
  offset change in 5.1
2007-05-30 11:18:55 +03:00
unknown
9e600f43bc Disable IM tests. 2007-05-30 12:06:07 +04:00
unknown
34f4dffd41 Merge dsl-hkibras1-ff5dc300-70.dhcp.inet.fi:/home/elkin/MySQL/TEAM/BARE/5.0
into  dsl-hkibras1-ff5dc300-70.dhcp.inet.fi:/tmp/merge_5.0
2007-05-30 10:59:54 +03:00
unknown
e5c4d97c9e bug#22725
test comments correction


mysql-test/r/binlog_killed.result:
  changed
mysql-test/t/binlog_killed.test:
  wrong comments (but important ones) left;
  little refinement in result calc
2007-05-30 10:56:18 +03:00
unknown
9f15fe64bd Disable IM-tests. 2007-05-30 11:53:50 +04:00
unknown
80d3415b71 Merge dsl-hkibras1-ff5dc300-70.dhcp.inet.fi:/home/elkin/MySQL/TEAM/BARE/5.0
into  dsl-hkibras1-ff5dc300-70.dhcp.inet.fi:/tmp/merge_5.0
2007-05-30 10:27:05 +03:00
unknown
9a1e9de91f bug#22725
combining the final result variable in such way that either option of the test execution
will yield zero.


mysql-test/r/binlog_killed.result:
  results changed
mysql-test/t/binlog_killed.test:
  there are two options for the test passing:
  1. no rows inserted and the INSERT gets killed, then there is no INSERT query in binlog
  2. all rows inserted, then INSERT gets to binlog and error_code is zero
2007-05-30 00:22:24 +03:00
unknown
9a4520a979 Merge malff@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime
into  weblab.(none):/home/marcsql/TREE/mysql-5.1-rt-merge


sql/sp_head.cc:
  Auto merged
2007-05-29 14:53:21 -06:00