Commit graph

31030 commits

Author SHA1 Message Date
unknown
558c41abfb BUG#17752: Non-allocated memory caused core in rpl_multi_engine test
sql/log_event.cc:
  Removed optimization that is no longer valid
2006-02-27 22:14:46 +01:00
unknown
1e3e30bdc2 log_event.cc:
Visual C++ dont relate 'byte' and 'char*' that close, added casts
mysql.sln:
  Only build mysqlserver.lib if embedded target


VC++Files/mysql.sln:
  Only build mysqlserver.lib if embedded target
sql/log_event.cc:
  Visual C++ dont relate 'byte' and 'char*' that close, added casts
2006-02-26 01:16:11 +01:00
unknown
1c8bf361f5 config-win.h:
Enable row based replication for Windows build
replication.m4:
  Made help text more clear, default is with row based replication enabled


config/ac-macros/replication.m4:
  Made help text more clear, default is with row based replication enabled
include/config-win.h:
  Enable row based replication for Windows build
2006-02-25 21:27:49 +01:00
unknown
0d97c20ec0 drop-on-restart.inc:
Drop 'mysqlslap'
  Added database name 'ndbsynctest'
sql_table.cc, create.test, create.result:
  Patch for bug#17530 done by evgen, extracted from 5.0


mysql-test/r/create.result:
  Patch for bug#17530 done by evgen, extracted from 5.0
mysql-test/t/create.test:
  Patch for bug#17530 done by evgen, extracted from 5.0
sql/sql_table.cc:
  Patch for bug#17530 done by evgen, extracted from 5.0
mysql-test/include/drop-on-restart.inc:
  Drop 'mysqlslap'
2006-02-25 20:17:07 +01:00
unknown
6afe1bc76e ndb - sockaddr alignment fix, found on sunfire100a, can affect any non-x86
storage/ndb/src/common/transporter/Transporter.cpp:
  use sockaddr_in in declarations to guarantee sin_addr alignment
storage/ndb/src/mgmsrv/Services.cpp:
  use sockaddr_in in declarations to guarantee sin_addr alignment
2006-02-25 17:25:22 +01:00
unknown
cfbb40bbc0 Merge mysqldev@production.mysql.com:my/mysql-5.1-release
into  mysql.com:/home/bk/mysql-5.1-release-bug13418-lars


mysql-test/t/disabled.def:
  Auto merged
2006-02-24 20:27:51 +01:00
unknown
a9dab911a4 BUG# 17430 Partitoins: crash on SELECT * FROM t1 WHERE f_int1 IS NULL
BUG# 17432: Partitions: wrong result, SELECT ... WHERE <column> is null


mysql-test/r/partition.result:
  result block for tests
mysql-test/t/partition.test:
  test cases for bug #17432 and 17430
sql/sql_partition.cc:
  improve null handling by returning LONGLONG_MIN for values that are NULL
2006-02-24 10:10:41 -06:00
unknown
3a78156ee6 Bug #17443 mysqldump test failure
client/mysqlimport.c:
  Remove disabled --use-threads option
mysql-test/r/mysqldump.result:
  Update result
mysql-test/t/disabled.def:
  Remove disable of mysqldump
mysql-test/t/mysqldump.test:
  Remove the disable_parsing on tests for --use-threads to mysqlimport
2006-02-24 17:10:40 +01:00
unknown
50397f3f4b Merge mysqldev@production.mysql.com:my/mysql-5.1-release
into  mysql.com:/users/lthalmann/bk/mysql-5.1-release-bug13418
2006-02-24 16:22:06 +01:00
unknown
d6aea04c5b Merge mysqldev@production.mysql.com:my/mysql-5.1-release
into mysql.com:/Users/kent/mysql/bk/mysql-5.1-release
2006-02-24 15:47:07 +01:00
unknown
dededdec0a BUG#13418 (V2): Bit columns should replicate correctly when using RBR
mysql-test/r/rpl_bit_npk.result:
  Updated results
mysql-test/t/disabled.def:
  rpl_bit_npk now works
