1
0
mirror of https://github.com/MariaDB/server.git synced 2025-07-17 12:02:09 +03:00
Commit Graph

18792 Commits

Author SHA1 Message Date
c8cd901b33 ndb - only run ndb_config test when using "default" config
mysql-test/t/ndb_config.test:
  only run ndb_config test when using "default" config
2005-07-26 16:12:17 +02:00
702f17ee89 ndb_config test requires ndb
mysql-test/t/ndb_config.test:
  test requires ndb
2005-07-26 07:59:10 +02:00
bc10bd8e80 fix compile error 2005-07-25 13:47:40 +02:00
ea010ef584 ndb - Fix LCP during SR parameters
ndb/include/mgmapi/mgmapi_config_parameters.h:
  Fix LCP during SR parameters
ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
  Fix LCP during SR parameters
ndb/src/kernel/blocks/dbtup/DbtupGen.cpp:
  Fix LCP during SR parameters
ndb/src/mgmsrv/ConfigInfo.cpp:
  Fix LCP during SR parameters
2005-07-25 12:41:25 +02:00
aab6612309 ndb - add mysql-test-run test case for ndb_config
mysql-test/r/ndb_config.result:
  New BitKeeper file ``mysql-test/r/ndb_config.result''
mysql-test/t/ndb_config.test:
  New BitKeeper file ``mysql-test/t/ndb_config.test''
2005-07-24 17:35:39 +02:00
8dd5bd5e55 Add tool to extract config info from ndb_mgmd
ndb/include/mgmapi/mgmapi.h:
  Add feature to redirect error printouts
ndb/src/mgmapi/mgmapi.cpp:
  Add feature to redirect error printouts
ndb/src/mgmsrv/ConfigInfo.hpp:
  Make param info public
ndb/tools/Makefile.am:
  Add ndb_config
ndb/tools/config.cpp:
  New BitKeeper file ``ndb/tools/config.cpp''
2005-07-23 12:06:02 +02:00
3f916d29b3 bug#11942 - ndb - backup during DDL
fix bug introduced in alter table
2005-07-21 11:13:07 +02:00
fe07364726 bug#11942 - ndb backup
fix error code to avoid clash with 5.0/5.1


ndb/include/kernel/signaldata/AlterTable.hpp:
  Change error codes to remove clash from 5.0
ndb/include/kernel/signaldata/DropTable.hpp:
  Change error codes to remove clash from 5.0
ndb/src/ndbapi/ndberror.c:
  Change error codes to remove clash from 5.0
2005-07-20 13:21:49 +02:00
e071abacf6 bug#11942 - ndb backup with parallell DDL
add testcase to autotest


ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  remove ;
ndb/test/run-test/daily-basic-tests.txt:
  add test case
2005-07-20 12:39:45 +02:00
783dbfc3a8 bug#11942
ndb/include/kernel/signaldata/AlterTable.hpp:
  Add error code for backup in progress
ndb/include/kernel/signaldata/DictTabInfo.hpp:
  Add backup state
ndb/include/kernel/signaldata/DropTable.hpp:
  Add error code for backup in progress
ndb/include/ndbapi/NdbDictionary.hpp:
  Add backup state
ndb/src/kernel/blocks/backup/Backup.cpp:
  1) remove invalid require (util_sequence_ref) crash
  2) Don't backup objects dropping/creating
  3) set correct error code on backup fragment ref (crash)
  4) save TrigAttrInfo header when getting log full (crash)
  5) lock/unlock tables during backup
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  1) add mutex lock/unlock as part of drop/alter table
  2) add lock/unlock for backup
  3) remove TC from backup trigger loop
ndb/src/kernel/blocks/dbdict/Dbdict.hpp:
  Add BACKUP_ONGOING state
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Add backup state
ndb/src/ndbapi/ndberror.c:
  Add error code for backup in progress
ndb/test/ndbapi/testBackup.cpp:
  Add testcase for testBackup -n BackupDDL
ndb/tools/drop_index.cpp:
  Fix ndb_drop_index
ndb/tools/listTables.cpp:
  Print of backup state
2005-07-20 11:48:48 +02:00
6913d8058e ndb -
fix bug in MemoryChannel


ndb/src/kernel/blocks/ndbfs/AsyncFile.cpp:
  Don't signal when reporting to NDBFS
