Commit graph

18213 commits

Author SHA1 Message Date
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
8c0f1e89c0 Clean up error message for connections-per-hour user limit
being exceeded. (Bug #9947)


sql/sql_parse.cc:
  Fix error message when connections per hour has been exceeded
2005-04-27 17:05:15 -07:00
unknown
df0a4ed64e Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/my/mysql-4.1


sql/sql_insert.cc:
  Auto merged
2005-04-28 00:41:39 +03: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
167ce82394 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/my/mysql-4.1
2005-04-27 15:38:58 +03: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
b00b2126de Fixed core dump bug when hot link list in key cache was empty. Bug #10167
mysql-test/r/drop.result:
  Fixed result
2005-04-27 14:31:04 +03: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
0eb3528741 Fix undersized array in my_print_defaults that caused crash on Sun Solaris
(and maybe strange results on other platforms). (Bug #9851)


extra/my_print_defaults.c:
  Increase size of tmp_arguments array to actually fit possible values
2005-04-26 17:33:49 -07: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
bf17c826de Cleanups during review
mysys/default.c:
  Cleanup:
  - Just test once for recursion level
  - Don't test explicitely for \r or \n as my_isspace() already does that
sql/sql_insert.cc:
  Fix argument
sql/sql_select.cc:
  Fixed indentation
  added comment
2005-04-26 23:24:59 +03:00
unknown
d8871a117b Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/my/mysql-4.1


sql/mysqld.cc:
  Auto merged
2005-04-26 21:09:42 +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
cf09e60632 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/my/mysql-4.1


sql/mysqld.cc:
  Auto merged
2005-04-26 16:03:20 +03: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
unknown
ccfcfce6db Fix compile issues in Intel C/C++ compiler (Bug #9063)
acinclude.m4:
  Use AC_LANG_PUSH/POP instead of _SAVE/RESTORE
  Add test to get type of 'struct rlimit'
  Switch order of including stdlib.h and declaration being tested to
  match how it will be used in regular code.
configure.in:
  Call MYSQL_TYPE_STRUCT_RLIMIT macro
sql/mysqld.cc:
  Use STRUCT_RLIMIT for getting type of struct rlimit.
2005-04-25 18:02:03 -07:00
unknown
f65f279944 BUG#2596 MySQL Client Segmentation Fault on Solaris 9
- Print readline or libedit version


client/mysql.cc:
  Print the version of readline or libedit library used.
2005-04-25 12:05:13 +02:00
unknown
2c066230be bug#9749 - ndb lock upgrade
post review fix.
  don't init hash value on restart operations
  make sure that lock mode is correct in entire que.


ndb/test/ndbapi/testOperations.cpp:
  Test case also for abort case.
    (abort if not lock owner still fails!)
2005-04-25 11:59:00 +02:00
unknown
86c75663b4 Post review fix of ndbcluster_drop_database, typo 2005-04-25 11:54:00 +02:00
unknown
d490e4def8 Post review fix of ndbcluster_drop_database, print error 2005-04-25 11:34:47 +02:00
unknown
32d2b6ed04 Post review fix of ndbcluster_drop_database 2005-04-25 11:31:16 +02:00
unknown
20cf8f82ee Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/dlenev/src/mysql-4.1-bg10040
2005-04-25 11:26:20 +04:00
unknown
b0d05dd9a3 Fix for func_sapdb failures on 64-bit platforms (aka Bug #10040
"'func_sapdb' fails on 64bit build hosts")


sql/item_timefunc.cc:
  calc_time_diff():
    Fixed yet another signedness problem.
2005-04-25 11:25:40 +04:00
unknown
7f005d177b ndb - autotest
add more tests to verify correctness of backups


ndb/test/run-test/daily-basic-tests.txt:
  ndb - test
    add more tests to verify correctness of backups
2005-04-25 08:43:16 +02:00
unknown
b2245d58a2 bug#9924 - ndb backup
remove incorrect assertion
2005-04-25 08:35:18 +02:00
unknown
3afaccc2e6 bug#9924 - ndb backup - abort handling
uninit variable
2005-04-24 20:34:42 +02:00
unknown
ffb64880b7 ndb - bug#10029 fix
ndb/include/kernel/signaldata/TuxMaint.hpp:
  handle multipl index update failure atomically
ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
  handle multipl index update failure atomically
ndb/src/kernel/blocks/dbtup/DbtupTrigger.cpp:
  handle multipl index update failure atomically
ndb/src/kernel/blocks/dbtup/Notes.txt:
  handle multipl index update failure atomically
ndb/src/kernel/blocks/dbtux/DbtuxNode.cpp:
  handle multipl index update failure atomically
ndb/src/ndbapi/ndberror.c:
  handle multipl index update failure atomically
ndb/test/ndbapi/testOIBasic.cpp:
  handle multipl index update failure atomically
2005-04-23 17:33:12 +02:00