Commit graph

7204 commits

Author SHA1 Message Date
unknown
b87892265c A fix (bug : CONCAT function and 'double' type). 2004-09-15 15:13:17 +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
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
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
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
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
81bca0a51d Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into deer.(none):/home/hf/work/mysql-4.1.4815
2004-09-14 10:07:17 +05:00
unknown
ded743366a Merging
sql/sql_table.cc:
  Auto merged
2004-09-14 10:04:35 +05:00
unknown
23c2113d9d Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/M41/mysql-4.1
2004-09-13 23:31:15 +02:00
unknown
81d8e1b01f Merge mskold@build.mysql.com:/home/bk/mysql-4.1
into mysql.com:/usr/local/home/marty/MySQL/test/mysql-4.1


sql/ha_ndbcluster.cc:
  Auto merged
2004-09-13 22:31:16 +02:00
unknown
bb5383172a 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-13 14:57:50 -05:00
unknown
5fc83a473b Merge mskold@build.mysql.com:/home/bk/mysql-4.1
into mysql.com:/usr/local/home/marty/MySQL/test/mysql-4.1
2004-09-13 20:09:55 +02:00
unknown
cd0b6b07e5 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-13 11:50:03 -05:00
unknown
c7431f4c26 Additional fix about paths
sql/sql_class.cc:
  we need to check exchange->file_name here
