mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-23 07:14:17 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
mariadb/BitKeeper/etc/logging_ok

191 lines
4.1 KiB
Text
Raw Normal View History

Merge pmartin@work.mysql.com:/home/bk/mysql-4.0 into mysql.com:/home/pem/work/mysql-4.0 BitKeeper/etc/logging_ok: auto-union
2002-10-15 16:12:53 +02:00
Administrador@light.
manual.texi updated MyOLEDB section Docs/manual.texi: updated MyOLEDB section BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
2001-12-24 10:15:04 +01:00
Administrator@co3064164-a.
Administrator@co3064164-a.rochd1.qld.optushome.com.au
Administrator@fred.
Applied fixes to issues discovered during test builds on Windows. VC++Files/libmysql/libmysql.dsp: strtod.c is needed to build the library. VC++Files/libmysqld/libmysqld.dsp: Add include directory to resolve problem with including emb_qcache.h, remove opt_ft.cc (no longer in tree). VC++Files/mysqldemb/mysqldemb.dsp: Add include directory to resolve problem with including emb_qcache.h, remove opt_ft.cc (no longer in tree). VC++Files/mysqlserver/mysqlserver.dsp: Add include directory to resolve problem with including emb_qcache.h. VC++Files/strings/MASM6x/strings.dsp: Remove atof.c (no longer in tree) and add strtod.c, needed for the library. VC++Files/strings/noMASM/strings.dsp: Remove atof.c (no longer in tree) and add strtod.c, needed for the library. VC++Files/strings/strings.dsp: Remove atof.c (no longer in tree) and add strtod.c, needed for the library. sql/mysqld.cc: A cast is required to resolve the compile error on Windows (char * is not equivalent to byte *). sql/set_var.cc: A cast is required to resolve the compile error on Windows (char * is not equivalent to byte *). BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
2004-02-27 17:27:07 +01:00
Greg@greg-laptop.
manual.texi updated MyOLEDB section Docs/manual.texi: updated MyOLEDB section BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
2001-12-24 10:15:04 +01:00
Miguel@light.local
Sinisa@sinisa.nasamreza.org
Merge with 4.0.3 Some simple optimzations, more comments and indentation changes. Add ` around database in 'use database' in binary log. Moved max_error_count and max_warning_count to variables struct. Removed SHOW_WARNS_COUNT and SHOW_ERRORS_COUNT calls. Changed string functions to use character set of first string argument as default return characterset (Each string function can change the above assumption if needed) BitKeeper/etc/ignore: auto-union BitKeeper/etc/logging_ok: auto-union BUILD/SETUP.sh: Auto merged BitKeeper/deleted/.del-getopt.h~a9ae679fa84f395: Auto merged BitKeeper/deleted/.del-getvar.c~2a29ff383970fd31: Auto merged Docs/manual.texi: Auto merged SSL/cacert.pem: Auto merged SSL/client-cert.pem: Auto merged SSL/client-key.pem: Auto merged SSL/server-cert.pem: Auto merged SSL/server-key.pem: Auto merged client/mysqldump.c: Auto merged include/my_base.h: Auto merged include/my_sys.h: Auto merged include/mysql_com.h: Auto merged isam/isamlog.c: Auto merged isam/pack_isam.c: Auto merged libmysqld/lib_sql.cc: Auto merged myisam/ft_dump.c: Auto merged myisam/ft_parser.c: Auto merged myisam/ft_static.c: Auto merged myisam/ft_test1.c: Auto merged myisam/ft_update.c: Auto merged myisam/mi_create.c: Auto merged myisam/mi_key.c: Auto merged myisam/mi_open.c: Auto merged myisam/mi_static.c: Auto merged myisam/mi_test1.c: Auto merged myisam/mi_test2.c: Auto merged myisam/mi_test3.c: Auto merged myisam/mi_update.c: Auto merged myisam/mi_write.c: Auto merged myisam/myisamchk.c: Auto merged myisam/myisamdef.h: Auto merged myisam/myisamlog.c: Auto merged myisam/myisampack.c: Auto merged mysql-test/mysql-test-run.sh: Auto merged mysql-test/r/create.result: Auto merged mysql-test/r/fulltext.result: Auto merged mysql-test/r/func_math.result: Auto merged mysql-test/r/innodb.result: Auto merged mysql-test/r/merge.result: Auto merged mysql-test/r/myisam.result: Auto merged mysql-test/r/select.result: Auto merged mysql-test/r/select_found.result: Auto merged mysql-test/r/union.result: Auto merged mysql-test/t/create.test: Auto merged mysql-test/t/myisam.test: Auto merged mysql-test/t/select_found.test: Auto merged mysql-test/t/union.test: Auto merged mysys/default.c: Auto merged mysys/mf_iocache2.c: Auto merged mysys/my_error.c: Auto merged mysys/my_init.c: Auto merged scripts/mysql_config.sh: Auto merged sql/convert.cc: Auto merged sql/filesort.cc: Auto merged sql/gen_lex_hash.cc: Auto merged sql/ha_berkeley.cc: Auto merged sql/ha_innodb.cc: Auto merged sql/ha_myisam.cc: Auto merged sql/handler.cc: Auto merged sql/handler.h: Auto merged sql/hostname.cc: Auto merged sql/item.cc: Auto merged sql/item_sum.cc: Auto merged sql/item_sum.h: Auto merged sql/item_timefunc.cc: Auto merged sql/item_timefunc.h: Auto merged sql/key.cc: Auto merged sql/log.cc: Auto merged sql/net_pkg.cc: Auto merged sql/opt_range.cc: Auto merged sql/opt_range.h: Auto merged sql/opt_sum.cc: Auto merged sql/repl_failsafe.cc: Auto merged sql/slave.cc: Auto merged sql/sql_cache.cc: Auto merged sql/sql_db.cc: Auto merged sql/sql_handler.cc: Auto merged sql/sql_insert.cc: Auto merged sql/sql_lex.cc: Auto merged sql/sql_load.cc: Auto merged sql/sql_string.cc: Auto merged sql/sql_table.cc: Auto merged sql/sql_test.cc: Auto merged sql/time.cc: Auto merged sql/unireg.cc: Auto merged strings/Makefile.am: Auto merged strings/ctype-latin1_de.c: Auto merged strings/ctype-tis620.c: Auto merged tools/mysqlmanager.c: Auto merged BitKeeper/deleted/.del-sslopt-case.h~224c80e75dad4997: merge with 4.0.3 BitKeeper/triggers/post-commit: merge with 4.0.3 client/mysql.cc: merge with 4.0.3 + simple optimsation client/mysqltest.c: merge with 4.0.3 (Indentation change) configure.in: merge with 4.0.3 extra/resolve_stack_dump.c: merge with 4.0.3 (Indentation change) include/Makefile.am: merge with 4.0.3 include/myisam.h: merge with 4.0.3 (Indentation change) include/mysql.h: merge with 4.0.3 (removed not used structure) include/mysqld_error.h: merge with 4.0.3 libmysql/Makefile.shared: merge with 4.0.3 libmysql/libmysql.c: merge with 4.0.3 (Indentation change) libmysqld/Makefile.am: merge with 4.0.3 myisam/ft_boolean_search.c: merge with 4.0.3 (Indentation change) myisam/ft_nlq_search.c: merge with 4.0.3 (Indentation change) myisam/mi_check.c: merge with 4.0.3 myisam/mi_search.c: merge with 4.0.3 myisam/mi_unique.c: merge with 4.0.3 mysys/Makefile.am: merge with 4.0.3 mysys/mf_casecnv.c: merge with 4.0.3 sql-bench/server-cfg.sh: Removed 8000 max row limit for Innodb sql/Makefile.am: merge with 4.0.3 sql/field.cc: Indentation cleanup Changed sprintf -> my_sprintf sql/field.h: merge with 4.0.3 sql/ha_heap.cc: merge with 4.0.3 (Indentation change) sql/item.h: merge with 4.0.3 (Indentation change) sql/item_cmpfunc.cc: merge with 4.0.3 sql/item_cmpfunc.h: Removed size_of() from items Indentation cleanup sql/item_create.cc: merge sql/item_create.h: merge sql/item_func.cc: Added comments Changed string functions to use character set of first string argument as default return characterset Simple optimizations. Removed return of uninitalized variable. sql/item_func.h: merge sql/item_strfunc.cc: merge with 4.0.3 (Indentation change) sql/item_strfunc.h: removed size_of() sql/item_uniq.h: removed size_of() sql/lex.h: merge with 4.0.3 (Indentation change) sql/log_event.cc: Add ` around database in 'use database' in binary log. sql/mysql_priv.h: merge with 4.0.3 sql/mysqld.cc: merge with 4.0.3 (Indentation change) sql/share/czech/errmsg.txt: merge sql/share/danish/errmsg.txt: merge sql/share/dutch/errmsg.txt: merge sql/share/english/errmsg.txt: merge sql/share/estonian/errmsg.txt: merge sql/share/french/errmsg.txt: merge sql/share/german/errmsg.txt: merge sql/share/greek/errmsg.txt: merge sql/share/hungarian/errmsg.txt: merge sql/share/italian/errmsg.txt: merge sql/share/japanese/errmsg.txt: merge sql/share/korean/errmsg.txt: merge sql/share/norwegian-ny/errmsg.txt: merge sql/share/norwegian/errmsg.txt: merge sql/share/polish/errmsg.txt: merge sql/share/portuguese/errmsg.txt: merge sql/share/romanian/errmsg.txt: merge sql/share/russian/errmsg.txt: merge sql/share/slovak/errmsg.txt: merge sql/share/spanish/errmsg.txt: merge sql/share/swedish/errmsg.txt: merge sql/share/ukrainian/errmsg.txt: merge sql/sql_acl.cc: merge with 4.0.3 sql/sql_base.cc: More comments Fixed bug in send_fields() when using convert sql/sql_class.cc: merge sql/sql_class.h: Merge with 4.0.3 Moved max_error_count and max_warning_count to variables struct. sql/sql_delete.cc: merge with 4.0.3 (Indentation change) sql/sql_lex.h: merge with 4.0.3 sql/sql_parse.cc: Removed SHOW_WARNS_COUNT and SHOW_ERRORS_COUNT. (Should be retrived from variables) sql/sql_select.cc: merge with 4.0.3 sql/sql_show.cc: merge with 4.0.3 sql/sql_union.cc: merge with 4.0.3 sql/sql_update.cc: merge with 4.0.3 sql/sql_yacc.yy: merge with 4.0.3 Indentation cleanup sql/structs.h: merge with 4.0.3 sql/table.cc: merge with 4.0.3 sql/table.h: merge with 4.0.3
2002-08-30 12:40:40 +03:00
WAX@sergbook.mysql.com
Fix deprecation warning - database_engine => storage_engine BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
2004-01-18 22:30:35 +00:00
acurtis@pcgem.rdg.cyberkinetica.com
Translation English -> Protuguese sql/share/portuguese/errmsg.txt: Translation English -> Portuguese BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
2003-05-23 03:06:00 -03:00
administrador@light.hegel.local
manual.texi updated MyOLEDB section Docs/manual.texi: updated MyOLEDB section BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
2001-12-24 10:15:04 +01:00
ahlentz@co3064164-a.rochd1.qld.optusnet.com.au
Merge work.mysql.com:/home/bk/mysql-4.0 into work.mysql.com:/home/akishkin/mysql-4.0 BitKeeper/etc/logging_ok: auto-union
2002-05-17 07:09:09 +02:00
akishkin@work.mysql.com
Fix for Bug 3481 CREATE statement allowed extra unnecessary commas mysql-test/r/alias.result: Extra comma removed in CREATE statement mysql-test/r/create.result: New test for Bug 3481 mysql-test/r/func_str.result: Extra comma removed in CREATE statement mysql-test/r/rpl_multi_update.result: Extra comma removed in CREATE statement mysql-test/t/alias.test: Extra comma removed in CREATE statement mysql-test/t/create.test: New test for bug 3481 mysql-test/t/func_str.test: Extra comma removed in CREATE statement mysql-test/t/rpl_multi_update.test: Extra comma removed in CREATE statement sql/sql_yacc.yy: Fix for bug 3481 No path through the grammar which has no clauses BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
2004-04-28 16:14:53 +01:00
antony@ltantony.dsl-verizon.net
WorkLog#1280 - Remove fixed table handler from lex/yacc include/mysqld_error.h: New error message: unknown table engine mysql-test/r/create.result: New error message: unknown table engine mysql-test/t/create.test: New error message: unknown table engine sql/lex.h: Remove some keywords: HEAP, ISAM, MERGE, MEMORY, MRG_MYISAM, MYISAM sql/mysql_priv.h: Remove unused symbol sql/set_var.h: New system variable type: sys_var_thd_table_type sql/sql_yacc.yy: Remove tokens and make table_types resolve at run time sql/sql_show.cc: Tidy up sql/sql_table.cc: Tidy up include/sql_state.h: Fix indent sql/mysqld.cc: optimize mysql-test/r/rpl_change_master.result: It wouldn't pass the tests mysql-test/r/variables.result: Fix for changes mysql-test/r/warnings.result: Fix for changes mysql-test/t/variables.test: Fix for changes sql/handler.h: parameter is a const sql/set_var.cc: Code clean up for sys_var_thd_table_type::check() sql/handler.cc: More tidyup sql/share/czech/errmsg.txt: Fixups during review sql/share/danish/errmsg.txt: Fixups during review sql/share/dutch/errmsg.txt: Fixups during review sql/share/english/errmsg.txt: Fixups during review sql/share/estonian/errmsg.txt: Fixups during review sql/share/french/errmsg.txt: Fixups during review sql/share/german/errmsg.txt: Fixups during review sql/share/greek/errmsg.txt: Fixups during review sql/share/hungarian/errmsg.txt: Fixups during review sql/share/italian/errmsg.txt: Fixups during review sql/share/japanese/errmsg.txt: Fixups during review sql/share/korean/errmsg.txt: Fixups during review sql/share/norwegian-ny/errmsg.txt: Fixups during review sql/share/norwegian/errmsg.txt: Fixups during review sql/share/polish/errmsg.txt: Fixups during review sql/share/portuguese/errmsg.txt: Fixups during review sql/share/romanian/errmsg.txt: Fixups during review sql/share/russian/errmsg.txt: Fixups during review sql/share/serbian/errmsg.txt: Fixups during review sql/share/slovak/errmsg.txt: Fixups during review sql/share/spanish/errmsg.txt: Fixups during review sql/share/swedish/errmsg.txt: Fixups during review sql/share/ukrainian/errmsg.txt: Fixups during review BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
2003-12-02 20:23:13 +00:00
antony@ltantony.rdg.cyberkinetica.homeunix.net
Inserted comment about lost root pwd procedure in Docs relying on command order in mysqladmin. BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
2004-02-25 09:46:43 +10:00
arjen@bitbike.com
manual.texi updated MyOLEDB section Docs/manual.texi: updated MyOLEDB section BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
2001-12-24 10:15:04 +01:00
arjen@co3064164-a.bitbike.com
merge with 3.23.50 BitKeeper/etc/logging_ok: auto-union BUILD/SETUP.sh: Auto merged Build-tools/Do-compile: Auto merged Build-tools/Do-rpm: Auto merged configure.in: Auto merged include/mysql_com.h: Auto merged innobase/btr/btr0btr.c: Auto merged innobase/btr/btr0cur.c: Auto merged innobase/btr/btr0sea.c: Auto merged innobase/dict/dict0dict.c: Auto merged innobase/dict/dict0load.c: Auto merged innobase/fil/fil0fil.c: Auto merged innobase/fsp/fsp0fsp.c: Auto merged innobase/include/srv0srv.h: Auto merged innobase/include/sync0rw.ic: Auto merged innobase/log/log0log.c: Auto merged innobase/rem/rem0cmp.c: Auto merged innobase/row/row0ins.c: Auto merged innobase/row/row0sel.c: Auto merged innobase/row/row0upd.c: Auto merged innobase/srv/srv0srv.c: Auto merged innobase/srv/srv0start.c: Auto merged myisam/myisampack.c: Auto merged mysql-test/t/range.test: Auto merged scripts/mysqldumpslow.sh: Auto merged sql/ha_innodb.h: Auto merged sql/handler.cc: Auto merged sql/handler.h: Auto merged sql/item.cc: Auto merged sql/item.h: Auto merged sql/item_func.cc: Auto merged sql/item_func.h: Auto merged sql/lock.cc: Auto merged sql/share/Makefile.am: Auto merged sql/sql_rename.cc: Auto merged sql/sql_select.cc: Auto merged sql/sql_show.cc: Auto merged support-files/mysql.spec.sh: Auto merged Docs/manual.texi: merge client/mysql.cc: merge client/mysqldump.c: merge innobase/buf/buf0buf.c: merge innobase/os/os0file.c: merge innobase/row/row0mysql.c: merge mysql-test/r/range.result: merge sql/ha_innodb.cc: merge sql/log_event.h: merge sql/mysqld.cc: merge sql/sql_base.cc: merge sql/sql_load.cc: merge
2002-03-27 01:56:10 +02:00
arjen@fred.bitbike.com
merge BitKeeper/etc/logging_ok: auto-union configure.in: Auto merged BitKeeper/deleted/.del-identity.result~e41453a364242503: Auto merged BitKeeper/deleted/.del-identity.test~326f469b59105404: Auto merged include/my_pthread.h: Auto merged innobase/dict/dict0crea.c: Auto merged innobase/dict/dict0dict.c: Auto merged innobase/dict/dict0load.c: Auto merged innobase/include/univ.i: Auto merged innobase/lock/lock0lock.c: Auto merged innobase/pars/pars0opt.c: Auto merged innobase/que/que0que.c: Auto merged innobase/row/row0ins.c: Auto merged innobase/row/row0mysql.c: Auto merged innobase/row/row0sel.c: Auto merged innobase/row/row0upd.c: Auto merged innobase/srv/srv0srv.c: Auto merged innobase/sync/sync0sync.c: Auto merged innobase/trx/trx0trx.c: Auto merged libmysql/libmysql.c: Auto merged myisam/myisampack.c: Auto merged mysql-test/t/func_test.test: Auto merged mysql-test/t/show_check.test: Auto merged mysql-test/t/variables.test: Auto merged mysys/my_pthread.c: Auto merged sql/item_cmpfunc.cc: Auto merged sql/item_func.cc: Auto merged sql/mysql_priv.h: Auto merged sql/share/danish/errmsg.txt: Auto merged sql/share/english/errmsg.txt: Auto merged sql/share/french/errmsg.txt: Auto merged sql/share/german/errmsg.txt: Auto merged sql/share/greek/errmsg.txt: Auto merged sql/share/hungarian/errmsg.txt: Auto merged sql/sql_show.cc: Auto merged sql/share/italian/errmsg.txt: Auto merged sql/share/japanese/errmsg.txt: Auto merged sql/share/korean/errmsg.txt: Auto merged sql/share/norwegian-ny/errmsg.txt: Auto merged sql/share/norwegian/errmsg.txt: Auto merged sql/share/polish/errmsg.txt: Auto merged sql/share/portuguese/errmsg.txt: Auto merged sql/share/romanian/errmsg.txt: Auto merged sql/share/russian/errmsg.txt: Auto merged sql/share/slovak/errmsg.txt: Auto merged sql/share/spanish/errmsg.txt: Auto merged sql/share/swedish/errmsg.txt: Auto merged sql/share/ukrainian/errmsg.txt: Auto merged
2002-04-25 01:16:42 +03:00
arjen@george.bitbike.com
Fix for Bug#2151: "USE db" affected the character set of further CREATE DATABASEs, which should have not happened. mysys/charset2html.c: It's earier to operate hex values when editing charset configuration file BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
2003-12-19 19:12:11 +04:00
bar@bar.intranet.mysql.r18.ru
Merge sergbook.mysql.com:/usr/home/serg/Abk/mysql into sergbook.mysql.com:/usr/home/serg/Abk/mysql-4.0 BitKeeper/etc/ignore: auto-union BitKeeper/etc/logging_ok: auto-union BitKeeper/deleted/.del-stamp-h.in~d3fb1119ddf3630f: Auto merged configure.in: Auto merged Docs/manual.texi: Auto merged strings/Makefile.am: Auto merged
2002-08-13 21:15:14 +02:00
bar@bar.mysql.r18.ru
Merge with 3.23.51 Fixed wrong usage of sprintf() in ha_innodb.cc BitKeeper/etc/logging_ok: auto-union BitKeeper/deleted/.del-global.h~e80d28157acfdcb5: Auto merged Docs/manual.ja.texi: Auto merged include/config-os2.h: Auto merged innobase/btr/btr0btr.c: Auto merged innobase/btr/btr0cur.c: Auto merged innobase/btr/btr0sea.c: Auto merged innobase/buf/buf0buf.c: Auto merged innobase/data/data0data.c: Auto merged innobase/dict/dict0crea.c: Auto merged innobase/dict/dict0dict.c: Auto merged innobase/fil/fil0fil.c: Auto merged innobase/fsp/fsp0fsp.c: Auto merged innobase/ibuf/ibuf0ibuf.c: Auto merged innobase/include/buf0buf.ic: Auto merged innobase/include/srv0srv.h: Auto merged innobase/lock/lock0lock.c: Auto merged innobase/log/log0log.c: Auto merged innobase/mtr/mtr0mtr.c: Auto merged innobase/os/os0file.c: Auto merged innobase/page/page0cur.c: Auto merged innobase/page/page0page.c: Auto merged innobase/rem/rem0cmp.c: Auto merged innobase/row/row0ins.c: Auto merged innobase/row/row0purge.c: Auto merged innobase/row/row0umod.c: Auto merged innobase/row/row0upd.c: Auto merged innobase/sync/sync0arr.c: Auto merged innobase/sync/sync0sync.c: Auto merged innobase/trx/trx0roll.c: Auto merged innobase/trx/trx0trx.c: Auto merged innobase/trx/trx0undo.c: Auto merged innobase/ut/ut0ut.c: Auto merged isam/pack_isam.c: Auto merged mysys/Makefile.am: Auto merged sql/ha_innodb.h: Auto merged sql/key.cc: Auto merged sql/mini_client.cc: Auto merged sql/sql_delete.cc: Auto merged sql/sql_lex.h: Auto merged sql/sql_table.cc: Auto merged sql/sql_update.cc: Auto merged sql/table.cc: Auto merged support-files/my-huge.cnf.sh: Auto merged support-files/my-large.cnf.sh: Auto merged support-files/my-medium.cnf.sh: Auto merged support-files/my-small.cnf.sh: Auto merged Docs/manual.texi: Merge with 3.23.51 configure.in: Merge with 3.23.51 include/Makefile.am: Merge with 3.23.51 innobase/dict/dict0load.c: Merge with 3.23.51 innobase/include/univ.i: Merge with 3.23.51 innobase/row/row0mysql.c: Merge with 3.23.51 innobase/srv/srv0srv.c: Merge with 3.23.51 innobase/srv/srv0start.c: Merge with 3.23.51 myisam/mi_cache.c: Merge with 3.23.51 myisammrg/myrg_rnext.c: Merge with 3.23.51 myisammrg/myrg_rprev.c: Merge with 3.23.51 sql/ha_innodb.cc: Merge with 3.23.51 Changed used of sprintf() to make code portable. sql/handler.cc: Indentation change sql/lex.h: Comment cleanup sql/log.cc: Merge with 3.23.51 sql/log_event.h: Merge with 3.23.51 sql/mysql_priv.h: Merge with 3.23.51 sql/mysqld.cc: Merge with 3.23.51 Cleaned up handling of innodb_flush_log_at_trx_commit sql/share/portuguese/errmsg.txt: Merge with 3.23.51 sql/slave.cc: Not merged as this affects many files; Will be fixed in next changeset sql/slave.h: Merge with 3.23.51 sql/sql_acl.cc: Merge with 3.23.51 (no changes) sql/sql_db.cc: Merge with 3.23.51 sql/sql_parse.cc: Merge with 3.23.51 sql/sql_yacc.yy: Merge with 3.23.51 (Renamed NO_FOREIGN_KEY_CHECKS and RELAXED_UNIQUE_CHECKS) support-files/mysql.spec.sh: Merge with 3.23.51
2002-07-25 22:46:28 +03:00
bar@bar.udmsearch.izhnet.ru
logging_ok: Logging to logging@openlogging.org accepted item_strfunc.cc: Bug wich appeared in ctype_tis620 is fixed sql/item_strfunc.cc: Bug wich appeared in ctype_tis620 is fixed BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
2003-12-29 18:45:13 +04:00
bar@deer.(none)
Merge work.mysql.com:/home/bk/mysql-4.0 into work.mysql.com:/home/bk/mysql-4.1 BitKeeper/etc/logging_ok: auto-union sql/sql_select.cc: Auto merged sql/sql_union.cc: Auto merged sql/sql_yacc.yy: Auto merged
2002-02-22 11:52:18 +01:00
bar@gw.udmsearch.izhnet.ru
Documentation fixed according bug 185 fixing patch (1.1551 03/04/23 00: Docs/internals.texi: Documentation fixed according bug 185 fixing patch (1.1551 03/04/23 00:01:19) BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
2003-04-28 20:40:41 +03:00
bell@laptop.sanja.is.com.ua
Merge from 3.23.48 tree BitKeeper/etc/logging_ok: auto-union Docs/manual.texi: Auto merged innobase/dict/dict0dict.c: Auto merged innobase/include/srv0srv.h: Auto merged innobase/mem/mem0dbg.c: Auto merged innobase/os/os0file.c: Auto merged innobase/que/que0que.c: Auto merged innobase/rem/rem0rec.c: Auto merged innobase/row/row0sel.c: Auto merged innobase/srv/srv0srv.c: Auto merged innobase/srv/srv0start.c: Auto merged innobase/sync/sync0arr.c: Auto merged innobase/trx/trx0trx.c: Auto merged innobase/trx/trx0undo.c: Auto merged myisam/mi_check.c: Auto merged mysql-test/t/join.test: Auto merged mysys/hash.c: Auto merged scripts/mysql_config.sh: Auto merged sql/ha_innodb.h: Auto merged sql/handler.cc: Auto merged sql/handler.h: Auto merged sql/sql_acl.cc: Auto merged
2002-01-30 16:37:47 +02:00
bell@sanja.is.com.ua
BK automatic LOD removal. BitKeeper/etc/skipkeys: auto add BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
2002-10-20 21:23:21 +02:00
bk@admin.bk
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1 into mysql.r18.ru:/usr/home/bk/mysql-4.1 BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
2003-06-21 19:42:36 +05:00
bk@mysql.r18.ru
First commit of the skeleton storage engine. Use this example as a template to build storage engines. Also includes a new degine for marking storage engine methods as not being implemented. sql/examples/ha_example.h: First commit of example storage engine. BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
2004-04-01 01:02:42 -08:00
brian@brian-akers-computer.local
Some error messages re. BLOBs are true for TEXTs as well sql/share/english/errmsg.txt: Some messages re. BLOBs are true for TEXTs as well BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
2003-06-09 15:22:28 +02:00
carsten@tsort.bitbybit.dk
manual.texi updated MyOLEDB section Docs/manual.texi: updated MyOLEDB section BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
2001-12-24 10:15:04 +01:00
davida@isil.mysql.com
"Fix" for BUG #2050 "10 to 1 performance drop with server 4.1.1". Actually it is not a bug but right behavior observed as pefomance degradation after we have forced Item_field::fix_fields() to re-execute each time when we are executing prep stmt. This patch implements small optimization which heals this bad behavior. We are caching field position in TABLE::field array in Item's member and are using this position for speeding up field lookups in fix_fields() in case of its re-execution. sql/item.cc: Added cached_field_index member to Item_ident for caching field position in TABLE::field array for quicker field lookup in case fix_fields() is executed twice. sql/item.h: Added cached_field_index member to Item_ident for caching field position in TABLE::field array for quicker field lookup in case fix_fields() is executed twice. sql/mysql_priv.h: Now find_field_in_table has one more in-out parameter which is used for caching field index in TABLE::field array stored for quicker field look up. sql/sql_acl.cc: Now find_field_in_table has one more in-out parameter which is used for caching field index in TABLE::field array stored for quicker field look up. sql/sql_base.cc: Optimization: Now when we are looking up Field by its name we are caching its position in TABLE::field array in Item_ident::cached_field_index, so when we will call fix_fields() second time for this item (e.g. when we are re-executing prep statement) we can reuse this index to speed up this lookup. sql/table.cc: Now we storing in TABLE::name_hash pointers to elements of TABLE::field array, because this allows easily retrieve index of field in this array when it is looked up by its name. sql/table.h: Added comment claryfying what we store in TABLE::name_hash. BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
2004-03-28 04:11:54 +04:00
dlenev@brandersnatch.localdomain
openssl_1.result, openssl_1.test: Aligned test with regenerated SSL certs Many files: Regenerated expired certificates SSL/cacert.pem: Regenerated expired certificates SSL/client-cert.pem: Regenerated expired certificates SSL/client-key.pem: Regenerated expired certificates SSL/client-req.pem: Regenerated expired certificates SSL/server-cert.pem: Regenerated expired certificates SSL/server-key.pem: Regenerated expired certificates SSL/server-req.pem: Regenerated expired certificates mysql-test/t/openssl_1.test: Aligned test with regenerated SSL certs mysql-test/r/openssl_1.result: Aligned test with regenerated SSL certs BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
2003-08-07 15:20:15 +02:00
dlenev@build.mysql.com
WL#775 "Add status variable identifying binlog_cache_size shortage" Added two status variables: binlog_cache_use - counts number of transactions that used somehow transaction temporary binary log. binlog_cache_disk_use - counts number of transactions that required disk I/O for storing info in this this binary log. include/my_sys.h: Added disk_writes member to the IO_CACHE structure for counting number of times when IO_CACHE was forced to write to disk. mysql-test/r/rpl_relayrotate.result: Fixed test result since added test for binlog_cache_use and binlog_cache_disk_use status variables. mysql-test/t/rpl_relayrotate.test: Added test for binlog_cache_use and binlog_cache_disk_use status variables. Now dropping t1 table on master too. mysys/mf_iocache.c: Added disk_writes member to the IO_CACHE structure for counting number of times when IO_CACHE was forced to write to disk. sql/handler.cc: Added support for binlog_cache_use and binlog_cache_disk_use status variable. First one is incremented if transaction used somehow transaction temporary binary log (doesn't matter in memory only or with writes to disk), the second one is incremented if this binary log was flushed to disk at some point. sql/mysql_priv.h: Added declaration of status variables binlog_cache_use and binlog_cache_disk_use. sql/mysqld.cc: Added status variables binlog_cache_use and binlog_cache_disk_use. BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
2004-04-02 00:47:20 +04:00
dlenev@jabberwock.localdomain
Fix security bug. mysqld server without ssl support was completly ignorant about ssl_type attribute sql/sql_acl.cc: Now acl_getroot() honors ssl_type attribute even if we compile without openssl BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
2003-07-23 18:50:18 +04:00
dlenev@mysql.com
Merge NDB patches into 4.1-clone, below is list of changesets # -------------------------------------------- # 04/04/13 joreland@mysql.com 1.1858.1.1 # Removal of NDBT_Table # -------------------------------------------- # 04/04/13 joreland@mysql.com 1.1858.1.2 # Removal of NDBT_Table # -------------------------------------------- # 04/04/13 joreland@mysql.com 1.1858.1.3 # Fix for crashing AT # -------------------------------------------- # 04/04/13 joreland@mysql.com 1.1858.1.4 # Bug fixes in testIndex # -------------------------------------------- # 04/04/13 joreland@mysql.com 1.1866.1.5 # Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb # into mysql.com:/home/jonas/src/tmp # -------------------------------------------- # 04/04/14 joreland@mysql.com 1.1858.1.5 # Fix for takeover when accessing indexes. # -------------------------------------------- # 04/04/14 joreland@mysql.com 1.1866.1.6 # Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb # into mysql.com:/home/jonas/src/tmp # -------------------------------------------- # 04/04/14 joreland@mysql.com 1.1858.2.1 # Fixed error handling of fire_trigger_ord + lqhkeyref w.r.t indexes # -------------------------------------------- # 04/04/14 joreland@mysql.com 1.1858.2.2 # Simple retry mechanism in UTIL # Helps testIndex -n BuildDuring _a lot_ # -------------------------------------------- # 04/04/14 joreland@mysql.com 1.1858.2.3 # Misc fixes to test prg. # -------------------------------------------- # 04/04/14 joreland@mysql.com 1.1858.2.4 # Allow more retires on application errors # -------------------------------------------- # 04/04/14 joreland@mysql.com 1.1858.2.5 # Pass no of rows fetched in SUB_SYNC_CONTINUE_REQ # -------------------------------------------- # 04/04/14 joreland@mysql.com 1.1869 # wl1714 # Improve parallellism # -------------------------------------------- # 04/04/14 joreland@mysql.com 1.1870 # Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb # into mysql.com:/home/jonas/src/wl1714 # -------------------------------------------- # 04/04/14 joreland@mysql.com 1.1866.1.7 # Merge # -------------------------------------------- # 04/04/14 joreland@mysql.com 1.1871 # Merge mysql.com:/home/jonas/src/wl1714 # into mysql.com:/home/jonas/src/mysql-4.1-ndb # -------------------------------------------- # 04/04/14 joreland@mysql.com 1.1872 # Fix for testScan -n ScanReadError5030 # -------------------------------------------- # 04/04/14 joreland@mysql.com 1.1873 # fix testDict -n FragmentType* # -------------------------------------------- # 04/04/14 johan@stingray.(none) 1.1866.2.1 # small fixes # -------------------------------------------- # 04/04/14 johan@stingray.(none) 1.1874 # Merge jandersson@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb # into stingray.(none):/space/bk/rep/mysql-4.1-ndb # -------------------------------------------- # 04/04/14 johan@stingray.(none) 1.1875 # handle rep node as an api node # -------------------------------------------- # 04/04/14 pekka@mysql.com 1.1873.1.1 # Fix for NDBT_Table removal # -------------------------------------------- # 04/04/15 joreland@mysql.com 1.1873.1.2 # Uninitialized var. # -------------------------------------------- # 04/04/15 johan@stingray.(none) 1.1876 # Merge jandersson@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb # into stingray.(none):/space/bk/rep/mysql-4.1-ndb # -------------------------------------------- # 04/04/15 joreland@mysql.com 1.1873.1.3 # Write pid before changing user # (as runas user probably doesn't have permissions on pid-dir) # -------------------------------------------- # -------------------------------------------- # 04/04/15 ndb@mc03.ndb.mysql.com 1.1862.1.3 # Fix printout of varchars # -------------------------------------------- # 04/04/15 ndb@mc03.ndb.mysql.com 1.1877 # Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb # into mc03.ndb.mysql.com:/space/ndb/tmp # -------------------------------------------- # 04/04/15 ndb@mc03.ndb.mysql.com 1.1862.1.4 # Hmm.. don't print attr as many times as length of array # -------------------------------------------- # 04/04/15 ndb@mc03.ndb.mysql.com 1.1878 # Merge mc03.ndb.mysql.com:/space/ndb/mysql-4.1-ndb # into mc03.ndb.mysql.com:/space/ndb/tmp # -------------------------------------------- # 04/04/15 joreland@mysql.com 1.1876.1.1 # Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb # into mysql.com:/home/jonas/src/mysql-4.1-ndb # -------------------------------------------- # 04/04/15 joreland@mysql.com 1.1877.1.1 # Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb # into mysql.com:/home/jonas/src/mysql-4.1-ndb # -------------------------------------------- # 04/04/15 ndb@mc03.ndb.mysql.com 1.1879 # Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb # into mc03.ndb.mysql.com:/space/ndb/tmp # -------------------------------------------- # 04/04/17 joreland@mysql.com 1.1880 # LCP bug when restarting ops take's longer than DIH sending a new lcp ord # Solution: # Send LCP_FRAG_REP after restarting all ops # -------------------------------------------- # 04/04/18 joreland@mysql.com 1.1881 # Missspelled ERROR_INSERT # -------------------------------------------- # 04/04/18 joreland@mysql.com 1.1882 # Added possibility to log only distributed signals # -------------------------------------------- # 04/04/22 joreland@mysql.com 1.1883 # Removed dependancy to libstdc++ # * pure virtual functions "__cxa_pure_virtual" is defined in libstd++ -> # remove all pure virtual functions # -------------------------------------------- # 04/04/23 joreland@mysql.com 1.1884 # Various minor bug fixes for problems found while compiling # with icc # -------------------------------------------- # -------------------------------------------- # 04/04/25 joreland@mysql.com 1.1885 # Removed debug code (joreland:1.1875) # -------------------------------------------- # 04/04/26 ejonore@mc03.ndb.mysql.com 1.1862.1.5 # Lock pages in memory _after_ daemon-mode (exec/fork) # -------------------------------------------- # 04/04/27 ejonore@mc03.ndb.mysql.com 1.1862.1.6 # 1) Trap abort() # 2) StopStart/StopAborted events # 3) warning if memlock fails # 4) use g_logger more often (instead of ndbout) # # -------------------------------------------- # 04/04/27 joreland@mysql.com 1.1886 # bug fix for a bug in wl1714 + software upgrade # -------------------------------------------- # 04/04/27 joreland@mysql.com 1.1887 # Cset exclude: joreland@mysql.com|ChangeSet|20040422160720|05374 # -------------------------------------------- # 04/04/27 joreland@mysql.com 1.1888 # removed libstc++ second try... # -------------------------------------------- # 04/04/28 ejonore@mc03.ndb.mysql.com 1.1862.1.7 # 1) Don't lock FUTURE pages but only current # 2) Do this when SIZEALT has completed # -------------------------------------------- # 04/04/30 joreland@mysql.com 1.1889 # Merge jonas@orca:/home/ndb/releases/mysql-4.1-ndb-3.4.x # into mysql.com:/home/jonas/src/mysql-4.1-ndb # -------------------------------------------- # 04/05/03 ndb@mc03.ndb.mysql.com 1.1862.1.8 # Version update # -------------------------------------------- # 04/05/03 joreland@mysql.com 1.1862.3.1 # Changed restart behavior. # Use "angel" process which monitor "real" process # -------------------------------------------- # 04/05/03 joreland@mysql.com 1.1862.1.9 # Merge jonas@orca:/home/ndb/releases/mysql-4.1-ndb-3.4.x # into mysql.com:/home/jonas/src/mysql-4.1-ndb-3.4.x # -------------------------------------------- # 04/05/03 joreland@mysql.com 1.1890 # Merge B2 fixes # -------------------------------------------- # -------------------------------------------- # 04/05/03 joreland@mysql.com 1.1862.1.10 # Better handling of children terminations # -------------------------------------------- # 04/05/03 joreland@mysql.com 1.1862.1.11 # Fixes for angel-restarting # -------------------------------------------- # 04/05/03 joreland@mysql.com 1.1891 # Merge mysql.com:/home/jonas/src/mysql-4.1-ndb-3.4.x # into mysql.com:/home/jonas/src/mysql-4.1-ndb # -------------------------------------------- # ndb/config/Defs.LINUX.x86.GCC.mk: Merge ndb fixes ndb/examples/ndbapi_async_example/Makefile: Merge ndb fixes ndb/examples/ndbapi_async_example/ndbapi_async.cpp: Merge ndb fixes ndb/examples/ndbapi_scan_example/Makefile: Merge ndb fixes ndb/include/debugger/SignalLoggerManager.hpp: Merge ndb fixes ndb/include/kernel/signaldata/ScanFrag.hpp: Merge ndb fixes ndb/include/ndb_version.h: Merge ndb fixes ndb/include/ndbapi/NdbScanOperation.hpp: Merge ndb fixes ndb/include/util/SocketServer.hpp: Merge ndb fixes ndb/src/common/debugger/SignalLoggerManager.cpp: Merge ndb fixes ndb/src/common/logger/ConsoleLogHandler.cpp: Merge ndb fixes ndb/src/common/portlib/unix/NdbMem.c: Merge ndb fixes ndb/src/common/util/Makefile: Merge ndb fixes ndb/src/common/util/version.c: Merge ndb fixes ndb/src/cw/cpcd/Process.cpp: Merge ndb fixes ndb/src/kernel/blocks/ERROR_codes.txt: Merge ndb fixes ndb/src/kernel/blocks/backup/restore/Restore.cpp: Merge ndb fixes ndb/src/kernel/blocks/backup/restore/Restore.hpp: Merge ndb fixes ndb/src/kernel/blocks/backup/restore/main.cpp: Merge ndb fixes ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp: Merge ndb fixes ndb/src/kernel/blocks/dbdict/Dbdict.cpp: Merge ndb fixes ndb/src/kernel/blocks/dblqh/Dblqh.hpp: Merge ndb fixes ndb/src/kernel/blocks/dblqh/DblqhInit.cpp: Merge ndb fixes ndb/src/kernel/blocks/dblqh/DblqhMain.cpp: Merge ndb fixes ndb/src/kernel/blocks/dbtc/Dbtc.hpp: Merge ndb fixes ndb/src/kernel/blocks/dbtc/DbtcInit.cpp: Merge ndb fixes ndb/src/kernel/blocks/dbtc/DbtcMain.cpp: Merge ndb fixes ndb/src/kernel/blocks/dbutil/DbUtil.cpp: Merge ndb fixes ndb/src/kernel/blocks/dbutil/DbUtil.hpp: Merge ndb fixes ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp: Merge ndb fixes ndb/src/kernel/blocks/ndbfs/Filename.cpp: Merge ndb fixes ndb/src/kernel/blocks/suma/Suma.cpp: Merge ndb fixes ndb/src/kernel/error/Error.hpp: Merge ndb fixes ndb/src/kernel/ndb-main/Main.cpp: Merge ndb fixes ndb/src/kernel/vm/Configuration.cpp: Merge ndb fixes ndb/src/kernel/vm/Configuration.hpp: Merge ndb fixes ndb/src/kernel/vm/DLFifoList.hpp: Merge ndb fixes ndb/src/kernel/vm/Emulator.cpp: Merge ndb fixes ndb/src/kernel/vm/SignalCounter.hpp: Merge ndb fixes ndb/src/kernel/vm/SimulatedBlock.cpp: Merge ndb fixes ndb/src/mgmsrv/MgmtSrvr.cpp: Merge ndb fixes ndb/src/mgmsrv/NodeLogLevel.cpp: Merge ndb fixes ndb/src/ndbapi/ClusterMgr.cpp: Merge ndb fixes ndb/src/ndbapi/Ndberror.cpp: Merge ndb fixes ndb/src/rep/rep_version.hpp: Merge ndb fixes ndb/test/ndbapi/testDict/testDict.cpp: Merge ndb fixes ndb/test/ndbapi/testIndex/testIndex.cpp: Merge ndb fixes ndb/test/ndbapi/testMgm/testMgm.cpp: Merge ndb fixes ndb/test/ndbapi/testScan/testScan.cpp: Merge ndb fixes ndb/test/src/HugoTransactions.cpp: Merge ndb fixes ndb/test/src/NDBT_Tables.cpp: Merge ndb fixes ndb/test/src/NDBT_Test.cpp: Merge ndb fixes ndb/test/src/UtilTransactions.cpp: Merge ndb fixes BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
2004-05-04 11:19:19 +02:00
ejonore@mc03.ndb.mysql.com
Added additional parameter userdata for mysql_set_local_infile_handler to allow binding of userland functions in PHP. include/mysql.h: added new last parameter (void *) for mysql_set_local_infile_handler st_mysql_options: added void *local_infile_userdata added last parameter (void *) for local_infile_init function pointer libmysql/libmysql.c: added parameter userdata in mysql_set_local_infile_handler added parameter (void *userdata __attribute__ ((unused))) in mysql_local_infile_init passed additional parameter userdata to init function in handle_local_infile BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
2004-05-07 14:50:10 +02:00
georg@beethoven.local
Change set for gcc patch on OpenUNIX and UnixWare SCO is the OS vendor. configure.in: Changes for UnixWare 7.1.X andOpenUNIX 8.0.0 to allow gcc. BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
2003-09-03 08:07:58 -06:00
gerberb@ou800.zenez.com
Some changes for SSL sql-bench/bench-init.pl.sh: Add option connect-options(using with SSL) sql-bench/server-cfg.sh: Add option connect-option(using with SSL) sql/sql_acl.cc: Fix bug when GRANT ... REQUIRE NONE doesn't unset SSL requirements BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
2002-10-30 18:27:15 +04:00
gluh@gluh.(none)
Replication: Optimize away string.append Fixed problem with replication LOAD DATA INFILE when using --old-rpl-compat Fixed rpl_temporary test mysql-test/r/rpl_temporary.result: Fixed rpl_temporary test mysql-test/t/rpl_temporary.test: Fixed rpl_temporary test sql/log_event.cc: Replication: Optimize away string.append Fixed problem with replication LOAD DATA INFILE when using --old-rpl-compat BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
2003-01-17 16:39:29 +04:00
gluh@gluh.mysql.r18.ru
Add --win-dist parameter to Bootstrap, to run make_win_src_distribution Build-tools/Bootstrap: Add --win-dist parameter to run make_win_src_distribution BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
2003-08-07 14:19:42 -04:00
greg@gcw.ath.cx
mwldnlm, mwenv, mwccnlm, mwasmnlm, nwconfigure, nwbootstrap: new file BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
2003-02-18 17:48:04 -05:00
greg@mysql.com
Test's result update because std_data/words.dat has been lengthened by 500 bytes. Increased some tests' robustness a bit : - Added RESET MASTER to all tests who do SHOW BINLOG EVENTS, to make them independent from previous tests. - Added save_master_pos to these tests to wait for the slave to start before purging its binary logs. mysql-test/r/rpl_log.result: Updated SHOW BINLOG EVENTS's positions as Monty lengthened std_data/words.dat by 500 bytes. mysql-test/r/rpl_temporary.result: Added RESET MASTER to make positions shown by SHOW BINLOG EVENTS independent of any previous test. mysql-test/r/rpl_user_variables.result: Added RESET MASTER to make positions shown by SHOW BINLOG EVENTS independent of any previous test. mysql-test/t/rpl_log.test: Added save_master_pos to wait for the slave to have started before purging its binary logs. Otherwise, we could purge before the slave finishes starting, and then the slave could log events implicitly provoked by previous tests. mysql-test/t/rpl_temporary.test: Added RESET MASTER to make positions shown by SHOW BINLOG EVENTS independent of any previous test. mysql-test/t/rpl_user_variables.test: Added RESET MASTER to make positions shown by SHOW BINLOG EVENTS independent of any previous test. BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
2003-02-21 23:38:56 +01:00
guilhem@mysql.com
logging_ok: Logging to logging@openlogging.org accepted README.1st: new file - Readme for Windows distribution BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
2003-07-29 00:40:50 +02:00
gweir@build.mysql.com
Many files: new file Makefile.am: Changes from Novell diff netware/Makefile.am: Changes from Novell diff BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
2003-02-01 00:42:26 +01:00
gweir@work.mysql.com
Add in bit_xor function (approved by Sergei) sql/item_sum.cc: Add in bit_xor class functions. sql/item_sum.h: Add bit_xor class. sql/lex.h: Add in bit_xor symbol. sql/sql_yacc.yy: Add in bit_xor function BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
2003-10-15 02:11:03 -04:00
harrison@mysql.com
Fix up history in readline implementation. Two things changed: 1. Repeated queries are only stored once in the history. 2. Multiline queries are stored in a concated format in the history, in addition to pieces. (Push approved by serg) client/mysql.cc: Fix up history in readline implementation. 1. Repeated queries are only stored once in the history. 2. Multiline queries are stored in a concated format in the history. (Push approved by serg) BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
2004-03-03 15:54:37 -05:00
harry@corona.lordblink.com
manual.texi updated MyOLEDB section Docs/manual.texi: updated MyOLEDB section BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
2001-12-24 10:15:04 +01:00
heikki@donna.mysql.fi
merge with 3.23.49 BitKeeper/etc/logging_ok: auto-union acconfig.h: Auto merged Docs/manual.texi: Auto merged client/client_priv.h: Auto merged include/mysql.h: Auto merged innobase/dict/dict0dict.c: Auto merged innobase/row/row0mysql.c: Auto merged mysql-test/t/comments.test: Auto merged sql/sql_lex.cc: Auto merged sql/sql_load.cc: Auto merged sql/sql_parse.cc: Auto merged sql/unireg.cc: Auto merged sql/unireg.h: Auto merged
2002-02-14 18:58:24 +02:00
heikki@hundin.mysql.fi
Merge work:/home/bk/mysql-4.0 into rescue.:/my/bk/mysql-4.0 BitKeeper/etc/logging_ok: auto-union sql/ha_innodb.cc: Auto merged
2002-09-05 17:17:21 +03:00
heikki@rescue.
Merge work:/home/bk/mysql-4.0 into rescue.:/my/bk/mysql-4.0 BitKeeper/etc/logging_ok: auto-union
2002-09-05 14:00:05 +03:00
heikki@work.mysql.com
Resolving of conflicts from pull BitKeeper/etc/logging_ok: auto-union include/mysql.h: Auto merged include/violite.h: Auto merged libmysqld/lib_sql.cc: Auto merged libmysqld/lib_vio.c: Auto merged sql/ha_myisam.cc: Auto merged sql/mysql_priv.h: Auto merged sql/sql_acl.cc: Auto merged sql/sql_class.cc: Auto merged sql/sql_parse.cc: Auto merged sql/sql_show.cc: Auto merged sql/sql_table.cc: Auto merged sql/net_pkg.cc: Merging of pull conflicts sql/sql_base.cc: Merging of pull conflicts sql/sql_class.h: Merging of pull conflicts
2002-06-17 17:14:20 +05:00
hf@bison.(none)
Merge abotchkov@work.mysql.com:/home/bk/mysql-4.1 into bisonxp.(none):/home/hf/work/mysql-4.1 BitKeeper/etc/logging_ok: auto-union sql/mysql_priv.h: Auto merged sql/sql_base.cc: Auto merged sql/sql_class.cc: Auto merged sql/sql_class.h: Auto merged sql/sql_handler.cc: Auto merged sql/sql_parse.cc: Auto merged sql/sql_select.cc: Auto merged sql/sql_show.cc: Auto merged sql/sql_table.cc: Auto merged
2002-07-09 10:42:24 +05:00
hf@bisonxp.(none)
Lots of conflicts resolved libmysqld/Makefile.am: Auto merged sql/repl_failsafe.cc: Auto merged sql/slave.cc: Auto merged libmysql/libmysql.c: Resolved conflicts sql/mini_client.cc: resolved conflicts BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
2003-05-28 13:54:58 +05:00
hf@deer.(none)
Some fixes libmysqld/lib_sql.cc: parameters for functions added libmysqld/lib_vio.c: name of option changed libmysqld/libmysqld.c: mysql_fetch_length fixed sql/field.cc: small fix sql/item.cc: fixes about Field::embedded_send sql/item_strfunc.cc: cs parameter added sql/mysqld.cc: small fix sql/sql_show.cc: strange code #ifdef-ed sql/sql_table.cc: small fix BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
2002-12-12 12:16:34 +04:00
hf@deer.mysql.r18.ru
Merge abotchkov@work.mysql.com:/home/bk/mysql-4.0 into genie.(none):/home/hf/work/04 BitKeeper/etc/logging_ok: auto-union
2002-10-21 09:57:53 +05:00
hf@genie.(none)
my_pthread.h: Missing merge in changeset 1.1435 include/my_pthread.h: Missing merge in changeset 1.1435 BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
2003-01-28 05:34:32 +02:00
igor@hundin.mysql.fi
logging_ok: Logging to logging@openlogging.org accepted mf_keycache.c: Fixed a deadlock when reading from an index file fails. mysys/mf_keycache.c: Fixed a deadlock when reading from an index file fails. BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
2003-05-13 12:06:34 -07:00
igor@rurik.mysql.com
Merge istruewing@bk-internal.mysql.com:/home/bk/mysql-4.1 into mysql.com:/home/mydev/mysql/mysql-4.1 BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
2004-03-05 13:48:38 +01:00
ingo@mysql.com
Fixed a problem with mysqld_multi log file. The default is now datadir/mysqld_multi.log, if doesn't exists or is not writable, then /var/log/mysqld_multi.log, if does not exists or is not writable, then /tmp/mysqld_multi.log, but only in case the file does not yet exists in /tmp. Otherwise log will be disabled, unless user explicitely sets it with an option. BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
2004-04-06 17:57:32 +03:00
jani@a80-186-24-72.elisa-laajakaista.fi
Merge work:/home/bk/mysql-4.0 into sergbook.mysql.com:/usr/home/serg/Abk/mysql-4.0 BitKeeper/etc/logging_ok: auto-union
2002-05-14 18:00:06 +02:00
jani@dsl-jkl1657.dial.inet.fi
mysql multiline comment, by Sergey Gluhov. BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
2002-12-24 00:53:07 +02:00
jani@dsl-kpogw4gb5.dial.inet.fi
Merge work:/home/bk/mysql-4.0 into rhols221.arenanet.fi:/home/my/bk/mysql-4.0 BitKeeper/etc/logging_ok: auto-union
2002-05-24 14:09:01 +03:00
jani@hynda.(none)
manual.texi updated MyOLEDB section Docs/manual.texi: updated MyOLEDB section BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
2001-12-24 10:15:04 +01:00
jani@hynda.mysql.fi
jani@janikt.pp.saunalahti.fi
Merge from 3.23.48 tree BitKeeper/etc/logging_ok: auto-union Docs/manual.texi: Auto merged innobase/dict/dict0dict.c: Auto merged innobase/include/srv0srv.h: Auto merged innobase/mem/mem0dbg.c: Auto merged innobase/os/os0file.c: Auto merged innobase/que/que0que.c: Auto merged innobase/rem/rem0rec.c: Auto merged innobase/row/row0sel.c: Auto merged innobase/srv/srv0srv.c: Auto merged innobase/srv/srv0start.c: Auto merged innobase/sync/sync0arr.c: Auto merged innobase/trx/trx0trx.c: Auto merged innobase/trx/trx0undo.c: Auto merged myisam/mi_check.c: Auto merged mysql-test/t/join.test: Auto merged mysys/hash.c: Auto merged scripts/mysql_config.sh: Auto merged sql/ha_innodb.h: Auto merged sql/handler.cc: Auto merged sql/handler.h: Auto merged sql/sql_acl.cc: Auto merged
2002-01-30 16:37:47 +02:00
jani@rhols221.adsl.netsonic.fi
Merge work:/home/bk/mysql-4.0 into rhols221.arenanet.fi:/home/my/bk/mysql-4.0 BitKeeper/etc/logging_ok: auto-union
2002-05-24 14:09:01 +03:00
jani@rhols221.arenanet.fi
Merge jani@192.168.0.2:/my/mysql-4.0 into ua126d19.elisa.omakaista.fi:/home/my/bk/mysql-4.0 BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
2003-05-26 15:50:05 +03:00
jani@ua126d19.elisa.omakaista.fi
An include was missing. BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
2004-02-10 13:11:55 +00:00
jani@ua141d10.elisa.omakaista.fi
Added error reporting if one of the multi queries failed. BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
2003-11-20 20:06:51 +02:00
jani@ua167d18.elisa.omakaista.fi
Fixed Bug#3115. CAST AS DATE with malformed string returns NULL but IS NULL is false. BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
2004-03-09 22:03:01 +02:00
jani@ua72d24.elisa.omakaista.fi
manual.texi updated MyOLEDB section Docs/manual.texi: updated MyOLEDB section BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
2001-12-24 10:15:04 +01:00
jcole@abel.spaceapes.com
jcole@main.burghcom.com
Added LOCAL INFILE callback function support. BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
2004-03-22 19:58:49 -05:00
jcole@mugatu.jcole.us
merge with 3.23.50 BitKeeper/etc/logging_ok: auto-union BUILD/SETUP.sh: Auto merged Build-tools/Do-compile: Auto merged Build-tools/Do-rpm: Auto merged configure.in: Auto merged include/mysql_com.h: Auto merged innobase/btr/btr0btr.c: Auto merged innobase/btr/btr0cur.c: Auto merged innobase/btr/btr0sea.c: Auto merged innobase/dict/dict0dict.c: Auto merged innobase/dict/dict0load.c: Auto merged innobase/fil/fil0fil.c: Auto merged innobase/fsp/fsp0fsp.c: Auto merged innobase/include/srv0srv.h: Auto merged innobase/include/sync0rw.ic: Auto merged innobase/log/log0log.c: Auto merged innobase/rem/rem0cmp.c: Auto merged innobase/row/row0ins.c: Auto merged innobase/row/row0sel.c: Auto merged innobase/row/row0upd.c: Auto merged innobase/srv/srv0srv.c: Auto merged innobase/srv/srv0start.c: Auto merged myisam/myisampack.c: Auto merged mysql-test/t/range.test: Auto merged scripts/mysqldumpslow.sh: Auto merged sql/ha_innodb.h: Auto merged sql/handler.cc: Auto merged sql/handler.h: Auto merged sql/item.cc: Auto merged sql/item.h: Auto merged sql/item_func.cc: Auto merged sql/item_func.h: Auto merged sql/lock.cc: Auto merged sql/share/Makefile.am: Auto merged sql/sql_rename.cc: Auto merged sql/sql_select.cc: Auto merged sql/sql_show.cc: Auto merged support-files/mysql.spec.sh: Auto merged Docs/manual.texi: merge client/mysql.cc: merge client/mysqldump.c: merge innobase/buf/buf0buf.c: merge innobase/os/os0file.c: merge innobase/row/row0mysql.c: merge mysql-test/r/range.result: merge sql/ha_innodb.cc: merge sql/log_event.h: merge sql/mysqld.cc: merge sql/sql_base.cc: merge sql/sql_load.cc: merge
2002-03-27 01:56:10 +02:00
jcole@mugatu.spaceapes.com
Merge from 3.23.48 tree BitKeeper/etc/logging_ok: auto-union Docs/manual.texi: Auto merged innobase/dict/dict0dict.c: Auto merged innobase/include/srv0srv.h: Auto merged innobase/mem/mem0dbg.c: Auto merged innobase/os/os0file.c: Auto merged innobase/que/que0que.c: Auto merged innobase/rem/rem0rec.c: Auto merged innobase/row/row0sel.c: Auto merged innobase/srv/srv0srv.c: Auto merged innobase/srv/srv0start.c: Auto merged innobase/sync/sync0arr.c: Auto merged innobase/trx/trx0trx.c: Auto merged innobase/trx/trx0undo.c: Auto merged myisam/mi_check.c: Auto merged mysql-test/t/join.test: Auto merged mysys/hash.c: Auto merged scripts/mysql_config.sh: Auto merged sql/ha_innodb.h: Auto merged sql/handler.cc: Auto merged sql/handler.h: Auto merged sql/sql_acl.cc: Auto merged
2002-01-30 16:37:47 +02:00
jcole@sarvik.tfr.cafe.ee
manual.texi updated MyOLEDB section Docs/manual.texi: updated MyOLEDB section BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
2001-12-24 10:15:04 +01:00
jcole@tetra.spaceapes.com
Merge NDB patches into 4.1-clone, below is list of changesets # -------------------------------------------- # 04/04/13 joreland@mysql.com 1.1858.1.1 # Removal of NDBT_Table # -------------------------------------------- # 04/04/13 joreland@mysql.com 1.1858.1.2 # Removal of NDBT_Table # -------------------------------------------- # 04/04/13 joreland@mysql.com 1.1858.1.3 # Fix for crashing AT # -------------------------------------------- # 04/04/13 joreland@mysql.com 1.1858.1.4 # Bug fixes in testIndex # -------------------------------------------- # 04/04/13 joreland@mysql.com 1.1866.1.5 # Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb # into mysql.com:/home/jonas/src/tmp # -------------------------------------------- # 04/04/14 joreland@mysql.com 1.1858.1.5 # Fix for takeover when accessing indexes. # -------------------------------------------- # 04/04/14 joreland@mysql.com 1.1866.1.6 # Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb # into mysql.com:/home/jonas/src/tmp # -------------------------------------------- # 04/04/14 joreland@mysql.com 1.1858.2.1 # Fixed error handling of fire_trigger_ord + lqhkeyref w.r.t indexes # -------------------------------------------- # 04/04/14 joreland@mysql.com 1.1858.2.2 # Simple retry mechanism in UTIL # Helps testIndex -n BuildDuring _a lot_ # -------------------------------------------- # 04/04/14 joreland@mysql.com 1.1858.2.3 # Misc fixes to test prg. # -------------------------------------------- # 04/04/14 joreland@mysql.com 1.1858.2.4 # Allow more retires on application errors # -------------------------------------------- # 04/04/14 joreland@mysql.com 1.1858.2.5 # Pass no of rows fetched in SUB_SYNC_CONTINUE_REQ # -------------------------------------------- # 04/04/14 joreland@mysql.com 1.1869 # wl1714 # Improve parallellism # -------------------------------------------- # 04/04/14 joreland@mysql.com 1.1870 # Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb # into mysql.com:/home/jonas/src/wl1714 # -------------------------------------------- # 04/04/14 joreland@mysql.com 1.1866.1.7 # Merge # -------------------------------------------- # 04/04/14 joreland@mysql.com 1.1871 # Merge mysql.com:/home/jonas/src/wl1714 # into mysql.com:/home/jonas/src/mysql-4.1-ndb # -------------------------------------------- # 04/04/14 joreland@mysql.com 1.1872 # Fix for testScan -n ScanReadError5030 # -------------------------------------------- # 04/04/14 joreland@mysql.com 1.1873 # fix testDict -n FragmentType* # -------------------------------------------- # 04/04/14 johan@stingray.(none) 1.1866.2.1 # small fixes # -------------------------------------------- # 04/04/14 johan@stingray.(none) 1.1874 # Merge jandersson@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb # into stingray.(none):/space/bk/rep/mysql-4.1-ndb # -------------------------------------------- # 04/04/14 johan@stingray.(none) 1.1875 # handle rep node as an api node # -------------------------------------------- # 04/04/14 pekka@mysql.com 1.1873.1.1 # Fix for NDBT_Table removal # -------------------------------------------- # 04/04/15 joreland@mysql.com 1.1873.1.2 # Uninitialized var. # -------------------------------------------- # 04/04/15 johan@stingray.(none) 1.1876 # Merge jandersson@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb # into stingray.(none):/space/bk/rep/mysql-4.1-ndb # -------------------------------------------- # 04/04/15 joreland@mysql.com 1.1873.1.3 # Write pid before changing user # (as runas user probably doesn't have permissions on pid-dir) # -------------------------------------------- # -------------------------------------------- # 04/04/15 ndb@mc03.ndb.mysql.com 1.1862.1.3 # Fix printout of varchars # -------------------------------------------- # 04/04/15 ndb@mc03.ndb.mysql.com 1.1877 # Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb # into mc03.ndb.mysql.com:/space/ndb/tmp # -------------------------------------------- # 04/04/15 ndb@mc03.ndb.mysql.com 1.1862.1.4 # Hmm.. don't print attr as many times as length of array # -------------------------------------------- # 04/04/15 ndb@mc03.ndb.mysql.com 1.1878 # Merge mc03.ndb.mysql.com:/space/ndb/mysql-4.1-ndb # into mc03.ndb.mysql.com:/space/ndb/tmp # -------------------------------------------- # 04/04/15 joreland@mysql.com 1.1876.1.1 # Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb # into mysql.com:/home/jonas/src/mysql-4.1-ndb # -------------------------------------------- # 04/04/15 joreland@mysql.com 1.1877.1.1 # Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb # into mysql.com:/home/jonas/src/mysql-4.1-ndb # -------------------------------------------- # 04/04/15 ndb@mc03.ndb.mysql.com 1.1879 # Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb # into mc03.ndb.mysql.com:/space/ndb/tmp # -------------------------------------------- # 04/04/17 joreland@mysql.com 1.1880 # LCP bug when restarting ops take's longer than DIH sending a new lcp ord # Solution: # Send LCP_FRAG_REP after restarting all ops # -------------------------------------------- # 04/04/18 joreland@mysql.com 1.1881 # Missspelled ERROR_INSERT # -------------------------------------------- # 04/04/18 joreland@mysql.com 1.1882 # Added possibility to log only distributed signals # -------------------------------------------- # 04/04/22 joreland@mysql.com 1.1883 # Removed dependancy to libstdc++ # * pure virtual functions "__cxa_pure_virtual" is defined in libstd++ -> # remove all pure virtual functions # -------------------------------------------- # 04/04/23 joreland@mysql.com 1.1884 # Various minor bug fixes for problems found while compiling # with icc # -------------------------------------------- # -------------------------------------------- # 04/04/25 joreland@mysql.com 1.1885 # Removed debug code (joreland:1.1875) # -------------------------------------------- # 04/04/26 ejonore@mc03.ndb.mysql.com 1.1862.1.5 # Lock pages in memory _after_ daemon-mode (exec/fork) # -------------------------------------------- # 04/04/27 ejonore@mc03.ndb.mysql.com 1.1862.1.6 # 1) Trap abort() # 2) StopStart/StopAborted events # 3) warning if memlock fails # 4) use g_logger more often (instead of ndbout) # # -------------------------------------------- # 04/04/27 joreland@mysql.com 1.1886 # bug fix for a bug in wl1714 + software upgrade # -------------------------------------------- # 04/04/27 joreland@mysql.com 1.1887 # Cset exclude: joreland@mysql.com|ChangeSet|20040422160720|05374 # -------------------------------------------- # 04/04/27 joreland@mysql.com 1.1888 # removed libstc++ second try... # -------------------------------------------- # 04/04/28 ejonore@mc03.ndb.mysql.com 1.1862.1.7 # 1) Don't lock FUTURE pages but only current # 2) Do this when SIZEALT has completed # -------------------------------------------- # 04/04/30 joreland@mysql.com 1.1889 # Merge jonas@orca:/home/ndb/releases/mysql-4.1-ndb-3.4.x # into mysql.com:/home/jonas/src/mysql-4.1-ndb # -------------------------------------------- # 04/05/03 ndb@mc03.ndb.mysql.com 1.1862.1.8 # Version update # -------------------------------------------- # 04/05/03 joreland@mysql.com 1.1862.3.1 # Changed restart behavior. # Use "angel" process which monitor "real" process # -------------------------------------------- # 04/05/03 joreland@mysql.com 1.1862.1.9 # Merge jonas@orca:/home/ndb/releases/mysql-4.1-ndb-3.4.x # into mysql.com:/home/jonas/src/mysql-4.1-ndb-3.4.x # -------------------------------------------- # 04/05/03 joreland@mysql.com 1.1890 # Merge B2 fixes # -------------------------------------------- # -------------------------------------------- # 04/05/03 joreland@mysql.com 1.1862.1.10 # Better handling of children terminations # -------------------------------------------- # 04/05/03 joreland@mysql.com 1.1862.1.11 # Fixes for angel-restarting # -------------------------------------------- # 04/05/03 joreland@mysql.com 1.1891 # Merge mysql.com:/home/jonas/src/mysql-4.1-ndb-3.4.x # into mysql.com:/home/jonas/src/mysql-4.1-ndb # -------------------------------------------- # ndb/config/Defs.LINUX.x86.GCC.mk: Merge ndb fixes ndb/examples/ndbapi_async_example/Makefile: Merge ndb fixes ndb/examples/ndbapi_async_example/ndbapi_async.cpp: Merge ndb fixes ndb/examples/ndbapi_scan_example/Makefile: Merge ndb fixes ndb/include/debugger/SignalLoggerManager.hpp: Merge ndb fixes ndb/include/kernel/signaldata/ScanFrag.hpp: Merge ndb fixes ndb/include/ndb_version.h: Merge ndb fixes ndb/include/ndbapi/NdbScanOperation.hpp: Merge ndb fixes ndb/include/util/SocketServer.hpp: Merge ndb fixes ndb/src/common/debugger/SignalLoggerManager.cpp: Merge ndb fixes ndb/src/common/logger/ConsoleLogHandler.cpp: Merge ndb fixes ndb/src/common/portlib/unix/NdbMem.c: Merge ndb fixes ndb/src/common/util/Makefile: Merge ndb fixes ndb/src/common/util/version.c: Merge ndb fixes ndb/src/cw/cpcd/Process.cpp: Merge ndb fixes ndb/src/kernel/blocks/ERROR_codes.txt: Merge ndb fixes ndb/src/kernel/blocks/backup/restore/Restore.cpp: Merge ndb fixes ndb/src/kernel/blocks/backup/restore/Restore.hpp: Merge ndb fixes ndb/src/kernel/blocks/backup/restore/main.cpp: Merge ndb fixes ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp: Merge ndb fixes ndb/src/kernel/blocks/dbdict/Dbdict.cpp: Merge ndb fixes ndb/src/kernel/blocks/dblqh/Dblqh.hpp: Merge ndb fixes ndb/src/kernel/blocks/dblqh/DblqhInit.cpp: Merge ndb fixes ndb/src/kernel/blocks/dblqh/DblqhMain.cpp: Merge ndb fixes ndb/src/kernel/blocks/dbtc/Dbtc.hpp: Merge ndb fixes ndb/src/kernel/blocks/dbtc/DbtcInit.cpp: Merge ndb fixes ndb/src/kernel/blocks/dbtc/DbtcMain.cpp: Merge ndb fixes ndb/src/kernel/blocks/dbutil/DbUtil.cpp: Merge ndb fixes ndb/src/kernel/blocks/dbutil/DbUtil.hpp: Merge ndb fixes ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp: Merge ndb fixes ndb/src/kernel/blocks/ndbfs/Filename.cpp: Merge ndb fixes ndb/src/kernel/blocks/suma/Suma.cpp: Merge ndb fixes ndb/src/kernel/error/Error.hpp: Merge ndb fixes ndb/src/kernel/ndb-main/Main.cpp: Merge ndb fixes ndb/src/kernel/vm/Configuration.cpp: Merge ndb fixes ndb/src/kernel/vm/Configuration.hpp: Merge ndb fixes ndb/src/kernel/vm/DLFifoList.hpp: Merge ndb fixes ndb/src/kernel/vm/Emulator.cpp: Merge ndb fixes ndb/src/kernel/vm/SignalCounter.hpp: Merge ndb fixes ndb/src/kernel/vm/SimulatedBlock.cpp: Merge ndb fixes ndb/src/mgmsrv/MgmtSrvr.cpp: Merge ndb fixes ndb/src/mgmsrv/NodeLogLevel.cpp: Merge ndb fixes ndb/src/ndbapi/ClusterMgr.cpp: Merge ndb fixes ndb/src/ndbapi/Ndberror.cpp: Merge ndb fixes ndb/src/rep/rep_version.hpp: Merge ndb fixes ndb/test/ndbapi/testDict/testDict.cpp: Merge ndb fixes ndb/test/ndbapi/testIndex/testIndex.cpp: Merge ndb fixes ndb/test/ndbapi/testMgm/testMgm.cpp: Merge ndb fixes ndb/test/ndbapi/testScan/testScan.cpp: Merge ndb fixes ndb/test/src/HugoTransactions.cpp: Merge ndb fixes ndb/test/src/NDBT_Tables.cpp: Merge ndb fixes ndb/test/src/NDBT_Test.cpp: Merge ndb fixes ndb/test/src/UtilTransactions.cpp: Merge ndb fixes BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
2004-05-04 11:19:19 +02:00
joreland@mysql.com
Merge work:/home/bk/mysql into hundin.mysql.fi:/my/bk/mysql BitKeeper/etc/logging_ok: auto-union
2002-02-13 22:01:42 +02:00
jorge@linux.jorge.mysql.com
Merge from 3.23.48 tree BitKeeper/etc/logging_ok: auto-union Docs/manual.texi: Auto merged innobase/dict/dict0dict.c: Auto merged innobase/include/srv0srv.h: Auto merged innobase/mem/mem0dbg.c: Auto merged innobase/os/os0file.c: Auto merged innobase/que/que0que.c: Auto merged innobase/rem/rem0rec.c: Auto merged innobase/row/row0sel.c: Auto merged innobase/srv/srv0srv.c: Auto merged innobase/srv/srv0start.c: Auto merged innobase/sync/sync0arr.c: Auto merged innobase/trx/trx0trx.c: Auto merged innobase/trx/trx0undo.c: Auto merged myisam/mi_check.c: Auto merged mysql-test/t/join.test: Auto merged mysys/hash.c: Auto merged scripts/mysql_config.sh: Auto merged sql/ha_innodb.h: Auto merged sql/handler.cc: Auto merged sql/handler.h: Auto merged sql/sql_acl.cc: Auto merged
2002-01-30 16:37:47 +02:00
kaj@work.mysql.com
Merge kosipov@bk-internal.mysql.com:/home/bk/mysql-4.1 into mysql.com:/home/kostja/mysql/mysql-4.1-root BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
2003-08-01 19:44:27 +04:00
konstantin@mysql.com
added disable_query_log to fulltext2.test mysql-test/r/fulltext2.result: result updated mysql-test/t/fulltext2.test: test is now more silent BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
2003-08-01 18:49:30 +04:00
kostja@oak.local
merge BitKeeper/etc/logging_ok: auto-union configure.in: Auto merged BitKeeper/deleted/.del-identity.result~e41453a364242503: Auto merged BitKeeper/deleted/.del-identity.test~326f469b59105404: Auto merged include/my_pthread.h: Auto merged innobase/dict/dict0crea.c: Auto merged innobase/dict/dict0dict.c: Auto merged innobase/dict/dict0load.c: Auto merged innobase/include/univ.i: Auto merged innobase/lock/lock0lock.c: Auto merged innobase/pars/pars0opt.c: Auto merged innobase/que/que0que.c: Auto merged innobase/row/row0ins.c: Auto merged innobase/row/row0mysql.c: Auto merged innobase/row/row0sel.c: Auto merged innobase/row/row0upd.c: Auto merged innobase/srv/srv0srv.c: Auto merged innobase/sync/sync0sync.c: Auto merged innobase/trx/trx0trx.c: Auto merged libmysql/libmysql.c: Auto merged myisam/myisampack.c: Auto merged mysql-test/t/func_test.test: Auto merged mysql-test/t/show_check.test: Auto merged mysql-test/t/variables.test: Auto merged mysys/my_pthread.c: Auto merged sql/item_cmpfunc.cc: Auto merged sql/item_func.cc: Auto merged sql/mysql_priv.h: Auto merged sql/share/danish/errmsg.txt: Auto merged sql/share/english/errmsg.txt: Auto merged sql/share/french/errmsg.txt: Auto merged sql/share/german/errmsg.txt: Auto merged sql/share/greek/errmsg.txt: Auto merged sql/share/hungarian/errmsg.txt: Auto merged sql/sql_show.cc: Auto merged sql/share/italian/errmsg.txt: Auto merged sql/share/japanese/errmsg.txt: Auto merged sql/share/korean/errmsg.txt: Auto merged sql/share/norwegian-ny/errmsg.txt: Auto merged sql/share/norwegian/errmsg.txt: Auto merged sql/share/polish/errmsg.txt: Auto merged sql/share/portuguese/errmsg.txt: Auto merged sql/share/romanian/errmsg.txt: Auto merged sql/share/russian/errmsg.txt: Auto merged sql/share/slovak/errmsg.txt: Auto merged sql/share/spanish/errmsg.txt: Auto merged sql/share/swedish/errmsg.txt: Auto merged sql/share/ukrainian/errmsg.txt: Auto merged
2002-04-25 01:16:42 +03:00
lenz@kallisto.mysql.com
merge BitKeeper/etc/logging_ok: auto-union
2002-05-09 06:29:49 +03:00
lenz@mysql.com
Initial revision of NDB Cluster files BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
2004-04-14 10:53:21 +02:00
magnus@neptunus.(none)
Remove unnecessary files .del-univoldmysql.i~9253a6f92058c565: Delete: innobase/include/univoldmysql.i .del-univold.i~4b5ed652407f63f1: Delete: innobase/include/univold.i .del-tsut.c~4a154913fc9cd5c0: Delete: innobase/ut/ts/tsut.c .del-makefile~9b8356bbdb8bd94e: Delete: innobase/ut/ts/makefile .del-tsttrxold.c~eb6fd6091405d54e: Delete: innobase/trx/ts/tsttrxold.c .del-tstrx.c~5425c98548ec1e0d: Delete: innobase/trx/ts/tstrx.c .del-makefile~16d63c17c8edf62a: Delete: innobase/trx/ts/makefile .del-tsthr.c~b095667070d626a9: Delete: innobase/thr/ts/tsthr.c .del-makefile~d5e4661188c1939d: Delete: innobase/thr/ts/makefile .del-tssync.c~fed4676cd4eb8457: Delete: innobase/sync/ts/tssync.c .del-makefile~f23368879649c806: Delete: innobase/sync/ts/makefile .del-tssrv.c~b8a6f5ad9ae639c8: Delete: innobase/srv/ts/tssrv.c .del-tsdbc.c~d36206bdccf338f: Delete: innobase/srv/ts/tsdbc.c .del-makefile~da6e87ef29c12dca: Delete: innobase/srv/ts/makefile .del-tstcur.c~a9d5cf73b020ec41: Delete: innobase/row/ts/tstcur.c .del-makefile~2cdfe39689004e6: Delete: innobase/row/ts/makefile .del-tsrem.c~bb4e1e2e8c2ee179: Delete: innobase/rem/ts/tsrem.c .del-makefile~3e48a33b4970faef: Delete: innobase/rem/ts/makefile .del-tspage.c~f5baf63f9924e43b: Delete: innobase/page/ts/tspage.c .del-makefile~66de73bc499566f9: Delete: innobase/page/ts/makefile .del-tsosaux.c~9ec97a83392a984c: Delete: innobase/os/ts/tsosaux.c .del-tsos.c~f6057d3c171f5915: Delete: innobase/os/ts/tsos.c .del-makefile~9a1d210afa6d666e: Delete: innobase/os/ts/makefile .del-tsmtr.c~293250c7ebfe0d3: Delete: innobase/mtr/ts/tsmtr.c .del-tsbuf.c~e8d15ee095194d2c: Delete: innobase/mtr/ts/tsbuf.c .del-makefile~fdf4c2a4ddb23230: Delete: innobase/mtr/ts/makefile .del-tsmem.c~cc483e2ab96e625c: Delete: innobase/mem/ts/tsmem.c .del-makefile~6d58ab1de0ac572: Delete: innobase/mem/ts/makefile .del-tsmach.c~af65166bb53ddfe9: Delete: innobase/mach/ts/tsmach.c .del-makefile~b8cbd25992ee51b: Delete: innobase/mach/ts/makefile .del-tsha.c~13dd5ea03fda370c: Delete: innobase/ha/ts/tsha.c .del-makefile~1bf12ce7b2dadfd5: Delete: innobase/ha/ts/makefile .del-tsfsp.c~890ead1636f0eaba: Delete: innobase/fsp/ts/tsfsp.c .del-makefile~a466e9eb27493a80: Delete: innobase/fsp/ts/makefile .del-del.c~35c6283be580200: Delete: innobase/fsp/ts/del.c .del-tsfil.c~e554b6f3c189c081: Delete: innobase/fil/ts/tsfil.c .del-makefile~1df6f952a960fef4: Delete: innobase/fil/ts/makefile .del-tsdyn.c~6f976764b53f3191: Delete: innobase/dyn/ts/tsdyn.c .del-makefile~f64427335fafdc65: Delete: innobase/dyn/ts/makefile .del-tsdict.c~5e82f7b8ac2b2e15: Delete: innobase/dict/ts/tsdict.c .del-makefile~6356c424e9747647: Delete: innobase/dict/ts/makefile .del-tscom.c~26aae2c5c4ca1dce: Delete: innobase/com/ts/tscom.c .del-tscli.c~2f3e4b281141eac2: Delete: innobase/com/ts/tscli.c .del-makefile~608fd39568db7238: Delete: innobase/com/ts/makefile .del-tsos.c~1dadfc1ef69f2ba3: Delete: innobase/buf/ts/tsos.c .del-tsbuf.c~b4c3feee158ef154: Delete: innobase/buf/ts/tsbuf.c .del-makefile~598acb06bf1e466: Delete: innobase/buf/ts/makefile .del-tscli.c~8d35740cc1f6f864: Delete: innobase/btr/ts/trash/tscli.c .del-tssrv.c~ee30b746c485aec: Delete: innobase/btr/ts/tssrv.c .del-tss.c~21ae628550141a68: Delete: innobase/btr/ts/tss.c .del-tsrecv97.c~dbeb3bc494b241c1: Delete: innobase/btr/ts/tsrecv97.c .del-tsrecv.c~3415f8a936a8d9fd: Delete: innobase/btr/ts/tsrecv.c .del-tscli.c~77fc1962db99aa2e: Delete: innobase/btr/ts/tscli.c .del-tsbtrold5.c~72a60e768c944904: Delete: innobase/btr/ts/trash/tsbtrold5.c .del-tsbtrins.c~3e3bb3f95f058b46: Delete: innobase/btr/ts/tsbtrins.c .del-TSIT.C~f53cce6fab8d325: Delete: innobase/btr/ts/trash/TSIT.C .del-tsbtrfull.c~fbcbe41b64cc71b6: Delete: innobase/btr/ts/tsbtrfull.c .del-tsbtr97.c~84dbb84ea9fa267c: Delete: innobase/btr/ts/tsbtr97.c .del-makefile~491918b4162b927c: Delete: innobase/btr/ts/makefile .del-isql.c~bc0b8cc213905175: Delete: innobase/btr/ts/isql.c BitKeeper/deleted/.del-isql.c~bc0b8cc213905175: Delete: innobase/btr/ts/isql.c BitKeeper/deleted/.del-makefile~491918b4162b927c: Delete: innobase/btr/ts/makefile BitKeeper/deleted/.del-tsbtr97.c~84dbb84ea9fa267c: Delete: innobase/btr/ts/tsbtr97.c BitKeeper/deleted/.del-tsbtrfull.c~fbcbe41b64cc71b6: Delete: innobase/btr/ts/tsbtrfull.c BitKeeper/deleted/.del-TSIT.C~f53cce6fab8d325: Delete: innobase/btr/ts/trash/TSIT.C BitKeeper/deleted/.del-tsbtrins.c~3e3bb3f95f058b46: Delete: innobase/btr/ts/tsbtrins.c BitKeeper/deleted/.del-tsbtrold5.c~72a60e768c944904: Delete: innobase/btr/ts/trash/tsbtrold5.c BitKeeper/deleted/.del-tscli.c~77fc1962db99aa2e: Delete: innobase/btr/ts/tscli.c BitKeeper/deleted/.del-tsrecv.c~3415f8a936a8d9fd: Delete: innobase/btr/ts/tsrecv.c BitKeeper/deleted/.del-tsrecv97.c~dbeb3bc494b241c1: Delete: innobase/btr/ts/tsrecv97.c BitKeeper/deleted/.del-tss.c~21ae628550141a68: Delete: innobase/btr/ts/tss.c BitKeeper/deleted/.del-tssrv.c~ee30b746c485aec: Delete: innobase/btr/ts/tssrv.c BitKeeper/deleted/.del-tscli.c~8d35740cc1f6f864: Delete: innobase/btr/ts/trash/tscli.c BitKeeper/deleted/.del-makefile~598acb06bf1e466: Delete: innobase/buf/ts/makefile BitKeeper/deleted/.del-tsbuf.c~b4c3feee158ef154: Delete: innobase/buf/ts/tsbuf.c BitKeeper/deleted/.del-tsos.c~1dadfc1ef69f2ba3: Delete: innobase/buf/ts/tsos.c BitKeeper/deleted/.del-makefile~608fd39568db7238: Delete: innobase/com/ts/makefile BitKeeper/deleted/.del-tscli.c~2f3e4b281141eac2: Delete: innobase/com/ts/tscli.c BitKeeper/deleted/.del-tscom.c~26aae2c5c4ca1dce: Delete: innobase/com/ts/tscom.c BitKeeper/deleted/.del-makefile~6356c424e9747647: Delete: innobase/dict/ts/makefile BitKeeper/deleted/.del-tsdict.c~5e82f7b8ac2b2e15: Delete: innobase/dict/ts/tsdict.c BitKeeper/deleted/.del-makefile~f64427335fafdc65: Delete: innobase/dyn/ts/makefile BitKeeper/deleted/.del-tsdyn.c~6f976764b53f3191: Delete: innobase/dyn/ts/tsdyn.c BitKeeper/deleted/.del-makefile~1df6f952a960fef4: Delete: innobase/fil/ts/makefile BitKeeper/deleted/.del-tsfil.c~e554b6f3c189c081: Delete: innobase/fil/ts/tsfil.c BitKeeper/deleted/.del-del.c~35c6283be580200: Delete: innobase/fsp/ts/del.c BitKeeper/deleted/.del-makefile~a466e9eb27493a80: Delete: innobase/fsp/ts/makefile BitKeeper/deleted/.del-tsfsp.c~890ead1636f0eaba: Delete: innobase/fsp/ts/tsfsp.c BitKeeper/deleted/.del-makefile~1bf12ce7b2dadfd5: Delete: innobase/ha/ts/makefile BitKeeper/deleted/.del-tsha.c~13dd5ea03fda370c: Delete: innobase/ha/ts/tsha.c BitKeeper/deleted/.del-makefile~b8cbd25992ee51b: Delete: innobase/mach/ts/makefile BitKeeper/deleted/.del-tsmach.c~af65166bb53ddfe9: Delete: innobase/mach/ts/tsmach.c BitKeeper/deleted/.del-makefile~6d58ab1de0ac572: Delete: innobase/mem/ts/makefile BitKeeper/deleted/.del-tsmem.c~cc483e2ab96e625c: Delete: innobase/mem/ts/tsmem.c BitKeeper/deleted/.del-makefile~fdf4c2a4ddb23230: Delete: innobase/mtr/ts/makefile BitKeeper/deleted/.del-tsbuf.c~e8d15ee095194d2c: Delete: innobase/mtr/ts/tsbuf.c BitKeeper/deleted/.del-tsmtr.c~293250c7ebfe0d3: Delete: innobase/mtr/ts/tsmtr.c BitKeeper/deleted/.del-makefile~9a1d210afa6d666e: Delete: innobase/os/ts/makefile BitKeeper/deleted/.del-tsos.c~f6057d3c171f5915: Delete: innobase/os/ts/tsos.c BitKeeper/deleted/.del-tsosaux.c~9ec97a83392a984c: Delete: innobase/os/ts/tsosaux.c BitKeeper/deleted/.del-makefile~66de73bc499566f9: Delete: innobase/page/ts/makefile BitKeeper/deleted/.del-tspage.c~f5baf63f9924e43b: Delete: innobase/page/ts/tspage.c BitKeeper/deleted/.del-makefile~3e48a33b4970faef: Delete: innobase/rem/ts/makefile BitKeeper/deleted/.del-tsrem.c~bb4e1e2e8c2ee179: Delete: innobase/rem/ts/tsrem.c BitKeeper/deleted/.del-makefile~2cdfe39689004e6: Delete: innobase/row/ts/makefile BitKeeper/deleted/.del-tstcur.c~a9d5cf73b020ec41: Delete: innobase/row/ts/tstcur.c BitKeeper/deleted/.del-makefile~da6e87ef29c12dca: Delete: innobase/srv/ts/makefile BitKeeper/deleted/.del-tsdbc.c~d36206bdccf338f: Delete: innobase/srv/ts/tsdbc.c BitKeeper/deleted/.del-tssrv.c~b8a6f5ad9ae639c8: Delete: innobase/srv/ts/tssrv.c BitKeeper/deleted/.del-makefile~f23368879649c806: Delete: innobase/sync/ts/makefile BitKeeper/deleted/.del-tssync.c~fed4676cd4eb8457: Delete: innobase/sync/ts/tssync.c BitKeeper/deleted/.del-makefile~d5e4661188c1939d: Delete: innobase/thr/ts/makefile BitKeeper/deleted/.del-tsthr.c~b095667070d626a9: Delete: innobase/thr/ts/tsthr.c BitKeeper/deleted/.del-makefile~16d63c17c8edf62a: Delete: innobase/trx/ts/makefile BitKeeper/deleted/.del-tstrx.c~5425c98548ec1e0d: Delete: innobase/trx/ts/tstrx.c BitKeeper/deleted/.del-tsttrxold.c~eb6fd6091405d54e: Delete: innobase/trx/ts/tsttrxold.c BitKeeper/deleted/.del-makefile~9b8356bbdb8bd94e: Delete: innobase/ut/ts/makefile BitKeeper/deleted/.del-tsut.c~4a154913fc9cd5c0: Delete: innobase/ut/ts/tsut.c BitKeeper/deleted/.del-univold.i~4b5ed652407f63f1: Delete: innobase/include/univold.i BitKeeper/deleted/.del-univoldmysql.i~9253a6f92058c565: Delete: innobase/include/univoldmysql.i BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
2004-02-19 11:32:07 +02:00
marko@hundin.mysql.fi
Fix error msg. Bug #681 BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
2003-06-19 12:17:23 -04:00
miguel@hegel.(none)
merged BitKeeper/etc/logging_ok: auto-union Build-tools/Do-compile: Auto merged Docs/manual.texi: Auto merged innobase/configure.in: Auto merged innobase/os/os0file.c: Auto merged innobase/os/os0thread.c: Auto merged innobase/pars/lexyy.c: Auto merged innobase/pars/pars0grm.c: Auto merged innobase/pars/pars0grm.y: Auto merged innobase/pars/pars0lex.l: Auto merged innobase/row/row0mysql.c: Auto merged
2002-08-31 23:38:10 +00:00
miguel@hegel.br
merge with 3.23.50 BitKeeper/etc/logging_ok: auto-union BUILD/SETUP.sh: Auto merged Build-tools/Do-compile: Auto merged Build-tools/Do-rpm: Auto merged configure.in: Auto merged include/mysql_com.h: Auto merged innobase/btr/btr0btr.c: Auto merged innobase/btr/btr0cur.c: Auto merged innobase/btr/btr0sea.c: Auto merged innobase/dict/dict0dict.c: Auto merged innobase/dict/dict0load.c: Auto merged innobase/fil/fil0fil.c: Auto merged innobase/fsp/fsp0fsp.c: Auto merged innobase/include/srv0srv.h: Auto merged innobase/include/sync0rw.ic: Auto merged innobase/log/log0log.c: Auto merged innobase/rem/rem0cmp.c: Auto merged innobase/row/row0ins.c: Auto merged innobase/row/row0sel.c: Auto merged innobase/row/row0upd.c: Auto merged innobase/srv/srv0srv.c: Auto merged innobase/srv/srv0start.c: Auto merged myisam/myisampack.c: Auto merged mysql-test/t/range.test: Auto merged scripts/mysqldumpslow.sh: Auto merged sql/ha_innodb.h: Auto merged sql/handler.cc: Auto merged sql/handler.h: Auto merged sql/item.cc: Auto merged sql/item.h: Auto merged sql/item_func.cc: Auto merged sql/item_func.h: Auto merged sql/lock.cc: Auto merged sql/share/Makefile.am: Auto merged sql/sql_rename.cc: Auto merged sql/sql_select.cc: Auto merged sql/sql_show.cc: Auto merged support-files/mysql.spec.sh: Auto merged Docs/manual.texi: merge client/mysql.cc: merge client/mysqldump.c: merge innobase/buf/buf0buf.c: merge innobase/os/os0file.c: merge innobase/row/row0mysql.c: merge mysql-test/r/range.result: merge sql/ha_innodb.cc: merge sql/log_event.h: merge sql/mysqld.cc: merge sql/sql_base.cc: merge sql/sql_load.cc: merge
2002-03-27 01:56:10 +02:00
miguel@hegel.local
Merge pmartin@work.mysql.com:/home/bk/mysql-4.0 into mysql.com:/home/pem/work/mysql-4.0 BitKeeper/etc/logging_ok: auto-union
2002-10-15 16:12:53 +02:00
miguel@light.
manual.texi updated MyOLEDB section Docs/manual.texi: updated MyOLEDB section BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
2001-12-24 10:15:04 +01:00
miguel@light.local
Translation updated BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
2003-06-08 02:53:41 -04:00
miguel@sartre.local
config-win.h: Enable 'LOAD LOCAL INFILE', for parity with unix binaries. include/config-win.h: Enable 'LOAD LOCAL INFILE', for parity with unix binaries. BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
2003-04-23 13:43:31 -05:00
mmatthew@markslaptop.
manual.texi updated MyOLEDB section Docs/manual.texi: updated MyOLEDB section BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
2001-12-24 10:15:04 +01:00
monty@bitch.mysql.fi
Portability fixes for Fortre C++ 5.0 (on Sun) in 32 and 64 bit modes. client/mysqlbinlog.cc: Portability fix configure.in: Added use of ASFLAGS (For Solaris with Forte 5.0) include/my_global.h: Portability fix include/myisam.h: Portability fix include/queues.h: Portability fix innobase/include/ut0ut.h: Portability fix innobase/log/log0log.c: Portability fix innobase/rem/rem0cmp.c: Portability fix innobase/trx/trx0sys.c: Portability fix isam/pack_isam.c: Portability fix myisam/ft_boolean_search.c: Portability fix myisam/mi_dynrec.c: Code change to go around bug in Forte 5.0 myisam/sort.c: Portability fix mysys/my_aes.c: Portability fix scripts/Makefile.am: Support for ASFLAGS scripts/mysqlbug.sh: Support for ASFLAGS sql/field.cc: Portability fix sql/filesort.cc: Portability fix sql/gen_lex_hash.cc: Portability fix sql/ha_innodb.cc: Portability fix Changed SHOW INNODB STATUS to return error instead of writing message to log file. sql/ha_isammrg.cc: Portability fix sql/ha_myisam.cc: Portability fix sql/ha_myisammrg.cc: Portability fix sql/hash_filo.h: Portability fix sql/hostname.cc: Portability fix sql/item_cmpfunc.h: Indentation change sql/item_func.cc: Portability fix sql/item_func.h: Portability fix sql/log.cc: Portability fix sql/log_event.cc: Portability fix sql/mysql_priv.h: Portability fix sql/mysqld.cc: Portability fix Fixed bug with rpl_recovery_rank command line option on 64 bit systems sql/opt_range.cc: Portability fix sql/repl_failsafe.cc: Portability fix sql/slave.cc: Portability fix sql/slave.h: Portability fix sql/sql_acl.cc: Portability fix sql/sql_base.cc: Portability fix sql/sql_cache.cc: Portability fix sql/sql_cache.h: Portability fix sql/sql_class.cc: Portability fix sql/sql_delete.cc: Portability fix sql/sql_insert.cc: Portability fix sql/sql_manager.cc: Portability fix sql/sql_parse.cc: Portability fix BUILD/compile-solaris-sparc-forte: C sql/sql_udf.cc: Portability fix sql/sql_update.cc: Portability fix strings/Makefile.am: Portability fix strings/bmove_upp-sparc.s: Fix so that this works on 32 and 64 bit sparcs strings/str_test.c: Cleanup strings/strappend-sparc.s: Fix so that this works on 32 and 64 bit sparcs strings/strend-sparc.s: Fix so that this works on 32 and 64 bit sparcs strings/strmake-sparc.s: Fix so that this works on 32 and 64 bit sparcs strings/strmov-sparc.s: Fix so that this works on 32 and 64 bit sparcs strings/strnmov-sparc.s: Fix so that this works on 32 and 64 bit sparcs strings/strstr-sparc.s: Fix so that this works on 32 and 64 bit sparcs strings/strxmov-sparc.s: Fixes to make this more portable, but it's still not usable on 64 bit systems :( BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
2002-11-07 03:54:00 +02:00
monty@butch.
manual.texi updated MyOLEDB section Docs/manual.texi: updated MyOLEDB section BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
2001-12-24 10:15:04 +01:00
monty@donna.mysql.fi
monty@hundin.mysql.fi
Merge bk-internal.mysql.com:/home/bk/mysql-4.1 into mashka.(none):/home/my/mysql-4.1 BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
2003-07-15 15:53:20 +03:00
monty@mashka.(none)
Merge BitKeeper/etc/logging_ok: auto-union sql/item_create.cc: Auto merged sql/item_strfunc.cc: Auto merged sql/lex.h: Auto merged client/mysqldump.c: SCCS merged
2002-06-14 15:24:22 +04:00
monty@mashka.mysql.fi
Merge with 4.0 innobase/dict/dict0boot.c: Auto merged innobase/dict/dict0load.c: Auto merged innobase/dict/dict0mem.c: Auto merged innobase/fut/fut0lst.c: Auto merged innobase/include/buf0lru.h: Auto merged innobase/include/dict0mem.h: Auto merged innobase/include/fsp0fsp.h: Auto merged innobase/include/ha0ha.h: Auto merged innobase/include/ibuf0ibuf.h: Auto merged innobase/include/lock0lock.h: Auto merged innobase/include/log0log.h: Auto merged innobase/include/mem0pool.h: Auto merged innobase/include/mtr0mtr.h: Auto merged innobase/include/os0file.h: Auto merged innobase/include/rem0rec.h: Auto merged innobase/include/rem0rec.ic: Auto merged innobase/include/srv0srv.h: Auto merged innobase/include/sync0sync.h: Auto merged innobase/include/trx0sys.h: Auto merged innobase/include/ut0byte.h: Auto merged innobase/include/ut0ut.h: Auto merged innobase/mem/mem0pool.c: Auto merged innobase/mtr/mtr0mtr.c: Auto merged innobase/os/os0proc.c: Auto merged innobase/pars/lexyy.c: Auto merged innobase/pars/pars0opt.c: Auto merged innobase/row/row0ins.c: Auto merged innobase/row/row0purge.c: Auto merged innobase/row/row0uins.c: Auto merged innobase/row/row0umod.c: Auto merged innobase/row/row0undo.c: Auto merged innobase/row/row0upd.c: Auto merged innobase/trx/trx0purge.c: Auto merged innobase/trx/trx0roll.c: Auto merged innobase/trx/trx0sys.c: Auto merged innobase/trx/trx0undo.c: Auto merged innobase/ut/ut0byte.c: Auto merged pstack/bucomm.h: Auto merged pstack/budbg.h: Auto merged sql/item_sum.h: Auto merged sql/slave.cc: Auto merged sql/sql_db.cc: Auto merged support-files/mysql.spec.sh: Auto merged tests/insert_test.c: Auto merged mysql-test/t/func_group.test: Merge with 4.0 Put 4.1 tests lasts sql/ha_innodb.cc: Merge with 4.0 Added checking of results from my_malloc() BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
2004-04-26 15:53:31 +03:00
monty@mishka.local
merge sql/item_strfunc.cc: Auto merged sql/lock.cc: Auto merged sql/repl_failsafe.cc: Auto merged sql/set_var.cc: Auto merged sql/sql_prepare.cc: Auto merged sql/sql_table.cc: Auto merged sql/sql_yacc.yy: Auto merged sql/table.cc: Auto merged BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted sql/net_serv.cc: Auto merged sql/sql_parse.cc: Auto merged
2003-09-24 10:24:56 +03:00
monty@mishka.mysql.fi
Cleanups (comments and compiler warnings) dded init of variable to fix core dump on startup errors mysql-test/Makefile.am: Added transformation of socket address for mysql-test-run mysql-test/mysql-test-run.sh: Added option --socket sql/derror.cc: Removed compiler warning sql/mysql_priv.h: Moved assert up to be able to use asserts in other header files sql/mysqld.cc: Fixed comment sql/sql_bitmap.h: Added copyright notice Removed not needed header files sql/sql_class.cc: Added init of variable to fix core dump on startup errors sql/sql_test.cc: Fixed compiler errors (from key_map code) BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
2003-11-02 14:00:25 +02:00
monty@mysql.com
merge BitKeeper/etc/logging_ok: auto-union
2002-05-09 06:29:49 +03:00
monty@narttu.
Merge hundin:/my/mysql-4.0 into narttu.mysql.fi:/my/mysql-4.0 BitKeeper/etc/logging_ok: auto-union Docs/manual.texi: Auto merged
2002-04-26 14:20:56 +03:00
monty@narttu.mysql.fi
Merge work:/home/bk/mysql-4.0 into rescue.:/my/bk/mysql-4.0 BitKeeper/etc/logging_ok: auto-union
2002-09-05 14:00:05 +03:00
monty@rescue.
merge with 3.23.51 BitKeeper/etc/ignore: auto-union BitKeeper/etc/logging_ok: auto-union BitKeeper/deleted/.del-mysql_fix_extensions.sh: Delete: scripts/mysql_fix_extensions.sh Build-tools/Do-rpm: Auto merged Makefile.am: Auto merged client/mysqldump.c: Auto merged client/mysqltest.c: Auto merged extra/resolve_stack_dump.c: Auto merged include/my_pthread.h: Auto merged include/my_sys.h: Auto merged include/mysqld_error.h: Auto merged innobase/row/row0ins.c: Auto merged innobase/row/row0mysql.c: Auto merged innobase/row/row0sel.c: Auto merged isam/pack_isam.c: Auto merged libmysql/libmysql.c: Auto merged mysql-test/r/func_if.result: Auto merged mysql-test/t/join.test: Auto merged mysys/array.c: Auto merged mysys/charset.c: Auto merged mysys/default.c: Auto merged mysys/hash.c: Auto merged mysys/my_thr_init.c: Auto merged mysys/raid.cc: Auto merged mysql-test/t/type_decimal.test: Auto merged sql/hostname.cc: Auto merged sql/item.h: Auto merged sql/item_cmpfunc.h: Auto merged sql/item_timefunc.h: Auto merged sql/log.cc: Auto merged sql/mini_client.cc: Auto merged sql/sql_parse.cc: Auto merged sql/sql_select.cc: Auto merged strings/Makefile.am: Auto merged
2002-05-16 18:20:49 +03:00
monty@tik.
manual.texi updated MyOLEDB section Docs/manual.texi: updated MyOLEDB section BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
2001-12-24 10:15:04 +01:00
monty@tik.mysql.fi
monty@tramp.mysql.fi
monty@work.mysql.com
Snippet from the Internet: Common Symbols If you get errors in linking complaining about common symbols ld: common symbols not allowed with MH_DYLIB format Then it means that you've got a global variable in the library which has not been assigned a value. Got this problem with three globals in NdbDaemon.c BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
2004-05-13 19:49:10 +02:00
mronstrom@mysql.com
Fix for BUG#3839 , too many signal handlers installed ndb/src/kernel/ndb-main/Main.cpp: Only install signalhandlers up to SIGRTMIN BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
2004-05-20 21:56:29 +02:00
msvensson@build.mysql.com
mysqldump.c: Added missing 'Q' for -Q option client/mysqldump.c: Added missing 'Q' for -Q option BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
2002-01-13 01:29:21 -06:00
mwagner@cash.mwagner.org
manual.texi updated MyOLEDB section Docs/manual.texi: updated MyOLEDB section BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
2001-12-24 10:15:04 +01:00
mwagner@evoq.mwagner.org
Merge pmartin@work.mysql.com:/home/bk/mysql-4.0 into mysql.com:/home/pem/work/mysql-4.0 BitKeeper/etc/logging_ok: auto-union
2002-10-15 16:12:53 +02:00
mwagner@work.mysql.com
Fixed a type mismatch between int_table_flags and table_flags() in MyISAM handler. BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
2004-03-04 22:53:48 +01:00
mydev@mysql.com
New function my_charset_same() BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
2003-03-16 17:19:24 +04:00
mysql@home.(none)
my_global.h: - QNX 6.2.1 actually defines HAVE_RINT - fixed rint(A) #define as it was causing compile errors on QNX include/my_global.h: - QNX 6.2.1 actually defines HAVE_RINT - fixed rint(A) #define as it was causing compile errors on QNX BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
2003-05-16 13:03:47 +02:00
mysqldev@build.mysql2.com
Forte compile fixes BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
2004-05-19 14:38:38 +02:00
mysqldev@mysql.com
Inverted #ifdef on HAVE_MLOCKALL BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
2004-05-11 22:23:29 +02:00
ndbdev@ndbmaster.mysql.com
merged BitKeeper/etc/logging_ok: auto-union Build-tools/Do-compile: Auto merged Docs/manual.texi: Auto merged innobase/configure.in: Auto merged innobase/os/os0file.c: Auto merged innobase/os/os0thread.c: Auto merged innobase/pars/lexyy.c: Auto merged innobase/pars/pars0grm.c: Auto merged innobase/pars/pars0grm.y: Auto merged innobase/pars/pars0lex.l: Auto merged innobase/row/row0mysql.c: Auto merged
2002-08-31 23:38:10 +00:00
nick@mysql.com
merge with 3.23.51 BitKeeper/etc/ignore: auto-union BitKeeper/etc/logging_ok: auto-union BitKeeper/deleted/.del-mysql_fix_extensions.sh: Delete: scripts/mysql_fix_extensions.sh Build-tools/Do-rpm: Auto merged Makefile.am: Auto merged client/mysqldump.c: Auto merged client/mysqltest.c: Auto merged extra/resolve_stack_dump.c: Auto merged include/my_pthread.h: Auto merged include/my_sys.h: Auto merged include/mysqld_error.h: Auto merged innobase/row/row0ins.c: Auto merged innobase/row/row0mysql.c: Auto merged innobase/row/row0sel.c: Auto merged isam/pack_isam.c: Auto merged libmysql/libmysql.c: Auto merged mysql-test/r/func_if.result: Auto merged mysql-test/t/join.test: Auto merged mysys/array.c: Auto merged mysys/charset.c: Auto merged mysys/default.c: Auto merged mysys/hash.c: Auto merged mysys/my_thr_init.c: Auto merged mysys/raid.cc: Auto merged mysql-test/t/type_decimal.test: Auto merged sql/hostname.cc: Auto merged sql/item.h: Auto merged sql/item_cmpfunc.h: Auto merged sql/item_timefunc.h: Auto merged sql/log.cc: Auto merged sql/mini_client.cc: Auto merged sql/sql_parse.cc: Auto merged sql/sql_select.cc: Auto merged strings/Makefile.am: Auto merged
2002-05-16 18:20:49 +03:00
nick@nick.leippe.com
Added options reconnect/enable-reconnect/disable-reconnect/skip-reconnect to the 'mysql' command-line client. Disabling can be safer when the server silently dies & restarts. This is for SCRUM task #727. client/client_priv.h: Added options reconnect/enable-reconnect/disable-reconnect/skip-reconnect to the 'mysql' command-line client client/mysql.cc: Added options reconnect/enable-reconnect/disable-reconnect/skip-reconnect to the 'mysql' command-line client. Disabling can be safer when the server silently dies & restarts. BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
2003-03-01 23:34:34 +01:00
papa@gbichot.local
logging_ok: Logging to logging@openlogging.org accepted Do-compile: 1. Option to ensure that logs are moved and then backed up on each host prior to a build 2. Option to run build with flag "--without-ndbcluster" Build-tools/Do-compile: 1. Option to ensure that logs are moved and then backed up on each host prior to a build 2. Option to run build with flag "--without-ndbcluster" BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
2004-05-24 17:20:22 -07:00
patg@krsna.patg.net
manual.texi updated MyOLEDB section Docs/manual.texi: updated MyOLEDB section BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
2001-12-24 10:15:04 +01:00
paul@central.snake.net
perror.c: fix typo. extra/perror.c: fix typo. BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
2003-07-12 11:45:43 -05:00
paul@ice.local
ft_update.c: Fix parse error per serg instructions. myisam/ft_update.c: Fix parse error per serg instructions. BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
2003-06-11 16:27:26 -05:00
paul@ice.snake.net
my-medium.cnf.sh: Correct typo, and fix up rest of sentence as well. support-files/my-medium.cnf.sh: Correct typo, and fix up rest of sentence as well. BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
2004-04-28 11:50:32 -05:00
paul@kite-hub.kitebird.com
manual.texi updated MyOLEDB section Docs/manual.texi: updated MyOLEDB section BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
2001-12-24 10:15:04 +01:00
paul@teton.kitebird.com
fix ndb odbc compile BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
2004-05-18 09:58:30 +02:00
pekka@mysql.com
Merge pmartin@work.mysql.com:/home/bk/mysql-4.0 into mysql.com:/home/pem/work/mysql-4.0 BitKeeper/etc/logging_ok: auto-union
2002-10-15 16:12:53 +02:00
pem@mysql.com
Merge BitKeeper/etc/logging_ok: auto-union sql/item_create.cc: Auto merged sql/item_strfunc.cc: Auto merged sql/lex.h: Auto merged client/mysqldump.c: SCCS merged
2002-06-14 15:24:22 +04:00
peter@linux.local
Merge changes in docs do go further BitKeeper/etc/logging_ok: auto-union Docs/manual.texi: Automerge (Arjen please check)
2002-07-19 00:06:33 +04:00
peter@mysql.com
Modify PeterG's internals documentation per Monty. Added more detailed explanation of record header and column storage. BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
2003-04-23 11:43:30 -07:00
peterg@mysql.com
Added PeterG's new internals documenation. Docs/internals.texi: Added PeterG's new internals documentation. BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
2003-03-12 21:35:57 -08:00
pgulutzan@linux.local
fix for r-tree code (memory overlap reported by valgrind) new comments. myisam/mi_open.c: fix for r-tree code (memory overlap reported by valgrind) myisam/myisamdef.h: fix for r-tree code (memory overlap reported by valgrind) myisam/rt_index.c: fix for r-tree code (memory overlap reported by valgrind) BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
2003-11-04 17:58:18 +04:00
ram@deer.(none)
Fix for the bug #1333: COMPRESS(NULL) segfaults. mysql-test/r/func_compress.result: Test for the bug #1333: COMPRESS(NULL) segfaults. mysql-test/t/func_compress.test: Test for the bug #1333: COMPRESS(NULL) segfaults. BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
2003-09-19 12:25:03 +05:00
ram@gw.mysql.r18.ru
merge with 4.0 BitKeeper/etc/ignore: auto-union BitKeeper/etc/logging_ok: auto-union BUILD/SETUP.sh: Auto merged BUILD/compile-pentium-debug: Auto merged BitKeeper/triggers/post-commit: Auto merged configure.in: Auto merged Docs/manual.texi: Auto merged client/mysql.cc: Auto merged client/mysqldump.c: Auto merged client/mysqltest.c: Auto merged extra/mysql_install.c: Auto merged extra/resolve_stack_dump.c: Auto merged extra/resolveip.c: Auto merged include/my_sys.h: Auto merged include/mysqld_error.h: Auto merged isam/pack_isam.c: Auto merged libmysql/Makefile.shared: Auto merged libmysql/libmysql.c: Auto merged myisam/ft_dump.c: Auto merged myisam/ft_test1.c: Auto merged myisam/ftdefs.h: Auto merged myisam/mi_check.c: Auto merged myisam/mi_test1.c: Auto merged myisam/mi_write.c: Auto merged myisam/myisamchk.c: Auto merged myisam/myisampack.c: Auto merged mysql-test/mysql-test-run.sh: Auto merged mysql-test/r/select_found.result: Auto merged mysql-test/t/select_found.test: Auto merged mysys/charset.c: Auto merged mysys/default.c: Auto merged mysys/hash.c: Auto merged sql/field.cc: Auto merged sql/gen_lex_hash.cc: Auto merged sql/ha_innodb.cc: Auto merged sql/hostname.cc: Auto merged sql/item_cmpfunc.h: Auto merged sql/item_strfunc.cc: Auto merged sql/item_timefunc.h: Auto merged sql/lex.h: Auto merged sql/log.cc: Auto merged sql/mysql_priv.h: Auto merged sql/repl_failsafe.cc: Auto merged sql/slave.cc: Auto merged sql/sql_acl.cc: Auto merged sql/sql_base.cc: Auto merged sql/sql_cache.cc: Auto merged sql/sql_class.cc: Auto merged sql/sql_class.h: Auto merged sql/sql_db.cc: Auto merged sql/sql_parse.cc: Auto merged sql/sql_select.cc: Auto merged sql/sql_string.cc: Auto merged sql/sql_table.cc: Auto merged sql/sql_union.cc: Auto merged sql/share/czech/errmsg.txt: Auto merged sql/share/danish/errmsg.txt: Auto merged sql/share/dutch/errmsg.txt: Auto merged sql/share/english/errmsg.txt: Auto merged sql/share/estonian/errmsg.txt: Auto merged sql/share/german/errmsg.txt: Auto merged sql/share/greek/errmsg.txt: Auto merged sql/share/hungarian/errmsg.txt: Auto merged sql/share/italian/errmsg.txt: Auto merged sql/share/japanese/errmsg.txt: Auto merged sql/share/korean/errmsg.txt: Auto merged sql/share/norwegian-ny/errmsg.txt: Auto merged sql/share/norwegian/errmsg.txt: Auto merged sql/sql_update.cc: Auto merged sql/structs.h: Auto merged sql/share/polish/errmsg.txt: Auto merged sql/share/portuguese/errmsg.txt: Auto merged sql/share/romanian/errmsg.txt: Auto merged sql/share/russian/errmsg.txt: Auto merged sql/share/slovak/errmsg.txt: Auto merged sql/share/spanish/errmsg.txt: Auto merged sql/share/swedish/errmsg.txt: Auto merged sql/share/ukrainian/errmsg.txt: Auto merged strings/Makefile.am: Auto merged strings/ctype-ujis.c: Auto merged tools/mysqlmanager.c: Auto merged
2002-06-03 12:59:31 +03:00
ram@gw.udmsearch.izhnet.ru
Merge mysql.r18.ru:/usr/home/ram/mysql-4.1.last into mysql.r18.ru:/usr/home/ram/mysql-4.1 BitKeeper/etc/logging_ok: auto-union sql/ha_heap.cc: Auto merged
2002-10-03 17:26:05 +05:00
ram@mysql.r18.ru
Merge sergbook.mysql.com:/usr/home/serg/Abk/mysql into sergbook.mysql.com:/usr/home/serg/Abk/mysql-4.0 BitKeeper/etc/ignore: auto-union BitKeeper/etc/logging_ok: auto-union BitKeeper/deleted/.del-stamp-h.in~d3fb1119ddf3630f: Auto merged configure.in: Auto merged Docs/manual.texi: Auto merged strings/Makefile.am: Auto merged
2002-08-13 21:15:14 +02:00
ram@ram.(none)
- Fix handling of suffix option - Replace function 'check_reserved_words' with correct one BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
2002-12-12 11:06:55 +02:00
ranger@regul.home.lan
set_default_charset() is not used anymore Some system_charset_info were removed BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
2003-03-16 10:56:14 +04:00
root@home.(none)
manual.texi updated MyOLEDB section Docs/manual.texi: updated MyOLEDB section BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
2001-12-24 10:15:04 +01:00
root@x3.internalnet
Removed ^M Reported by Georg Richter as it brokes his build with mipspro client/mysqlimport.c: Removed ^M client/mysqlshow.c: Removed ^M BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
2002-12-27 18:13:32 +02:00
salle@banica.(none)
Merge changes in docs do go further BitKeeper/etc/logging_ok: auto-union Docs/manual.texi: Automerge (Arjen please check)
2002-07-19 00:06:33 +04:00
salle@geopard.(none)
salle@geopard.online.bg
Typo fixing s/expection/exception BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
2004-02-02 12:09:47 +02:00
salle@vafla.home
Fix for Bug #1752 Wrong letter cases. Thanks to Daniel Convissor BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
2003-11-05 14:35:08 +02:00
salle@vafla.online.bg
manual.texi updated MyOLEDB section Docs/manual.texi: updated MyOLEDB section BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
2001-12-24 10:15:04 +01:00
sasha@mysql.sashanet.com
do not use static array of pastpoints in my_strtod - it is not portable (that is, these numbers are converted to doubles by a local OS strtod, and on different systems they get different values) sql/item_strfunc.cc: no need to check for HAVE_ISNAN here, it is taken care of in my_global.h strings/strtod.c: do not use static array of pastpoints - it is not portable (that is, these numbers are converted to doubles by a local OS strtod, and on different systems they get different values) BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
2004-02-27 14:40:08 +01:00
serg@build.mysql.com
Merge BitKeeper/etc/logging_ok: auto-union configure.in: Auto merged sql/sql_yacc.yy: merged
2002-09-23 16:39:18 +02:00
serg@build.mysql2.com
make compilation to work w/o InnoDB as well BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
2003-04-30 14:15:24 +02:00
serg@serg.mylan
manual.texi updated MyOLEDB section Docs/manual.texi: updated MyOLEDB section BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
2001-12-24 10:15:04 +01:00
serg@serg.mysql.com
triggers magic enforce REAL_EMAIL BitKeeper/deleted/.del-post-incoming~9f2168f531f09f3b: Delete: BitKeeper/triggers/post-incoming BitKeeper/deleted/.del-post-outgoing~1dd3d8f0f6e8f3cd: Delete: BitKeeper/triggers/post-outgoing BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
2003-06-18 14:12:50 +02:00
serg@sergbook.mylan
Merge work:/home/bk/mysql-4.0 into sergbook.mysql.com:/usr/home/serg/Abk/mysql-4.0 BitKeeper/etc/logging_ok: auto-union
2002-05-14 18:00:06 +02:00
serg@sergbook.mysql.com
Fix for bug #1820 mysql-test/r/multi_update.result: Test for bug #1820 mysql-test/t/multi_update.test: Test for bug #1820 BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
2003-11-18 17:04:52 +03:00
sergefp@mysql.com
Two bug fixes Docs/manual.texi: Added text fof bug fixes readline/Makefile.am: Bug fix for coredump of mysql program with some Ctrl+keys sql/convert.cc: A bug fix for using SET CHAR... SET on columns > 64K BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
2002-03-28 18:35:21 +02:00
sinisa@rhols221.adsl.netsonic.fi
Merge pmartin@work.mysql.com:/home/bk/mysql-4.0 into mysql.com:/home/pem/work/mysql-4.0 BitKeeper/etc/logging_ok: auto-union
2002-10-15 16:12:53 +02:00
tfr@beta.frontier86.ee
Merge BitKeeper/etc/logging_ok: auto-union sql/item_create.cc: Auto merged sql/item_strfunc.cc: Auto merged sql/lex.h: Auto merged client/mysqldump.c: SCCS merged
2002-06-14 15:24:22 +04:00
tfr@indrek.tfr.cafe.ee
manual.texi updated MyOLEDB section Docs/manual.texi: updated MyOLEDB section BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
2001-12-24 10:15:04 +01:00
tfr@sarvik.tfr.cafe.ee
tim@bitch.mysql.fi
tim@black.box
tim@hundin.mysql.fi
Fix typos that resulted in adding names to the global namespace that were never defined. This potentially caused problems when trying to link libmysqld with shared libraries. strings/longlong2str-x86.s: typo: longlong10_str -> longlong10_to_str strings/strings-x86.s: typo: strxmov_end-strxmov -> .strxmov_end-strxmov BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
2004-04-12 08:05:15 -06:00
tim@sand.box
manual.texi updated MyOLEDB section Docs/manual.texi: updated MyOLEDB section BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
2001-12-24 10:15:04 +01:00
tim@threads.polyesthetic.msg
tim@white.box
tim@work.mysql.com
Merge from 3.23.48 tree BitKeeper/etc/logging_ok: auto-union Docs/manual.texi: Auto merged innobase/dict/dict0dict.c: Auto merged innobase/include/srv0srv.h: Auto merged innobase/mem/mem0dbg.c: Auto merged innobase/os/os0file.c: Auto merged innobase/que/que0que.c: Auto merged innobase/rem/rem0rec.c: Auto merged innobase/row/row0sel.c: Auto merged innobase/srv/srv0srv.c: Auto merged innobase/srv/srv0start.c: Auto merged innobase/sync/sync0arr.c: Auto merged innobase/trx/trx0trx.c: Auto merged innobase/trx/trx0undo.c: Auto merged myisam/mi_check.c: Auto merged mysql-test/t/join.test: Auto merged mysys/hash.c: Auto merged scripts/mysql_config.sh: Auto merged sql/ha_innodb.h: Auto merged sql/handler.cc: Auto merged sql/handler.h: Auto merged sql/sql_acl.cc: Auto merged
2002-01-30 16:37:47 +02:00
tom@basil-firewall.home.com
logging_ok: Logging to logging@openlogging.org accepted stop_ndbcluster, ndb_config_2_node.ini, install_ndbcluster: new file BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
2004-04-14 15:46:39 +02:00
tomas@mc05.(none)
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 into poseidon.(none):/home/tomas/mysql-4.1-ndb ndb/src/kernel/ndb-main/Main.cpp: Auto merged BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
2004-05-21 00:00:34 +00:00
tomas@poseidon.(none)
manual.texi updated MyOLEDB section Docs/manual.texi: updated MyOLEDB section BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
2001-12-24 10:15:04 +01:00
tonu@hundin.mysql.fi
tonu@volk.internalnet
tonu@x153.internalnet
tonu@x3.internalnet
logging_ok: Logging to logging@openlogging.org accepted item_cmpfunc.cc, ctype_recoding.test, ctype_recoding.result: Call Item_func_conv_charset::fix_fields() in Item_bool_func2::fix_length_and_dec() (but #3704) mysql-test/r/ctype_recoding.result: Call Item_func_conv_charset::fix_fields() in Item_bool_func2::fix_length_and_dec() mysql-test/t/ctype_recoding.test: Call Item_func_conv_charset::fix_fields() in Item_bool_func2::fix_length_and_dec() sql/item_cmpfunc.cc: Call Item_func_conv_charset::fix_fields() in Item_bool_func2::fix_length_and_dec() BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
2004-05-10 23:19:50 +02:00
tsmith@build.mysql.com
merge resolve extra/perror.c: Auto merged ndb/include/debugger/SignalLoggerManager.hpp: Auto merged ndb/include/ndb_version.h: Auto merged ndb/src/common/portlib/unix/NdbMem.c: Auto merged ndb/src/common/portlib/unix/NdbThread.c: Auto merged ndb/src/common/util/Parser.cpp: Auto merged ndb/src/common/util/getarg.c: Auto merged ndb/src/common/util/version.c: Auto merged ndb/src/kernel/blocks/backup/restore/Restore.cpp: Auto merged ndb/src/kernel/blocks/dbutil/DbUtil.cpp: Auto merged ndb/src/kernel/blocks/ndbfs/AsyncFile.cpp: Auto merged ndb/src/kernel/ndb-main/Main.cpp: Auto merged ndb/src/mgmapi/test/keso.c: Auto merged ndb/src/mgmclient/test_cpcd/test_cpcd.cpp: Auto merged BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
2004-05-10 17:40:57 +02:00
tulin@build.mysql.com
fix for bug #2905 - "mysqladmin.c & co fail to use MYSQL_PORT as the default value of the TCP/IP port" client/mysqladmin.c: changed the value after REQUIRED_ARG from 0 to MYSQL_PORT client/mysqltest.c: changed the value after REQUIRED_ARG from 0 to MYSQL_PORT client/thread_test.c: changed the value after REQUIRED_ARG from 0 to MYSQL_PORT BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
2004-02-26 19:09:49 +01:00
ulli@morbus.(none)
Introduced a scalable key cache management. Added some fields to the st_my_thread_var structure to be able to link such structures into a list. include/my_pthread.h: Added some fields to the st_my_thread_var structure to be able to link such structures into a list. mysys/mf_keycache.c: Introduced a scalable key cache management. BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
2003-01-28 03:37:57 +02:00
venu@hundin.mysql.fi
Merge with 4.0.3 Some simple optimzations, more comments and indentation changes. Add ` around database in 'use database' in binary log. Moved max_error_count and max_warning_count to variables struct. Removed SHOW_WARNS_COUNT and SHOW_ERRORS_COUNT calls. Changed string functions to use character set of first string argument as default return characterset (Each string function can change the above assumption if needed) BitKeeper/etc/ignore: auto-union BitKeeper/etc/logging_ok: auto-union BUILD/SETUP.sh: Auto merged BitKeeper/deleted/.del-getopt.h~a9ae679fa84f395: Auto merged BitKeeper/deleted/.del-getvar.c~2a29ff383970fd31: Auto merged Docs/manual.texi: Auto merged SSL/cacert.pem: Auto merged SSL/client-cert.pem: Auto merged SSL/client-key.pem: Auto merged SSL/server-cert.pem: Auto merged SSL/server-key.pem: Auto merged client/mysqldump.c: Auto merged include/my_base.h: Auto merged include/my_sys.h: Auto merged include/mysql_com.h: Auto merged isam/isamlog.c: Auto merged isam/pack_isam.c: Auto merged libmysqld/lib_sql.cc: Auto merged myisam/ft_dump.c: Auto merged myisam/ft_parser.c: Auto merged myisam/ft_static.c: Auto merged myisam/ft_test1.c: Auto merged myisam/ft_update.c: Auto merged myisam/mi_create.c: Auto merged myisam/mi_key.c: Auto merged myisam/mi_open.c: Auto merged myisam/mi_static.c: Auto merged myisam/mi_test1.c: Auto merged myisam/mi_test2.c: Auto merged myisam/mi_test3.c: Auto merged myisam/mi_update.c: Auto merged myisam/mi_write.c: Auto merged myisam/myisamchk.c: Auto merged myisam/myisamdef.h: Auto merged myisam/myisamlog.c: Auto merged myisam/myisampack.c: Auto merged mysql-test/mysql-test-run.sh: Auto merged mysql-test/r/create.result: Auto merged mysql-test/r/fulltext.result: Auto merged mysql-test/r/func_math.result: Auto merged mysql-test/r/innodb.result: Auto merged mysql-test/r/merge.result: Auto merged mysql-test/r/myisam.result: Auto merged mysql-test/r/select.result: Auto merged mysql-test/r/select_found.result: Auto merged mysql-test/r/union.result: Auto merged mysql-test/t/create.test: Auto merged mysql-test/t/myisam.test: Auto merged mysql-test/t/select_found.test: Auto merged mysql-test/t/union.test: Auto merged mysys/default.c: Auto merged mysys/mf_iocache2.c: Auto merged mysys/my_error.c: Auto merged mysys/my_init.c: Auto merged scripts/mysql_config.sh: Auto merged sql/convert.cc: Auto merged sql/filesort.cc: Auto merged sql/gen_lex_hash.cc: Auto merged sql/ha_berkeley.cc: Auto merged sql/ha_innodb.cc: Auto merged sql/ha_myisam.cc: Auto merged sql/handler.cc: Auto merged sql/handler.h: Auto merged sql/hostname.cc: Auto merged sql/item.cc: Auto merged sql/item_sum.cc: Auto merged sql/item_sum.h: Auto merged sql/item_timefunc.cc: Auto merged sql/item_timefunc.h: Auto merged sql/key.cc: Auto merged sql/log.cc: Auto merged sql/net_pkg.cc: Auto merged sql/opt_range.cc: Auto merged sql/opt_range.h: Auto merged sql/opt_sum.cc: Auto merged sql/repl_failsafe.cc: Auto merged sql/slave.cc: Auto merged sql/sql_cache.cc: Auto merged sql/sql_db.cc: Auto merged sql/sql_handler.cc: Auto merged sql/sql_insert.cc: Auto merged sql/sql_lex.cc: Auto merged sql/sql_load.cc: Auto merged sql/sql_string.cc: Auto merged sql/sql_table.cc: Auto merged sql/sql_test.cc: Auto merged sql/time.cc: Auto merged sql/unireg.cc: Auto merged strings/Makefile.am: Auto merged strings/ctype-latin1_de.c: Auto merged strings/ctype-tis620.c: Auto merged tools/mysqlmanager.c: Auto merged BitKeeper/deleted/.del-sslopt-case.h~224c80e75dad4997: merge with 4.0.3 BitKeeper/triggers/post-commit: merge with 4.0.3 client/mysql.cc: merge with 4.0.3 + simple optimsation client/mysqltest.c: merge with 4.0.3 (Indentation change) configure.in: merge with 4.0.3 extra/resolve_stack_dump.c: merge with 4.0.3 (Indentation change) include/Makefile.am: merge with 4.0.3 include/myisam.h: merge with 4.0.3 (Indentation change) include/mysql.h: merge with 4.0.3 (removed not used structure) include/mysqld_error.h: merge with 4.0.3 libmysql/Makefile.shared: merge with 4.0.3 libmysql/libmysql.c: merge with 4.0.3 (Indentation change) libmysqld/Makefile.am: merge with 4.0.3 myisam/ft_boolean_search.c: merge with 4.0.3 (Indentation change) myisam/ft_nlq_search.c: merge with 4.0.3 (Indentation change) myisam/mi_check.c: merge with 4.0.3 myisam/mi_search.c: merge with 4.0.3 myisam/mi_unique.c: merge with 4.0.3 mysys/Makefile.am: merge with 4.0.3 mysys/mf_casecnv.c: merge with 4.0.3 sql-bench/server-cfg.sh: Removed 8000 max row limit for Innodb sql/Makefile.am: merge with 4.0.3 sql/field.cc: Indentation cleanup Changed sprintf -> my_sprintf sql/field.h: merge with 4.0.3 sql/ha_heap.cc: merge with 4.0.3 (Indentation change) sql/item.h: merge with 4.0.3 (Indentation change) sql/item_cmpfunc.cc: merge with 4.0.3 sql/item_cmpfunc.h: Removed size_of() from items Indentation cleanup sql/item_create.cc: merge sql/item_create.h: merge sql/item_func.cc: Added comments Changed string functions to use character set of first string argument as default return characterset Simple optimizations. Removed return of uninitalized variable. sql/item_func.h: merge sql/item_strfunc.cc: merge with 4.0.3 (Indentation change) sql/item_strfunc.h: removed size_of() sql/item_uniq.h: removed size_of() sql/lex.h: merge with 4.0.3 (Indentation change) sql/log_event.cc: Add ` around database in 'use database' in binary log. sql/mysql_priv.h: merge with 4.0.3 sql/mysqld.cc: merge with 4.0.3 (Indentation change) sql/share/czech/errmsg.txt: merge sql/share/danish/errmsg.txt: merge sql/share/dutch/errmsg.txt: merge sql/share/english/errmsg.txt: merge sql/share/estonian/errmsg.txt: merge sql/share/french/errmsg.txt: merge sql/share/german/errmsg.txt: merge sql/share/greek/errmsg.txt: merge sql/share/hungarian/errmsg.txt: merge sql/share/italian/errmsg.txt: merge sql/share/japanese/errmsg.txt: merge sql/share/korean/errmsg.txt: merge sql/share/norwegian-ny/errmsg.txt: merge sql/share/norwegian/errmsg.txt: merge sql/share/polish/errmsg.txt: merge sql/share/portuguese/errmsg.txt: merge sql/share/romanian/errmsg.txt: merge sql/share/russian/errmsg.txt: merge sql/share/slovak/errmsg.txt: merge sql/share/spanish/errmsg.txt: merge sql/share/swedish/errmsg.txt: merge sql/share/ukrainian/errmsg.txt: merge sql/sql_acl.cc: merge with 4.0.3 sql/sql_base.cc: More comments Fixed bug in send_fields() when using convert sql/sql_class.cc: merge sql/sql_class.h: Merge with 4.0.3 Moved max_error_count and max_warning_count to variables struct. sql/sql_delete.cc: merge with 4.0.3 (Indentation change) sql/sql_lex.h: merge with 4.0.3 sql/sql_parse.cc: Removed SHOW_WARNS_COUNT and SHOW_ERRORS_COUNT. (Should be retrived from variables) sql/sql_select.cc: merge with 4.0.3 sql/sql_show.cc: merge with 4.0.3 sql/sql_union.cc: merge with 4.0.3 sql/sql_update.cc: merge with 4.0.3 sql/sql_yacc.yy: merge with 4.0.3 Indentation cleanup sql/structs.h: merge with 4.0.3 sql/table.cc: merge with 4.0.3 sql/table.h: merge with 4.0.3
2002-08-30 12:40:40 +03:00
venu@myvenu.com
manual.texi updated MyOLEDB section Docs/manual.texi: updated MyOLEDB section BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
2001-12-24 10:15:04 +01:00
venu@work.mysql.com
add 'SOUNDS LIKE' syntax Docs/manual.texi: add 'SOUNDS LIKE' description mysql-test/r/func_str.result: add 'SOUNDS LIKE' test mysql-test/t/func_str.test: add 'SOUNDS LIKE' test sql/lex.h: add 'SOUNDS' symbol BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
2002-12-14 02:18:14 +04:00
vva@eagle.mysql.r18.ru
Merge BitKeeper/etc/logging_ok: auto-union configure.in: Auto merged sql/sql_yacc.yy: merged
2002-09-23 16:39:18 +02:00
vva@genie.(none)
fixed small merge bug BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
2003-05-27 16:58:57 +05:00
vva@mysql.r18.ru
merge Ranger's patches to crash-me, add new tests ( DEFAULT VALUES ) to crash-me sql-bench/crash-me.sh: new tests: - INSERT with DEFAULT: - INSERT with empty value list: - Insert DEFAULT VALUES; ------- -checking of reserved keywords (by courtesy of Ranger) -------- - added "--suffix" option - added description of "--config-file" to help section - fixed test for DIFFERENCE() - fixed small bug in safe_query_result (was s/,/,/ should s/,/./) (by courtesy of Ranger) sql-bench/server-cfg.sh: remove "KERNEL" and add "SAPDB" to sapdb version BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
2002-12-10 18:40:38 +05:00
walrus@kishkin.ru
Merge changes in docs do go further BitKeeper/etc/logging_ok: auto-union Docs/manual.texi: Automerge (Arjen please check)
2002-07-19 00:06:33 +04:00
walrus@mysql.com
URGENT fixed bug in shared memory (handler_count) sql/mysqld.cc: fixed bug in shared memory BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
2003-03-02 19:35:37 +05:00
wax@kishkin.ru
Add shared memory protocol and option --protocol client/client_priv.h: Add OPT_MYSQL_PROTOCOL and OPT_SHARED_MEMORY_BASE_NAME include/config-win.h: Add shared memory protocol include/errmsg.h: Add error codes of shared memory protocol include/my_sys.h: Delete TYPELIB, moved to typelib.h include/mysql.h: Add shared memory protocol include/violite.h: Add shared memory protocol libmysql/errmsg.c: Add texts of errors of shared memory protocol sql/mysqld.cc: Add shared memory protocol and option --shared-memory, correct option --named-pipe sql/set_var.cc: Add shared memory protocol variables vio/vio.c: Add shared memory protocol vio/viosocket.c: Add shared memory protocol BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
2002-11-15 00:16:30 +05:00
wax@mysql.com
Merge work:/home/bk/mysql-4.0 into rhols221.arenanet.fi:/home/my/bk/mysql-4.0 BitKeeper/etc/logging_ok: auto-union
2002-05-24 14:09:01 +03:00
worm@altair.is.lan
Minor changes to allow colspec numbering Docs/Support/colspec-fix.pl: Added code snippet to handle colspec numbering BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
2002-03-16 16:18:49 -07:00
zak@balfor.local
Patched conversion system to generate well-formed XML Docs/Support/docbook-fixup.pl: Series of minor changes to convert the output of makeinfo to well-formed XML - Discarded DTD - ORA can add their own appropriate DTD - Added required XML PI - included appropriate character encoding information - Added missing abstract and bookinfo tags - Escaped ampersands in HTML escape sequences to allow validation - need to review Docs/Support/make-docbook: Forced validation of XML document at end of conversion process Removed temporary files - set makeinfo output to stdout BitKeeper/etc/ignore: Added Docs/safe-mysql.xml to the ignore list BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
2002-02-15 16:14:38 -07:00
zak@linux.local
A set of improvements to the German localized error messages sql/share/german/errmsg.txt: Improved localized error messages courtesy of Georg Richter (georg@php.net) BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
2002-12-11 20:17:15 -07:00
zak@mysql.com
Minor typo corrections and documenation improvements. Docs/manual.texi: Expanded and corrected information on case-insensitive string comparison. Fixed spelling mistake and lanuage usage in query cache information. Expanded query cache information by noting that the query cache is flushed when table data changes. BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
2002-07-09 22:14:07 -06:00
zgreant@mysql.com
Reference in a new issue Copy permalink