Commit graph

18338 commits

Author SHA1 Message Date
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
unknown
8a9c988122 Step 3 of the switch to support configuration with NPTL:
Change "configure.in".

The branches for Tru64 (ex: OSF/1) and Linux are separated,
and for Linux 'getconf GNU_LIBPTHREAD_VERSION' is used to tell between Linuxthreads and NPTL.


configure.in:
  Step 3 of the switch to support configuration with NPTL:
  Change "configure.in".
  
  1) Separate the branches checking for thread libraries on OSF/1 (now: Tru64) and on Linux,
     as these are different things. In the Tru64 branch, remove the obsolete part for OSF/1 3.2,
     because that is gone since long (about a decade?); we are at 5 now. Adapt the comment.
  
  2) For Linux, the thread libraries are "Linuxthreads" (older) and "NPTL" (newer).
     Until now, we cared only about "Linuxthreads", and we did so by checking a comment in 
     the header file '/usr/include/pthread.h'.
     With NPTL as an alternative or only thread package, this is not secure any more,
     there are distributions where the header file still contains that comment but the lib is NPTL.
     For all current distributions, the way to check is the 'getconf' command.
  
     On old distributions, 'getconf' exists but does not understand the 'GNU_LIBPTHREAD_VERSION'
     parameter. It is unlikely that such an old system should have NPTL, so the header file check is
     sufficient if the getconf inquiry fails.
  
     For both Linuxthreads and NPTL, '-lpthread' is the linker option to use.
  
  3) To detect problems as early as possible, on Linux a link test using '-lpthread' is done.
     The code is copied from a later check where the thread functions are searched in '-lc',
     '-lpthread', and '-lpthreads', but this later search would not be executed after the lib
     was already determined. So if the test is not done here, it will be detected only during
     the real build. This is too late.
2005-04-22 20:49:05 +02:00
unknown
af4c58e090 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
2005-04-22 17:41:06 +02:00
unknown
639d4295c6 Fix for Bug #9318 drop database does not drop ndb tables 2005-04-22 15:28:23 +02:00
unknown
12a176c8f9 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/jonas/src/mysql-4.1


ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
ndb/src/ndbapi/ndberror.c:
  Auto merged
2005-04-22 13:20:47 +02:00
unknown
3431b2179f Bug#7806 - insert on duplicate key and auto-update of timestamp
A fix of the original patch.
Correctly clear a bit from an enum value.
2005-04-22 12:30:09 +02:00
unknown
feb4822816 bug#9724 - ndb restart
if file already open occur print files...
2005-04-22 11:04:26 +02:00
unknown
d69c6e85fa bug#9969 - ndb
missleading error message


ndb/test/src/NdbBackup.cpp:
  typo
2005-04-22 09:40:44 +02:00
unknown
d9faad9c1a bug#9924 - ndb backup abort handling
Redo abort handling according to descr. in Backup.txt
bug#9960 - ndb backup
      increase wait completed timeout to 48 hours


ndb/include/kernel/signaldata/BackupImpl.hpp:
  Add nodeid to reply to be able to fake reply during NF
ndb/include/kernel/signaldata/BackupSignalData.hpp:
  new error codes
ndb/src/common/debugger/signaldata/BackupImpl.cpp:
  fix printout
ndb/src/kernel/blocks/backup/Backup.cpp:
  bug#9924 - ndb backup abort handling
    Redo abort handling according to descr. in Backup.txt
ndb/src/kernel/blocks/backup/Backup.hpp:
  bug#9924 - ndb backup abort handling
    Redo abort handling according to descr. in Backup.txt
ndb/src/kernel/blocks/backup/Backup.txt:
  bug#9924 - ndb backup abort handling
    Redo abort handling according to descr. in Backup.txt
ndb/src/kernel/blocks/backup/BackupInit.cpp:
  bug#9924 - ndb backup abort handling
    Redo abort handling according to descr. in Backup.txt
ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
  Init own version
ndb/src/mgmapi/mgmapi.cpp:
  bug#9960 - ndb backup
    increase wait completed timeout to 48 hours
ndb/src/mgmsrv/MgmtSrvr.cpp:
  Handle node failures activly
    (mainly for backup...)
ndb/src/mgmsrv/MgmtSrvr.hpp:
  Handle node failures activly
    (mainly for backup...)
ndb/src/mgmsrv/MgmtSrvrGeneralSignalHandling.cpp:
  Handle node failures activly
    (mainly for backup...)
ndb/src/ndbapi/ndberror.c:
  new error codes
ndb/test/ndbapi/testBackup.cpp:
  fix return codes
ndb/test/run-test/daily-basic-tests.txt:
  Add failure test cases to autotest
ndb/test/src/NdbBackup.cpp:
  fix error codes
  introduce checking of backup resources after each test