sql/field.h:
  Field_bit::cmp_binary_offset wrongly used base class method that does not work for Field_bit
  This was discussed with Monty and should be pushed into 5.0 too
sql/log_event.cc:
  Added checks for null bits
  Swapped use of m_after_image (was m_search_record) and table->record[1] to use record[i] 
  in the same way as other MySQL code (i.e. use record[1] for scan data).
  Removed use of cmp_binary in record_compare (it is currently wrong to use that 
  without copying the null bits to the compare data record)
sql/log_event.h:
  Name change to indicate new semantics
2006-02-24 15:38:20 +01:00
unknown
760de195eb Merge mysqldev@production.mysql.com:my/mysql-5.1-release
into  mysql.com:/home/emurphy/src/mysql/bk-clean/mysql-5.1-release
2006-02-23 23:21:53 -05:00
unknown
c6ee60933d BUG#17521 alter database crashes slave
Problem was a null pointer
Fixed by passing correct database name to slave filtering mechanism
Added test.


sql/sql_parse.cc:
  Fix slave crash when issuing 'ALTER DATABASE' with specifying db name
  Don't pass null pointer to db_ok_with_wild_table()
2006-02-23 23:20:29 -05:00
unknown
3754c4eb1f Makefile.am:
Conditionally link with libmysqlclient.la or libmysqlclient_r.la
configure.in:
  Corrected help text for --with-debug option
  Changed default to be with thread safe client
  Added THREAD_SAFE_CLIENT to be used in 'if' in make files


configure.in:
  Corrected help text for --with-debug option
  Changed default to be with thread safe client
  Added THREAD_SAFE_CLIENT to be used in 'if' in make files
client/Makefile.am:
  Conditionally link with libmysqlclient.la or libmysqlclient_r.la
2006-02-24 01:24:41 +01:00
unknown
9805bd76f6 Merge mysqldev@production.mysql.com:my/mysql-5.1-release
into lmy004.:/work/mysql-5.1-release
2006-02-24 00:33:26 +01:00
unknown
bb26549bc0 fix for bug #16400
scripts/mysql_fix_privilege_tables.sh:
  fix the message as per #16399
sql/sql_acl.cc:
  fix the priv per review comment by Serg
2006-02-24 00:29:50 +01:00
unknown
b9697b2056 Merge mysqldev@production.mysql.com:my/mysql-5.1-release
into  mysql.com:/home/bk/fix-mysql-5.1-release
2006-02-23 22:21:07 +01:00
unknown
e2994b2857 Bug#17678 (RBR format change: moving from VLE to net encoding):
Switching to use net_*_length() instead of VLE functions.


sql/log_event.cc:
  Switching to use net_*_length() instead of VLE functions.
2006-02-23 22:19:47 +01:00
unknown
37bd6647aa Merge mysqldev@production.mysql.com:my/mysql-5.1-release
into  mysql.com:/users/mkindahl/bk/merge-b17181-mysql-5.1-new


sql/ha_ndbcluster_binlog.cc:
  Auto merged
2006-02-23 13:49:27 +01:00
unknown
7d4c684633 Bug#17181 (mysqlslap test server crash):
Moving assignments to table_map_id for thread-safe handling of
  table shares.


sql/ha_ndbcluster_binlog.cc:
  Assign_new_table_id() now takes table share instead of table.
sql/mysql_priv.h:
  New protptype for assign_new_table_id().
sql/sql_base.cc:
  Assign_new_table_id() now takes a table share instead of a table.
  Moving call to assign_new_table_id() into get_table_share().
sql/table.cc:
  Setting default values of table_map_id and table_map_version inside
  alloc_table_share() and init_tmp_table_share().
  Removing the settings from open_table_from_share().
2006-02-23 13:34:03 +01:00
unknown
3150f7ccab Makefile.am:
Change for 'make distcheck'
libmysqld.vcproj:
  Typo


VC++Files/libmysqld/libmysqld.vcproj:
  Typo
mysql-test/ndb/Makefile.am:
  Change for 'make distcheck'
storage/archive/Makefile.am:
  Change for 'make distcheck'
