Commit graph

17260 commits

Author SHA1 Message Date
unknown
6e667ec888 Merge mysql.com:/home/wax/mysql/mysql-4.1
into mysql.com:/home/wax/mysql/mysql-4.1test2
2005-01-31 19:23:19 +05:00
unknown
5ebe0dd231 WL#964
added client_test.dsp in project
    added CHARACTER SET in tables
    added 5th time zone
    included lstat in if()
    expanded ignore list for windows
    added directory slave1 and slave2
    added options for mysqld and mysqltest
    fixed error in read_option()
    fixed and added enviroment variables for Linux and Windows
    rewrote str_tok()
    added replacment 3th column
    New BitKeeper file ``VC++Files/tests/client_test.dsp''



VC++Files/mysql.dsw:
  added client_test.dsp in project
mysql-test/my_create_tables.c:
  added CHARACTER SET in tables
  added 5th time zone
mysql-test/my_manage.c:
  included lstat in if()
mysql-test/mysql_test_run_new.c:
  expanded ignore list for windows
  added directory slave1 and slave2
  added options for mysqld and mysqltest
  fixed error in read_option()
  fixed and added enviroment variables for Linux and Windows
  rewrote str_tok()
mysql-test/t/ps_1general.test:
  added replacment 3th column
2005-01-31 19:18:06 +05:00
unknown
0bd5c1e3b2 Bug#7011
Fix tests after merge from 4.0
2005-01-31 13:18:36 +00:00
unknown
ed9f484556 Bug#7011
Merge from 4.0


sql/sql_select.cc:
  Auto merged
2005-01-31 12:48:00 +00:00
unknown
4faf77a9fe BUG#8208 don't fsync unless something has been written
+ ion shutdown - don't close files that are not open
+ abort in debug - if closing a fd == -1


BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2005-01-31 11:47:10 +01:00
unknown
b4ecba65de Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.0
into gw.mysql.r18.ru:/usr/home/ram/work/4.0.b6000
2005-01-31 14:29:20 +04:00
unknown
a701afe24e Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.0
into gw.mysql.r18.ru:/usr/home/ram/work/4.0
2005-01-31 14:04:18 +04:00
unknown
bcfa783bfb Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.0
into gw.mysql.r18.ru:/usr/home/ram/work/4.0.b6000
2005-01-31 12:27:33 +04:00
unknown
f5729e2c4d Merge marko@bk-internal.mysql.com:/home/bk/mysql-4.1
into hundin.mysql.fi:/home/marko/k/mysql-4.1


sql/set_var.cc:
  Auto merged
2005-01-31 09:36:07 +02:00
unknown
30025f3fdc Merge marko@bk-internal.mysql.com:/home/bk/mysql-4.0
into hundin.mysql.fi:/home/marko/k/mysql-4.0
2005-01-31 09:34:34 +02:00
unknown
934fde094c Bug#7011
Fix replication for multi-update
  new test - rpl_multi_update2


sql/mysql_priv.h:
  Bug#7011
    New function mysql_multi_update_lock()
sql/sql_parse.cc:
  Bug#7011
    New function check_multi_update_lock()
    For multi-update on slave, perform an early open&lock
sql/sql_update.cc:
  Bug#7011
    Split out multi-update locking into its own function,
      mysql_multi_update_lock()
