summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Implementation of WL#1824 "Add replication of character set variables in 4.1",unknown2004-06-0318-84/+766
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | by binlogging some SET ONE_SHOT CHARACTER_SETetc, which will be enough until we have it more compact and more complete in 5.0. With the present patch, replication will work ok between 4.1.3 master and slaves, as long as: - master and slave have the same GLOBAL.COLLATION_SERVER - COLLATION_DATABASE and CHARACTER_SET_DATABASE are not used - application does not use the fact that table is created with charset of the USEd db (BUG#2326). all of which are not too hard to fulfill. ONE_SHOT is reserved for internal use of mysqlbinlog|mysql and works only for charsets, so we give error if used for non-charset vars. Fix for BUG#3875 "mysqlbinlog produces wrong ouput if query uses variables containing quotes" and BUG#3943 "Queries with non-ASCII literals are not replicated properly after SET NAMES". Detecting that master and slave have different global charsets or server ids. mysql-test/r/rpl_server_id1.result: it's normal to not run as I have added a test to compare server ids of master and slave at startup and stop if equal (unless --replicate-same-server-id) mysql-test/r/rpl_user_variables.result: result update (as we now print charset of user var). mysql-test/r/user_var.result: result update mysql-test/t/rpl_server_id1.test: no need to select as slave is not running mysql-test/t/user_var.test: testing if the content of user vars is escaped when mysqlbinlog prints them, and if the name is backquoted. sql/lex.h: new keyword ONE_SHOT sql/log.cc: when writing to the binlog, before writing the actual statement, write some SET ONE_SHOT CHARACTER_SET_CLIENT etc for the slave to know the charset variables (which are important as they affect the inserted data). sql/log_event.cc: print charset and collation of user var in mysqlbinlog and SHOW BINLOG EVENTS. escape the content of the var. Backquote its name. Will ask Bar to check that using my_charset_bin for escaping is ok. sql/set_var.cc: understand SET CHARACTER_SET_CLIENT=10 (don't require a string, accept a number). Refuse changing of GLOBAL CHARACTER_SET_SERVER/COLLATION_SERVER if binlog or slave, as it will make the master or slave make wrong assumptions. A function to catch SET ONE_SHOT on non-charset variables (which is forbidden) sql/set_var.h: no_support_one_shot to know if the var supports ONE_SHOT (only charset vars do, soon timezones). Accept int arg in SET CHARACTER_SET_etc sql/slave.cc: when I/O slave thread starts, verify that master's and slave charsets match. And by the way verify that server ids are different. Don't fail if UNIX_TIMESTAMP() can't be done on master (very old master), that's not fatal. sql/sql_class.cc: one_shot sql/sql_class.h: one_shot sql/sql_lex.h: one_shot sql/sql_parse.cc: when SET ONE_SHOT is used, verify that it's only used for charset/collation vars; otherwise refuse. sql/sql_yacc.yy: ONE_SHOT keyword in SET
* InnoDB: os0file.c:unknown2004-06-011-16/+10
| | | | | | | | Do not lock raw devices or files opened for read only innobase/os/os0file.c: Do not lock raw devices or files opened for read only
* fil0fil.c:unknown2004-06-011-2/+2
| | | | | | | | Add missing newlines in fprintfs innobase/fil/fil0fil.c: Add missing newlines in fprintfs
* InnoDB cleanup: Fix potential buffer overflows,unknown2004-06-014-201/+236
| | | | | | | | | | | | | | | | | allow deletion of tablespaces whose names contain "'" innobase/dict/dict0load.c: dict_check_tablespaces_or_store_max_id(): Dynamically allocate memory for file name innobase/fil/fil0fil.c: Dynamically allocate memory for file names innobase/os/os0file.c: os_file_dirname(): allocate slightly less memory os_file_create_subdirs_if_needed(): compare more efficiently innobase/row/row0mysql.c: Allow tablespaces with "'" in their names to be deleted Display identifiers with ut_print_name() or dict_index_name_print()
* BUILD/compile-pentium-maintainer should not ever be needed since there is unknown2004-05-311-13/+0
| | | | | | | | no AM_MAINTAINER_MODE macro in configure.in BitKeeper/deleted/.del-compile-pentium-maintainer~3747d5c8d7ec49df: Delete: BUILD/compile-pentium-maintainer
* AC_MAINTAINER_MODE removed: now MySQL is always configured in maintainer unknown2004-05-311-1/+0
| | | | | | | mode and one should expect better dependencies tracking.
* Fix for Bug#3796 "Prepared statement, select concat(<parameter>,<column>), ↵unknown2004-05-313-6/+136
| | | | | | | | | | | | | | | | | | wrong result": new Item_param member for use in val_str() sql/item.cc: Fix for Bug#3796: - return str_value_ptr from val_str to prevent modifications of parameter value. sql/item.h: Fix for bug#3796: - Item::val_str() method semantics documented - new member of Item_param tests/client_test.c: Test case for bug #3796 added. A few compile-time warnings removed.
* Merge abelkin@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2004-05-285-2/+8
|\ | | | | | | | | | | | | into sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
| * Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1unknown2004-05-285-2/+8
| |\ | | | | | | | | | | | | | | | | | | into sanja.is.com.ua:/home/bell/mysql/bk/work-4.1
| | * if exists should not be used inside testunknown2004-05-285-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | removed influence of some tests on other tests mysql-test/r/multi_update.result: removed influence on other tests mysql-test/r/subselect.result: if exists should not be used inside test mysql-test/t/multi_update.test: removed influence on other tests mysql-test/t/subselect.test: if exists should not be used inside test mysql-test/t/system_mysql_db_fix.test: removed influence on other tests
* | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1unknown2004-05-281-1/+1
|\ \ \ | |/ / | | | | | | | | | | | | | | | into mysql.com:/home/my/mysql-4.1
| * | Restore.cpp:unknown2004-05-280-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | Added include of ndbout ndb/src/kernel/blocks/backup/restore/Restore.cpp: Added include of ndbout
| * | ha_ndbcluster.cc:unknown2004-05-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Missing semicolon sql/ha_ndbcluster.cc: Missing semicolon
* | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1unknown2004-05-282-9/+11
|\ \ \ | |/ / | | | | | | | | | | | | | | | into mysql.com:/home/my/mysql-4.1
| * | Merge msvensson@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2004-05-282-9/+11
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | into neptunus.(none):/home/magnus/mysql-4.1
| | * | Fix for compile problem with newtonapi unknown2004-05-282-9/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | ndb/src/Makefile: Compile newtonapi ndb/src/newtonapi/dba_schema.cpp: Use NdbSchemaCon.hpp from newtonapi
* | | | Merge mysql.com:/home/my/mysql-4.0 into mysql.com:/home/my/mysql-4.1unknown2004-05-282-3/+24
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Build-tools/Do-compile: Auto merged include/my_global.h: Auto merged
| * | | | Added option --config-extra-env to Do-compileunknown2004-05-282-7/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Build-tools/Do-compile: Added option --config-extra-env include/my_global.h: Cleaned up comment to follow same indentation style as the rest of the code
| * | | | my_global.h:unknown2004-05-281-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improved a comment about HAVE_BROKEN_PREAD: pread() only works on HP-UX 11.0 if one installs kernel patch PHKL_20349 or greater include/my_global.h: Improved a comment about HAVE_BROKEN_PREAD: pread() only works on HP-UX 11.0 if one installs kernel patch PHKL_20349 or greater
* | | | | New patch to ensure that InnoDB gets values for CFLAGS and CXXFLAGSunknown2004-05-282-2/+3
| |/ / / |/| | | | | | | | | | | | | | | sql/handler.h: Remove compiler warnings
* | | | Portability fix (using 'char' as argument to C functions may give warnings)unknown2004-05-283-19/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | mysql-test/r/variables.result: update results after merge strings/int2str.c: Portability fix (using 'char' as a parameter may give a warning)
* | | | merge with 4.0 to get fix for hpuxunknown2004-05-285-4/+11
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | configure.in: Auto merged innobase/os/os0file.c: Auto merged mysql-test/t/variables.test: Auto merged mysql-test/r/variables.result: merge fix
| * | | Portability fix for HPUXunknown2004-05-282-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | configure.in: Ensure that innodb gets system specific CFLAGS and CXXFLAGS innobase/os/os0file.c: Don't use pread/pwrite on systems where these are not working. This fixes a bug on HPUX, where InnoDB didn't create the ibdata1 file correctly.
| * | | Always enable HAVE_COMPRESS on netwareunknown2004-05-281-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | include/config-netware.h: Always enable HAVE_COMPRESS on netware We can't detect compress in configure on netware because we must use AC_TRY_RUN to detect zlib on other platforms
| * | | Portability fix for 32 bit file systemsunknown2004-05-282-1/+2
| | | |
* | | | Merge mysql.com:/home/my/mysql-4.0 into mysql.com:/home/my/mysql-4.1unknown2004-05-281-39/+69
|\ \ \ \ | |/ / / | | | | | | | | | | | | netware/BUILD/nwbootstrap: Auto merged
| * | | Merged in some patches from Novell.unknown2004-05-272-39/+74
| | | | | | | | | | | | | | | | | | | | | | | | | | | | netware/BUILD/nwbootstrap: Patch from Novell, create the libmysqld.imp file. netware/mysqld_safe.c: Patch from Novell, new option --set-variable.
* | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1unknown2004-05-284-6/+8
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/my/mysql-4.1
| * | | | Remove some code from sql_yacc.cc that doesn't do anything except produce ↵unknown2004-05-282-6/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | warnings on VC++ mysql-test/t/fulltext.test: After merge fix
| * | | | merge with 4.0 to get fix to VC++ project filesunknown2004-05-273-2/+6
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | VC++Files/comp_err/comp_err.dsp: Auto merged VC++Files/sql/mysqld.dsp: Auto merged myisam/ft_boolean_search.c: Auto merged mysql-test/t/fulltext.test: Auto merged myisam/ft_parser.c: Keep old code mysql-test/r/fulltext.result: Remove duplicate test from 4.0
| | * | | removed reference to not existing library lib_release\dbug.libunknown2004-05-272-2/+2
| | | | |
| | * | | backport bug#2708 fix from 4.1unknown2004-05-274-17/+32
| | | | | | | | | | | | | | | | | | | | | | | | | myisam/ft_boolean_search.c: perlify comment
* | | | | Made my_snprintf() behavior snprintf() compatible when printing %x arguments ↵unknown2004-05-2720-111/+98
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (it should produce hex digits in lower case). (fixed version) Replaced _dig_vec array with two _dig_vec_upper/_dig_vec_lower arrays. Added extra argument to int2str function which controls case of digits you get. Replaced lot of invocations of int2str for decimal radix with more optimized int10_to_str() function. Removed unused my_itoa/my_ltoa functions. client/mysql.cc: Replaced int2str invocations with radix argument equal to 10 with optimized int10_to_str() call. client/mysqladmin.c: Replaced int2str invocations with radix argument equal to 10 with optimized int10_to_str() call. dbug/dbug.c: _dig_vec became _dig_vec_upper. include/m_string.h: _dig_vec is obsoleted by _dig_vec_upper/_dig_vec_lower. my_itoa()/my_ltoa() functions were removed because they were never used in our code. int2str() now has one more argument which controls case of digits it will produce. include/my_global.h: my_itoa()/my_ltoa() functions were removed because they were never used in our code. isam/isamchk.c: Replaced int2str invocations with radix argument equal to 10 with optimized int10_to_str() call. libmysql/libmysql.def: _dig_vec is obsoleted by _dig_vec_upper/_dig_vec_lower. myisam/myisamchk.c: Replaced int2str invocation with radix argument equal to 10 with optimized int10_to_str() call. mysys/mf_tempfile.c: _dig_vec became _dig_vec_upper. mysys/my_error.c: Replaced int2str invocations with radix argument equal to 10 with optimized int10_to_str() call. mysys/my_tempnam.c: _dig_vec became _dig_vec_upper. sql-common/client.c: Replaced int2str invocation with radix argument equal to 10 with optimized int10_to_str() call. sql/item_strfunc.cc: _dig_vec became _dig_vec_upper. Also we don't need hex[] array in this file now because we have _dig_vec_lower instead. sql/mysqld.cc: Replaced int2str invocations with radix argument equal to 10 with optimized int10_to_str() call. sql/password.c: _dig_vec became _dig_vec_upper. sql/sql_bitmap.h: _dig_vec became _dig_vec_upper. strings/int2str.c: Replaced _dig_vec by _dig_vec_upper/_dig_vec_lower pair. int2str() now has one more argument which controls case of digits it will produce. my_itoa()/my_ltoa() functions were removed because they were never used in our code. strings/longlong2str-x86.s: _dig_vec became _dig_vec_upper. strings/longlong2str.c: _dig_vec became _dig_vec_upper. strings/my_vsnprintf.c: If my_snprintf() is printing %x argument it should produce lower case hexadecimal digits to be snprintf() compatible.
* | | | | InnoDB cleanup:unknown2004-05-2733-432/+516
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Disable log archiving code unless #ifdef UNIV_LOG_ARCHIVE Remove (char*) casts of string constants; add const qualifiers Remove some Hot Backup code unless #ifdef UNIV_HOTBACKUP innobase/btr/btr0cur.c: Cast away constness from dfield_get_data() result innobase/buf/buf0buf.c: Enclose a debug assertion in #ifdef UNIV_SYNC_DEBUG innobase/buf/buf0rea.c: Corrected compile error #ifdef UNIV_DEBUG innobase/dict/dict0boot.c: Remove (char*) casts of string constants innobase/dict/dict0crea.c: Remove (char*) casts of string constants innobase/dict/dict0dict.c: Enclosed a debug assertion in #ifdef UNIV_SYNC_DEBUG Replaced some debug assertions with preprocessor tests Add const qualifiers to string constants innobase/dict/dict0load.c: Remove (char*) casts of string constants innobase/fil/fil0fil.c: Remove (char*) casts of string constants Enclose debug assertions in #ifdef UNIV_SYNC_DEBUG innobase/ha/ha0ha.c: Enclose debug assertion in #ifdef UNIV_SYNC_DEBUG innobase/ibuf/ibuf0ibuf.c: Remove (char*) casts of string constants innobase/include/buf0buf.ic: Add const qualifier to string parameter innobase/include/fil0fil.h: Disable log archiving code unless #ifdef UNIV_LOG_ARCHIVE innobase/include/log0recv.h: Disable log archiving code unless #ifdef UNIV_LOG_ARCHIVE Enclose ibbackup specific code in #ifdef UNIV_HOTBACKUP innobase/include/mem0dbg.ic: Add const qualifiers to string parameters innobase/include/srv0srv.h: Add const qualifiers to string constants Enclose srv_arch_dir and srv_log_archive_on #ifdef UNIV_LOG_ARCHIVE innobase/include/sync0rw.ic: Add const qualifier to string parameter innobase/include/sync0sync.ic: Add const qualifier to string parameter innobase/log/log0log.c: Enclose log archiving code in #ifdef UNIV_LOG_ARCHIVE Do not cast string constants to (char*) innobase/log/log0recv.c: Enclose ibbackup specific code in #ifdef UNIV_HOTBACKUP Enclose disabled log code in #ifdef UNIV_LOG_REPLICATE or UNIV_LOG_ARCHIVE innobase/mem/mem0dbg.c: Add const qualifiers to string parameters innobase/page/page0page.c: Remove (char*) casts of string constants innobase/pars/pars0pars.c: Add const qualifier to string variable innobase/row/row0ins.c: Remove (char*) casts of string constants Add const qualifiers to string parameters row_ins_foreign_check_on_constraint(): Allocate table_name dynamically innobase/row/row0mysql.c: Remove (char*) casts of string constants innobase/row/row0sel.c: Remove (char*) casts of string constants innobase/srv/srv0srv.c: Remove (char*) casts of string constants Disable log archiving variables unless #ifdef UNIV_LOG_ARCHIVE innobase/srv/srv0start.c: Disable log archiving code unless #ifdef UNIV_LOG_ARCHIVE Remove (char*) casts of string constants innobase/sync/sync0rw.c: Remove (char*) casts of string constants Add const qualifier to string parameter innobase/sync/sync0sync.c: Remove (char*) cast of string constant Add const qualifier to string parameter innobase/trx/trx0roll.c: Remove (char*) cast of string constants innobase/trx/trx0sys.c: Remove (char*) cast of string constants innobase/trx/trx0trx.c: Remove (char*) cast of string constant sql/ha_innodb.cc: Enclose log archiving code in #ifdef UNIV_LOG_ARCHIVE
* | | | | Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2004-05-2721-9/+90
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | into deer.(none):/home/hf/work/mysql-4.1.spa
| * | | | Mergingunknown2004-05-2721-9/+90
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | myisam/mi_create.c: Auto merged myisam/mi_open.c: Auto merged myisam/rt_test.c: Auto merged myisam/sp_test.c: Auto merged sql/spatial.cc: Auto merged sql/spatial.h: Auto merged sql/sql_yacc.yy: Auto merged myisam/mi_range.c: merging myisam/mi_rnext.c: merging
| | * | | | WL#1163 (To make spatial code optional)unknown2004-03-152-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a couple of lines added to make code easier to read myisam/mi_key.c: 'autodocumenting' code added myisam/mi_open.c: 'autodocumenting' code added
| | * | | | WL#1163 To make spatial code optionalunknown2004-03-1221-9/+86
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | myisam spatial code isolated myisam/mi_create.c: spatial code ifdef-ed myisam/mi_key.c: spatial code ifdef-ed myisam/mi_open.c: spatial code ifdef-ed myisam/mi_range.c: spatial code ifdef-ed myisam/mi_rkey.c: spatial code ifdef-ed myisam/mi_rnext.c: spatial code ifdef-ed myisam/mi_rnext_same.c: spatial code ifdef-ed myisam/rt_index.c: spatial code ifdef-ed myisam/rt_index.h: spatial code ifdef-ed myisam/rt_key.c: spatial code ifdef-ed myisam/rt_key.h: spatial code ifdef-ed myisam/rt_mbr.c: spatial code ifdef-ed myisam/rt_mbr.h: spatial code ifdef-ed myisam/rt_split.c: spatial code ifdef-ed myisam/rt_test.c: spatial code ifdef-ed myisam/sp_defs.h: spatial code ifdef-ed myisam/sp_key.c: spatial code ifdef-ed myisam/sp_test.c: spatial code ifdef-ed sql/spatial.cc: spatial code ifdef-ed sql/spatial.h: spatial code ifdef-ed sql/sql_yacc.yy: wrong error messages fixed
* | | | | | Portability fixesunknown2004-05-272-3/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | innobase/os/os0thread.c: Portability fix myisam/sort.c: Fixed wrong variable type (gave compiler warning)
* | | | | | Merge mysql.com:/home/my/mysql-4.0 into mysql.com:/home/my/mysql-4.1unknown2004-05-271-0/+4
|\ \ \ \ \ \ | |/ / / / / |/| | / / / | | |/ / / | |/| | | VC++Files/innobase/innobase.dsp: Auto merged
| * | | | Add back wrongly deleted fileunknown2004-05-271-0/+4
| | | | |
* | | | | Added new netware fileunknown2004-05-271-0/+1
| | | | |
* | | | | Merge mysql.com:/home/my/mysql-4.0 into mysql.com:/home/my/mysql-4.1unknown2004-05-274-4/+29
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Makefile.am: Auto merged client/mysqldump.c: Auto merged configure.in: Auto merged netware/Makefile.am: Auto merged
| * | | | netware files should always be in 'make dist'unknown2004-05-274-5/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | use opt_net_buffer_length instead of net_buffer_length Makefile.am: netware files should always be in 'make dist' client/mysqldump.c: use opt_net_buffer_length instead of net_buffer_length configure.in: netware files should always be in 'make dist' netware/Makefile.am: netware files should always be in 'make dist'
* | | | | After merge fixesunknown2004-05-273-10/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Docs/manual_toc.html: Rename: BitKeeper/deleted/.del-manual_toc.html~f483f2d33d9acb41 -> Docs/manual_toc.html libmysqld/lib_sql.cc: Fixed type of new variables libmysqld/libmysqld.c: Removed duplicate function (allready in libmysql.c)
* | | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1unknown2004-05-2721-387/+78
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/my/mysql-4.1
| * \ \ \ \ merge with 4.0 to get windows fixesunknown2004-05-2721-387/+78
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | VC++Files/client/mysqlclient.dsp: Auto merged VC++Files/innobase/innobase.dsp: Auto merged include/mysql.h: Auto merged include/mysql_com.h: Auto merged innobase/include/log0log.h: Auto merged innobase/include/log0log.ic: Auto merged innobase/include/mtr0mtr.h: Auto merged innobase/log/log0log.c: Auto merged innobase/log/log0recv.c: Auto merged innobase/que/que0que.c: Auto merged libmysql/libmysql.c: Auto merged libmysql_r/Makefile.am: Auto merged sql/log_event.cc: Auto merged sql/mysqld.cc: Auto merged tools/mysqlmanager.c: Auto merged
| | * | | | VC++ portability fixunknown2004-05-263-7/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | VC++Files/client/mysqlclient.dsp: Added missing /D MYSQL_CLIENT VC++Files/innobase/innobase.dsp: Remove not existing file sql/mysqld.cc: Fixed comment
| | * | | | InnoDB fixup: remove debug assertion that causes compile errorunknown2004-05-261-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | when UNIV_DEBUG is defined (introduced in ChangeSet@1.1850) innobase/que/que0que.c: Remove ut_ad() reference to removed parameter next_thr
| | * | | | Fix to make Windows compilation smootherunknown2004-05-2613-43/+65
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | VC++Files/innobase/innobase.dsp: non-existent file removed client/mysql.cc: local opt_max_allowed_packet and opt_net_buffer_length introduced client/mysqldump.c: local opt_max_allowed_packet and opt_net_buffer_length introduced include/mysql.h: mysql_get_parameters() interface added #define max_allowed_packet added include/mysql_com.h: these should not be exported libmysql/libmysql.c: mysql_get_parameters implementations libmysql/libmysql.def: interface changed libmysql_r/Makefile.am: MYSQL_CLIENT define added libmysqld/lib_sql.cc: line moved to be above the '#include "mysql.cc"' libmysqld/libmysqld.c: mysql_get_parameters implementation (embedded) libmysqld/libmysqld.def: interface changed sql/log_event.cc: should be like that in this case tools/mysqlmanager.c: compiler warns on this line
View Lorry Controller Status