14293 Commits

Author SHA1 Message Date
unknown
62c3acac18 Portablity fix.
hpux11 compiler dislikes empty array initializers.
2004-08-17 12:05:34 +04:00
unknown
cdc766a8e5 Limit testIndex CreateAll
Limit testBackup BackupOne
2004-08-17 09:29:00 +02:00
unknown
b95e2525b8 More testBackup fixes
ndb/test/ndbapi/testBackup.cpp:
  Drop table after testBackup
ndb/test/src/NdbBackup.cpp:
  Remove node id
2004-08-17 08:50:01 +02:00
unknown
1146f38f32 A fix (bug #5055: SQL_SELECT_LIMIT=0 crashes command line client):
mysql outwits itself.
2004-08-17 11:12:22 +05:00
unknown
8025133553 Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1
into ice.snake.net:/Volumes/ice2/MySQL/bk/mysql-4.1
2004-08-17 00:53:34 -05:00
unknown
cee499f1b5 Fix testBackup
ndb/src/ndbapi/TransporterFacade.cpp:
  Retry alloc of node id
2004-08-17 07:48:13 +02:00
unknown
5a7dd14edf Fix for bug#4488: sign-aware equality check
mysql-test/r/range.result:
  Fix for bug#4488: more tests
mysql-test/t/range.test:
  Fix for bug#4488: more tests
2004-08-17 02:59:24 +04:00
unknown
b5ea2224a6 A desperate attempt to comment one place where we do conversions. 2004-08-16 15:07:45 -07:00
unknown
dc11a82e33 Updated of test cases for CSV engine.
mysql-test/r/ps_1general.result:
  Updated test results for addition of CSV engine.
2004-08-16 14:19:50 -07:00
unknown
fcb6f9a4ef Merge heikki@build.mysql.com:/home/bk/mysql-4.0
into hundin.mysql.fi:/home/heikki/mysql-4.0
2004-08-16 19:06:01 +03:00
unknown
7152382e21 Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1
into ice.snake.net:/Volumes/ice2/MySQL/bk/mysql-4.1


sql/set_var.cc:
  Auto merged
2004-08-16 10:47:20 -05:00
unknown
a7a508e14f Merge gbichot@213.136.52.20:/home/bk/mysql-4.1
into mysql.com:/home/mysql_src/mysql-4.1-874
2004-08-16 17:01:36 +02:00
unknown
a15233457a Fix for BUG#5064 "SET GLOBAL SYNC_BINLOG does not work on some platforms":
var->save_result.ulong_value was 0 on Mac OS X probably due to positions
of members in the union. sys_var::check() only sets ulonglong_value


sql/set_var.cc:
  Of the save_result union, sys_var::check() only updates ulonglong_value;
  so other types of the union are garbage. Here we must use ulonglong_value
  in sys_var_sync_binlog_period::update(), not ulong_value (which is )
2004-08-16 17:00:48 +02:00
unknown
952f456e83 ctype_utf8.test:
Bug#4521: unique prefix keys, fix for HEAP HASH and HEAP BTREE case insensitive collations.


mysql-test/t/ctype_utf8.test:
  Bug#4521: unique prefix keys, fix for HEAP HASH and HEAP BTREE case insensitive collations.
2004-08-16 19:58:50 +05:00
unknown
a5f1fea039 Merge msvensson@bk-internal.mysql.com:/home/bk/mysql-4.1
into neptunus.(none):/home/magnus/mysql-4.1
2004-08-16 13:07:50 +02:00
unknown
4c1f172193 Updated server-cfg, remove limitation for blobs + NDB
sql-bench/server-cfg.sh:
  Remove the limitation for NDB+blobs
2004-08-16 13:06:32 +02:00
unknown
e65e823c48 Merge mysql.com:/home/jonas/src/ll
into mysql.com:/home/jonas/src/mysql-4.1
2004-08-15 21:45:00 +02:00
unknown
dc276ef72e Fix AC_DEFINE for CSV storage engine 2004-08-15 21:44:09 +02:00
unknown
f755cf9e08 1) Removed to hard require
2) Fix variable scope for irix compiler


ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Remove part of require
ndb/test/src/NDBT_Tables.cpp:
  old compiler fix