2005-01-30 10:24:03 +00:00
unknown
f787145fc0 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/Users/kent/mysql/bk/mysql-4.1-perl
2005-01-30 00:32:14 +01:00
unknown
a88ca8f548 Fix for a "table is full" bug in multi-table updates (Bug #7788)
mysys/my_handler.c:
  Fix for a bug in multi table updates, when offset of one table is 
  5 bytes or more. This occured because in that case binary(5) indexed
  column is space packed, so it was hit by this bug in the function
  for binary comparison.
  Bug #7788
2005-01-29 22:56:00 +02:00
unknown
25c0775b16 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/dlenev/src/mysql-4.1-tzbug
2005-01-29 20:04:33 +03:00
unknown
bcb31692fc Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-4.1
into bob.(none):/home/reggie/bk/mysql41
2005-01-29 09:41:23 -06:00
unknown
79016ecb2c Bug #5185 mysqldump for windows database gets table names with different case
mysqldump.c:
  Trimmed some lines to be less than 80 chars.  Using just NAME_LEN now for table name buffers


client/mysqldump.c:
  Trimmed some lines to be less than 80 chars.  Using just NAME_LEN now for table name buffers
2005-01-29 09:25:56 -06:00
unknown
15501915c6 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/Users/kent/mysql/bk/mysql-4.1-perl
2005-01-29 12:46:13 +01:00
unknown
7f25f21c25 Merging fix for BUG#7672 - the changes will not go into 4.1 2005-01-29 06:49:48 +03:00
unknown
fa0b4b5e8d Merge baker@bk-internal.mysql.com:/home/bk/mysql-4.1
into zim.(none):/home/brian/mysql/mysql-4.1


sql/examples/ha_archive.cc:
  Auto merged
2005-01-28 18:10:47 -08:00
unknown
c2383412b2 Fix error in string comparisons with CHAR(31) against the space-padding
of strings of unequal length. (Bug #8134)


mysql-test/t/compare.test:
  Add new regression test
strings/ctype-simple.c:
  Fix value used for swapping negative/positive values using XOR
mysql-test/r/compare.result:
  Add new test result
2005-01-28 17:18:35 -08:00
unknown
96e4281f05 Cleanup for lost file descriptors on close table for ha_archive.
sql/examples/ha_archive.cc:
  More comments, fixed issue with lost file descriptors.
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2005-01-28 16:43:10 -08:00
unknown
af68c169ab Fix test results for mysqldump test. Part of Bug #8148.
mysql-test/r/mysqldump.result:
  Update results
2005-01-28 12:13:01 -08:00
unknown
47f15599e8 ut0ut.c:
Use a 32-bit right-shift implementation through a 64-bit integer that should work ok for both gcc and Visual C++; the code depended on defining SIZEOF_LONG, and that is not set when compiling ibbackup


innobase/ut/ut0ut.c:
  Use a 32-bit right-shift implementation through a 64-bit integer that should work ok for both gcc and Visual C++; the code depended on defining SIZEOF_LONG, and that is not set when compiling ibbackup
2005-01-28 21:49:21 +02:00
unknown
d848286e70 Use single quotes to set SQL_MODE in mysqldump output in case ANSI_QUOTES
was already defined on the server the dump is loaded into. (Bug #8148)


client/mysqldump.c:
  Use single quotes when setting SQL_MODE
2005-01-28 11:16:49 -08:00
unknown
c392de41b2 os0file.c:
Fix Windows porting bugs that broke ibbackup: 1) wrong error check in for CreateDirectory(), 2) wrong error check if the file did not exist in DeleteFile(), 3) too strict sharing restrictions in os_file_create_simple(): when ibbackup called that function, it would not allow mysqld to write to the file


innobase/os/os0file.c:
  Fix Windows porting bugs that broke ibbackup: 1) wrong error check in for CreateDirectory(), 2) wrong error check if the file did not exist in DeleteFile(), 3) too strict sharing restrictions in os_file_create_simple(): when ibbackup called that function, it would not allow mysqld to write to the file
