Commit graph

14685 commits

Author SHA1 Message Date
unknown
91f62b34d4 Optimzed handling of NO_AUTO_VALUE_ON_ZERO 2004-09-16 04:55:22 +02:00
unknown
dd343eb8d0 Merge mskold@build.mysql.com:/home/bk/mysql-4.1
into mysql.com:/usr/local/home/marty/MySQL/test/mysql-4.1


ndb/src/common/transporter/TransporterRegistry.cpp:
  Auto merged
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Auto merged
2004-09-15 19:01:00 +02:00
unknown
53e85a275b Fixed compiler warnings 2004-09-15 19:00:23 +02:00
unknown
7e45c7299b Merge msvensson@build.mysql.com:/home/bk/mysql-4.1
into neptunus.(none):/home/magnus/mysql/mysql-4.1
2004-09-15 18:59:27 +02:00
unknown
31fff768e1 Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.1
into eagle.mysql.r18.ru:/home/vva/work/mysql.orig/test/mysql-4.1
2004-09-15 21:59:26 +05:00
unknown
ce5d0b2d78 fixed Bug "libedit compile failure in term.c"
(for octane2)

included term.h if there isn't termcap.h in cmd-line-utils/libedit/term.c


cmd-line-utils/libedit/term.c:
  fixed Bug  "libedit compile failure in term.c"
  
  (for octane2)
  
  included term.h if there isn't termcap.h
2004-09-15 21:50:32 +05:00
unknown
f955763fb3 Fixed handling of NO_AUTO_VALUE_ON_ZERO 2004-09-15 18:44:18 +02:00
unknown
00fa471d5a Added support for auto_increment of partial key 2004-09-15 17:31:15 +02:00
unknown
46d15a3765 Merge msvensson@build.mysql.com:/home/bk/mysql-4.1
into neptunus.(none):/home/magnus/mysql/mysql-4.1
2004-09-15 16:01:58 +02:00
unknown
1ae999b0ae Print the error message if read of local config fails.
ndb/src/mgmsrv/main.cpp:
  Print error if read of local config file fails.
2004-09-15 16:01:20 +02:00
unknown
3db7442e28 Fix the test case to make it more predictable (cause: 4.1.5 test failure
on intelxeon3 (Solaris x86))


mysql-test/r/ps_2myisam.result:
  Test results fixed (order by for a couple of statements in the PS test).
mysql-test/r/ps_3innodb.result:
  Test results fixed (order by for a couple of statements in the PS test).
mysql-test/r/ps_4heap.result:
  Test results fixed (order by for a couple of statements in the PS test).
mysql-test/r/ps_5merge.result:
  Test results fixed (order by for a couple of statements in the PS test).
mysql-test/r/ps_6bdb.result:
  Test results fixed (order by for a couple of statements in the PS test).
2004-09-15 14:25:58 +04:00
unknown
b87892265c A fix (bug : CONCAT function and 'double' type). 2004-09-15 15:13:17 +05:00
unknown
1afd5d4d3d Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
into gw.mysql.r18.ru:/usr/home/ram/work/4.1.b5546
2004-09-15 14:00:52 +05:00
unknown
de677cf8c3 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/usr/home/bar/mysql-4.1
2004-09-15 13:45:44 +05:00
unknown
07860c536a Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
into gw.mysql.r18.ru:/usr/home/ram/work/4.1.b5546
2004-09-15 13:45:44 +05:00
unknown
2032737a34 CommandInterpreter.cpp:
removed help text for non implemented command


ndb/src/mgmclient/CommandInterpreter.cpp:
  removed help text for non implemented command
2004-09-15 08:45:43 +00:00
unknown
ff376da011 fixed cosmetic printouts 2004-09-15 08:39:12 +00:00
unknown
405869c14a Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.(none):/home/tomas/mysql-4.1-ndb
2004-09-15 08:27:51 +00:00
unknown
f34ca30698 mysql.cc:
SQL_SELECT_LIMIT=0 protection


client/mysql.cc:
  SQL_SELECT_LIMIT=0 protection
2004-09-15 13:26:47 +05:00
unknown
a598b85475 bug, forgot to set to zero 2004-09-15 08:23:44 +00:00
unknown
656755c437 Fixed compilation warning 2004-09-15 09:29:56 +02:00
unknown
eeb6f578b9 Restoring old code to be used with 4.0 server if 4.1-compient query fails.
Restoring displaying database and user which was removed in a mistake
in the previous change.
2004-09-15 10:06:30 +05:00
unknown
a7ad88a41a Fix the test case for bug#4231 (which before was passing just by occasion) 2004-09-15 02:43:17 +04:00
unknown
150d987d71 Fix warnings reported by aclocal > 1.8 (Underquoted definition of ...)
acinclude.m4:
  Fix warnings reported by aclocal > 1.8