plugin/fulltext/Makefile.am:
  Change for 'make distcheck'
storage/csv/Makefile.am:
  Change for 'make distcheck'
storage/heap/Makefile.am:
  Change for 'make distcheck'
2006-02-22 20:34:25 +01:00
unknown
71ffac7e60 Fix the changelog entry header, format was wrong 2006-02-21 15:39:43 -05:00
unknown
517250a6d3 configure.in (in the new clone):
This is a re-clone after tagging, so the version must be set back to 5.1.7-beta.


configure.in:
  This is a re-clone after tagging, so the version must be set back to 5.1.7-beta.
2006-02-21 18:24:28 +01:00
unknown
010f9be50c Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  april.(none):/home/svoj/devel/mysql/BUG17116/mysql-5.1-new
2006-02-21 16:20:02 +04:00
unknown
a11129afc4 disable tests. failures happen from time to time and stop people from
pushing. the code needs to be more stable.
2006-02-21 13:07:25 +01:00
unknown
5eadf344fe ndb - enable ndb_dd_backuprestore
mysql-test/t/disabled.def:
  enable ndb_dd_backuprestore
2006-02-21 09:27:20 +01:00
unknown
0e58db7473 Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/space/pekka/ndb/version/my51
2006-02-21 09:27:19 +01:00
unknown
f19241d521 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
2006-02-21 09:27:18 +01:00
unknown
37684a1e3e fixed test result on ndb_dd_restore whwas not done before 2006-02-21 09:25:50 +01:00
unknown
13a81d455f Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/space/pekka/ndb/version/my51
2006-02-21 05:08:18 +01:00
unknown
5c9afee608 fixed result
mysql-test/r/events.result:
  result fixed
2006-02-21 03:17:53 +01:00
unknown
ae48f5fdf7 fix for bug#16407 (EVENTS: sql_mode)
post-review fixes


mysql-test/r/events_bugs.result:
  fix result
sql/event.cc:
  fix compilation problem on windows
sql/event_executor.cc:
  show the right host in show processlist (should be event_scheduler@localhost)