2005-01-28 20:58:16 +02:00
unknown
92ae534c40 Merge heikki@bk-internal.mysql.com:/home/bk/mysql-4.1
into hundin.mysql.fi:/home/heikki/mysql-4.1
2005-01-28 20:50:16 +02:00
unknown
9dc831c94f Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/dlenev/src/mysql-4.1-tzbug
2005-01-28 17:43:59 +03:00
unknown
0b7ca5e847 Merge marko@bk-internal.mysql.com:/home/bk/mysql-4.0
into hundin.mysql.fi:/home/marko/k/mysql-4.0
2005-01-28 14:17:49 +02:00
unknown
3487cba72d A fix (bug #6000: No "@%"-accounts after install).
scripts/mysql_install_db.sh:
  A fix (bug #6000: No "@%"-accounts after install).
    Why do we need those REPLACE queries?
    Removed $hostname queries for windows builds.
2005-01-28 15:26:17 +04:00
unknown
bc12f67343 Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/export/space/pekka/ndb/version/my41
2005-01-28 10:52:31 +01:00
unknown
9b3bfa5f14 ndb - fix DATE printout
ndb/src/ndbapi/NdbRecAttr.cpp:
  fix DATE printout
2005-01-28 10:51:30 +01:00
unknown
5f27595f55 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.0
into gw.mysql.r18.ru:/usr/home/ram/work/4.0.b6000


scripts/mysql_install_db.sh:
  Auto merged
2005-01-28 12:27:46 +04:00
unknown
bd556f0d70 NdbThread.c:
wrong order in c-file


ndb/src/common/portlib/NdbThread.c:
  wrong order in c-file
2005-01-28 09:15:01 +01:00
unknown
bf89dc063a Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/dlenev/src/mysql-4.1-tzbug


sql/item_timefunc.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/tztime.cc:
  Auto merged
2005-01-28 09:32:43 +03:00
unknown
418a06308b Do-compile:
ndbcluster requires more ports, this is the reason why builds will not start on multiple builds


Build-tools/Do-compile:
  ndbcluster requires more ports, this is the reason why builds will not start on multiple builds
2005-01-28 02:06:27 +01:00
unknown
c5922fcc5c Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
2005-01-28 01:31:27 +01:00
unknown
df7bb879cd Bug#8167 signal usage clash between mysql server and ndb shared memory
added shared memory config parameter, signum for use in signalling
    added global variable for holdign signum to be used for shared memory connection
    only fiddle with signals if it is set
    simplified common ndb client option handling


ndb/include/Makefile.am:
  added common defaults file
ndb/include/mgmapi/mgmapi_config_parameters.h:
  added shared memory config parameter, signum for use in signalling
ndb/include/transporter/TransporterDefinitions.hpp:
  added shared memory config parameter, signum for use in signalling
ndb/include/util/ndb_opts.h:
  simplified common ndb client option handling
ndb/src/common/mgmcommon/IPCConfig.cpp:
  added shared memory config parameter, signum for use in signalling
ndb/src/common/portlib/NdbThread.c:
  added global variable for holdign signum to be used for shared memory connection
  only block signals if shared memory is used
ndb/src/common/transporter/SHM_Transporter.cpp:
  use signum in new global variable for shared memory signalling
ndb/src/common/transporter/TransporterRegistry.cpp:
  use signum in new global variable for shared memory signalling
  only fiddle with signals if it is set
ndb/src/cw/cpcd/main.cpp:
  ndb_opts not really used
ndb/src/kernel/vm/Configuration.cpp:
  simplified common ndb client option handling
ndb/src/mgmclient/main.cpp:
  simplified common ndb client option handling
ndb/src/mgmsrv/ConfigInfo.cpp:
  added shared memory config parameter, signum for use in signalling
ndb/src/mgmsrv/main.cpp:
  simplified common ndb client option handling
ndb/tools/delete_all.cpp:
  simplified common ndb client option handling
ndb/tools/desc.cpp:
  simplified common ndb client option handling
ndb/tools/drop_index.cpp:
  simplified common ndb client option handling
ndb/tools/drop_tab.cpp:
  simplified common ndb client option handling
ndb/tools/listTables.cpp:
  simplified common ndb client option handling
ndb/tools/restore/restore_main.cpp:
  simplified common ndb client option handling
ndb/tools/select_all.cpp:
  simplified common ndb client option handling
ndb/tools/select_count.cpp:
  simplified common ndb client option handling
ndb/tools/waiter.cpp:
  simplified common ndb client option handling
2005-01-28 00:42:41 +01:00
unknown
7e1bc3d3b5 compile-solaris-sparc-purify:
Added preparation of mysql_client_test(_embedded) and mysqltest(_embedded)
  Added --purify, --purecov, --quantify and --cxxfilt <cxxfiltprog> options
mysql-test-run.sh:
  Report correctly combinations of embedded+ps-protocol etc
  Added initial Purify support


mysql-test/mysql-test-run.sh:
  Report correctly combinations of embedded+ps-protocol etc
  Added initial Purify support
BUILD/compile-solaris-sparc-purify:
  Added preparation of mysql_client_test(_embedded) and mysqltest(_embedded)
  Added --purify, --purecov, --quantify and --cxxfilt <cxxfiltprog> options
2005-01-28 00:35:26 +01:00
unknown
b485ed7b49 Remove unused configure.in name TOOLS_LIBS.
configure.in:
  Remove unused TOOLS_LIBS: LIBS and CLIENT_LIBS should
  be enough for the global configure.in
2005-01-28 01:23:06 +03:00
unknown
b8cac71494 Bug #5185 mysqldump for windows database gets table names with different case
Added the get_actual_table_name function that issues a SHOW TABLES LIKE '%s'.  This will get the table 
name in the proper case.  We use this table name rather than the one given on the command line.  This will
prevent problems when importing SQL on Linux that was generated on a Windows platform where case can be
an issue.

mysqldump.c:
  call get_actual_table_name to get the table name in the proper case


client/mysqldump.c:
  call get_actual_table_name to get the table name in the proper case
2005-01-27 14:48:26 -06:00
unknown
c84ff98672 fil0fil.c:
We accidentally checked if the DIRECTORY is of type OS_FILE_TYPE_UNKNOWN; our intention was to check if the FILE is that; best to remove the check altogether, as in crash recovery it is safest to try to open also files whose type is unknown
os0file.c:
  Fix a bug: in Windows, os_file_readdir_next_file() returned OS_FILE_TYPE_UNKNOWN as the type of a regular file; this did not break mysqld, but did break ibbackup on Windows


innobase/os/os0file.c:
  Fix a bug: in Windows, os_file_readdir_next_file() returned OS_FILE_TYPE_UNKNOWN as the type of a regular file; this did not break mysqld, but did break ibbackup on Windows
innobase/fil/fil0fil.c:
  We accidentally checked if the DIRECTORY is of type OS_FILE_TYPE_UNKNOWN; our intention was to check if the FILE is that; best to remove the check altogether, as in crash recovery it is safest to try to open also files whose type is unknown
2005-01-27 22:00:36 +02:00
unknown
555c0e8fd1 Merge heikki@bk-internal.mysql.com:/home/bk/mysql-4.1
into hundin.mysql.fi:/home/heikki/mysql-4.1


sql/mysqld.cc:
  Auto merged
2005-01-27 21:33:15 +02:00
unknown
965288542f Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/export/space/pekka/ndb/version/my41
2005-01-27 18:12:04 +01:00
unknown
1ed40339e2 ndb - make YEAR and TIMESTAMP into ndb types
mysql-test/r/ndb_index_ordered.result:
  make YEAR and TIMESTAMP into ndb types
mysql-test/t/ndb_index_ordered.test:
  make YEAR and TIMESTAMP into ndb types
ndb/include/kernel/signaldata/DictTabInfo.hpp:
  make YEAR and TIMESTAMP into ndb types
ndb/include/ndbapi/NdbDictionary.hpp:
  make YEAR and TIMESTAMP into ndb types
ndb/include/util/NdbSqlUtil.hpp:
  make YEAR and TIMESTAMP into ndb types
ndb/src/common/util/NdbSqlUtil.cpp:
  make YEAR and TIMESTAMP into ndb types
ndb/src/ndbapi/NdbDictionary.cpp:
  make YEAR and TIMESTAMP into ndb types
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  make YEAR and TIMESTAMP into ndb types
ndb/src/ndbapi/NdbRecAttr.cpp:
  make YEAR and TIMESTAMP into ndb types
ndb/test/include/NdbSchemaOp.hpp:
  make YEAR and TIMESTAMP into ndb types
sql/ha_ndbcluster.cc:
  make YEAR and TIMESTAMP into ndb types
2005-01-27 17:33:35 +01:00
unknown
bde9e86041 configure.in:
Add -DDBUG_ON to CXXFLAGS whenever it is added to CFLAGS.
  Thus, sql/ha_innodb.cc will be compiled with the same
  setting of UNIV_DEBUG as the rest of InnoDB,
  i.e., --with-debug enables InnoDB ut_ad() assertions
  everywhere.


configure.in:
  Add -DDBUG_ON to CXXFLAGS whenever it is added to CFLAGS.
  Thus, sql/ha_innodb.cc will be compiled with the same
  setting of UNIV_DEBUG as the rest of InnoDB,
  i.e., --with-debug enables InnoDB ut_ad() assertions
  everywhere.
2005-01-27 17:12:21 +02:00
unknown
a12d52a1d7 InnoDB: Tolerate negative return values from ftell().
sql/ha_innodb.cc:
  Tolerate negative return values from ftell().
2005-01-27 14:05:44 +02:00
unknown
a271a6c878 Re-enabled the use of --prefix.
Adjusted the "Usage:" string.
Ordered the option recognition in reverse order from "Usage:".
2005-01-27 12:13:35 +01:00
unknown
99fdc5ef78 Merge mysql.com:/home/mydev/mysql-4.1
into mysql.com:/home/mydev/mysql-4.1-4100
2005-01-27 12:10:15 +01:00
unknown
4e5a513c4d Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
into gw.mysql.r18.ru:/usr/home/ram/work/4.1.b7261
2005-01-27 15:10:06 +04:00
unknown
f6297a90ad Merge mysql.com:/home/mydev/mysql-4.1
into mysql.com:/home/mydev/mysql-4.1-4100
2005-01-27 12:01:19 +01:00