configure.in:
  Fix warnings reported by aclocal > 1.8
2004-09-15 02:15:11 +04:00
unknown
bdc21869b0 Merge mskold@build.mysql.com:/home/bk/mysql-4.1
into mysql.com:/usr/local/home/marty/MySQL/test/mysql-4.1
2004-09-14 18:17:04 +02:00
unknown
067241d501 Merge mysql.com:/home/mydev/mysql-4.1
into mysql.com:/home/mydev/mysql-4.1-bug5318
2004-09-14 18:17:03 +02:00
unknown
59f2dc39d6 Merge mskold@build.mysql.com:/home/bk/mysql-4.1
into mysql.com:/usr/local/home/marty/MySQL/test/mysql-4.1


ndb/src/ndbapi/Ndb.cpp:
  Auto merged
ndb/src/ndbapi/NdbDictionary.cpp:
  Auto merged
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/ha_ndbcluster.h:
  Auto merged
2004-09-14 18:17:03 +02:00
unknown
d467ad24c3 Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1
into kite-hub.kitebird.com:/src/extern/MySQL/bk/mysql-4.1
2004-09-14 11:17:02 -05:00
unknown
6829605c4a fix to make transaction failure also affect select count() on other tables in thread 2004-09-14 16:17:01 +00:00
unknown
0deb4c4192 Added testcase for select count() during transaction with failures
added fix for keeping "records" up to date when execute() fails


mysql-test/r/ndb_insert.result:
  Added testcase for select count() during transaction with failures
mysql-test/t/ndb_insert.test:
  Added testcase for select count() during transaction with failures
sql/ha_ndbcluster.cc:
  added fix for keeping "records" up to date when execute() fails
sql/ha_ndbcluster.h:
  added fix for keeping "records" up to date when execute() fails
2004-09-14 15:51:57 +00:00
unknown
f198cb35b7 code clean-up
sql/sql_repl.cc:
  code clean-up: we can use thd here.
2004-09-14 18:57:22 +05:00
unknown
b51118aaa0 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.(none):/home/tomas/mysql-4.1-ndb-merge
2004-09-14 12:48:42 +00:00
unknown
86dc9605da Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
into poseidon.(none):/home/tomas/mysql-4.1-ndb-merge
2004-09-14 12:48:05 +00:00
unknown
2ed29f9371 new method to set size of local table data
clearer configure description texts
changed Ndb_local_table_info to use create, destroy metods and hidden constructor/destructor
move definition if Thd_ndb to .h file and changes seize/release to operate on Thd_ndb instead of Ndb objects
moved allocation/deletion of Ndb objects to Thd_ndb


ndb/include/ndbapi/NdbDictionary.hpp:
  new method to set size of local table data
ndb/src/mgmsrv/ConfigInfo.cpp:
  clearer configure description texts
ndb/src/ndbapi/DictCache.cpp:
  changed Ndb_local_table_info to use create, destroy metods and hidden constructor/destructor
ndb/src/ndbapi/DictCache.hpp:
  changed Ndb_local_table_info to use create, destroy metods and hidden constructor/destructor
ndb/src/ndbapi/NdbDictionary.cpp:
  new method to set size of local table data
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  new method to set size of local table data
ndb/src/ndbapi/NdbDictionaryImpl.hpp:
  new method to set size of local table data
sql/ha_ndbcluster.cc:
  new method to set size of local table data
  moved allocation/deletion of Ndb objects to Thd_ndb
sql/ha_ndbcluster.h:
  move definition if Thd_ndb to .h file and changes seize/release to operate on Thd_ndb instead of Ndb objects
2004-09-14 12:47:34 +00:00
unknown
52b355e1f8 A fix (bug : mysqld crash on PURGE MASTER LOGS BEFORE '...' with log-bin off). 2004-09-14 17:30:57 +05:00
unknown
dbd8e7611f Merge mysql.com:/home/mydev/mysql-4.1
into mysql.com:/home/mydev/mysql-4.1-bug5318
2004-09-14 13:50:30 +02:00
unknown
b4e557fdd6 BUG#5318 - failure: 'IGNORE_SPACE' affects numeric values after DEFAULT.
Added a check to recover from IGNORE_SPACE in this situation: 
<ident-character(s)><space><dot><ident-character(s)>
The ignored space led to the false identification of the dot
as an ident separator (like "db.table").


mysql-test/r/sql_mode.result:
  BUG#5318 - failure: 'IGNORE_SPACE' affects numeric values after DEFAULT.
  Added the test results.
mysql-test/t/sql_mode.test:
  BUG#5318 - failure: 'IGNORE_SPACE' affects numeric values after DEFAULT.
  Added new tests for the bug.
