Commit graph

32044 commits

Author SHA1 Message Date
unknown
ee467d38e9 Merge bk@192.168.21.1:mysql-5.0-kt
into  mysql.com:/home/hf/work/mysql-5.0.20910
2006-08-09 14:57:51 +05:00
unknown
8f88400d33 Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-4.1
into  may.pils.ru:/home/svoj/devel/mysql/BUG20060/mysql-4.1
2006-08-09 14:35:45 +05:00
unknown
51bb3b2a7f Merge may.pils.ru:/home/svoj/devel/mysql/BUG20060/mysql-4.1
into  may.pils.ru:/home/svoj/devel/mysql/BUG20060/mysql-5.0


myisam/mi_update.c:
  Auto merged
2006-08-09 14:33:45 +05:00
unknown
a2a5f2b536 BUG#20060 - mysqld option "--flush " doesn't work for update statement
Problem described in this bug report affects MyISAM tables only.

Running mysqld --flush instructs mysqld to sync all changes to disk
after each SQL statement. It worked well for INSERT and DELETE
statements, but it did sync for UPDATE only in case if there was
index change (change of colum that has an index). If no updated column
has an index, data wasn't synced to disk.

This fix makes UPDATE statement to sync data to disk even if there is
no index change (that is only data change) and mysqld is run with
--flush option.


myisam/mi_update.c:
  Every myisam function that updates myisam table must end with
  call to _mi_writeinfo(). If operation (second param of
  _mi_writeinfo()) is not 0 it sets share->changed to 1, that is
  flags that data has changed. If operation is 0, this function
  equals to no-op in this case.
  
  mi_update() must always pass !0 value as operation, since even if
  there is no index change there could be data change.
2006-08-09 14:28:39 +05:00
unknown
1bd553d41b remove undeeded printing of newline.
ndb/src/ndbapi/ClusterMgr.cpp:
  remove extra 'ndbout << endl'
2006-08-09 15:39:32 +08:00
unknown
7fcb36e2af BUG#13985
fixups after review by jonas


ndb/src/mgmclient/CommandInterpreter.cpp:
  Guard the print mutex when running SHOW
ndb/src/mgmsrv/MgmtSrvr.cpp:
  replace global_flag_send_heartbeat_now with forceHB()/updateStatus()
  
  don't use bitmask as parameter to forceHB to reflect reality of what the
  function does.
  
  remove get_connected_ndb_nodes() as it is no longer used
ndb/src/mgmsrv/MgmtSrvr.hpp:
  remove unused get_connected_ndb_nodes()
  
  update updateStatus prototype
ndb/src/mgmsrv/Services.cpp:
  use new prototype for updateStatus() - doesn't accept NodeBitmask
ndb/src/ndbapi/ClusterMgr.cpp:
  remove global_flag_send_heartbeat_now, replace with forceHB.
  
  compute bitmask of nodes to send HB to in forceHB
ndb/src/ndbapi/ClusterMgr.hpp:
  update prototype for forceHB, don't give the illusion that NodeBitmask means much.
2006-08-09 15:03:55 +08:00
unknown
4abe4b1717 sql_view.cc:
After merge fix


sql/sql_view.cc:
  After merge fix
2006-08-09 06:46:06 +04:00
unknown
a5ccdea772 Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0
into  sunlight.local:/local_work/leak_fix


sql/sql_view.cc:
  Auto merged
2006-08-09 01:45:42 +04:00
unknown
962d5b4d4e Merge sunlight.local:/home/evgen/bk-trees/mysql-5.0
into  sunlight.local:/local_work/leak_fix


sql/sql_base.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/table.cc:
  Auto merged
sql/sql_view.cc:
  Manually merged
2006-08-09 01:43:11 +04:00
unknown
1e9ebd010a sql_base.cc, unireg.h, sql_lex.h, table.cc, sql_view.h, sql_view.cc:
Correct memory leak fix


sql/unireg.h:
  Correct memory leak fix
sql/table.cc:
  Correct memory leak fix
sql/sql_view.h:
  Correct memory leak fix
sql/sql_view.cc:
  Correct memory leak fix
sql/sql_lex.h:
  Correct memory leak fix
sql/sql_base.cc:
  Correct memory leak fix
2006-08-09 00:05:42 +04:00
unknown
9672ef612e Bug#16172 DECIMAL data type processed incorrectly
issue an error in case of DECIMAL(M,N) if N > M


mysql-test/r/type_newdecimal.result:
  Bug#16172 DECIMAL data type processed incorrectly
  result fix & test case
