Commit graph

16823 commits

Author SHA1 Message Date
unknown
5504c0acfd Added doxygen comments for fast path calls 2004-11-18 12:27:18 +01:00
unknown
99143ffaa4 Fixed show table output 2004-11-17 17:05:21 +01:00
unknown
069b829557 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/usr/local/home/marty/MySQL/test/mysql-5.0-ndb
2004-11-17 16:49:10 +01:00
unknown
1dad655030 Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0
into gluh.mysql.r18.ru:/home/gluh/MySQL/mysql-5.0.1
2004-11-17 18:49:09 +03:00
unknown
173722db8b Fix for Auto_increment filed value in 'show table status'
code cleanup


mysql-test/r/information_schema.result:
  Fix for Auto_increment filed value in 'show table status'
mysql-test/t/information_schema.test:
  Fix for Auto_increment filed value in 'show table status'
2004-11-17 18:48:12 +03:00
unknown
7fc70c7f40 #warning removed
AC_FUNC_MMAP changes to AC_CHECK_FUNCS(mmap)


configure.in:
  don't use AC_FUNC_MMAP - it checks for "private fixed mapping of
  already-mapped memory" - and we don't care about it.
  use regular AC_CHECK_FUNCS(mmap) instead
  (blame autoconf for misleading macro name - should've been
  AC_MMAP_CAN_DO_PRIVATE_FIXING_MAPPING_OF_ALREADY_MAPPED_MEMORY :)
include/my_pthread.h:
  not all cpp's understand #warning :-[]
2004-11-17 14:38:01 +01:00
unknown
adfa66e92f add ndb_init 2004-11-17 14:27:28 +01:00
unknown
c0114674fd don't fail if dbug manual cannot be built 2004-11-17 12:28:44 +01:00
unknown
7cd9cc1bfc Fix warnings and compilation failures (Windows).
sql/field.cc:
  Fix warning.
sql/item_func.cc:
  Fix Windows compilation failure.
sql/opt_range.cc:
  Fix warnings and errors (Windows)
sql/sp_pcontext.h:
  Fix warning (Windows).
sql/table.h:
  Fix warning (Windows).
2004-11-17 13:45:05 +03:00
unknown
876ca39a01 Merge mysql.com:/home/jonas/src/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0-ndb
2004-11-17 07:35:04 +01:00
unknown
13ee1cc675 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0
2004-11-17 00:00:12 +01:00
unknown
163d8b27aa portability fix
server-tools/instance-manager/mysqlmanager.cc:
  removed non-portable sys_siglist
2004-11-17 01:52:33 +03:00
unknown
8c2ae72055 - added a cast to avoid a compiler error on HP-UX 2004-11-16 22:05:29 +01:00
unknown
cb39ddfbb8 Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-5.0
into sinisa.nasamreza.org:/mnt/work/petica
2004-11-16 18:17:43 +02:00
unknown
245efb1bda Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
into mysql.com:/space/pekka/ndb/version/my50-cc
2004-11-16 16:53:43 +01:00
unknown
906d871d12 don't delete ac_available_languages_fragment in configure - it may be needed later
BitKeeper/etc/ignore:
  added ac_available_languages_fragment
2004-11-16 16:52:29 +01:00
unknown
746470a82d ndb: wl-2066: remove dead code
ndb/src/kernel/blocks/dbacc/Dbacc.hpp:
  dead code 6
ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
  dead code 8
2004-11-16 16:52:16 +01:00
unknown
2b024cee73 Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-5.0
into sinisa.nasamreza.org:/mnt/work/petica
2004-11-16 17:46:35 +02:00
unknown
5119d6f73d Fixing a linking problem that occurs with some compilers, due to
unresolved symbols.
2004-11-16 17:42:36 +02:00
unknown
b23f183049 bad fix of the bad cleanup corrected :)
sql/sql_parse.cc:
  bad fix of the bad cleanup corrected
2004-11-16 12:39:10 +01:00
unknown
f4110834a3 In 5.0 we return 'out of range' instead of 'data truncated'.
mysql-test/r/rpl_rewrite_db.result:
  in 5.0 we return 'out of range' instead of 'data truncated'.
