Commit graph

21361 commits

Author SHA1 Message Date
unknown
69d8bfe231 Fix for bug #23653: Crash if last_day('0000-00-00')
As get_arg0_date() in the Item_func_last_day::get_date() returns 
0000-00-00 date sometimes, we have to check ltime->month for 0 after the call.


mysql-test/r/func_time.result:
  Fix for bug #23653: Crash if last_day('0000-00-00')
    - test result.
mysql-test/t/func_time.test:
  Fix for bug #23653: Crash if last_day('0000-00-00')
    - test case.
sql/item_timefunc.cc:
  Fix for bug #23653: Crash if last_day('0000-00-00')
    - return error if month is 0.
2006-11-09 16:17:50 +04:00
unknown
870b2e0a2b This ChangeSet must be null-merged to 5.0. Applied innodb-4.1-ss33
Fixes:
- Bug #24089: Race condition in fil_flush_file_spaces()


innobase/fil/fil0fil.c:
  Applied innodb-4.1-ss33
  
  Revision r33:
  innodb-4.1: Merge r1002 from innodb/trunk:
  
  fil_flush_file_spaces(): Copy the system->unflushed_spaces list to an
  array while holding the mutex.  This removes the crash-triggering
  race condition that was introduced when fixing Bug 15653.  (Bug #24089)
2006-11-09 05:03:35 +01:00
unknown
671d863ca5 Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/g41
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/41
2006-11-09 00:47:48 +01:00
unknown
d3b049a6bf Update of --mem flag after comments
mysql-test/mysql-test-run.pl:
  Allow --mem to be specified as a flag or --mem=<dir>
  Add /tmp to locations to search
  Update comments and usage description
2006-11-08 23:16:44 +01:00
unknown
26e6d78845 No need to pass an additional arg to to mtr_add_arg when there is no % sign 2006-11-08 22:56:06 +01:00
unknown
427f1acaaa Pass location of charsets dir to mysqltest to avoid using the charsetdir locally installed on machine.
client/mysqltest.c:
  Add new option --character-sets-dir to mysqltest
  Set MYSQL_SET_CHRSET_DIR before connecting to mysqld if the above variable is set
mysql-test/mysql-test-run.pl:
  Pass $path_charsetsdir to mysqltest
2006-11-08 22:53:40 +01:00
unknown
c98a6dc8af Don't run mysqltest with both --silent and --verbose 2006-11-08 22:45:52 +01:00
unknown
d167b60f63 Merge mysql.com:/Users/kent/mysql/bk/lic/my40-lic
into  mysql.com:/Users/kent/mysql/bk/lic/my41-lic


README:
  Auto merged
2006-11-07 22:49:46 +01:00
unknown
22655de1d5 make_binary_distribution.sh:
Added LICENSE.mysql, removed LICENSE.doc README.NW.
  Removed obselete section about MySQLEULA.txt and README.NW.
README:
  Added reference to the EXCEPTIONS-CLIENT file.
  Changed reference to the commercial license file.
  Corrected references into chapters in the manual.
.del-MySQLEULA.txt~4a1afd9284f9be5a:
  Delete: Docs/MySQLEULA.txt


README:
  Added reference to the EXCEPTIONS-CLIENT file.
  Changed reference to the commercial license file.
  Corrected references into chapters in the manual.
BitKeeper/deleted/.del-MySQLEULA.txt~4a1afd9284f9be5a:
  Delete: Docs/MySQLEULA.txt
scripts/make_binary_distribution.sh:
  Added LICENSE.mysql, removed LICENSE.doc README.NW.
  Removed obselete section about MySQLEULA.txt and README.NW.
2006-11-07 22:26:37 +01:00
unknown
a797e75a3e Bug#23981 memory leaks from yassl code + other
- Readd --skip-bdb when valgrinding


mysql-test/mysql-test-run.pl:
  Readd --skip-bdb when valgrinding
2006-11-07 16:09:32 +01:00
unknown
a10cfc6a0c Don't allow path to be passed to --mem 2006-11-07 13:01:32 +01:00
unknown
3893f90764 Correct faulty commit, the opt_tastcase_timeout value is in minutes, to it need to be multiplied with 60 before ping passed to mtr_timer_start 2006-11-07 12:56:55 +01:00
unknown
04d32c1dd2 Merge bk-internal:/home/bk/mysql-4.1-maint
into  neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
2006-11-07 11:09:14 +01:00
unknown
434192fe54 Make --mem settable with environment variable MTR_MEM and make it possible to pass the directory to use. I.e --mem=<directory>
include/abi_check.ic:
  Ignore file
include/abi_check:
  Ignore file
2006-11-07 11:07:27 +01:00
unknown
02e764bd10 Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug23411/my41-bug23411
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-4.1-maint
2006-11-06 18:01:47 -05:00
unknown
2b35fee8ab Bug#23411: ... MOD-ing zero returns strange result
The Item_func_mod objects never had maybe_null set, so users had no reason 
to expect that they can be NULL, and may therefore deduce wrong results.
Now, set maybe_null.


mysql-test/r/func_test.result:
  Verify that the predictions are true.
mysql-test/t/func_test.test:
  Verify that the predictions are true.
sql/item_func.cc:
  MOD functions may be NULL.
2006-11-06 17:13:19 -05:00
unknown
16a671c021 Don't warn about "Found non pid file" for elements that are not files. 2006-11-03 15:26:42 +01:00
unknown
65e3646258 Fix merge collision. 2006-11-02 18:27:52 -05:00
unknown
e1a722b2d3 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-4.1-maint


configure.in:
  Auto merged
mysql-test/t/ps.test:
  Auto merged
sql/handler.cc:
  Auto merged
sql/sql_delete.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/table.cc:
  Auto merged
tests/mysql_client_test.c:
  Auto merged
myisam/sort.c:
  Manual merge.
mysql-test/r/innodb_mysql.result:
  Manual merge.
mysql-test/t/innodb_mysql.test:
  Manual merge.
mysys/mf_iocache.c:
  Manual merge.
2006-11-02 17:27:42 -05:00
unknown
2772d9e182 Merge bk-internal:/home/bk/mysql-4.1-maint
into  shellback.(none):/home/msvensson/mysql/mysql-4.1-maint
2006-11-02 23:09:32 +01:00
unknown
24232ff032 configure.in:
Raise version number to 4.1.23


configure.in:
  Raise version number to 4.1.23
2006-11-02 21:58:42 +01:00
unknown
aae0caf608 Merge kpettersson@bk-internal:/home/bk/mysql-4.1-maint
into  kpdesk.mysql.com:/home/thek/dev/mysql-4.1-maint
2006-11-02 13:35:28 +01:00
unknown
4868875cec Bug#22828 complementary patch:
- 'false' not defined in C, use FALSE instead.


mysys/my_lock.c:
  Fixed error in windows built:
  'false' not defined in C, use FALSE instead.
2006-11-02 13:33:26 +01:00
unknown
e9f182b3b9 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1-maint
into  mysql.com:/usr/home/ram/work/bug22913/my41-bug22913


client/mysql.cc:
  Auto merged
2006-11-02 16:25:01 +04:00
unknown
b96f1a477d Fix for bug #22913: mysql --quick doesn't report some errors.
We don't check for errors that may occur during data printing.


client/mysql.cc:
  Fix for bug #22913: mysql --quick doesn't report some errors.
    - check for errors after the data output.
2006-11-02 14:32:00 +04:00
unknown
2886e07d3f Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into  bodhi.local:/opt/local/work/mysql-4.1-runtime


mysql-test/r/ps.result:
  Auto merged
mysql-test/t/func_gconcat.test:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_func.h:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_delete.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged
2006-11-02 01:08:39 +03:00
unknown
0797800841 Merge bk-internal:/home/bk/mysql-4.1-maint
into  shellback.(none):/home/msvensson/mysql/mysql-4.1-maint
2006-11-01 16:16:34 +01:00
unknown
bc7b0a2e92 Merge 192.168.0.10:mysql/mysql-4.1-maint
into  shellback.(none):/home/msvensson/mysql/mysql-4.1-maint
2006-11-01 16:08:17 +01:00
unknown
2d1215f4c6 Merge kpdesk.mysql.com:/home/thek/dev/bug22828/my41-bug22828
into  kpdesk.mysql.com:/home/thek/dev/mysql-4.1-maint


mysys/my_chsize.c:
  Auto merged
2006-11-01 09:24:57 +01:00
unknown
aa8c830d9b Improve the reading of .pid files from var/run
- Only read *.pid
 - Only allow it to contain a number 


mysql-test/lib/mtr_io.pl:
  Check that the value read from pidfile is a valid number consisting only of digits
mysql-test/lib/mtr_process.pl:
  Only process .pid files in var/run dir and print a warning if other files are found there.
2006-10-31 19:02:33 +01:00
unknown
8e0113be8c Make variables static to please Netware compiler
client/mysqltest.c:
  Make the variables that are referenced from the "command_arg" arrays static to please the NetWare compiler.
  Apparently the arrays can't reference local stack variables.
2006-10-31 18:51:23 +01:00
unknown
c54f778e96 Remove warning, exe_mysql_fix_system_tables are not available on windows 2006-10-31 17:16:07 +01:00
unknown
23061beb73 Bug#22828 _my_b_read() ignores return values for my_seek() calls
- Because my_seek actually is capable of returning an error code we should
  exploit that in the best possible way.
- There might be kernel errors or other errors we can't predict and capturing
  the return value of all system calls gives us better understanding of
  possible errors.


mysys/mf_iocache.c:
  - Added check on return value for my_seek
  - Added comments
mysys/my_chsize.c:
  - Added check on return value for my_seek
  - Added comments
mysys/my_lock.c:
  - Added check on return value for my_seek
  - Added comments
mysys/my_seek.c:
  - Added comments
2006-10-31 09:26:16 +01:00
unknown
dfdb972e03 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1-maint
into  mysql.com:/usr/home/ram/work/bug23412/my41-bug23412
2006-10-31 10:21:18 +04:00
unknown
49c9509a5f Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-4.1-runtime
into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-4.1-bug21915
2006-10-30 17:58:56 +03:00
unknown
885dc1cb9b BUG#21915: Changing limits of table_cache when setting max_connections
If the user has specified --max-connections=N or --table-open-cache=M
options to the server, a warning could be given that some values were
recalculated, and table-open-cache could be assigned greater value.

Note that both warning and increase of table-open-cache were totally
harmless.

This patch fixes recalculation code to ensure that table-open-cache will
be never increased automatically and that a warning will be given only if
some values had to be decreased due to operating system limits.

No test case is provided because we neither can't predict nor control
operating system limits for maximal number of open files.


sql/mysql_priv.h:
  Add constants for table_cache minimum and default values.
sql/mysqld.cc:
  Fix max_connections and table_cache_size re-computation.
2006-10-30 17:47:02 +03:00
unknown
9711d72205 Merge bk-internal:/home/bk/mysql-4.1-maint
into  shellback.(none):/home/msvensson/mysql/mysql-4.1-maint
2006-10-30 15:03:04 +01:00
unknown
c2b8a63ccf Bug#18654 Test is timing-dependent and fails from scheduling effects (?)
- Wait in loop with small sleep until tables has been renamed


mysql-test/t/rename.test:
  To avoid scheduling effects wait for the tables to be renamed in a loop with small sleeps
  before continuing with tests
mysql-test/include/wait_for_query_to_suceed.inc:
  New BitKeeper file ``mysql-test/include/wait_for_query_to_suceed.inc''
2006-10-30 14:42:28 +01:00
unknown
142a448594 Merge perch.ndb.mysql.com:/home/jonas/src/mysql-4.1
into  perch.ndb.mysql.com:/home/jonas/src/mysql-4.1-ndb


sql/sql_select.cc:
  Auto merged
2006-10-27 23:56:51 +02:00
unknown
3e2dacaeaf Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
into  perch.ndb.mysql.com:/home/jonas/src/mysql-4.1-ndb
2006-10-27 23:54:57 +02:00
unknown
7577630572 Merge perch.ndb.mysql.com:/home/jonas/src/41-work
into  perch.ndb.mysql.com:/home/jonas/src/mysql-4.1-ndb
2006-10-27 23:54:24 +02:00
unknown
11ac490779 ndb - valgrind
Still leakage, make sure all unlinked operations are put back so they will be release
  (on failing blob operations, when AO_IgnoreError)


ndb/src/ndbapi/NdbConnection.cpp:
  Still leakage, make sure all unlinked operations are put back so they will be release
2006-10-27 16:32:59 +02:00
unknown
928fa57a9e Update the rules for abi_check
include/Makefile.am:
  Move m_ctype.h from BUILT_SOURCES, it's in vcs
  Update the rule for abi_check
include/mysql_h.ic:
  Update the refernce and rename it to mysql_h.ic
2006-10-27 15:57:00 +02:00
unknown
d2c90fcb8e Fix for bug #23412: delete rows with null date field
Backport of the fix for bug #8143: A date with value 0 is treated as a NULL value


mysql-test/r/delete.result:
  Fix for bug #23412: delete rows with null date field
    - test result
mysql-test/t/delete.test:
  Fix for bug #23412: delete rows with null date field
    - test case
sql/sql_delete.cc:
  Fix for bug #23412: delete rows with null date field
    - during SELECT queries processing we convert 'date[time]_field is null'                   
      conditions into 'date[time]_field = 0000-00-00[ 00:00:00]' for not null                  
      DATE and DATETIME fields. To be consistent, we have to do the same for DELETE            
      queries. So we should call remove_eq_conds() in the mysql_delete() as well.              
      Also it may simplify and speed up DELETE queries execution.
2006-10-27 18:08:50 +05:00
unknown
722d433018 Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-4.1-runtime
into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-4.1-bug18819
2006-10-25 20:13:07 +04:00
unknown
e3d49f0c3f BUG#18819: DELETE IGNORE hangs on foreign key parent delete
If the error happens during DELETE IGNORE, nothing could be send to the
client, thus leaving it frozen expecting the reply.

The problem was that if some error occurred, it wouldn't be reported to
the client because of IGNORE, but neither success would be reported.

MySQL 4.1 would not freeze the client, but will report

  ERROR 1105 (HY000): Unknown error

instead, which is also a bug.

The solution is to report success if we are in DELETE IGNORE and some
non-fatal error has happened.


mysql-test/r/innodb_mysql.result:
  Add result for bug#18819: DELETE IGNORE hangs on foreign key parent
  delete.
mysql-test/t/innodb_mysql.test:
  Add test case for bug#18819: DELETE IGNORE hangs on foreign key parent
  delete.
sql/sql_delete.cc:
  Report success if we have got an error, but we are in DELETE IGNORE, and
  the error is not fatal (if it is, it would be reported to the client).
2006-10-25 19:53:26 +04:00
unknown
5decebc5f3 Skip innodb test if mysqld doesn't have innodb support 2006-10-25 16:50:06 +02:00
unknown
81e4c2fb08 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
into  mysql.com:/windows/Linux_space/MySQL/mysql-4.1-ndb
2006-10-25 15:17:44 +02:00
unknown
7596e12bbe Update the binlog format parse routine to only be avaliable in 5.1 and allow for any binlog_format to be specified 2006-10-25 14:56:36 +02:00
unknown
870ed0c3f5 Add valgrinding support for mysql_client_test
Fix two memory leaks in mysql_client_test


mysql-test/mysql-test-run.pl:
  Add valgrinding support for mysql_client_test
tests/mysql_client_test.c:
  Fix two memory leaks
2006-10-25 14:34:18 +02:00