2004-08-15 21:15:40 +02:00
unknown
d9e3b38ffd Minor bugs
ndb/src/kernel/blocks/dbtup/DbtupPagMan.cpp:
  Init page state
ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
  Init usr pointer for tcseize/releasereq
ndb/test/src/NDBT_Tables.cpp:
  More error printouts
2004-08-15 20:44:41 +02:00
unknown
20160a1084 Merge mysql.com:/home/jonas/src/mysql-4.1
into mysql.com:/home/jonas/src/mysql-4.1-ndb
2004-08-15 18:58:02 +02:00
unknown
d68c334cf0 Bug#4970 2004-08-15 14:26:08 +02:00
unknown
750f619325 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/mysql_src/mysql-4.0
2004-08-14 15:25:52 +02:00
unknown
f95c6fb5c0 Fix for BUG#5050 "mysql-test-run fails on rpl_trunc_binlog after 'make install'":
The binlog files we use for some tests must be installed like other mysql-test/std_data/ files.


mysql-test/Makefile.am:
  The binlog files we use for some tests must be installed like other mysql-test/std_data/ files.
  Putting a * before 001 so that it works for 6-digit extensions of 4.1.
2004-08-14 15:24:40 +02:00
unknown
3d23bb83b8 Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1
into ice.snake.net:/Volumes/ice2/MySQL/bk/mysql-4.1


sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
2004-08-13 22:43:26 -05:00
unknown
767d880f9c mysql_priv.h:
Added declarations for print_msg_to_log and vprint_msg_to_log.  sql_print_error are simple functions that wrap calls to print_msg_to_log.  Define the different error types with MY_ERROR_TYPE, MY_WARNING_TYPE, and MY_INFORMATION_TYPE
gen_lex_hash.cc:
  Added NULL error reporting parameter to handle_options
log.cc:
  Add print_msg_to_log, print_buffer_to_log, and vprint_msg_to_log.  Print_msg_to_log will write the message to the windows event log if on NT.  We now have error, warning, and information versions of sql_print_xxxx.  T his is a variation of a similar changeset WAX did.
mysqld.cc:
  Added option_error_reporter callback function and pass that into handle_options
mysql.cc:
  Added NULL as error reporter arg to the end of handle_options
Many files:
  Added NULL error reporter parameter as the last paramter to handle_options
my_getopt.c:
  Added second function pointer to server as an error reporting callback.  Added local function report_option_error that will either write the error to stderr or to the error reporting callback.  changed all calls in handle_options from fprintf(stderr, ... ) to report_option_error
my_getopt.h:
  Changed declaration of handle_options to use typedefs for the two function pointers.  added second function pointer to server as an error reporting callback
mysqld.dsp:
  Added custom build step for compiling message file and added message resource file (output of mc)


VC++Files/sql/mysqld.dsp:
  Added custom build step for compiling message file and added message resource file (output of mc)
client/mysqladmin.c:
  Added NULL error reporter parameter as the last paramter to handle_options
client/mysqlcheck.c:
  Added NULL error reporter parameter as the last paramter to handle_options
client/mysqldump.c:
  Added NULL error reporter parameter as the last paramter to handle_options
client/mysqlimport.c:
  Added NULL error reporter parameter as the last paramter to handle_options
client/mysqlmanager-pwgen.c:
  Added NULL error reporter parameter as the last paramter to handle_options
client/mysqlmanagerc.c:
  Added NULL error reporter parameter as the last paramter to handle_options
client/mysqlbinlog.cc:
  Added NULL error reporter parameter as the last paramter to handle_options
client/mysqlshow.c:
  Added NULL error reporter parameter as the last paramter to handle_options
client/mysqltest.c:
  Added NULL error reporter parameter as the last paramter to handle_options
extra/my_print_defaults.c:
  Added NULL error reporter parameter as the last paramter to handle_options
extra/mysql_install.c:
  Added NULL error reporter parameter as the last paramter to handle_options
extra/mysql_waitpid.c:
  Added NULL error reporter parameter as the last paramter to handle_options
extra/perror.c:
  Added NULL error reporter parameter as the last paramter to handle_options
extra/resolve_stack_dump.c:
  Added NULL error reporter parameter as the last paramter to handle_options