2004-11-16 10:12:09 +01:00
unknown
effa1ed512 Merge mysql.com:/home/jonas/src/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0-ndb
2004-11-16 07:08:18 +01:00
unknown
215b20301d Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0
2004-11-16 07:06:56 +01:00
unknown
2924c94bd2 Merge joreland@build:/home/bk/mysql-5.0-ndb
into mysql.com:/home/jonas/src/5.0-ndb-jonas
2004-11-16 07:02:36 +01:00
unknown
f569abdbd2 Fix typos 2004-11-16 07:01:41 +01:00
unknown
6e5c5b7839 Merge mysql.com:/home/mysql_src/mysql-4.1-clean
into mysql.com:/home/mysql_src/mysql-5.0-clean


client/mysqldump.c:
  Auto merged
2004-11-16 00:14:46 +01:00
unknown
546e2d3192 compilation failures fixes. mysqldump now compiles on AIX 4.3.
client/mysqldump.c:
  row[i] is char* so some compilers don't want to put it into a unsigned char*. A C++ comment.
2004-11-16 00:10:32 +01:00
unknown
445c9103a3 Merge
Makefile.am:
  Auto merged
client/Makefile.am:
  Auto merged
client/mysqldump.c:
  Auto merged
configure.in:
  Auto merged
include/my_global.h:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/log_event.h:
  Auto merged
sql/sql_parse.cc:
  SCCS merged
2004-11-16 00:04:12 +01:00
unknown
fa68d58087 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/mysql_src/mysql-4.1-clean
2004-11-15 23:52:04 +01:00
unknown
6763a1da76 Merge bk-internal:/home/bk/mysql-5.0
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2004-11-15 22:45:53 +01:00
unknown
5b20904078 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-mysqladmin
2004-11-15 21:42:52 +00:00
unknown
e392cd0806 Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-5.0
into sinisa.nasamreza.org:/mnt/work/petica
2004-11-15 23:29:50 +02:00
unknown
c6388e5560 Merge bk-internal:/home/bk/mysql-5.0
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2004-11-15 22:29:50 +01:00
unknown
ac9e3a9633 valgrind error fix 2004-11-16 00:29:49 +03:00
unknown
d17105aec6 fixing a small typo 2004-11-15 23:25:24 +02:00
unknown
252e85e655 fixed "condition is always false" warnings 2004-11-15 22:12:19 +01:00
unknown
60015bff84 Merge mysql.com:/home/jonas/src/mysql-5.0-ndb
into mysql.com:/home/jonas/src/5.0-ndb-jonas


ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
2004-11-15 21:55:25 +01:00
unknown
dc745d742f wl2240 - ndb partitioning
- new test program
- changed scan take over protocol
- fixed some bugs
 


ndb/include/kernel/signaldata/TcKeyReq.hpp:
  Changed scan takeover to instead
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  return fargment instead of node (as info for scan take-over)
ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
  remove unused scanNode
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Ship fragment instead of node in scan take over.
  The case where fragment has changed primary will still be handled
    as fragmentdistribution has changed then
ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp:
  Send fragment wo/ extra bit
ndb/src/ndbapi/NdbOperationSearch.cpp:
  Fix distribution key length
ndb/test/ndbapi/Makefile.am:
  new test program for partitioning
2004-11-15 21:40:35 +01:00
unknown
03d82a4652 Merge bk-internal:/home/bk/mysql-5.0
into serg.mylan:/usr/home/serg/Abk/mysql-5.0


BitKeeper/etc/ignore:
  auto-union
configure.in:
  Auto merged
dbug/dbug.c:
  Auto merged
include/my_dbug.h:
  Auto merged
include/my_sys.h:
  Auto merged
sql/filesort.cc:
  Auto merged
sql/ha_isam.cc:
  Auto merged
sql/ha_isammrg.cc:
  Auto merged
sql/ha_myisam.cc:
  Auto merged
sql/ha_myisammrg.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
2004-11-15 19:27:06 +01:00
unknown
b478635110 Bug#6608: MySQL server crash in some query with tis620 character set.
The bug was that the function allocates 'a', then changes the value
of 'a' with the operator ++, and then tries to free 'a'!
2004-11-15 21:26:16 +04:00
unknown
a59b0fbfd6 Fixes for information_schema
sql/sql_acl.cc:
  Fix for bug 'If user has column privilege with grant option is_grantable is 'NO' in 
  INFORMATION_SCHEMA.COLUMN_PRIVILEGES'
