Commit graph

34,429 commits

Author SHA1 Message Date
unknown
c4b4bd6982 Merge kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build-work
into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-work


BUILD/check-cpu:
  Auto merged
2006-12-20 17:43:45 +01:00
unknown
cdd5a353c4 BUG#20061 build script can not detect my cpu
BUILD/check-cpu:
  add a handful of Celeroni and automatic fallback to uname if /proc/cpuinfo is there but we don't understand the information in it
2006-12-20 17:42:44 +01:00
unknown
6914a6b322 When running with --valgrind and --debug send all the output from
mysqld and valgrind to tracefile.
2006-12-20 16:54:37 +01:00
unknown
baabcb290f Add possibility to activate --mark-progress of mysqltest 2006-12-20 16:53:06 +01:00
unknown
fc9642b46d Bug#25213 - Compiler warnings in MyISAM code
Compiler warnings due to non-matching conversion
specifications in format strings in DBUG_PRINT calls,
due to non-used parameters (in non-debug mode), and
due to seemingly uninitialized variables.

Initialized variables, declared parameters unused, and
casted DBUG_PRINT arguments to get rid of warnings.


myisam/mi_range.c:
  Bug#25213 - Compiler warnings in MyISAM code
  Initialized a variable to get rid of a compiler warning.
myisam/mi_test1.c:
  Bug#25213 - Compiler warnings in MyISAM code
  Declared an parameter unused to get rid of warnings.
myisam/mi_write.c:
  Bug#25213 - Compiler warnings in MyISAM code
  Initialized a variable to get rid of a compiler warning.
  Casted arguments to DBUG_PRINT to match them with their
  format string conversion specification.
myisam/rt_split.c:
  Bug#25213 - Compiler warnings in MyISAM code
  Initialized variables to get rid of compiler warnings.
2006-12-20 15:32:02 +01:00
unknown
40b23b3bbc Bug#25208 - Warnings in mi_packrec.c
Compiler warnings due to non-matching conversion
specifications in format strings in DBUG_PRINT calls.

Fixed DBUG_PRINT format specifiactions.


myisam/mi_packrec.c:
  Bug#25208 - Warnings in mi_packrec.c
  Fixed DBUG_PRINT format specifiactions.
2006-12-20 15:18:09 +01:00
unknown
a1ecbab689 add file to VC++ project file
VC++Files/mysys/mysys.vcproj:
  add my_getpagesize.c to mysys.vcproj