ndb/src/kernel/blocks/ndbfs/MemoryChannel.hpp:
  1) add new method which don't signal
  2) remove wait(0) from tryReadChannel
2005-07-04 10:18:36 +02:00
5285b53042 bug#11133 - ndb write handling
fix handling of write's in lock queue
  add test case
  add support for pkWrite+async exec in HugoOperations


ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
  Handle operation type wrt ZWRITE when restarting operations
ndb/test/include/HugoOperations.hpp:
  Add support for 
  1) pkWriteRecord 
  2) async execute
ndb/test/ndbapi/testNdbApi.cpp:
  Extend test case for bug#11133 with multi transaction tests aswell...
ndb/test/src/HugoOperations.cpp:
  Add support for 
  1) pkWriteRecord 
  2) async execute
2005-07-01 09:57:48 +02:00
8cf4e0c86b ndb autotest - merge jebs fixes
ndb/test/run-test/ndb-autotest.sh:
  fix eval
  merge jeb's fix
2005-06-30 10:10:12 +02:00
90300c071a Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-bug3-4.1
2005-06-28 22:59:16 +03:00
3aca0a0c62 fixed not_null_tables() for IN() (BUG#9393)
(IN() remove NULL rows only for tables from first argument (value which we looking for in IN() list) but not for tables from IN() list)
Also it will be better change Item::not_null_tables() to prohibit this optimisation by default for new created items in 5.0 or 5.1.


mysql-test/r/select.result:
  IN with outer join condition
mysql-test/t/select.test:
  IN with outer join condition
sql/item_cmpfunc.h:
  correct not_null_tables() for IN
2005-06-28 22:20:25 +03:00
dadf91f0ff Merge marko@bk-internal.mysql.com:/home/bk/mysql-4.1
into hundin.mysql.fi:/home/marko/mysql-4.1
2005-06-28 15:33:41 +03:00
d8edc2db59 Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-4.1
into rurik.mysql.com:/home/igor/mysql-4.1
2005-06-28 05:33:40 -07:00
05c7edf648 Move reset of insert_values to ensure it's done also during error conditions
This fixed a failure of insert_update.test on some platforms


mysys/thr_alarm.c:
  Fixed problem noticed by valgrind
sql/opt_range.cc:
  Simple optimization for common case
sql/sql_base.cc:
  Safety assert
sql/sql_insert.cc:
  Added comment
2005-06-28 15:06:16 +03:00
69f2934891 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-06-28 03:24:06 -07:00
27478af9d5 Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-4.1
into rurik.mysql.com:/home/igor/mysql-4.1


sql/field.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
2005-06-28 03:20:00 -07:00
67abd491a1 group_by.result, group_by.test:
Added a test case for bug #11414.
sql_select.cc:
  Fixed bug #11414: crash on Windows with some simple
  GROUP BY queries.
  It happened to an allocation of an array containing
  0 Copy_field elements in setup_copy_fields.
  The bug had been already fixed in 5.0.


sql/sql_select.cc:
  Fixed bug #11414: crash on Windows with some simple
  GROUP BY queries.
  It happened to an allocation of an array containing
  0 Copy_field elements in setup_copy_fields.
  The bug had been already fixed in 5.0.
mysql-test/t/group_by.test:
  Added a test case for bug #11414.
mysql-test/r/group_by.result:
  Added a test case for bug #11414.
2005-06-28 03:18:37 -07:00
2776aa35b7 ctype_ucs.result, ctype_ucs.test, ctype_utf8.result, ctype_utf8.test:
Fixing tests accordingly.
ctype-ucs2.c:
  The same fix for UCS2.
ctype-utf8.c:
  Bug #9557
  MyISAM utf8 table crash
  The problem was that my_strnncollsp_xxx could
  return big value in the range 0..0xffff.
  for some constant pairs it could return 32738,
  which is defined as MI_FOUND_WRONG_KEY in
  myisamdef.h. As a result, table considered to
  be crashed. 
  Fix to return -1,0 or 1.


strings/ctype-utf8.c:
  Bug #9557
  MyISAM utf8 table crash
  The problem was that my_strnncollsp_xxx could
  return big value in the range 0..0xffff.
  for some constant pairs it could return 32738,
  which is defined as MI_FOUND_WRONG_KEY in
  myisamdef.h. As a result, table considered to
  be crashed. 
  Fix to return -1,0 or 1.
strings/ctype-ucs2.c:
  The same fix for UCS2.
mysql-test/t/ctype_utf8.test:
  Fixing tests accordingly.
mysql-test/r/ctype_utf8.result:
  Fixing tests accordingly.
mysql-test/t/ctype_ucs.test:
  Fixing tests accordingly.
mysql-test/r/ctype_ucs.result:
  Fixing tests accordingly.
2005-06-28 15:00:22 +05:00
0037781f05 Makefile.am:
Bug#9873, reenabled --without-man option to work


Makefile.am:
  Bug#9873, reenabled --without-man option to work
2005-06-28 04:49:03 +02:00
c7e157e71e configure.in:
Enable build with CXX=gcc and gcc version 4


configure.in:
  Enable build with CXX=gcc and gcc version 4
2005-06-28 04:44:27 +02:00
9c41fbda76 mysqld.dsp:
Corrected quoting of string "pro-nt"


VC++Files/sql/mysqld.dsp:
  Corrected quoting of string "pro-nt"
2005-06-28 04:37:01 +02:00
f7780a1cc2 opt_range.cc:
Added missing `;' to DBUG_RETURN()


sql/opt_range.cc:
  Added missing `;' to DBUG_RETURN()
2005-06-28 04:33:06 +02:00
f3dd815156 Fix test after last push 2005-06-27 20:31:02 +03:00
07de1f820a Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/my/mysql-4.1
2005-06-27 20:31:01 +03:00
76d444fcb6 Portability fixes
Fixes while reviewing new pushed code
NULL as argument to encrypt/decrypt should return NULL without a warning


client/mysqldump.c:
  Cleanup
  Ensure we free allocated memory
  Portability fixes
client/mysqltest.c:
  Cleanup of code during review
  Portability fixes (Don't use 'bool')
mysql-test/r/func_encrypt.result:
  NULL as argument to encrypt/decrypt should return NULL without a warning
mysql-test/r/func_encrypt_nossl.result:
  Added test of NULL argument
mysql-test/t/func_encrypt_nossl.test:
  Added test of NULL argument
sql/handler.cc:
  Cleanup during code review
sql/item_strfunc.cc:
  NULL as argument to encrypt/decrypt should return NULL without a warning
sql/sql_parse.cc:
  Fix wrong merge (fix was not needed as the previous code was reverted)
sql/sql_table.cc:
  Removed extra new line
2005-06-27 20:31:00 +03:00
b608f091db InnoDB: After review fixes
innobase/os/os0file.c:
  os_file_set_size(): After review fixes (prevent overflows)
2005-06-27 17:25:37 +03:00
1084e540ee InnoDB: Optimize the extension of files. This will greatly speed
up CREATE TABLE in innodb_file_per_table=1 mode.


innobase/fil/fil0fil.c:
  fil_extend_space_to_desired_size(): Do not allocate or initialize
  more memory than is necessary.  Write at most one megabyte at a time.
innobase/include/os0file.h:
  os_file_set_size(): Corrected the synopsis
innobase/os/os0file.c:
  os_file_set_size(): Corrected the synopsis and some comments.
  s/offset/current_size; s/low/desired_size/;
  Do not allocate or initialize more memory than is necessary.
  Write at most one megabyte at a time.
2005-06-27 17:04:57 +03:00
78b35bc041 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/my/mysql-4.1
2005-06-27 16:49:55 +03:00
6c46a993d7 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into  mishka.local:/home/my/mysql-4.1


sql/ha_ndbcluster.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
2005-06-27 16:47:44 +03:00
d10877ce8c Better bug fix for:
#9728  'Decreased functionality in "on duplicate key update
#8147  'a column proclaimed ambigous in INSERT ... SELECT .. ON DUPLICATE'

This ensures fields are uniquely qualified and also that one can't update other tables in the ON DUPLICATE KEY UPDATE part


mysql-test/r/insert_select.result:
  More tests for bug #9728 and #8147
mysql-test/r/insert_update.result:
  Updated tests after changing how INSERT ... SELECT .. ON DUPLICATE KEY works
mysql-test/t/insert_select.test:
  More tests for bug #9728 and #8147
mysql-test/t/insert_update.test:
  Updated tests after changing how INSERT ... SELECT .. ON DUPLICATE KEY works
mysys/my_access.c:
  Cleanup (shorter loop variable names)
sql/ha_ndbcluster.cc:
  Indentation fixes
sql/item.cc:
  Remove item_flags
sql/item.h:
  Remove item_flags
sql/mysql_priv.h:
  New arguments to mysql_prepare_insert
sql/sql_base.cc:
  Remove old fix for bug #8147
sql/sql_insert.cc:
  Extend mysql_prepare_insert() with new field list for tables that can be used in the values port of ON DUPLICATE KEY UPDATE
sql/sql_parse.cc:
  Revert fix for #9728
  Allow one to use other tables in ON DUPLICATE_KEY for INSERT ... SELECT if there is no GROUP BY clause
sql/sql_prepare.cc:
  New arguments to mysql_prepare_insert
sql/sql_yacc.yy:
  Revert bug fix for #9728
2005-06-27 16:46:41 +03:00
e00981bb5f Include <sys/wait.h> to get WEXITSTATUS 2005-06-27 15:11:40 +02:00
8478223a6d Add "#include <stdlib.h>" to define WEXITSTATUS 2005-06-27 15:01:49 +02:00
f40f711e0c Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into neptunus.(none):/home/msvensson/mysql/mysql-4.1
2005-06-27 09:53:11 +02:00
3f499c32d4 Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-4.1
into rurik.mysql.com:/home/igor/mysql-4.1
2005-06-25 05:45:50 -07:00
a7e66efc2c Bug#10178 - failure to find a row in heap table by concurrent UPDATEs
Moved the key statistics update to info().
The table is not locked in open(). This made wrong stats possible.

No test case for the test suite.
This happens only with heavy concurrency.
A test script is added to the bug report.


mysql-test/r/heap_hash.result:
  Bug#10178 - failure to find a row in heap table by concurrent UPDATEs
  Updated test results to reflect the new  statistics behaviour.
mysql-test/t/heap_hash.test:
  Bug#10178 - failure to find a row in heap table by concurrent UPDATEs
  Added a FLUSH TABLES to avoid statistics differences between normal 
  and ps-protocol tests.
sql/ha_heap.cc:
  Bug#10178 - failure to find a row in heap table by concurrent UPDATEs
  Moved the key statistics update to info().
  The table is not locked in open(). This made wrong stats possible.
sql/ha_heap.h:
  Bug#10178 - failure to find a row in heap table by concurrent UPDATEs
  Added an element to track the validity of the key statistics.
2005-06-24 17:47:09 +02:00
5aa793f72b backport for #10568: Function 'LAST_DAY(date)' does not return NULL for invalid argument. 2005-06-24 14:04:48 +05:00
77dc5c423f an improvement (bug #7851: C++ 'new' conflicts with kernel header asm/system.h).
include/my_global.h:
  an improvement (bug #7851: C++ 'new' conflicts with kernel header asm/system.h).
  redefine 'new' before #include <asm/atomic.h> in any case.
2005-06-24 12:51:11 +05:00
2288296483 Merge tkatchaounov@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/timka/mysql/src/4.1-virgin
2005-06-23 22:40:04 +03:00
26576e9011 Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-4.1
into rurik.mysql.com:/home/igor/mysql-4.1
2005-06-23 10:09:01 -07:00
aa4ccff7f7 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into neptunus.(none):/home/msvensson/mysql/mysql-4.1
2005-06-23 19:06:35 +02:00
5d12a0bf49 Merge tkatchaounov@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/timka/mysql/src/4.1-virgin
2005-06-23 20:06:35 +03:00
7ed5026d36 Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1-gca
into mysql.com:/Users/kent/mysql/bk/mysql-4.1
2005-06-23 19:06:35 +02:00
d9a7e4e0dc Merge rurik.mysql.com:/home/igor/mysql-4.1
into rurik.mysql.com:/home/igor/dev/mysql-4.1-1
2005-06-23 10:06:35 -07:00
1093237174 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/psergey/mysql-4.1-bug10151
2005-06-23 19:06:34 +02:00
d06446af84 sql_parse.cc:
Fix for fix for bug #9728
  Error caused server hang on prepared insert ... select


sql/sql_parse.cc:
  Fix for fix for bug #9728
  Error caused server hang on prepared insert ... select
2005-06-23 21:06:33 +04:00
744f6a1a99 mysql-test-run.pl:
Might need a restart after test with special TZ
  Removed unused argument to run_mysqltest()


mysql-test/mysql-test-run.pl:
  Might need a restart after test with special TZ
  Removed unused argument to run_mysqltest()
2005-06-23 17:38:40 +02:00