Commit graph

18171 commits

Author SHA1 Message Date
unknown
1c62941741 Merge mysql.com:/home/jimw/my/mysql-4.1-9634
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-04-29 08:47:03 -07:00
unknown
65d0de3b7b Manually resolve merge
mysql-test/r/query_cache.result:
  Resolve merge
mysql-test/t/query_cache.test:
  Resolve merge
2005-04-29 08:46:03 -07:00
unknown
931389d5ac Merge mysql.com:/home/jimw/my/mysql-4.0-clean
into mysql.com:/home/jimw/my/mysql-4.1-clean


configure.in:
  Auto merged
2005-04-29 08:41:25 -07:00
unknown
ede028b063 Merge mysql.com:/home/jimw/my/mysql-4.0-9690
into mysql.com:/home/jimw/my/mysql-4.0-clean


configure.in:
  Auto merged
2005-04-29 08:26:33 -07:00
unknown
8ebd64bb46 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
2005-04-29 14:10:26 +02:00
unknown
d937adf967 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
2005-04-29 11:56:38 +02:00
unknown
b6ad57e0a3 Fix for avoiding gettin Invalid schema object version when doing local changes, fixed found bug 2005-04-29 11:37:47 +02:00
unknown
db58f75c6f Merge mysql.com:/home/mydev/mysql-4.1
into mysql.com:/home/mydev/mysql-4.1-4100
2005-04-29 09:03:34 +02:00
unknown
275c8e7790 Merge mysql.com:/home/mydev/mysql-4.1-bug5964
into mysql.com:/home/mydev/mysql-4.1-4100
2005-04-28 18:34:47 +02:00
unknown
f0e256efe4 BUG#5964 - 4.1 MERGE tables regression from 4.0
Changed the creation of the .MRG file so that only the table  name
is written when the MyISAM table is in the same database as the
MERGE table, a relative path is used in other cases in mysqld,
and possibly an absolute path is used in an embedded server.
No test case is added as the external behaviour is unchanged.
Only the file names within the .MRG file are changed.


include/my_sys.h:
  BUG#5964 - 4.1 MERGE tables regression from 4.0
  Added declaration for a new function.
myisammrg/myrg_open.c:
  BUG#5964 - 4.1 MERGE tables regression from 4.0
  Changed check for absolute path to check for any path.
mysys/my_getwd.c:
  BUG#5964 - 4.1 MERGE tables regression from 4.0
  Added a new functions which checks for absolute _or_
  relative paths.
sql/ha_myisammrg.cc:
  BUG#5964 - 4.1 MERGE tables regression from 4.0
  Changed the creation of the .MRG file so that only the table  name
  is written when the MyISAM table is in the same database as the
  MERGE table, a relative path is used in other cases in mysqld,
  and possibly an absolute path is used in an embedded server.
2005-04-28 18:28:50 +02:00
unknown
e26a93e999 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/psergey/mysql-4.1-bug9298
2005-04-28 19:58:52 +04:00
unknown
21d16ca707 Bug#8321 - myisampack bug in compression algorithm
Merge from 4.0.
2005-04-28 16:09:53 +02:00
unknown
994674c09b Bug#8321 - myisampack bug in compression algorithm
This is the second of three changesets. It contains the pure bug fix.
It also contains the second after-review fixes.
The problem was that with gcc on x86, shifts are done modulo word size. 
'value' is 32 bits wide and shifting it by 32 bits is a no-op.
This was triggered by an evil distribution of character incidences. 
A distribution of 2917027827 characters made of 202 distinct values led to
34 occurrences of 32-bit Huffman codes.
This might have been the first time ever that write_bits() had to write
32-bit values. Since it can be expected that one day even 32 bits might
be insufficient, the third changeset suggests to enlarge some variables
to 64 bits.
2005-04-28 15:27:42 +02:00
unknown
b411128fa5 After review fixes to check-cpu
BUILD/check-cpu:
  Remove the exit 0 from check-cpu
2005-04-28 13:30:45 +02:00
unknown
c53b0c4398 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
2005-04-28 10:57:08 +02:00
unknown
67a7bc2d98 Merge neptunus.(none):/home/msvensson/mysql/bug9911
into neptunus.(none):/home/msvensson/mysql/mysql-4.1
2005-04-28 10:50:31 +02:00
unknown
2c8e261725 BUG#9911 After review fixes
- Remove ha_archive::rename_table and move the fix to handler::rename_table


sql/examples/ha_archive.cc:
  Remove ha_archive::rename_table
sql/examples/ha_archive.h:
  Remove ha_archive::rename_table
sql/handler.cc:
  Fix handler::rename_table so it does not care about if the file to rename is missing