2006-12-20 13:23:33 +01:00
unknown
eff3409964 Merge trift2.:/MySQL/M50/push-5.0
into  trift2.:/MySQL/M50/clone-5.0
2006-12-20 11:17:31 +01:00
unknown
b8550ca15a Fix silly typos in the disabling of "im_daemon_life_cycle" (bug#24415). 2006-12-20 11:13:16 +01:00
unknown
c6e1e91b66 Merge mysqldev@production.mysql.com:/data0/mysqldev/my/build-200612151202-5.0.32/mysql-5.0-release
into  trift2.:/MySQL/M50/clone-5.0
2006-12-20 10:58:16 +01:00
unknown
18a0b751ce Merge trift2.:/MySQL/M50/clone-5.0
into  trift2.:/MySQL/M50/push-5.0
2006-12-20 10:56:43 +01:00
unknown
14d05efc91 Disable test "im_deamon_life_cycle", Bug#24425, see note: [19 Dec 23:17] Trudy Pelzer 2006-12-20 10:54:41 +01:00
unknown
dfddc147ef Merge kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-24896
into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-release


client/mysql_upgrade.c:
  Auto merged
2006-12-20 10:40:05 +01:00
unknown
b38fd5c427 Merge dev:my/build-200612151202-5.0.32/mysql-5.0-release
into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-release
2006-12-20 09:44:47 +01:00
unknown
d6237b895a Merge siva.hindu.god:/usr/home/tim/m/bk/50-release
into  siva.hindu.god:/usr/home/tim/m/bk/50-build
2006-12-19 20:23:34 -07:00
unknown
29aae17044 Remove warnings by casting
cmd-line-utils/readline/histfile.c:
  Remove warning (compare signed & unsigned)
sql/udf_example.c:
  Remove warning (cast integer to pointer of different size)
strings/decimal.c:
  Remove warning (%lx format, double arg)
2006-12-19 20:17:33 -07:00
unknown
cf31ba3c54 Merge siva.hindu.god:/usr/home/tim/m/bk/50-release
into  siva.hindu.god:/usr/home/tim/m/bk/50-build


sql/ha_innodb.cc:
  Auto merged
2006-12-19 17:46:28 -07:00
unknown
6417ddd6d3 Merge siva.hindu.god:/usr/home/tim/m/bk/50-24200
into  siva.hindu.god:/usr/home/tim/m/bk/50-release
2006-12-19 17:43:56 -07:00
unknown
fe3672d285 Alternative decimal2double implementation using an algorithm
more similar to my_strtod() (and maybe even a bit faster due
to less floating point divisions).

This should at least partially fix Bug #23260 for DECIMALs
with a moderate number of total digits.
2006-12-19 17:42:26 -07:00
unknown
47b0a0b089 Added innodb_rollback_on_timeout option to restore the 4.1
InnoDB timeout behavior (Bug #24200)


mysql-test/t/innodb_mysql-master.opt:
  Set --innodb-lock-wait-timeout=2, since test for bug #24200 times out.
  
  This *could* cause random test failures if some long-running transaction concurrency is being tested.  However, such a test really should go in innodb-big or some other test file.
2006-12-19 16:57:51 -07:00
unknown
f8920dd59f Bug #24947: REPEAT function returns NULL when passed a field as the count parameter
Handling of large signed/unsigned values was not consistent, so some string functions could return bogus results.
The current fix is to simply patch up the val_str() methods for those string items.
It would be good clean this code up in general, to make similar problems much harder to make.  This is left as an exercise for the reader.


mysql-test/r/func_str.result:
  Update test results for bug #24947
mysql-test/t/func_str.test:
  Add test case for bug #24947
sql/item_strfunc.cc:
  Adjust some string function Items' val_str() methods to handle large signed/unsigned arguments properly
2006-12-19 15:54:12 -07:00
unknown
1012542590 Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint
into  qualinost.(none):/home/mtaylor/src/mysql-5.0-maint
2006-12-19 12:28:09 -08:00
unknown
353204ff1c Merge kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-work
into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-release
2006-12-19 15:32:41 +01:00
unknown
cc21a4822d Merge kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build-work
into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-work


mysql-test/t/grant_cache.test:
  Auto merged
mysql-test/t/myisam.test:
  Auto merged
mysql-test/t/query_cache_notembedded.test:
  Auto merged
mysql-test/t/rpl_rotate_logs.test:
  Auto merged
mysql-test/t/rpl000015.test:
  SCCS merged
mysql-test/t/rpl000017.test:
  SCCS merged
2006-12-19 15:31:10 +01:00
unknown
2eeeb9b4d3 remove hard-coded socket paths from some tests
mysql-test/t/grant_cache.test:
  replace hard-coded socket paths with variable containing the appropriate path
mysql-test/t/myisam.test:
  replace hard-coded socket paths with variable containing the appropriate path
mysql-test/t/query_cache_notembedded.test:
  replace hard-coded socket paths with variable containing the appropriate path
mysql-test/t/rpl000015.test:
  replace hard-coded socket paths with variable containing the appropriate path
mysql-test/t/rpl000017.test:
  replace hard-coded socket paths with variable containing the appropriate path
mysql-test/t/rpl_rotate_logs.test:
  replace hard-coded socket paths with variable containing the appropriate path
2006-12-19 15:10:15 +01:00
unknown
ce10e6ca13 Bug #23578: Corruption prevents Optimize table from working properly with a
spatial index
 While executing OPTIMIZE TABLE on MyISAM tables the server re-creates the
 index file(s) in order to sort them physically by the key. This cannot be 
 done for R-tree indexes as it makes no sense.
 The server was not checking the type of the index and was accessing an 
 R-tree index as if it was a B-tree.
 Fixed by preventing sorting the index file if it contains an R-tree index.  
 


myisam/mi_check.c:
  Bug #23578: Corruption prevents Optimize table from working properly with a
  spatial index
   - disable sorting the index file if it contains an R-tree index.
mysql-test/r/gis-rtree.result:
  Bug #23578: Corruption prevents Optimize table from working properly with a
  spatial index
   - test case
mysql-test/t/gis-rtree.test:
  Bug #23578: Corruption prevents Optimize table from working properly with a
  spatial index
   - test case
2006-12-19 15:04:26 +02:00
unknown
b66ab7f80b Fix for BUG#24293: '\Z' token is not handled correctly in views.
If SELECT-part of CREATE VIEW statement contains '\Z',
it is not handled correctly.

The problem was in String::print().
Symbol with code 032 (26) is replaced with '\z',
which is not supported by the lexer.

The fix is to replace the symbol with '\Z'.


mysql-test/r/view.result:
  Update result file.
mysql-test/t/view.test:
  Add test case for BUG#24293.
sql/sql_string.cc:
  We should replace 032 with \Z, since lexer does not understand \z.
2006-12-19 15:32:02 +03:00
unknown
76da582ca5 Merge chilla.local:/home/mydev/mysql-4.1-axmrg
into  chilla.local:/home/mydev/mysql-5.0-axmrg
2006-12-19 12:42:22 +01:00
unknown
d6bc366f44 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  chilla.local:/home/mydev/mysql-5.0-axmrg


configure.in:
  Auto merged
sql/sql_class.h:
  Auto merged
2006-12-19 12:41:39 +01:00
unknown
9d8c9e9d96 Merge mysql.com:/data0/mysqldev/my/mysql-5.0-release
into  mysql.com:/data0/mysqldev/my/build-200612151202-5.0.32/mysql-5.0-release


sql/ha_innodb.cc:
  Auto merged
2006-12-19 11:48:08 +01:00
unknown
9166c711c2 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into  chilla.local:/home/mydev/mysql-4.1-axmrg
2006-12-19 10:40:53 +01:00
unknown
466758f77b Merge polly.local:/tmp/maint/bug24117/my50-bug24117
into  polly.local:/home/kaa/src/maint/mysql-5.0-maint


include/mysql_h.ic:
  Auto merged
2006-12-19 12:24:44 +03:00
unknown
6cf0571a97 Added copy_typelib() declaration to make ABI compatibility test happy 2006-12-19 11:21:14 +03:00
unknown
5fdbd481b0 Merge qualinost.(none):/home/mtaylor/src/mysql-4.1-maint
into  qualinost.(none):/home/mtaylor/src/mysql-5.0-maint
2006-12-18 21:16:18 -08:00
unknown
76daa59fc8 Search through options to find where the slow query log actually is. 2006-12-18 21:12:01 -08:00
unknown
7a663d0499 Merge siva.hindu.god:/usr/home/tim/m/bk/50-release
into  siva.hindu.god:/usr/home/tim/m/bk/50-build


sql/ha_innodb.cc:
  Auto merged
2006-12-18 18:48:52 -07:00
unknown
306f42701c This ChangeSet must be null-merged to 5.1.
Applied innodb-5.0-ss1040 and innodb-5.0-ss1099 snapshots.

Bugs fixed:
- Bug #21468: InnoDB crash during recovery with corrupted data pages: XA bug?
- Bug #24299: Identifiers in foreign keys cannot contain U+0160, U+0360, ..., U+FF60
- Bug #24386: Performance degradation caused by instrumentation in mutex_struct
- Bug #24712: SHOW TABLE STATUS for file-per-table showing incorrect time fields


innobase/dict/dict0dict.c:
  Applied innodb-5.0-ss1040 and innodb-5.0-ss1099 snapshots.
  
  Revision r1030:
  branches/5.0: Replace isspace() with a wrapper ib_isspace(), because on
  Win32 isspace(0xa0) appears to hold.  (Bug #24299)
innobase/include/sync0rw.h:
  Applied innodb-5.0-ss1040 and innodb-5.0-ss1099 snapshots.
  
  Revision r1040:
  branches/5.0: Port r1039 from trunk:
  
  Port r1034 from branches/zip: Remove some instrumentation and reduce
  the output of SHOW MUTEX STATUS in non-debug builds.  (Bug #24386)
innobase/include/sync0sync.h:
  Applied innodb-5.0-ss1040 and innodb-5.0-ss1099 snapshots.
  
  Revision r1040:
  branches/5.0: Port r1039 from trunk:
  
  Port r1034 from branches/zip: Remove some instrumentation and reduce
  the output of SHOW MUTEX STATUS in non-debug builds.  (Bug #24386)
innobase/include/sync0sync.ic:
  Applied innodb-5.0-ss1040 and innodb-5.0-ss1099 snapshots.
  
  Revision r1040:
  branches/5.0: Port r1039 from trunk:
  
  Port r1034 from branches/zip: Remove some instrumentation and reduce
  the output of SHOW MUTEX STATUS in non-debug builds.  (Bug #24386)
innobase/log/log0recv.c:
  Applied innodb-5.0-ss1040 and innodb-5.0-ss1099 snapshots.
  
  Revision r1076:
  branches/5.0: Remove the unintentionally committed change to univ.i in r1075.
  Fix assertion failure sync0sync.c line 1239
  (the latter ut_error in sync_thread_reset_level())
  in crash recovery when UNIV_SYNC_DEBUG is enabled.
  
  
  Revision r1079:
  branches/5.0: recv_recovery_from_checkpoint_finish(): Add 1 sec delay
  before switching on the sync order checks in crash recovery, so that
  file I/O threads have time to suspend themselves.
innobase/srv/srv0start.c:
  Applied innodb-5.0-ss1040 and innodb-5.0-ss1099 snapshots.
  
  Revision r1075:
  branches/5.0: Fix assertion failure sync0sync.c line 1239
  (the latter ut_error in sync_thread_reset_level())
  in crash recovery when UNIV_SYNC_DEBUG is enabled.
  
  
  Revision r1077:
  branches/5.0: innobase_start_or_create_for_mysql(): Remove unnecessary delay
  now that we moved the setting sync_order_checks_on=TRUE to log0recv.c,
  to the start of the rollback phase in crash recovery.
innobase/sync/sync0rw.c:
  Applied innodb-5.0-ss1040 and innodb-5.0-ss1099 snapshots.
  
  Revision r1040:
  branches/5.0: Port r1039 from trunk:
  
  Port r1034 from branches/zip: Remove some instrumentation and reduce
  the output of SHOW MUTEX STATUS in non-debug builds.  (Bug #24386)
innobase/sync/sync0sync.c:
  Applied innodb-5.0-ss1040 and innodb-5.0-ss1099 snapshots.
  
  Revision r1040:
  branches/5.0: Port r1039 from trunk:
  
  Port r1034 from branches/zip: Remove some instrumentation and reduce
  the output of SHOW MUTEX STATUS in non-debug builds.  (Bug #24386)
innobase/trx/trx0roll.c:
  Applied innodb-5.0-ss1040 and innodb-5.0-ss1099 snapshots.
  
  Revision r1067:
  branches/5.0: trx_rollback_for_mysql(), trx_commit_for_mysql():
  Protect the creation of trx_dummy_sess with kernel_mutex.
  This error was introduced in r1046 and r1050.
  
  
  Revision r1050:
  branches/5.0: trx_rollback_for_mysql(): Fix the comment introduced in r1046.
  
  trx_commit_for_mysql(): Use the dummy trx->sess also for committing a prepared
  transaction in XA recovery, just in case our code would need the session
  object also in that case (does not seem to need it right now).
  
  
  Revision r1048:
  branches/5.0: trx_rollback_for_mysql(): Do not set trx->sess back to NULL.
  This bug was introduced in r1046.
  
  
  Revision r1046:
  branches/5.0: trx_rollback_for_mysql(): Ensure that trx->sess is non-NULL
  when calling trx_general_rollback_for_mysql().  This removes a segmentation
  fault when rolling back a prepared transaction in XA recovery.  (Bug #21468)
innobase/trx/trx0trx.c:
  Applied innodb-5.0-ss1040 and innodb-5.0-ss1099 snapshots.
  
  Revision r1067:
  branches/5.0: trx_rollback_for_mysql(), trx_commit_for_mysql():
  Protect the creation of trx_dummy_sess with kernel_mutex.
  This error was introduced in r1046 and r1050.
  
  
  Revision r1050:
  branches/5.0: trx_rollback_for_mysql(): Fix the comment introduced in r1046.
  
  trx_commit_for_mysql(): Use the dummy trx->sess also for committing a prepared
  transaction in XA recovery, just in case our code would need the session
  object also in that case (does not seem to need it right now).
sql/ha_innodb.cc:
  Applied innodb-5.0-ss1040 and innodb-5.0-ss1099 snapshots.
  
  Revision r1040:
  branches/5.0: Port r1039 from trunk:
  
  Port r1034 from branches/zip: Remove some instrumentation and reduce
  the output of SHOW MUTEX STATUS in non-debug builds.  (Bug #24386)
  
  
  Revision r1099:
  branches/5.0: Merge revision 1098 from trunk: Fix bug #24712: SHOW TABLE
  STATUS for file-per-table showing incorrect time fields
2006-12-18 18:41:38 -07:00
unknown
0dc0e52db3 Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint
into  polly.local:/home/kaa/src/maint/mysql-5.0-maint
2006-12-18 18:04:26 +03:00
unknown
b871e8d29e Merge kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build
into  kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build-work
2006-12-18 14:41:55 +01:00
unknown
0a27651fdf Merge kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build
into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build
2006-12-18 14:38:00 +01:00
unknown
c32d646d25 Merge kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-work
into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-release


support-files/mysql.spec.sh:
  Auto merged
2006-12-18 13:49:53 +01:00
unknown
052624e1bd Merge kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build-work
into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-work


mysql-test/mysql-test-run.pl:
  Auto merged
2006-12-18 13:44:57 +01:00
unknown
e55c9a7ab5 Use a temporary directory for sockets if the socket path becomes too long. 2006-12-18 13:44:21 +01:00
unknown
5958296be1 Merge kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build
into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-work
2006-12-18 13:35:29 +01:00
unknown
134b83d0a0 support-files/mysql.spec.sh
Fix the move of "mysqlmanager" to section 8: Directory name was wrong.


support-files/mysql.spec.sh:
  Fix the move of "mysqlmanager" to section 8: Directory name was wrong.
2006-12-18 11:51:45 +01:00
unknown
e403f0e774 Merge maint1:/data/localhome/msvensson/mysql-5.0-maint
into  shellback.:C:/mysql/mysql-5.0-maint
2006-12-18 11:30:34 +01:00
unknown
43a251011c Change windows pthread_cond_timedwait to use an absolute time value
include/my_pthread.h:
  Calculate absolute time value int set_timespec_*
mysys/my_wincond.c:
  Use absolute timevalue in pthread_cond_timedwwait
2006-12-18 11:09:47 +01:00
unknown
1aad903b71 Use MYSQLTEST_VARDIR variable 2006-12-18 10:22:48 +01:00
unknown
607af5c651 Merge qualinost.(none):/home/mtaylor/src/mysql-4.1-maint
into  qualinost.(none):/home/mtaylor/src/mysql-5.0-maint


scripts/mysqld_multi.sh:
  Auto merged
2006-12-15 16:18:03 -08:00
unknown
3c04f839b9 support /etc/mysql/my.cnf in mysqld_multi as well. 2006-12-15 16:17:10 -08:00