Commit graph

17246 commits

Author SHA1 Message Date
unknown
d743b10262 Merge bk-internal:/home/bk/mysql-4.1
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-02-03 15:41:07 -08:00
unknown
9f7c9aa7d5 ndb - sol9x86: cc -xO3: fix optimizer error.
ndb/src/common/util/NdbSqlUtil.cpp:
  sol9x86: cc -xO3: fix optimizer error.
  Note: same expression remains in Field_newdate::val_int().
2005-02-03 23:56:13 +01:00
unknown
a3efbf47c8 Copy *.result.es files for binary distribution so embedded tests can be run
scripts/make_binary_distribution.sh:
  Make sure to copy result.es files
2005-02-03 14:21:16 -08:00
unknown
6bfc46f0bf Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into pcgem.rdg.cyberkinetica.com:/var/db/bk/work-acurtis/bug8057


sql/item_func.cc:
  Auto merged
2005-02-03 21:16:36 +00:00
unknown
3c925ee0f1 Bug#8057
Fix crash with LAST_INSERT_ID() in UPDATE,
  Tests included,


mysql-test/r/update.result:
  Bug#8057
    Test for bug
mysql-test/t/update.test:
  Bug#8057
    Test for bug
sql/item_func.cc:
  Bug#8057
    Don't create new Item in val_int()
2005-02-03 21:11:12 +00:00
unknown
90095cbc9d Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/Users/kent/mysql/bk/mysql-4.1-perl
2005-02-03 21:56:57 +01:00
unknown
c2e9e15e9f mtr_cases.pl:
new file
2005-02-03 21:50:56 +01:00
unknown
f8d38cffdf Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-4.1
into orca.ndb.mysql.com:/export/home/mikael/mysql-4.1


BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2005-02-03 21:13:28 +01:00
unknown
044f9e8227 mysql-test-run.pl:
Let --start-and-exit actually start a server
  Added that test case names can be specified on the comman line
  Added embedded server support
  Added environment variables UMASK, UMASK_DIR
  Added missing MASTER_MYSOCK1, MASTER_MYPORT1, USE_RUNNING_SERVER
  Added missing CHARSETSDIR, MYSQL_FIX_SYSTEM_TABLES, MYSQL_CLIENT_TEST
  Pass on return value from sleep_until_file_created(), to fail test
  Fail test if early termination of mysqld servers
  Create intial databases for the second master, and two additional slaves
mtr_process.pl:
  Find out if port is still in use, using simple TCP connect
  Use non blocking waitpid() to catch terminations early
  Make a special case spawning the 'mysqltest' application
  Redo the fork() if it returns EAGAIN
  Make sure to record if master or slave terminated
  Improved debugging output
  Improved code that remove PID files to avoid race
  Abort if we can't stop all mysqld servers using our ports
  Many improvements in killing mysqld servers
  Let sleep_until_file_created() catch if server died early
mtr_report.pl:
  Added option to disable test cases using <testcase>.disabled file
  If --timer, only try to open file with time data if it exists
mtr_io.pl:
  Remove starting/ending space reading server options from file


mysql-test/lib/mtr_io.pl:
  Remove starting/ending space reading server options from file
mysql-test/lib/mtr_report.pl:
  Added option to disable test cases using <testcase>.disabled file
  If --timer, only try to open file with time data if it exists
mysql-test/lib/mtr_process.pl:
  Find out if port is still in use, using simple TCP connect
  Use non blocking waitpid() to catch terminations early
  Make a special case spawning the 'mysqltest' application
  Redo the fork() if it returns EAGAIN
  Make sure to record if master or slave terminated
  Improved debugging output
  Improved code that remove PID files to avoid race
  Abort if we can't stop all mysqld servers using our ports
  Many improvements in killing mysqld servers
  Let sleep_until_file_created() catch if server died early
mysql-test/mysql-test-run.pl:
  Let --start-and-exit actually start a server
  Added that test case names can be specified on the comman line
  Added embedded server support
  Added environment variables UMASK, UMASK_DIR
  Added missing MASTER_MYSOCK1, MASTER_MYPORT1, USE_RUNNING_SERVER
  Added missing CHARSETSDIR, MYSQL_FIX_SYSTEM_TABLES, MYSQL_CLIENT_TEST
  Pass on return value from sleep_until_file_created(), to fail test
  Fail test if early termination of mysqld servers
  Create intial databases for the second master, and two additional slaves
2005-02-03 21:13:27 +01:00
unknown
567055363e Bug#7310
Fix test for classic builds


mysql-test/t/multi_update.test:
  Bug#7310
    Ignore warnings for Bug#5837 test
2005-02-03 18:26:59 +00:00
unknown
81abb11ad4 Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/Users/mikron/mysql-4.1
2005-02-03 18:22:06 +01:00
unknown
e244a3a9b4 made an .sh file of ndb-config-2-node.ini instead
support-files/ndb-config-2-node.ini.sh:
  Rename: support-files/ndb-config-2-node.ini -> support-files/ndb-config-2-node.ini.sh