mysql-test/t/type_newdecimal.test:
  Bug#16172 DECIMAL data type processed incorrectly
  test fix
2006-08-08 14:40:07 +05:00
unknown
3bb35e0cba bug #20910 (NOT NULL reported as NULL for TIMESTAMP)
we intentionally reported that for TIMESTAMPS, which isn't right


mysql-test/r/type_timestamp.result:
  result fixed
mysql-test/t/type_timestamp.test:
  testcase added
sql/sql_show.cc:
  remove the check for TIMESTAMP type -
  all types will report 'NO' if they're defined as NOT NULL
2006-08-08 13:34:27 +05:00
unknown
1cf5669955 result fix 2006-08-08 12:50:05 +05:00
unknown
4bf59910f7 Merge willster.(none):/home/stewart/Documents/MySQL/5.0/main
into  willster.(none):/home/stewart/Documents/MySQL/5.0/bug13985
2006-08-08 14:40:40 +08:00
unknown
ad2a2f57da Merge perch.ndb.mysql.com:/home/jonas/src/41-work
into  perch.ndb.mysql.com:/home/jonas/src/50-work


ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
2006-08-08 08:00:22 +02:00
unknown
6e5ad6914e ndb - bug#21213
Make sure totSendlenAi is set in case of ACC_ABORTCONF and activeCreate == true
  (only needed when >2 replica)


ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Make sure totSendlenAi is set in case of ACC_ABORTCONF and activeCreate == true
2006-08-08 07:59:52 +02:00
unknown
507fffa5c7 Merge willster.(none):/home/stewart/Documents/MySQL/5.0/main
into  willster.(none):/home/stewart/Documents/MySQL/5.0/bug13985


ndb/src/mgmsrv/MgmtSrvr.cpp:
  Auto merged
ndb/src/mgmsrv/MgmtSrvr.hpp:
  Auto merged
ndb/src/mgmsrv/Services.cpp:
  Auto merged
ndb/src/mgmclient/CommandInterpreter.cpp:
  manually merge parameter to pass print mutex to event thread
2006-08-08 11:59:21 +08:00
unknown
698bd7c4fa Remove extra whitespace 2006-08-07 19:21:43 +02:00
unknown
d09ba5a874 Add some more code to analyze why the fgets fails. 2006-08-07 17:26:02 +02:00
unknown
f3ea109f9b After merge fix. 2006-08-07 19:35:02 +05:00
unknown
4d22c359d0 Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.0-engines
into  may.pils.ru:/home/svoj/devel/mysql/BUG14770/mysql-5.0-engines
2006-08-07 18:00:46 +05:00
unknown
703c50e639 Add printouts in test case for bug17667
tests/mysql_client_test.c:
  Add printout describing what master.log is to be opened.
  Add printout about statements that are found in the log.
2006-08-07 14:02:57 +02:00
unknown
f93b1e4837 Merge bk-internal:/home/bk/mysql-5.0-maint
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-08-07 11:32:20 +02:00
unknown
966d11ef8d Change the 'sleep' into an explicit FLUSH LOGS command 2006-08-07 11:29:41 +02:00
unknown
a234e13a05 fflush(NULL) before abort so that all pending writes are performed 2006-08-07 10:16:37 +02:00
unknown
ef6019010d Merge mysql.com:/usr/home/bar/mysql-4.1.b19741v0
into  mysql.com:/usr/home/bar/mysql-4.1.b19741
2006-08-07 13:15:23 +05:00
unknown
78ead1feb2 Merge perch.ndb.mysql.com:/home/jonas/src/41-work
into  perch.ndb.mysql.com:/home/jonas/src/50-work


ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
  merge
2006-08-07 09:49:46 +02:00
unknown
f4e01cf6a1 ndb - bug#18475
Fix error message on copyfragref


ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
  Fix error message
2006-08-07 09:41:39 +02:00
unknown
a517c2440e Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0-kt
into  mysql.com:/home/hf/work/mysql-5.0.clean
2006-08-07 11:57:53 +05:00
unknown
86a239f555 information_schema_db.test fixed
mysql-test/t/information_schema_db.test:
  user dropped
2006-08-07 11:56:22 +05:00
unknown
a7088b3c82 Bug #20987: str_to_date doesn't accept user variable for specification
str_to_date() would sometimes render NULL if %D was used as rule other than last.
since this was due to two pointers getting mixed up in the server, this behaviour
seemed somewhat non-deterministic at SQL level.


mysql-test/r/func_time.result:
  Bug #20987: str_to_date doesn't accept user variable for specification
  
  show we can do the usual str_to_date() conversions without triggering the bug.