2004-09-13 21:49:41 +05:00
unknown
b39ddcf9b9 Fix ; when compiling release 2004-09-13 18:46:56 +02:00
unknown
21d95d33bc Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/jonas/src/mysql-4.1
2004-09-13 18:07:51 +02:00
unknown
5d2fc66942 Merge mskold@build.mysql.com:/home/bk/mysql-4.1
into mysql.com:/usr/local/home/marty/MySQL/test/mysql-4.1
2004-09-13 17:14:57 +02:00
unknown
95d36faadb 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-13 10:14:00 -05:00
unknown
8f8ccc4bd5 Replace 'sete_id(__)' calls by 'setre_id(-1,__)' to solve the
missing prototyped problem (bug#5521).


sql/mysqld.cc:
  Some systems (Unixware, SCO) have no prototypes for 'seteuid()' and
  'setegid()', but have them for 'setreuid()' / 'setregid()'.
  So 'sete_id(__)' calls are replaced by 'setre_id(-1,__)' (bug#5521).
2004-09-13 16:32:47 +02:00
unknown
f0e23df61a Merge bk-internal.mysql.com:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2004-09-13 16:20:42 +02:00
unknown
61e6211646 A fix (bug : COMPRESS() returns NULL for large strings). 2004-09-13 18:43:59 +05:00
unknown
736963b5e0 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/dbdata/psergey/mysql-4.1-bug-tina


sql/handler.h:
  Auto merged
2004-09-13 16:26:01 +04:00
unknown
b9c0f6b77e select send_error cleanup (not everything is fixed) 2004-09-13 11:22:01 +02:00
unknown
356840594d un-reserving "RETURNS" 2004-09-13 11:19:38 +02:00
unknown
e9e714459f indentation cleanup 2004-09-13 11:16:34 +02:00
unknown
ce763f8b2c Merge mysql.com:/home/jonas/src/mysql-4.1-ndb
into mysql.com:/home/jonas/src/mysql-4.1
2004-09-13 06:49:16 +02:00
unknown
b4f59e866b Fix dict error code on list tables
Check g_ndb before deleting it
Wait until ready(10) if get mgm connection
2004-09-13 06:40:25 +02:00
unknown
b28118abfb Fix for BUG#5117:
* Renamed handler::estimate_number_of_rows to handler::estimate_rows_upper_bound function, which can also return "unknown"
 * made filesort to use full sort buffer if number of rows to sort is not known.


sql/examples/ha_tina.h:
  Renamed estimate_number_of_rows -> estimate_rows_upper_bound
sql/filesort.cc:
   * Fix for BUG#5117: made filesort() to use full sort buffer if number of rows to sort is not known.
   * Comments and assertion added
sql/ha_berkeley.cc:
  Renamed estimate_number_of_rows -> estimate_rows_upper_bound
sql/ha_berkeley.h:
  Renamed estimate_number_of_rows -> estimate_rows_upper_bound
sql/ha_innodb.cc:
  Renamed estimate_number_of_rows -> estimate_rows_upper_bound
sql/ha_innodb.h:
  Renamed estimate_number_of_rows -> estimate_rows_upper_bound
sql/handler.h:
  Renamed estimate_number_of_rows -> estimate_rows_upper_bound
2004-09-13 06:14:25 +04:00
unknown
c6d8121cba Merge mskold@build.mysql.com:/home/bk/mysql-4.1
into mysql.com:/usr/local/home/marty/MySQL/test/mysql-4.1
2004-09-12 21:59:17 +02:00
unknown
4e639af733 Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.1
into gluh.mysql.r18.ru:/home/gluh/MySQL-BUGS/mysql-4.1


sql/item_func.cc:
  Auto merged
2004-09-12 10:41:06 +04:00
unknown
180abf8338 Merge mskold@build.mysql.com:/home/bk/mysql-4.1
into mysql.com:/usr/local/home/marty/MySQL/test/mysql-4.1


ndb/include/mgmcommon/ConfigRetriever.hpp:
  Auto merged
ndb/src/common/debugger/signaldata/ScanTab.cpp:
  Auto merged
ndb/src/common/mgmcommon/ConfigRetriever.cpp:
  Auto merged
ndb/src/common/mgmcommon/LocalConfig.cpp:
  Auto merged
ndb/src/ndbapi/Ndb.cpp:
  Auto merged
ndb/src/ndbapi/NdbDictionary.cpp:
  Auto merged
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Auto merged
ndb/src/ndbapi/Ndbif.cpp:
  Auto merged
ndb/src/ndbapi/Ndbinit.cpp:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/handler.cc:
  Auto merged
2004-09-11 20:56:06 +02:00
unknown
00d5f66af5 Merge bk-internal.mysql.com:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2004-09-11 13:57:02 +02:00
unknown
9ecf15ed74 Fix for bug : FIND_IN_SET fails if set ends with a comma 2004-09-11 15:48:23 +04:00
unknown
3ffc483275 Merge mysql.com:/home/mydev/mysql-4.1
into mysql.com:/home/mydev/mysql-4.1-bug4788
2004-09-11 12:31:28 +02:00
unknown
ca31bda2bf Add GPL notice to a bunch of files.
sql/share/charsets/Index.xml:
  Add GPL notice.
sql/share/charsets/armscii8.xml:
  Add GPL notice.
sql/share/charsets/ascii.xml:
  Add GPL notice.
sql/share/charsets/cp1250.xml:
  Add GPL notice.
sql/share/charsets/cp1251.xml:
  Add GPL notice.
sql/share/charsets/cp1256.xml:
  Add GPL notice.
sql/share/charsets/cp1257.xml:
  Add GPL notice.
sql/share/charsets/cp850.xml:
  Add GPL notice.
sql/share/charsets/cp852.xml:
  Add GPL notice.
sql/share/charsets/cp866.xml:
  Add GPL notice.
sql/share/charsets/dec8.xml:
  Add GPL notice.
sql/share/charsets/geostd8.xml:
  Add GPL notice.
sql/share/charsets/greek.xml:
  Add GPL notice.
sql/share/charsets/hebrew.xml:
  Add GPL notice.
sql/share/charsets/hp8.xml:
  Add GPL notice.
sql/share/charsets/keybcs2.xml:
  Add GPL notice.
sql/share/charsets/koi8r.xml:
  Add GPL notice.
sql/share/charsets/koi8u.xml:
  Add GPL notice.
sql/share/charsets/latin1.xml:
  Add GPL notice.
sql/share/charsets/latin2.xml:
  Add GPL notice.
sql/share/charsets/latin5.xml:
  Add GPL notice.
sql/share/charsets/latin7.xml:
  Add GPL notice.
sql/share/charsets/macce.xml:
  Add GPL notice.
sql/share/charsets/macroman.xml:
  Add GPL notice.
sql/share/charsets/swe7.xml:
  Add GPL notice.
2004-09-10 14:53:06 -05:00
unknown
9d80a396db Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-4.1
2004-09-10 21:40:18 +03:00
unknown
7c80446c4e BUG#4788 - show create table provides incorrect statement.
Added code to adjust the field_length of user variables 
in dependence on the field type.
Aded new constants for numeric field widths.


include/mysql_com.h:
  BUG#4788 - show create table provides incorrect statement.
  Introduced definitions for default field width of numeric types.
  So common values can be used at different places in the code.
mysql-test/r/variables.result:
  BUG#4788 - show create table provides incorrect statement.
  New test results.
mysql-test/t/variables.test:
  BUG#4788 - show create table provides incorrect statement.
  Added a test for the bug.
sql/item_func.cc:
  BUG#4788 - show create table provides incorrect statement.
  Added code to adjust the field_length of user variables 
  in dependence on the field type.
sql/sql_parse.cc:
  BUG#4788 - show create table provides incorrect statement.
  Changed numeric literals to the new constants.
2004-09-10 18:56:47 +02:00
unknown
32dc386d5e information about different variables agged to query cache (BUG#5515, BUG#5394)
mysql-test/r/query_cache.result:
  test of QC with different variables
mysql-test/t/query_cache.test:
  test of QC with different variables
sql/mysql_priv.h:
  new information for query key calculation
sql/sql_cache.cc:
  new information for query key calculation
sql/sql_cache.h:
  removed unused definitions
2004-09-10 16:28:18 +03:00