2005-02-03 17:58:02 +01:00
unknown
12a0a21c5e ndbcluster rpms 2005-02-03 17:53:03 +01:00
unknown
a6cb0e5ff1 ndb - use hugo methods all the way in hugo
more test program fixes
  replace pNdb->closeTransaction with closeTransaction(pNdb)


ndb/test/src/HugoTransactions.cpp:
  more test program fixes
    replace pNdb->closeTransaction with closeTransaction(pNdb)
2005-02-03 17:10:46 +01:00
unknown
2e132a8ac8 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/jonas/src/mysql-4.1


configure.in:
  Auto merged
2005-02-03 15:15:43 +01:00
unknown
ba51652c2c Fix 'mysqlcheck --help' to not specify what storage engines are
supported, rather than give incorrect information. (Bug #8029)


client/mysqlcheck.c:
  Make usage message more general as to what storage engines are supported.
2005-02-02 15:03:34 -08:00
unknown
355f7128c4 Merge mysql.com:/data0/mysqldev/my/mysql-4.1
into mysql.com:/data0/mysqldev/my/mysql-4.1-build


configure.in:
  Auto merged
2005-02-02 21:36:40 +01:00
unknown
ad21db5e07 Use -DUNIV_DEBUG (extra debugging for InnoDB) when configuring with --debug=full 2005-02-02 22:35:36 +02:00
unknown
c30ccbcdb4 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/my/mysql-4.1
2005-02-02 22:28:22 +02:00
unknown
1bbfa6f75f ndb -
add abort to multi op test case


ndb/include/ndbapi/NdbConnection.hpp:
  Add aborts to test case
ndb/test/include/HugoOperations.hpp:
  Add aborts to test case
ndb/test/ndbapi/testOperations.cpp:
  Add aborts to test case
ndb/test/src/HugoOperations.cpp:
  Add aborts to test case
ndb/test/src/HugoTransactions.cpp:
  Add aborts to test case
2005-02-02 21:03:46 +01:00
unknown
e6e9849530 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/jonas/src/mysql-4.1


configure.in:
  Auto merged
2005-02-02 20:27:53 +01:00
unknown
c95ce34ed5 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/my/mysql-4.1
2005-02-02 20:30:57 +02:00
unknown
7d3553590f Merge mysql.com:/data0/mysqldev/my/mysql-4.1
into mysql.com:/data0/mysqldev/my/mysql-4.1-build
2005-02-02 19:30:08 +01:00
unknown
3d0f9d96d7 Fixed during review of new pulled code
extra/perror.c:
  Use strmov() instead of strcpy()
  Indentation fixes
sql/sql_table.cc:
  Revert back part of the old code as the new code didn't use mysql_data_home, which would have caused problems in the embedded server
sql/sql_update.cc:
  Ensure that used_index is always set (It has to be set because it's value is tested if order != 0)
2005-02-02 20:28:01 +02:00
unknown
7116beb95d Merge mysql.com:/space/my/mysql-4.0 into mysql.com:/space/my/mysql-4.1
Build-tools/Bootstrap:
  Auto merged
2005-02-02 19:25:43 +01:00
unknown
4c253be8c3 Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/space/my/mysql-4.1
2005-02-02 19:24:13 +01:00
unknown
d4ac4cb112 - typo fix... 2005-02-02 19:23:24 +01:00
unknown
7f7bdce086 Merge mysql.com:/data0/mysqldev/my/mysql-4.1
into mysql.com:/data0/mysqldev/my/mysql-4.1-build
2005-02-02 18:45:29 +01:00
unknown
785049c678 fix linkerror on sol9x86
configure.in:
  fix linkerror on sol9x86
2005-02-02 18:30:33 +01:00
unknown
8ecae2e65c Fix merge of func_str tests (accidently duplicated a test).
mysql-test/t/func_str.test:
  Remove duplicated test that crept in during merge
mysql-test/r/func_str.result:
  Update results
2005-02-02 09:05:52 -08:00
unknown
422cbb7462 Merge production:my/mysql-4.1-build
into mysql.com:/home/mysqldev/tulin/mysql-4.1
2005-02-02 18:04:01 +01:00
unknown
33e74b1427 Merge fixes for #8248, #5569.
mysql-test/r/func_str.result:
  Update results
mysql-test/t/func_str.test:
  Merge test
sql/item_strfunc.cc:
  Set charset on output string
sql/item_strfunc.h:
  Merge
sql/sql_parse.cc:
  Merge
vio/viosocket.c:
  Merge
2005-02-02 08:21:11 -08:00
unknown
6b6e5d4a16 Merge mysql.com:/home/jimw/my/mysql-4.1-8207
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-02-02 07:51:55 -08:00
unknown
fb950497db Merge bk-internal:/home/bk/mysql-4.1
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-02-02 07:49:30 -08:00
unknown
613c2f68e2 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/my/mysql-4.1
2005-02-02 16:50:35 +02:00
unknown
ecac023c1f Merge mysql.com:/space/my/mysql-4.1
into mysql.com:/space/my/mysql-4.1-build
2005-02-02 13:45:32 +01:00
unknown
d2784c988f Small Do-compile improvements:
- added Option "--comment" to be able to override the default compilation comment
- improved the abort subroutine to not rely on an external "tail" command (the
  default /usr/bin/tail on Solaris does not understand the "-n" notation).
  Get rid of a "useless use of cat" case in the process.


Build-tools/Do-compile:
  - added Option "--comment" to be able to override the default compilation comment
  - improved the abort subroutine to not rely on an external "tail" command (the
    default /usr/bin/tail on Solaris does not understand the "-n" notation).
    Get rid of a "useless use of cat" case in the process.
2005-02-02 13:40:17 +01:00
unknown
c83412f705 configure.in
don't define UNIV_DEBUG in CFLAGS/CXXFLAGS anymore
sql/mysqld.cc
    hide from the user options that do nothing
sql/sql_update.cc
    better fix for uninitialized used_index


configure.in:
  don't define UNIV_DEBUG in CFLAGS/CXXFLAGS anymore
sql/mysqld.cc:
  hide from the user options that do nothing
sql/sql_update.cc:
  better fix for uninitialized used_index
2005-02-02 12:08:20 +01:00
unknown
5725fa5df5 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/jonas/src/mysql-4.1
2005-02-02 11:35:33 +01:00
unknown
4734f3f746 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/mysqldev/tulin/mysql-4.1
2005-02-02 11:13:35 +01:00
unknown
e7ff746989 backported configure flag from 5.0
workaround for HPUX signal.h error, missing extern "C" 
    moved my_thread_end to NdbThreadExit
   more checks for shared memory transporter signum setup


acinclude.m4:
  backported configure flag from 5.0
include/my_global.h:
  workaround for HPUX signal.h error, missing extern "C"
ndb/src/common/portlib/NdbThread.c:
  moved my_thread_end to NdbThreadExit
ndb/src/mgmsrv/ConfigInfo.cpp:
  more checks for shared memory transporter signum setup
2005-02-02 10:50:33 +01:00
unknown
6fd984d592 Merge mysql.com:/home/timka/mysql/src/4.1-dbg
into mysql.com:/home/timka/mysql/src/4.1-bug-8023
2005-02-02 09:55:41 +02:00
unknown
f229695845 Merge rurik.mysql.com:/home/igor/mysql-4.1
into rurik.mysql.com:/home/igor/dev/mysql-4.1-0
2005-02-01 23:54:39 -08:00
unknown
4c76152b35 func_str.result, func_str.test:
Added a test case for bug #7751.
item_strfunc.cc:
  Fixed bug #7751.
  The function Item_func_conv::val_str did not update
  the unsigned_flag value.


sql/item_strfunc.cc:
  Fixed bug #7751.
  The function Item_func_conv::val_str did not update
  the unsigned_flag value.
mysql-test/t/func_str.test:
  Added a test case for bug #7751.
mysql-test/r/func_str.result:
  Added a test case for bug #7751.
2005-02-01 23:34:31 -08:00
unknown
d81a0bede2 Fix for BUG#8023.
Allow LIMIT clause after DUAL.


mysql-test/r/limit.result:
  Added test result for BUG#8023.
mysql-test/t/limit.test:
  Added test for BUG#8023.
sql/sql_yacc.yy:
  Allow the specification of a LIMIT clause after DUAL. This is needed for queries as:
  select a from t1 union all select 1 from dual limit 1;
  In this query LIMIT is applied to the whole UNION, so it makes sense, however, the
  current parser did not allow any clause after DUAL.
2005-02-02 08:38:24 +02:00
unknown
01e1ca9f67 ndb - (backport from 4.1)
Fix weird link error on sol9x86
  - use incremental linker


configure.in:
  Fix weird link error on sol9x86
   - use incremental linker
2005-02-02 07:38:11 +01:00
unknown
d54b72c9fc Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/jonas/src/mysql-4.1
2005-02-02 06:32:11 +01:00
unknown
1a2ef2be00 ndb - backup fix, found on powermacg4
ndb/src/kernel/blocks/backup/Backup.cpp:
  index typo overwrote attribute array, found on powermacg4
2005-02-02 03:58:43 +01:00
unknown
22f839cdd2 Merge mysql.com:/home/jimw/my/mysql-4.0-clean
into mysql.com:/home/jimw/my/mysql-4.0-8248
2005-02-01 18:34:28 -08:00
unknown
327537b408 Merge bk-internal:/home/bk/mysql-4.0
into mysql.com:/home/jimw/my/mysql-4.0-clean
2005-02-01 18:34:16 -08:00