sql/sql_lex.cc:
  BUG#5318 - failure: 'IGNORE_SPACE' affects numeric values after DEFAULT.
  Added code to recover from skipped spaces in mode IGNORE_SPACES,
  when testing for an ident separator (which happens to be a dot).
2004-09-14 13:49:08 +02:00
unknown
37125a7752 Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/M41/mysql-4.1
2004-09-14 11:30:01 +02:00
unknown
714667b448 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.(none):/home/tomas/mysql-4.1-ndb-merge
2004-09-14 09:15:43 +00:00
unknown
e7f4e54c6f Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
into poseidon.(none):/home/tomas/mysql-4.1-ndb-merge


sql/ha_ndbcluster.cc:
  Auto merged
2004-09-14 08:55:09 +00:00
unknown
4e02422cc3 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
into gw.mysql.r18.ru:/usr/home/ram/work/4.1.b5497
2004-09-14 13:55:03 +05:00
unknown
2e43e47040 moved all ndb thread specific data into new placeholder
new methods to keep "records" up to date
unset flag HA_NOT_EXACT_COUNT to make handler read "records" field, for count() optim and join optimization
new methods to keep "records" up to datecorrect record field in ndbcluster handler
new method for ndbcluster handler to store/retrieve table and thread specific data
changed local hash to store new table_info object, with placeholders for local data, instead of TableImpl
hanged deleteKey to return ponter to deleted object
moved heavy global cache fetch from inline to separate method


mysql-test/r/ndb_alter_table.result:
  correct record field in ndbcluster handler
mysql-test/r/ndb_blob.result:
  correct record field in ndbcluster handler
ndb/include/ndbapi/NdbDictionary.hpp:
  new method for ndbcluster handler to store/retrieve table and thread specific data
ndb/src/ndbapi/DictCache.cpp:
  changed local hash to store new table_info object, with placeholders for local data, instead of TableImpl
ndb/src/ndbapi/DictCache.hpp:
  changed local hash to store new table_info object, with placeholders for local data, instead of TableImpl
ndb/src/ndbapi/Ndb.cpp:
  replaced method DictionaryImpl::getTable with DictionaryImpl::get_local_table_info
ndb/src/ndbapi/NdbDictionary.cpp:
  new method for ndbcluster handler to store/retrieve table and thread specific data
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  changed local hash to store new table_info object, with placeholders for local data, instead of TableImpl
  moved heavy global cache fetch from inline to separate method
ndb/src/ndbapi/NdbDictionaryImpl.hpp:
  replaced method DictionaryImpl::getTable with DictionaryImpl::get_local_table_info
ndb/src/ndbapi/NdbLinHash.hpp:
  changed deleteKey to return ponter to deleted object
sql/ha_ndbcluster.cc:
  moved all ndb thread specific data into new placeholder
  new methods to keep "records" up to date
  unset flag HA_NOT_EXACT_COUNT to make handler read "records" field, for count() optim and join optimization
sql/ha_ndbcluster.h:
  new methods to keep "records" up to date
sql/sql_class.h:
  moved all ndb thread specific data into new placeholder
2004-09-14 08:52:21 +00:00
unknown
68e80952aa Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
into gw.mysql.r18.ru:/usr/home/ram/work/4.1.b5497


sql/item_strfunc.cc:
  Auto merged
2004-09-14 13:09:51 +05:00
unknown
373f1b7014 ctype-ucs2.c:
Bug#5523 Test failure: 'ctype_uca'
  Type cast should have been applied to shift and bit-and operation results, not to min_sort_char/max_sort_char before the operation.


strings/ctype-ucs2.c:
  Bug#5523 Test failure: 'ctype_uca'
  Type cast should have been applied to shift and bit-and operation results, not to min_sort_char/max_sort_char before the operation.
2004-09-14 13:02:20 +05:00
unknown
7226dc5155 Syntax correction for bug#5560.
tests/client_test.c:
  Pointer arithmetic on array names is not allowed in all compilers,
  rather use array elements and the address operator (bug#5560).
2004-09-14 09:46:05 +02:00
unknown
f21c7b17ed Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/jonas/src/mysql-4.1
2004-09-14 09:30:03 +02:00
unknown
1d014ceb58 removed printout 2004-09-14 09:27:06 +02:00
unknown
0f72096668 Fix UtilTransaction::verifyIndex wrt to null handling 2004-09-14 09:08:03 +02:00
unknown
6a9a52e724 Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into deer.(none):/home/hf/work/mysql-4.1.5396
2004-09-14 11:37:16 +05:00
unknown
a60004438a Merge bk@192.168.21.1:/usr/home/bk/mysql-4.1
into deer.(none):/home/hf/work/mysql-4.1.5396
2004-09-14 11:35:57 +05:00