sql/event_timed.cc:
  a bit more debug infor
  fix a problem introduced with previous push :( . clean everything that's whitespace.
  found because of new test cases which were crashing.
sql/sql_show.cc:
  fix compile problem on windows
2006-02-21 02:40:23 +01:00
unknown
449cc2400b ndb - fix event created by ndb_restore bug#17045 (not really)
mysql-test/t/disabled.def:
  leave ndb_dd_backuprestore disabled until *.result corrected
storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp:
  error code was clobbered
storage/ndb/tools/restore/consumer_restore.cpp:
  surprise - ndb_restore creates events
2006-02-21 02:27:23 +01:00
unknown
e41f5cc464 manual merge
sql/event.cc:
  Auto merged
sql/event.h:
  Auto merged
sql/sql_show.cc:
  Auto merged
2006-02-21 00:01:39 +01:00
unknown
203b37effe fix for bug#16407 (Events: Changes in sql_mode won't be taken into account)
WL#1032
sql_mode setting was disregarded during create/alter event and wasn't set during
event execution.
(post-review small fixes)


sql/event.cc:
  store the sql_mode when the body is stored
  - always on create event
  - during alter event if the user changes the body
sql/event.h:
  add sql_mode as member variable
sql/event_timed.cc:
  - exchange thd->variables.sql_mode before and after execution
  - set the sql_mode of the anonymous SP -> event_timed::sphead
sql/sql_show.cc:
  - show real content in I_S.EVENTS.SQL_MODE , disallow NULL
2006-02-20 23:52:22 +01:00
unknown
b36730953c Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into lmy004.:/work/mysql-5.1-bug16406
2006-02-20 23:29:55 +01:00
unknown
56d1810d0a Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into mysql.com:/home/psergey/mysql-5.1-look
2006-02-21 00:20:44 +03:00
unknown
c7d335a7d2 BUG#15448 (group_min_max test failure): Don't bypass group-min-max optimizer entry point
if we've got a tree of type ALWAYS or MAYBE.


sql/opt_range.cc:
  BUG#15448 (group_min_max test failure): Don't buypass group-min-max optimizer entry point 
  if we've got a tree of type ALWAYS or MAYBE.
  The effect observed by this bug has been introduced by this cset: 
  ChangeSet 1.1967.5.2 2005/12/26 08:40:09 sergefp@mysql.com. The cset introduced PARAM::remove_jump_scans
  which purpose was to avoid making [always unsuccessful] attempts to construct index_merge for construct 
  index_merge for conditions like "t.key1partX=c1 OR t.key1partY=c2". The effect of this change was that some
  queries that previously had produced a SEL_TREE representing candidate for index_merge(X,Y) now started to 
  produce SEL_TREE with type=ALWAYS, and group-min-max analysis for these trees has been bypassed.
  In this fix we make SEL_TREE with type=ALWAYS to be processed in the same way as (SEL_TREE*)NULL, its equivalent.
2006-02-21 00:17:29 +03:00
unknown
fc6416fca7 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/home/kostja/mysql/mysql-5.1-vanilla
2006-02-20 23:00:50 +03:00
unknown
5e00b327cd Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into lmy004.:/work/mysql-5.1-bug16406


mysql-test/r/events.result:
  Auto merged
2006-02-20 20:57:44 +01:00
unknown
4ba2e0085f A new error message for deprecated statements.
Fixes failing sp.test


mysql-test/r/backup.result:
  A new error message for deprecated statements.
mysql-test/t/sp.test:
  Disable warnings in the test for Bug#13012
sql/share/errmsg.txt:
  A new error message for deprecated statements.
sql/sql_yacc.yy:
  Use a better worded error message.
2006-02-20 22:51:32 +03:00
unknown
37b1731727 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
2006-02-20 18:23:30 +01:00
unknown
de83767bd0 ndb - enable rpl_ndb_blob2 bug#17505
mysql-test/extra/rpl_tests/rpl_row_blob.test:
  enable rpl_ndb_blob2 (sleep fixed)
mysql-test/t/disabled.def:
  enable rpl_ndb_blob2 (sleep fixed)
2006-02-20 17:20:54 +01:00
unknown
140c3b8a94 ndb - rbr blobs etc: minor changes bug#17045 bug#17505
sql/ha_ndbcluster_binlog.cc:
  optim: setting db/schema for data events seems unnecessary
storage/ndb/src/ndbapi/Ndb.cpp:
  use NAME_LEN
2006-02-20 16:36:30 +01:00
unknown
b6ed1294c2 Merge jonas@perch:src/mysql-5.1-new
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
2006-02-20 13:38:26 +01:00
unknown
c8a03c1753 disabled.def: merge
mysql-test/t/disabled.def:
  e
  hate bk
2006-02-20 12:37:28 +01:00
unknown
68ef8a6f18 Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/space/pekka/ndb/version/my51


sql/ha_ndbcluster.cc:
  Auto merged
sql/ha_ndbcluster_binlog.cc:
  Auto merged
2006-02-20 12:37:27 +01:00
unknown
613d172123 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
2006-02-20 12:37:26 +01:00
unknown
281cd0f300 Bug #17559 ndb_gis test failure
- test tables use blobs without PK, and was not handled correctly
2006-02-20 12:36:10 +01:00
unknown
2ce03bb5ba ndb - rbr blobs etc: set db/schema in injector_ndb before calling NDB
storage/ndb/src/ndbapi/NdbBlob.cpp:
  DBUG
storage/ndb/include/ndbapi/Ndb.hpp:
  method to set db/schema from table name + format check in internalize_table_name
storage/ndb/include/ndbapi/NdbDictionary.hpp:
  method to set db/schema from table name + format check in internalize_table_name
storage/ndb/src/ndbapi/Ndb.cpp:
  method to set db/schema from table name + format check in internalize_table_name
sql/ha_ndbcluster_binlog.cc:
  set injector_ndb db/schema before calling NDB (may be more cases..).  only place to get it is table internal name
2006-02-20 12:07:12 +01:00