2005-04-28 10:49:18 +02:00
unknown
c97859b300 Fix for avoiding gettin Invalid schema object version when doing local changes, more post review fixes 2005-04-28 10:46:39 +02:00
unknown
2ef10765dc Fix for avoiding gettin Invalid schema object version when doing local changes, post review fixes 2005-04-28 09:39:29 +02:00
unknown
e82d1e91ba Fix 'mysql_client_test' with embedded server. (Bug #9634)
mysql-test/mysql-test-run.sh:
  Set up arguments for mysql_client_test when testing
  the embedded server.
tests/mysql_client_test.c:
  Add -A switch for passing arguments to the embedded server.
2005-04-27 17:50:48 -07:00
unknown
7a8716d60e Backport fix from 4.1 for testing whether CXX is gcc. (Bug #9690)
configure.in:
  Use more flexible for test for CXX being gcc.
2005-04-27 17:14:53 -07:00
unknown
57d9c6d077 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into neptunus.(none):/home/msvensson/mysql/mysql-4.1


configure.in:
  Auto merged
2005-04-27 21:40:11 +02:00
unknown
7183076dcf Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/psergey/mysql-4.1-bug9298
2005-04-27 23:02:57 +04:00
unknown
3238612840 Bug#7823 - FLUSH TABLES WITH READ LOCK + INSERT DELAYED = deadlock
After merge fix.
2005-04-27 20:54:19 +02:00
unknown
66f9674613 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/psergey/mysql-4.1-bug9298
2005-04-27 22:52:54 +04:00
unknown
8d22538041 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/psergey/mysql-4.1-bug9298
2005-04-27 22:51:02 +04:00
unknown
f3a1bafa48 Merge from 4.0 needs fixes
sql/lock.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
2005-04-27 18:59:31 +02:00
unknown
27a6a81464 Fix for avoiding gettin Invalid schema object version when doing local changes 2005-04-27 18:17:41 +02:00
unknown
cd50bf9ae4 After review fix
BUILD/check-cpu:
  Remove defaul flag i386 and add a check to see wheter to set check_cpu_cflags or not.
2005-04-27 17:52:14 +02:00
unknown
b580f8ddf5 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
2005-04-27 17:12:08 +02:00
unknown
a43bfdd289 Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/M41/mysql-4.1
2005-04-27 15:50:11 +02:00
unknown
77d8d716b4 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/usr/home/ram/work/4.1.b9803
2005-04-27 17:20:29 +05:00
unknown
ffb4ff2454 Bug #9954 mysql-4.1.11/cmd-line-utils/libedit/makelist.sh is not portable
- Reverted removal of errorcheck mutex initialise, used in safe_mutex_init. 


include/my_pthread.h:
  Reverted the removal of errorcheck mutex initializer
mysys/my_thr_init.c:
  Reverted the removal of errorcheck mutex initializer
  Add destruction of mutex initializer
2005-04-27 13:29:37 +02:00
unknown
78f89a729a Bug#9263 GCC4: -mcpu is depricated, use -mtune or -march instead
- Made a script that selects the best compiler optimizations for the current cpu.
   - Use the script from BUILD/SETUP.sh 


BUILD/SETUP.sh:
  Run check-cpu and use the compiler optimization flags it outputs
2005-04-27 12:50:37 +02:00
unknown
f63c8f53b0 Bug#7823 - FLUSH TABLES WITH READ LOCK + INSERT DELAYED = deadlock
Added protection against global read lock while creating and
initializing a delayed insert handler.
Allowed to ignore a global read lock when locking the table
inside the delayed insert handler.
Added some minor improvements.


sql/lock.cc:
  Bug#7823 - FLUSH TABLES WITH READ LOCK + INSERT DELAYED = deadlock
  Changed mysql_lock_tables() to allow for ignoring global read lock.
  Added functions to set/unset protection against global read lock.
sql/mysql_priv.h:
  Bug#7823 - FLUSH TABLES WITH READ LOCK + INSERT DELAYED = deadlock
  Changed existing and added new function declarations.
sql/sql_insert.cc:
  Bug#7823 - FLUSH TABLES WITH READ LOCK + INSERT DELAYED = deadlock
  Added and extended some comments.
  Added a protection against global read lock while a handler is
  created and initialized.
  Moved the unlock of the delayed insert object past its last usage
  in delayed_get_table().
  Changed the table locking in handle_delayed_insert() so that it
  does not wait for global read lock.
2005-04-27 12:40:37 +02:00
unknown
abf4e93d82 Merge neptunus.(none):/home/msvensson/mysql/bug8162
into neptunus.(none):/home/msvensson/mysql/mysql-4.1


configure.in:
  Auto merged
2005-04-27 12:24:17 +02:00
unknown
3ce2f6f40a Merge neptunus.(none):/home/msvensson/mysql/bug9954
into neptunus.(none):/home/msvensson/mysql/mysql-4.1


configure.in:
  Auto merged
2005-04-27 12:19:18 +02:00
unknown
fc26e1c15b Merge neptunus.(none):/home/msvensson/mysql/bug9911
into neptunus.(none):/home/msvensson/mysql/mysql-4.1
2005-04-27 12:17:07 +02:00
unknown
e9cf23d1fc Merge neptunus.(none):/home/msvensson/mysql/bug2596
into neptunus.(none):/home/msvensson/mysql/mysql-4.1
2005-04-27 12:10:19 +02:00
unknown
ecfae64d65 Bug #8162 MySQL cannot be compiled without readline
- Display error if system readline or libedit can't be found


configure.in:
  Display an error if user has selected not to use the bundled libedit or readline, AND the system readline or libedit can't be found
2005-04-27 11:19:00 +02:00
unknown
7e04d257eb Bug #9954 mysql-4.1.11/cmd-line-utils/libedit/makelist.sh is not portable
- Changed makelist.sh
  - Bump up required version of autoconf
  - Use new style to init mutex in my_thr_init


cmd-line-utils/libedit/makelist.sh:
  Changed file so it works also on windows cr/lf files.
configure.in:
  Bump up required AC version number so that correct version of aclocal and autoconf is selected.
include/my_pthread.h:
  Use PTHREAD_MUTEX_ADAPTIVE_NP to see if "fast" mutexes are available
  Remove "errorcheck" mutexes, since they are never used.
mysys/my_thr_init.c:
  Use new style functions to init mutex if PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP is defined
  Add comment what mutex "kind" means
2005-04-27 09:59:12 +02:00
unknown
21d5136def Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/jonas/src/mysql-4.1


ndb/src/ndbapi/ndberror.c:
  Auto merged
2005-04-27 07:56:37 +02:00
unknown
705d163124 dict0dict.c, dict0dict.h, fil0fil.c:
Fix a problem in crash recovery of .ibd files on Windows if the user used lower_case_table_names=0 or 2; the directory scan in crash recovery forgot to put all paths to lower case, so that the tablespace name would be consistent with the internal data dictionary of InnoDB; remember that InnoDB puts internally all database names and table names to lower case on Windows, regardless of the value of lower_case_table_names


innobase/fil/fil0fil.c:
  Fix a problem in crash recovery of .ibd files on Windows if the user used lower_case_table_names=0 or 2; the directory scan in crash recovery forgot to put all paths to lower case, so that the tablespace name would be consistent with the internal data dictionary of InnoDB; remember that InnoDB puts internally all database names and table names to lower case on Windows, regardless of the value of lower_case_table_names
innobase/include/dict0dict.h:
  Fix a problem in crash recovery of .ibd files on Windows if the user used lower_case_table_names=0 or 2; the directory scan in crash recovery forgot to put all paths to lower case, so that the tablespace name would be consistent with the internal data dictionary of InnoDB; remember that InnoDB puts internally all database names and table names to lower case on Windows, regardless of the value of lower_case_table_names
innobase/dict/dict0dict.c:
  Fix a problem in crash recovery of .ibd files on Windows if the user used lower_case_table_names=0 or 2; the directory scan in crash recovery forgot to put all paths to lower case, so that the tablespace name would be consistent with the internal data dictionary of InnoDB; remember that InnoDB puts internally all database names and table names to lower case on Windows, regardless of the value of lower_case_table_names
2005-04-27 02:57:19 +03:00
unknown
3b2964c5c4 Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/M41/mysql-4.1


acinclude.m4:
  Auto merged
configure.in:
  Auto merged
2005-04-26 19:26:51 +02:00
unknown
98b911d537 Merge mysql.com:/M41/mysql-4.1 into mysql.com:/M41/nptl-4.1 2005-04-26 19:22:43 +02:00
unknown
1faa742b86 Merge bk-internal:/home/bk/mysql-4.1
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-04-26 08:56:29 -07:00
unknown
cff8039064 Fix typo in include file name (Bug #9063)
acinclude.m4:
  Fix typo
2005-04-26 08:20:00 -07:00
unknown
24caf249d3 checking that statements get into binlog even when they were affecting
no rows of the blackhold engine (for this engine to be a binlog propagator).
NOTE: blackhole.test currently hangs in 5.0 BUG#10175 so I'll merge without running this test; the
person who fixes the hang will correct the merged blackhole.result or ask me to).


mysql-test/r/blackhole.result:
  result update
mysql-test/t/blackhole.test:
  checking that statements get into binlog even when they were affecting
  no rows of the blackhold engine. So that this engine can serve as
  a binlog propagator (A->B->C replication where B has only blackhole tables,
  B receives binlog from A, applies it to blackhole tables, writes statements
  to its binlog which it sends to C; both A and C have non-blackhole tables). B is just a proxy.
2005-04-26 15:52:04 +02:00
unknown
910c305867 Final fix for NPTL configuration (bug#2173, bug#5871, and bug#9497).
include/my_global.h:
  As we have a new CPP symbol, this should be "undef"ed explicitly.
2005-04-26 13:15:20 +02:00
unknown
5444ad9400 BUG#9911 RENAME TABLE of type ARCHIVE fails with .ARN file error
- Implemented ha_archive::rename_table
 - Added testcases for rename


mysql-test/r/archive.result:
  Addd testcase for rename of archive table
mysql-test/t/archive.test:
  Addd testcase for rename of archive table
sql/examples/ha_archive.cc:
  Implement special version of rename table that does not care it the .arn file is missing
sql/examples/ha_archive.h:
  Implement special version of rename table that does not care it the .arn file is missing
2005-04-26 11:35:52 +02:00