sql/sql_show.cc:
  removed sprinf
  Fix for 'sp with select from information_schema table crashes server'
  typo fixes
2004-11-15 19:20:45 +03:00
unknown
58f984add2 BUG#6353 V2:
Replication using replicate-rewrite-db did not work for LOAD DATA INFILE.
Now is does.  There was one place in the code that used current database 
instead of the rewrite database.


mysql-test/r/rpl_rewrite_db.result:
  New tests
mysql-test/t/rpl_rewrite_db-slave.opt:
  New tests
mysql-test/t/rpl_rewrite_db.test:
  New tests
sql/log_event.cc:
  Added db to set_fields function so that current db is used.
sql/log_event.h:
  Added db to set_fields function so that current db is used.
2004-11-15 17:03:54 +01:00
unknown
8b743b38ad ndb: minor ACC cleanup
ndb/src/kernel/blocks/dbacc/Dbacc.hpp:
  remove unused members _not_ related to wl-2066
2004-11-15 16:12:54 +01:00
unknown
5ffed18459 ndb: fix rootFragId in ACC undo log
ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
  fix rootFragId in undo log
2004-11-15 14:47:19 +01:00
unknown
595d467d0c changed compile order, mysqladmin with ndbcluster extensions needs ndb to be compiled first
added libs variable for ndbmgmclient used by mysqladmin
    add linkage with @ndb_mgmclient_libs@
    additional options for ndbcluster
    added support for managing the cluster to mysqladmin
    added DEFINE_CXA_PURE_VIRTUAL flag to CFLAGS to enable linkage with c++ libs
    use macros for C_MODE_START/END so that define of FIX_GCC_LINKING_PROBLEM works in c-programs


Makefile.am:
  changed compile order, mysqladming with ndbcluster extensions needs ndb to be compiled first
acinclude.m4:
  added libs variable for ndbmgmclient used by mysqladmin
client/Makefile.am:
  add linkage with @ndb_mgmclient_libs@
client/client_priv.h:
  additional options for ndbcluster
client/mysqladmin.c:
  added support for managing the cluster to mysqladmin
configure.in:
  added DEFINE_CXA_PURE_VIRTUAL flag to CFLAGS to enable linkage with c++ libs
include/my_global.h:
  use macros for C_MODE_START/END so that define of FIX_GCC_LINKING_PROBLEM works in c-programs
2004-11-15 12:40:32 +00:00
unknown
fe37a1472c always let traffic through to api cluster manager in transporter
print some info event on api connects with wrong versions


BitKeeper/deleted/.del-Makefile.am~91c159ff4011609:
  Delete: ndb/tools/restore/Makefile.am
ndb/src/common/transporter/TransporterRegistry.cpp:
  let traffic through to api cluster manager as well
ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
  print some info event on api connects with wrong versions
2004-11-15 12:20:05 +00:00
unknown
6c4f9f5d96 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
2004-11-15 10:23:31 +00:00
unknown
9d16201f2d merge
ndb/include/ndbapi/NdbDictionary.hpp:
  Auto merged
ndb/src/common/debugger/signaldata/SignalDataPrint.cpp:
  Auto merged
ndb/src/ndbapi/NdbDictionaryImpl.hpp:
  Auto merged
ndb/src/ndbapi/NdbOperationExec.cpp:
  Auto merged
ndb/src/ndbapi/NdbScanOperation.cpp:
  Auto merged
2004-11-15 11:21:21 +01:00
unknown
2efdf76554 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0


mysql-test/r/ndb_autodiscover.result:
  Auto merged
ndb/src/ndbapi/NdbOperationExec.cpp:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
2004-11-15 11:18:27 +01:00
unknown
ce85816690 Try to lower the probability of a stall of mysqldump AND most client connections, when mysqldump does a FLUSH TABLES WITH READ LOCK
(doing FLUSH TABLES first).


client/mysqldump.c:
  try to lower the probability of a stall of mysqldump AND most client connections, when mysqldump does a FLUSH TABLES WITH READ LOCK
  (doing FLUSH TABLES first).
2004-11-14 17:45:37 +01:00