2005-04-22 09:07:25 +02:00
unknown
c8ad2e0317 Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1
into neptunus.(none):/home/msvensson/mysql/bug2596
2005-04-21 21:52:31 +02:00
unknown
cfac923cf5 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into neptunus.(none):/home/msvensson/mysql/mysql-4.1
2005-04-21 21:51:36 +02:00
unknown
7941c9af51 C99 Portability fix 2005-04-21 21:47:58 +02:00
unknown
ae641bdd31 Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1
into neptunus.(none):/home/msvensson/mysql/bug2596
2005-04-21 21:25:34 +02:00
unknown
8c56ac2f04 - added missing file config_readline.h to the source distribution 2005-04-21 21:15:35 +02:00
unknown
e2f5671064 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
2005-04-21 13:10:05 +02:00
unknown
122a2fdaf1 Fix for failing ps_7ndb.test, force write_row when batching inserts so that update of primary key is done before next value to insert 2005-04-21 13:09:19 +02:00
unknown
6905af20b8 Reverting back to original path of readline.h
cmd-line-utils/libedit/readline/readline.h:
  mvdir
2005-04-21 12:36:23 +02:00
unknown
948d88da93 Upgrade to libedit-2.9
BitKeeper/deleted/.del-readline.h~ac6080227e4b72fc:
  Delete: cmd-line-utils/libedit/readline/readline.h
2005-04-21 12:06:46 +02:00
unknown
ab16339db2 Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/space/my/mysql-4.1
2005-04-21 10:27:37 +02:00
unknown
7f0f4c5875 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
2005-04-21 09:27:20 +02:00
unknown
50ee81d5db Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/space/my/mysql-4.1
2005-04-21 09:08:09 +02:00
unknown
ecf7f30b30 Merge bk@192.168.21.1:/usr/home/bk/mysql-4.1
into deer.(none):/home/hf/work/mysql-4.1.7344
2005-04-21 11:10:28 +05:00
unknown
39fe76b209 Fix for bug #7344 (Repeating mysql_server_start/mysql_server_end crash clients)
One more free_charset call added


libmysql/libmysql.c:
  free_charset call added
2005-04-21 10:58:58 +05:00
unknown
2e33f4e2fb Merge rurik.mysql.com:/home/igor/mysql-4.1
into rurik.mysql.com:/home/igor/dev/mysql-4.1-0


sql/sql_select.cc:
  Auto merged
2005-04-20 15:08:22 -07:00
unknown
6b645d309f Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/space/my/mysql-4.1
2005-04-20 20:44:18 +02:00
unknown
b6a4a2f41c Step 2 of the switch to support configuration with NPTL:
Define a new CPP symbol that the target OS is Linux, and use it where only the OS matters and not the threads Library.
Until now, 'HAVE_LINUXTHREADS' was used to indicate "Target is Linux" in many places.
When we support configuration with NPTL but no Linuxthreads, this misuse must cease.


configure.in:
  Step 2 of the switch to support configuration with NPTL:
  Define a new CPP symbol that the target OS is Linux.
  Until now, 'HAVE_LINUXTHREADS' was used to indicate "Target is Linux" in many places.
  When we support configuration with NPTL but no Linuxthreads, this misuse must cease.
include/my_global.h:
  Step 2 of the switch to support configuration with NPTL:
  Use the new 'TARGET_OS_LINUX' where only the OS matters and not the threads Library.
mysys/thr_mutex.c:
  Step 2 of the switch to support configuration with NPTL:
  Use the new 'TARGET_OS_LINUX' where only the OS matters and not the threads Library.
sql/stacktrace.c:
  Step 2 of the switch to support configuration with NPTL:
  Use the new 'TARGET_OS_LINUX' where only the OS matters and not the threads Library.
sql/stacktrace.h:
  Step 2 of the switch to support configuration with NPTL:
  Use the new 'TARGET_OS_LINUX' where only the OS matters and not the threads Library.
tools/mysqlmanager.c:
  Step 2 of the switch to support configuration with NPTL:
  Use the new 'TARGET_OS_LINUX' where only the OS matters and not the threads Library.
2005-04-20 20:38:57 +02:00
unknown
677fbc7d4e Step 1 of the switch to support configuration with NPTL:
Rename 'IS_LINUX' configuration variable to 'TARGET_LINUX'.
2005-04-20 20:10:28 +02:00
unknown
90de09db2a ndb - dbug aid for api signal log
ndb/src/ndbapi/TransporterFacade.cpp:
  dbug aid for api signal log
2005-04-20 16:09:00 +02:00
unknown
acfca4259a Merge mysql.com:/home/mydev/mysql-4.1
into mysql.com:/home/mydev/mysql-4.1-bug7806
2005-04-20 15:04:00 +02:00