mysql-test/t/func_time.test:
  Bug #20987: str_to_date doesn't accept user variable for specification
  
  show we can do the usual str_to_date() conversions without triggering the bug.
sql/item_timefunc.cc:
  Bug #20987: str_to_date doesn't accept user variable for specification
  
  str_to_date() used a wrong pointer in %D conversions which could lead to the
  input being cut off after the token matching %D; if the rule required further
  tokens, the conversion would fail and render NULL.
2006-08-07 07:35:28 +02:00
unknown
55bd10965a sql_view.cc:
Memory leak fix


sql/sql_view.cc:
  Memory leak fix
2006-08-07 07:41:49 +04:00
unknown
3212394a54 grant.result:
manual merge


mysql-test/r/grant.result:
  manual merge
2006-08-07 04:13:05 +02:00
unknown
20d0a277c2 Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint
into  mysql.com:/home/tnurnberg/work/mysql-5.0-maint-20214


mysql-test/r/grant.result:
  manual merge
mysql-test/t/grant.test:
  manual merge
2006-08-07 01:39:05 +02:00
unknown
c57b6620c5 Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0
into  sunlight.local:/local_work/leak_fix


sql/sql_view.cc:
  Auto merged
2006-08-07 02:29:59 +04:00
unknown
89a9125b70 Flush stderr before calling abort() 2006-08-06 23:56:51 +02:00
unknown
ca23eef305 Merge sunlight.local:/home/evgen/bk-trees/mysql-5.0
into  sunlight.local:/local_work/leak_fix


sql/sql_view.cc:
  Auto merged
2006-08-07 00:06:54 +04:00
unknown
c34baab996 sql_view.cc:
Memory leak fix


sql/sql_view.cc:
  Memory leak fix
2006-08-07 00:06:03 +04:00
unknown
70d5bb95f9 Merge bk-internal:/home/bk/mysql-5.0-maint
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-08-06 20:59:43 +02:00
unknown
12de829a49 Send output from mysql_client_test to var/log/mysql_client_test.log 2006-08-06 20:58:30 +02:00
unknown
08e0df1bc1 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/Users/kent/mysql/bk/mysql-5.0
2006-08-06 16:47:49 +02:00
unknown
5efe5fd820 please don't call methods that should always execute inside assert()
tests/mysql_client_test.c:
  fixed lines that are executing methods that should always execute inside assert()
2006-08-05 18:58:38 -05:00
unknown
46ed9d0b67 mysql_client_test.c:
Moving call that processes select results out of the assert


tests/mysql_client_test.c:
  Moving call that processes select results out of the assert
2006-08-05 23:15:23 +02:00
unknown
e061ed925f relying on loop counter variables being local to the loop body if
declared in the 'for' statement is not portable, some compilers
  still don't implement this ANSI C++ specification (Bug #14995)
2006-08-05 13:41:22 +02:00
unknown
60a4f50c96 Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-5.0-kt
into  production.mysql.com:/usersnfs/rburnett/mysql-5.0-kt


sql/mysqld.cc:
  Auto merged
2006-08-04 21:34:46 +02:00
unknown
29e946ee5a lowercase_fs_off fails on windows because lower_case_file_system is not being
set properly.  This patch should fix that.

mysqld.cc:
  Call test_if_case_insensitive in all cases so lower_case_file_system always gets set


sql/mysqld.cc:
  Call test_if_case_insensitive in all cases so lower_case_file_system always gets set
2006-08-04 21:18:58 +02:00
unknown
d166ede9a3 Merge bk-internal.mysql.com:/data0/bk/mysql-5.0
into  bk-internal.mysql.com:/data0/bk/mysql-5.0-kt


client/mysql.cc:
  Auto merged
mysql-test/r/gis.result:
  Auto merged
2006-08-04 19:19:26 +02:00
unknown
b50642e899 ndb - bug#21129
add missing function to mgmapi


ndb/src/mgmapi/ndb_logevent.cpp:
  add missing function
2006-08-04 10:30:57 +02:00
unknown
9e78bbc220 Merge perch.ndb.mysql.com:/home/jonas/src/41-work
into  perch.ndb.mysql.com:/home/jonas/src/50-work


ndb/include/ndbapi/NdbOperation.hpp:
  Auto merged
2006-08-04 10:16:42 +02:00
unknown
bb285b44c3 ndb - bug#21400
Fix docs for NdbOpertation::sub_reg


ndb/include/ndbapi/NdbOperation.hpp:
  Fix docs for sub_reg
2006-08-04 09:43:23 +02:00