extra/resolveip.c:
  Added NULL error reporter parameter as the last paramter to handle_options
isam/isamchk.c:
  Added NULL error reporter parameter as the last paramter to handle_options
isam/pack_isam.c:
  Added NULL error reporter parameter as the last paramter to handle_options
myisam/mi_test1.c:
  Added NULL error reporter parameter as the last paramter to handle_options
myisam/myisam_ftdump.c:
  Added NULL error reporter parameter as the last paramter to handle_options
myisam/myisamchk.c:
  Added NULL error reporter parameter as the last paramter to handle_options
myisam/myisampack.c:
  Added NULL error reporter parameter as the last paramter to handle_options
include/my_getopt.h:
  Changed declaration of handle_options to use typedefs for the two function pointers.  added second function pointer to server as an error reporting callback
mysys/my_getopt.c:
  Added second function pointer to server as an error reporting callback.  Added local function report_option_error that will either write the error to stderr or to the error reporting callback.  changed all calls in handle_options from fprintf(stderr, ... ) to report_option_error
tools/mysqlmanager.c:
  Added NULL error reporter parameter as the last paramter to handle_options
client/mysql.cc:
  Added NULL as error reporter arg to the end of handle_options
sql/mysqld.cc:
  Added option_error_reporter callback function and pass that into handle_options
sql/log.cc:
  Add print_msg_to_log, print_buffer_to_log, and vprint_msg_to_log.  Print_msg_to_log will write the message to the windows event log if on NT.  We now have error, warning, and information versions of sql_print_xxxx.  T his is a variation of a similar changeset WAX did.
sql/gen_lex_hash.cc:
  Added NULL error reporting parameter to handle_options
sql/mysql_priv.h:
  Added declarations for print_msg_to_log and vprint_msg_to_log.  sql_print_error are simple functions that wrap calls to print_msg_to_log.  Define the different error types with MY_ERROR_TYPE, MY_WARNING_TYPE, and MY_INFORMATION_TYPE
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2004-08-14 03:38:37 +02:00
unknown
24e03b49a2 Adding test cases for the example storage engine (so that you can test to see if it was built correctly). 2004-08-13 17:14:36 -07:00
unknown
2d8f4a61bf Merge baker@bk-internal.mysql.com:/home/bk/mysql-4.1
into avenger.(none):/export/brian/tina-4.1


acinclude.m4:
  Auto merged
BitKeeper/deleted/.del-acconfig.h~8d2e3113fc8056da:
  Auto merged
configure.in:
  Auto merged
sql/Makefile.am:
  Auto merged
sql/handler.cc:
  Auto merged
sql/handler.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
2004-08-13 16:27:17 -07:00
unknown
ff5ade15bd Merge resolve. Changed name of ha_example to ha_example_engine.
sql/set_var.cc:
  Changed have_example to have_example_engine (easier to understand when reading output). Also resolved merge problem.
2004-08-13 16:24:46 -07:00
unknown
1dda5f60a0 set_var.cc:
Make query_cache_wlock_invalidate show up in SHOW VARIABLES.
  (Sanja agrees that it should show up, has seen the patch, and
  agrees that it's correct.)


sql/set_var.cc:
  Make query_cache_wlock_invalidate show up in SHOW VARIABLES.
2004-08-13 14:31:30 -05:00
unknown
0d57b0067c Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1
into ice.snake.net:/Volumes/ice2/MySQL/bk/mysql-4.1
2004-08-13 12:40:51 -05:00
unknown
a5a4ed90f5 Merge
myisam/mi_key.c:
  SCCS merged
2004-08-13 18:31:30 +02:00
unknown
b6f6d5b2fd apply UNIQUE constrain correctly for multi-byte charsets
only MyISAM is fixed


include/m_ctype.h:
  my_charpos() macro
myisam/mi_key.c:
  apply UNIQUE constrain correctly for multi-byte charsets
mysql-test/r/binary.result:
  new test
mysql-test/r/key.result:
  apply UNIQUE constrain correctly for multi-byte charsets
mysql-test/t/binary.test:
  new test
mysql-test/t/func_gconcat.test:
  make test to pass w/o InnoDB
mysql-test/t/key.test:
  apply UNIQUE constrain correctly for multi-byte charsets
2004-08-13 18:29:25 +02:00
unknown
c9c7834164 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
into mysql.com:/home/jonas/src/mysql-4.1-ndb


ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
ndb/src/ndbapi/ndberror.c:
  Auto merged
2004-08-13 17:11:52 +02:00
unknown
d528d8c454 Fix apiConnectptr after execute direct 2004-08-13 17:10:08 +02:00
unknown
cd8898460a Dump core if VM_TRACE || ERROR_INSERT 2004-08-13 16:41:06 +02:00
unknown
a10db839cb Fix type for 4115 2004-08-13 16:37:19 +02:00
unknown
7b68640505 Bug fix for error insert 5038,
timeout in abort handling with more than 128 operations
2004-08-13 16:33:55 +02:00
unknown
6ca6579587 row0mysql.c:
Fix bug: if we RENAME a table, InnoDB forgot to load the foreign key constraints that reference the new table name, and forgot to check that they are compatible with the table


innobase/row/row0mysql.c:
  Fix bug: if we RENAME a table, InnoDB forgot to load the foreign key constraints that reference the new table name, and forgot to check that they are compatible with the table
2004-08-13 17:27:58 +03:00
unknown
9003c146b8 - manual merge 2004-08-13 16:25:23 +02:00
unknown
a4d3f0dad9 Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1
into ice.snake.net:/Volumes/ice2/MySQL/bk/mysql-4.1
2004-08-13 09:25:22 -05:00
unknown
cb6a3b222d New error codes + automatic nulling of tvariables
ndb/src/kernel/blocks/ERROR_codes.txt:
  New error codes for LQH
ndb/src/kernel/blocks/dbtc/DbtcInit.cpp:
  Automatic nulling of tvariables
2004-08-13 16:11:00 +02:00
unknown
467f5956eb CSC issue # 3299 fix:
ENUM and SET type didn't compute their length correctly.
That showed up for example while converting into a CHAR column.
2004-08-13 19:06:24 +05:00
unknown
621506815f Escaping [] so that darwin[7-8] gets into 'configure' and not darwin7-8
Adding a compilation define so that on recent Darwin mysqld does not react to SIGHUP and SIGQUIT:
this fixes a rpl000001 problem on our Powermac G5 machine (popping after an upgrade from 10.3.4 to
10.3.5) and is expected to fix 
BUG#2030 "relay bin log on slave resets multiple times a second"
(i.e. under some Mac OS X Panther versions, mysqld receives many SIGHUP and SIGQUIT).
So this fix is more a problem-hider than a real understanding of why mysqld receives so many signals.
Note that we saw other problems on this OS where mysqld reacts to Ctrl-Z but apparently only once,
where using SSL seems to make the problem more frequent...


configure.in:
  Escaping [] so that darwin[7-8] gets into 'configure' and not darwin7-8
  Adding a compilation define so that on recent Darwin mysqld does not react to SIGHUP and SIGQUIT.
sql/mysqld.cc:
  optionally ignore SIGHUP and SIGQUIT, for some Mac OS X Panther versions which send too many of those.
2004-08-13 15:29:47 +02:00
unknown
eddc4fdeb5 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1-ndb
2004-08-13 14:34:51 +02:00
unknown
b8c73f8100 Removed unused error code 2004-08-13 14:33:59 +02:00
unknown
55cc6be43c Added support for NULL in unique index 2004-08-13 13:51:18 +02:00
unknown
9f935d578a Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1
into ice.snake.net:/Volumes/ice2/MySQL/bk/mysql-4.1
2004-08-13 06:28:09 -05:00
unknown
271b2dd886 Merge lgrimmer@build.mysql.com:/home/bk/mysql-4.0
into mysql.com:/space/my/mysql-4.0
2004-08-13 12:44:08 +02:00
unknown
e2cfe7b607 ctype_utf8.result, ctype_utf8.test, item_strfunc.cc:
LEFT() didn't work well in some cases.


sql/item_strfunc.cc:
  LEFT() didn't work well in some cases.
mysql-test/t/ctype_utf8.test:
  LEFT() didn't work well in some cases.
mysql-test/r/ctype_utf8.result:
  LEFT() didn't work well in some cases.
2004-08-13 15:04:10 +05:00