mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-23 15:24:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
54777 commits 2778 branches 343 tags 1.6 GiB
Commit graph

712 commits

Author SHA1 Message Date
unknown
a52035d1de merge 
BitKeeper/etc/logging_ok:
  auto-union
configure.in:
  Auto merged
libmysqld/Makefile.am:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
sql/field.cc:
  Auto merged
sql/field.h:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
storage/bdb/dist/configure.ac:
  Auto merged
storage/innobase/os/os0file.c:
  Auto merged
storage/innobase/os/os0sync.c:
  Auto merged
storage/myisam/mi_check.c:
  Auto merged
storage/myisam/mi_open.c:
  Auto merged
storage/ndb/src/common/logger/Logger.cpp:
  Auto merged
storage/ndb/src/cw/cpcd/main.cpp:
  Auto merged
storage/ndb/test/ndbapi/testBlobs.cpp:
  Auto merged
storage/ndb/tools/restore/consumer_restore.cpp:
  Auto merged
 2005-06-13 14:09:09 +02:00
unknown
4ecc9757b2 Merge bk-internal:/home/bk/mysql-5.0 
into serg.mylan:/usr/home/serg/Abk/mysql-5.0


mysql-test/mysql-test-run.sh:
  Auto merged
 2005-06-10 20:23:37 +02:00
unknown
eae4072e4b remove old libmysqld.a before assembling a new one 2005-06-09 22:04:05 +02:00
unknown
92354ea6d6 mysql_client_test.dsp, mysql_test_run_new.dsp, mysqltest.dsp: 
Added /FD flag, to avoid include file warnings
mysqlclient.dsp:
  Removed duplicate entry for "strings/ctype-cp932.c"
  Added missing "mysys/my_access.c"
libmysqld.dsp:
  Added missing "mysys/charset.c"
libmysqld.def:
  Added symbol 'get_charset_name'


libmysqld/libmysqld.def:
  Added symbol 'get_charset_name'
VC++Files/libmysqld/libmysqld.dsp:
  Added missing "mysys/charset.c"
VC++Files/client/mysqlclient.dsp:
  Removed duplicate entry for "strings/ctype-cp932.c"
  Added missing "mysys/my_access.c"
VC++Files/client/mysqltest.dsp:
  Added /FD flag, to avoid include file warnings
VC++Files/mysql-test/mysql_test_run_new.dsp:
  Added /FD flag, to avoid include file warnings
VC++Files/tests/mysql_client_test.dsp:
  Added /FD flag, to avoid include file warnings
 2005-06-09 00:49:37 +02:00
unknown
84f89641cf Merge 
BitKeeper/etc/logging_ok:
  auto-union
libmysqld/Makefile.am:
  Auto merged
sql/field.cc:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/ha_ndbcluster.h:
  Auto merged
sql/item.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
storage/ndb/src/mgmclient/CommandInterpreter.cpp:
  Auto merged
sql/sql_bitmap.h:
  merge
 2005-06-04 19:26:35 +02:00
unknown
4d81713cb8 assemble libmysqld.a 5-10 times faster! 2005-06-02 22:59:37 +02:00
unknown
024e1d1bce merge 
BitKeeper/etc/logging_ok:
  auto-union
BUILD/compile-alpha-cxx:
  Auto merged
BUILD/compile-alpha-debug:
  Auto merged
configure.in:
  Auto merged
sql/handler.cc:
  Auto merged
sql/handler.h:
  Auto merged
sql/item.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
 2005-05-18 22:26:23 +02:00
unknown
48ce8aebd5 New file default_modify.c. Fixed a typo on mysqld.cc 
Changed name of function my_correct_default_file to
modify_defaults_file. Improved function and fixed some
bugs in it.


include/my_sys.h:
  Changed function name.
include/mysql_com.h:
  New function, modify_defaults_file()
libmysql/Makefile.shared:
  New file, default_modify.lo
libmysql/libmysql.def:
  New function, modify_defaults_file() and fixed version number.
libmysqld/libmysqld.def:
  New function, modify_defaults_file()
mysys/Makefile.am:
  New file, default_modify.c
mysys/default.c:
  Removed function from default.c. New, corresponding one is in default_modify.c,
  name is modify_defaults_file.
server-tools/instance-manager/commands.cc:
  Changed function name.
sql/mysqld.cc:
  Fixed typo.
 2005-05-18 20:10:17 +03:00
unknown
598df75bc9 merge 
BitKeeper/etc/logging_ok:
  auto-union
configure.in:
  Auto merged
libmysqld/Makefile.am:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
sql/field.cc:
  Auto merged
sql/field.h:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/ha_ndbcluster.h:
  Auto merged
sql/handler.cc:
  Auto merged
sql/handler.h:
  Auto merged
sql/item.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_delete.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged
sql/table.cc:
  Auto merged
sql/unireg.cc:
  Auto merged
storage/innobase/row/row0mysql.c:
  Auto merged
storage/myisam/mi_create.c:
  Auto merged
storage/myisam/mi_dynrec.c:
  Auto merged
storage/myisam/mi_key.c:
  Auto merged
storage/myisam/mi_locking.c:
  Auto merged
storage/myisam/mi_static.c:
  Auto merged
storage/myisam/mi_statrec.c:
  Auto merged
storage/myisam/mi_write.c:
  Auto merged
storage/myisam/myisamdef.h:
  Auto merged
storage/ndb/src/cw/cpcd/APIService.cpp:
  Auto merged
storage/ndb/src/cw/cpcd/APIService.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdict/Dbdict.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdict/SchemaFile.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdict/printSchemaFile.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Auto merged
storage/ndb/test/ndbapi/testNodeRestart.cpp:
  Auto merged
storage/ndb/test/ndbapi/testScan.cpp:
  Auto merged
storage/ndb/test/run-test/main.cpp:
  Auto merged
storage/ndb/test/run-test/run-test.hpp:
  Auto merged
 2005-05-17 10:17:53 +02:00
unknown
7f5bf3dcdb Manual merge (again) 
configure.in:
  Auto merged
include/mysql.h:
  Auto merged
innobase/row/row0mysql.c:
  Auto merged
BitKeeper/deleted/.del-ctype-cp932.c:
  Auto merged
BitKeeper/deleted/.del-errmsg.txt~4617575065d612b9:
  Auto merged
BitKeeper/deleted/.del-errmsg.txt~ffe4a0c9e3206150:
  Auto merged
libmysql/libmysql.c:
  Auto merged
libmysqld/Makefile.am:
  Auto merged
mysql-test/r/ctype_ucs.result:
  Auto merged
mysql-test/t/ctype_ucs.test:
  Auto merged
mysql-test/t/ps_grant.test:
  Auto merged
sql/ha_blackhole.cc:
  Auto merged
strings/ctype-big5.c:
  Auto merged
strings/ctype-ucs2.c:
  Auto merged
 2005-05-14 12:38:12 +04:00
unknown
05a945ecf4 Makefile.am, configure.in: 
Enable creation of embedded lib when --with-darwin-mwcc


configure.in:
  Enable creation of embedded lib when --with-darwin-mwcc
libmysqld/Makefile.am:
  Enable creation of embedded lib when --with-darwin-mwcc
 2005-05-10 13:53:47 +02:00
unknown
df96db6318 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1


sql/ha_ndbcluster.h:
  Auto merged
sql/handler.h:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
storage/heap/hp_hash.c:
  Auto merged
 2005-05-09 20:28:54 +02:00
unknown
59f6cf25f5 Fix for bug #9632 (strict.test fails in -embedded-server mode) 
libmysqld/libmysqld.c:
  we need this code before we create thd instance
sql/sql_parse.cc:
  dispatch_command is the more appropriate place for this code
 2005-05-09 16:26:06 +05:00
unknown
f2b41e6886 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-clean


configure.in:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
scripts/mysql_create_system_tables.sh:
  Auto merged
scripts/mysql_fix_privilege_tables.sql:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_cache.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
 2005-05-03 00:10:52 +02:00
unknown
41e7a9709d Clean up merge from 4.1 
configure.in:
  Auto merged
extra/my_print_defaults.c:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
mysql-test/r/lowercase_table.result:
  Auto merged
mysql-test/r/query_cache.result:
  Mege results
mysql-test/t/lowercase_table.test:
  Merge tests
mysql-test/t/query_cache.test:
  Merge tests
mysys/default.c:
  Merge from 4.1
sql/sql_cache.cc:
  Merge
sql/sql_parse.cc:
  Merge from 4.1
sql/sql_table.cc:
  Merge
tests/mysql_client_test.c:
  Merge
 2005-05-02 10:19:37 -07:00
unknown
65d0de3b7b Manually resolve merge 
mysql-test/r/query_cache.result:
  Resolve merge
mysql-test/t/query_cache.test:
  Resolve merge
 2005-04-29 08:46:03 -07:00
unknown
a9da10f7a8 Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1 
into zim.(none):/home/brian/mysql/mysql-5.1


configure.in:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
sql/Makefile.am:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/ha_myisam.cc:
  Auto merged
sql/lock.cc:
  Auto merged
storage/innobase/btr/btr0pcur.c:
  Auto merged
storage/innobase/dict/dict0dict.c:
  Auto merged
storage/innobase/dict/dict0load.c:
  Auto merged
storage/innobase/fil/fil0fil.c:
  Auto merged
storage/innobase/include/btr0pcur.h:
  Auto merged
storage/innobase/include/btr0pcur.ic:
  Auto merged
storage/innobase/include/dict0dict.h:
  Auto merged
storage/innobase/include/dict0load.h:
  Auto merged
storage/innobase/include/os0file.h:
  Auto merged
storage/innobase/include/srv0srv.h:
  Auto merged
storage/innobase/log/log0log.c:
  Auto merged
storage/innobase/os/os0file.c:
  Auto merged
storage/innobase/row/row0ins.c:
  Auto merged
storage/innobase/row/row0mysql.c:
  Auto merged
storage/innobase/row/row0sel.c:
  Auto merged
storage/innobase/srv/srv0srv.c:
  Auto merged
storage/innobase/srv/srv0start.c:
  Auto merged
storage/myisam/mi_check.c:
  Auto merged
storage/myisam/mi_create.c:
  Auto merged
storage/myisam/mi_dynrec.c:
  Auto merged
storage/myisam/mi_search.c:
  Auto merged
storage/myisam/mi_write.c:
  Auto merged
storage/myisam/myisamdef.h:
  Auto merged
storage/myisam/myisampack.c:
  Auto merged
storage/myisammrg/myrg_create.c:
  Auto merged
storage/ndb/include/kernel/signaldata/BackupImpl.hpp:
  Auto merged
storage/ndb/include/kernel/signaldata/BackupSignalData.hpp:
  Auto merged
storage/ndb/include/kernel/signaldata/TuxMaint.hpp:
  Auto merged
storage/ndb/include/mgmapi/mgmapi_config_parameters.h:
  Auto merged
storage/ndb/include/ndbapi/NdbScanOperation.hpp:
  Auto merged
storage/ndb/include/ndbapi/NdbTransaction.hpp:
  Auto merged
storage/ndb/src/common/debugger/signaldata/BackupImpl.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/ERROR_codes.txt:
  Auto merged
storage/ndb/src/kernel/blocks/backup/Backup.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/backup/Backup.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/backup/Backup.txt:
  Auto merged
storage/ndb/src/kernel/blocks/backup/BackupInit.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbacc/Dbacc.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Auto merged
storage/ndb/src/kernel/main.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupTrigger.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtup/Notes.txt:
  Auto merged
storage/ndb/src/kernel/blocks/dbtux/DbtuxNode.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/ndbfs/OpenFiles.hpp:
  Auto merged
storage/ndb/src/mgmapi/mgmapi.cpp:
  Auto merged
storage/ndb/src/mgmsrv/ConfigInfo.cpp:
  Auto merged
storage/ndb/src/mgmsrv/MgmtSrvr.cpp:
  Auto merged
storage/ndb/src/mgmsrv/MgmtSrvr.hpp:
  Auto merged
storage/ndb/src/mgmsrv/MgmtSrvrGeneralSignalHandling.cpp:
  Auto merged
storage/ndb/src/ndbapi/Ndb.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbIndexOperation.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbOperationDefine.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbOperationSearch.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbScanOperation.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbTransaction.cpp:
  Auto merged
storage/ndb/src/ndbapi/Ndbif.cpp:
  Auto merged
storage/ndb/src/ndbapi/Ndblist.cpp:
  Auto merged
storage/ndb/src/ndbapi/TransporterFacade.cpp:
  Auto merged
storage/ndb/src/ndbapi/ndberror.c:
  Auto merged
storage/ndb/test/ndbapi/Makefile.am:
  Auto merged
storage/ndb/test/ndbapi/testBackup.cpp:
  Auto merged
storage/ndb/test/ndbapi/testIndex.cpp:
  Auto merged
storage/ndb/test/ndbapi/testNodeRestart.cpp:
  Auto merged
storage/ndb/test/ndbapi/testOIBasic.cpp:
  Auto merged
storage/ndb/test/ndbapi/testOperations.cpp:
  Auto merged
storage/ndb/test/run-test/daily-basic-tests.txt:
  Auto merged
storage/ndb/test/run-test/daily-devel-tests.txt:
  Auto merged
storage/ndb/test/src/NdbBackup.cpp:
  Auto merged
storage/ndb/tools/desc.cpp:
  Auto merged
 2005-04-26 19:07:13 -07:00
unknown
25311ea4a5 All changes for change to all storage engines being under storage directory. 
config/ac-macros/ha_berkeley.m4:
  change for stroage
config/ac-macros/ha_innodb.m4:
  change for storage
config/ac-macros/ha_ndbcluster.m4:
  change for storage
configure.in:
  change for storage
extra/perror.c:
  change for storage
libmysqld/Makefile.am:
  change for storage
mysql-test/mysql-test-run.sh:
  change for storage
sql/Makefile.am:
  change for storage
sql/ha_innodb.cc:
  change storage
sql/ha_myisam.cc:
  change for storage
sql/ha_myisammrg.cc:
  change for storage
sql/lock.cc:
  change for storage
sql/sql_cache.cc:
  change for storage
storage/heap/Makefile.am:
  change for storage
storage/innobase/include/Makefile.i:
  change for storage
storage/myisammrg/myrg_def.h:
  change for storage
storage/ndb/Makefile.am:
  change for storage
storage/ndb/config/common.mk.am:
  change for storage
storage/ndb/config/type_kernel.mk.am:
  change for storage
storage/ndb/config/type_mgmapiclient.mk.am:
  change for storage
storage/ndb/config/type_ndbapi.mk.am:
  change for storage
storage/ndb/config/type_ndbapiclient.mk.am:
  change for storage
storage/ndb/config/type_ndbapitest.mk.am:
  change for storage
storage/ndb/config/type_ndbapitools.mk.am:
  change for storage
storage/ndb/config/type_util.mk.am:
  change for storage
storage/ndb/docs/Makefile.am:
  change for storage
storage/ndb/include/Makefile.am:
  change for storage
storage/ndb/src/Makefile.am:
  change for storage
storage/ndb/src/common/debugger/Makefile.am:
  change for storage
storage/ndb/src/common/debugger/signaldata/Makefile.am:
  change for storage
storage/ndb/src/common/logger/Makefile.am:
  change for storage
storage/ndb/src/common/mgmcommon/Makefile.am:
  change for storage
storage/ndb/src/common/portlib/Makefile.am:
  change for storage
storage/ndb/src/common/transporter/Makefile.am:
  change for storage
storage/ndb/src/common/util/Makefile.am:
  change for storage
storage/ndb/src/cw/cpcd/Makefile.am:
  change for storage
storage/ndb/src/kernel/Makefile.am:
  change for storage
storage/ndb/src/kernel/blocks/backup/Makefile.am:
  change for storage
storage/ndb/src/kernel/blocks/cmvmi/Makefile.am:
  change for storage
storage/ndb/src/kernel/blocks/dbacc/Makefile.am:
  change for storage
storage/ndb/src/kernel/blocks/dbdict/Makefile.am:
  change for storage
storage/ndb/src/kernel/blocks/dbdih/Makefile.am:
  change for storage
storage/ndb/src/kernel/blocks/dblqh/Makefile.am:
  change for storage
storage/ndb/src/kernel/blocks/dbtc/Makefile.am:
  change for storage
storage/ndb/src/kernel/blocks/dbtup/Makefile.am:
  change for storage
storage/ndb/src/kernel/blocks/dbtux/Makefile.am:
  change for storage
storage/ndb/src/kernel/blocks/dbutil/Makefile.am:
  change for storage
storage/ndb/src/kernel/blocks/grep/Makefile.am:
  change for storage
storage/ndb/src/kernel/blocks/ndbcntr/Makefile.am:
  change for storage
storage/ndb/src/kernel/blocks/ndbfs/Makefile.am:
  change for storage
storage/ndb/src/kernel/blocks/qmgr/Makefile.am:
  change for storage
storage/ndb/src/kernel/blocks/suma/Makefile.am:
  change for storage
storage/ndb/src/kernel/blocks/trix/Makefile.am:
  change for storage
storage/ndb/src/kernel/error/Makefile.am:
  change for storage
storage/ndb/src/kernel/vm/Makefile.am:
  change for storage
storage/ndb/src/mgmapi/Makefile.am:
  change for storage
storage/ndb/src/mgmclient/Makefile.am:
  change for storage
storage/ndb/src/mgmsrv/Makefile.am:
  change for storage
storage/ndb/src/ndbapi/Makefile.am:
  change for storage
storage/ndb/test/ndbapi/Makefile.am:
  change for storage
storage/ndb/test/ndbapi/bank/Makefile.am:
  change for storage
storage/ndb/test/run-test/Makefile.am:
  change for storage
storage/ndb/test/src/Makefile.am:
  Change for storage
storage/ndb/test/tools/Makefile.am:
  Change for storage
storage/ndb/tools/Makefile.am:
  Change for storage
 2005-04-26 19:04:36 -07:00
unknown
f239b78c4b Merge 
scripts/mysql_fix_privilege_tables.sql:
  Auto merged
sql/log.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
configure.in:
  merge
 2005-04-25 22:21:25 +02:00
unknown
53eb1b5b57 - manual merge 
sql/share/Makefile.am:
  Auto merged
tools/Makefile.am:
  Auto merged
 2005-04-21 08:30:59 +02:00
unknown
33ea3ff345 - manual merge 
sql/share/Makefile.am:
  Auto merged
 2005-04-19 17:18:56 +02:00
unknown
1f1a579aa9 - added missing copyright headers to several Makefile.am's (noticed 
while testing changes to the mysql-copyright scripts


libmysqld/examples/Makefile.am:
  - added a copyright header
sql/share/Makefile.am:
  - added a copyright header
tools/Makefile.am:
  - added a copyright header
 2005-04-19 17:00:05 +02:00
unknown
5f30526986 Merging 5.0->5.1 
BitKeeper/etc/logging_ok:
  auto-union
BitKeeper/triggers/post-commit:
  Auto merged
mysql-test/r/grant.result:
  Auto merged
scripts/mysql_create_system_tables.sh:
  Auto merged
scripts/mysql_fix_privilege_tables.sql:
  Auto merged
sql/Makefile.am:
  Auto merged
sql/log.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
 2005-04-19 11:09:54 +02:00
unknown
2189e5e7bd BUG#9391 mysqlshow prints incorrect "rows" information 
- Removed use of mysql->extra_info
 - Removed unused function send_records_num


VC++Files/winmysqladmin/mysql.h:
  Comment extra_info as not used anymore
client/mysqlshow.c:
  Remove use of extra info. Instead read number of records in table using SELECT COUNT(*)
include/mysql.h:
  Comment extra_info as not used anymore
libmysqld/lib_sql.cc:
  Removed unused function send_records_num
sql-common/client.c:
  Remove use of extra_info since number of records is not sent in the protocol anymore
sql/protocol.cc:
  Removed unused function send_records_num
sql/protocol.h:
  Removed unused function send_records_num
 2005-04-13 12:22:20 +02:00
unknown
c0333ecee4 5.0 to 5.1 merge 
mysql-test/r/grant.result:
  Auto merged
scripts/mysql_create_system_tables.sh:
  Auto merged
scripts/mysql_fix_privilege_tables.sql:
  Auto merged
sql/Makefile.am:
  Auto merged
sql/log.cc:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/slave.cc:
  Auto merged
sql/slave.h:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
configure.in:
  merge of 5.0 to 5.1, version info and NDB_VERSION_() conflicts
libmysqld/Makefile.am:
  merge of Makefile sql_sources list
sql/sql_acl.h:
  merge, no need to hand resolve
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
 2005-04-01 12:32:17 -08:00
unknown
e7332e64ca Fix crash in embedded server due to incorrect storage of results 
in the query cache. (Bug #9549)


libmysqld/emb_qcache.h:
  Fix Querycache_stream::use_next_block() to actually use the next
  block and mark blocks as used when it writes to them.
mysql-test/r/query_cache.result:
  Update results.
mysql-test/t/query_cache.test:
  Add new regression test.
libmysqld/emb_qcache.cc:
  Fix calls to use_next_block() to indicate whether we are writing
  to the next block or not.
sql/sql_cache.cc:
  Initialize the first block properly when storing a result in
  the embedded server.
 2005-03-31 19:17:45 -08:00
unknown
844acf9a66 Fix of build failure of library 2005-04-01 01:33:04 +02:00
unknown
2c353624fb fixed conflict making embedded server with libmysqld 
libmysqld/Makefile.am:
  Fixed conflict
 2005-03-25 14:12:46 -08:00
unknown
0310e2a770 Fixing blackhole support in libmysqld 
libmysqld/Makefile.am:
  Adding ha_blackhole.cc
 2005-03-25 14:09:19 -08:00
unknown
d27a709f3d merged 
BitKeeper/etc/logging_ok:
  auto-union
mysql-test/r/information_schema.result:
  Auto merged
mysql-test/r/ndb_autodiscover.result:
  Auto merged
mysql-test/r/ps_1general.result:
  Auto merged
mysql-test/r/show_check.result:
  Auto merged
mysql-test/r/sp.result:
  Auto merged
mysql-test/r/view.result:
  Auto merged
scripts/fill_func_tables.sh:
  Auto merged
scripts/mysql_create_system_tables.sh:
  Auto merged
scripts/mysql_fix_privilege_tables.sh:
  Auto merged
scripts/mysql_fix_privilege_tables.sql:
  Auto merged
sql/field.cc:
  Auto merged
sql/handler.cc:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/item_sum.h:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/table.cc:
  Auto merged
 2005-03-23 09:42:24 +01:00
unknown
95098bd7e2 Fix test_libmysqld link problem on Windows. 
libmysqld/libmysqld.def:
  Bump version number, add two symbols
VC++Files/libmysqld/examples/test_libmysqld.dsp:
  Fix target name
  Remove unwanted dependency
 2005-03-21 21:51:31 +01:00
unknown
d1deb65996 Remove unexistent @MT_INCLUES@ 2005-03-18 00:24:35 +03:00
unknown
98de4d79ed Removed support for RAID, mit-threads, and MySQL FS (really, if someone wants this feature look at a web-dav hookup). 
BitKeeper/deleted/.del-mysqlfs.m4~2c0a06625ffdef2:
  Delete: config/ac-macros/mysqlfs.m4
Makefile.am:
  Removed fs_dir (since dropping mysqlfs support)
configure.in:
  Removed support for MySQLFS.
  Gone is support for mit-threads.
  Gone is Raid.
  I feel like if I say "gone" one more time I should embed a secret country song somewhere in the source as an easter egg.
dbug/Makefile.am:
  Removed mit-threads
extra/Makefile.am:
  Removed mit-threads
heap/Makefile.am:
  removed mit-threads
libmysql_r/Makefile.am:
  removed mit-threads
libmysqld/Makefile.am:
  removed mit-threads
myisam/Makefile.am:
  remove mt-threads
myisammrg/Makefile.am:
  removed mit-threas
mysys/Makefile.am:
  removed mit-threads
regex/Makefile.am:
  removed mit-treads
sql/Makefile.am:
  removed mit-threads
strings/Makefile.am:
  removed mit-threads
tests/Makefile.am:
  removed mit-threads
tools/Makefile.am:
  removed mit-threads
 2005-03-16 16:22:56 -08:00
unknown
248e449451 Remove compiler warnings and remove not used variables 
(Found during build process)


extra/comp_err.c:
  Remove compiler warnings
extra/perror.c:
  Remove compiler warnings
innobase/dict/dict0dict.c:
  Remove compiler warnings
innobase/dict/dict0load.c:
  Remove compiler warnings
innobase/pars/pars0sym.c:
  Remove compiler warnings
innobase/row/row0row.c:
  Remove compiler warnings
innobase/row/row0sel.c:
  Remove compiler warnings
libmysqld/lib_sql.cc:
  Remove not used variables
myisam/mi_key.c:
  Remove compiler warnings
regex/engine.c:
  Added comment
sql/derror.cc:
  Remove not used variables
sql/examples/ha_archive.cc:
  Fixed bug in blob handling
  Removed not used variable
sql/field.cc:
  Remove compiler warnings
  Remove not used variables
sql/filesort.cc:
  Remove compiler warnings
sql/ha_heap.cc:
  Remove not used variable
sql/ha_innodb.cc:
  Remove not used variables
  Remove compiler warnings
sql/handler.cc:
  Remove compiler warnings and remove not used variables
sql/item.cc:
  Remove compiler warnings and remove not used variables
sql/item_subselect.cc:
  Remove compiler warnings
sql/item_sum.cc:
  Remove compiler warnings
sql/item_sum.h:
  Remove compiler warnings and remove not used variables
sql/log.cc:
  Remove compiler warnings and remove not used variables
sql/log_event.cc:
  Remove compiler warnings
sql/mysqld.cc:
  Remove compiler warnings and remove not used variables
sql/opt_range.cc:
  Remove compiler warnings and remove not used variables
sql/slave.cc:
  Remove compiler warnings and remove not used variables
sql/sp_pcontext.cc:
  Remove compiler warnings and remove not used variables
sql/sql_acl.cc:
  Remove compiler warnings and remove not used variables
sql/sql_analyse.cc:
  Remove compiler warnings and remove not used variables
sql/sql_base.cc:
  Remove compiler warnings and remove not used variables
sql/sql_db.cc:
  Remove compiler warnings and remove not used variables
sql/sql_help.cc:
  Remove compiler warnings and remove not used variables
sql/sql_insert.cc:
  Remove compiler warnings and remove not used variables
sql/sql_load.cc:
  Remove compiler warnings and remove not used variables
sql/sql_parse.cc:
  Remove compiler warnings and remove not used variables
sql/sql_prepare.cc:
  Remove compiler warnings and remove not used variables
sql/sql_select.cc:
  Remove compiler warnings and remove not used variables
sql/sql_show.cc:
  Remove compiler warnings and remove not used variables
sql/sql_table.cc:
  Remove compiler warnings
sql/sql_union.cc:
  Remove compiler warnings
sql/sql_update.cc:
  Remove compiler warnings and remove not used variables
sql/sql_yacc.yy:
  Remove compiler warnings and remove not used variables
sql/strfunc.cc:
  Remove compiler warnings and remove not used variables
strings/ctype-ucs2.c:
  Remove compiler warnings
tests/mysql_client_test.c:
  Remove compiler warnings and remove not used variables
tools/mysqlmanager.c:
  Remove compiler warnings and remove not used variables
 2005-02-25 16:53:22 +02:00
unknown
7aa1d93fd4 Merge serg.mylan:/usr/home/serg/Abk/mysql-5.0 
into serg.mylan:/usr/home/serg/Abk/mysql-5.0-xa


mysql-test/r/ctype_ucs.result:
  Auto merged
mysql-test/t/ctype_ucs.test:
  Auto merged
mysql-test/t/strict.test:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged
sql/examples/ha_archive.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
 2005-02-17 14:00:44 +01:00
unknown
e2edf02421 Merge with 4.1 
BitKeeper/etc/logging_ok:
  auto-union
BitKeeper/triggers/post-commit:
  Auto merged
innobase/row/row0mysql.c:
  Auto merged
myisam/ft_boolean_search.c:
  Auto merged
mysql-test/r/ctype_ucs.result:
  Auto merged
mysql-test/r/distinct.result:
  Auto merged
mysql-test/r/fulltext.result:
  Auto merged
mysql-test/r/select.result:
  Auto merged
mysql-test/r/subselect.result:
  Auto merged
mysql-test/r/union.result:
  Auto merged
mysql-test/t/ctype_ucs.test:
  Auto merged
mysql-test/t/subselect.test:
  Auto merged
mysql-test/t/union.test:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/sql_cache.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_list.h:
  Auto merged
sql/examples/ha_archive.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_string.h:
  Auto merged
vio/viosocket.c:
  Auto merged
scripts/mysql_create_system_tables.sh:
  simple merge
sql/field.cc:
  simple merge
sql/item.h:
  simple merge
sql/sql_lex.h:
  simple merge
sql/sql_yacc.yy:
  Merge
  (join_table_list was not comptely merged. Need to run test to know how things works...)
sql/table.cc:
  Keep code from 5.0, except delted one not needed line
strings/ctype-ucs2.c:
  Auto merge
 2005-02-15 17:12:13 +02:00
unknown
2d8b51991c manually merged 
client/mysqlbinlog.cc:
  Auto merged
configure.in:
  Auto merged
include/my_global.h:
  Auto merged
include/my_pthread.h:
  Auto merged
innobase/trx/trx0trx.c:
  Auto merged
mysql-test/include/varchar.inc:
  Auto merged
mysql-test/r/bdb.result:
  Auto merged
mysql-test/r/myisam.result:
  Auto merged
mysql-test/r/mysqlbinlog2.result:
  Auto merged
mysql-test/t/ctype_ucs.test:
  Auto merged
mysql-test/t/user_var.test:
  Auto merged
mysys/hash.c:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/log_event.h:
  Auto merged
sql/set_var.h:
  Auto merged
sql/slave.cc:
  Auto merged
sql/slave.h:
  Auto merged
sql/sp_head.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_repl.cc:
  Auto merged
sql/sql_repl.h:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_trigger.cc:
  Auto merged
mysql-test/r/ctype_ucs.result:
  ul
mysql-test/r/drop_temp_table.result:
  ul
mysql-test/r/innodb.result:
  ul
mysql-test/r/insert_select.result:
  ul
mysql-test/r/mix_innodb_myisam_binlog.result:
  ul
mysql-test/r/rpl_change_master.result:
  ul
mysql-test/r/rpl_charset.result:
  ul
mysql-test/r/rpl_error_ignored_table.result:
  ul
mysql-test/r/rpl_flush_log_loop.result:
  ul
mysql-test/r/rpl_flush_tables.result:
  ul
mysql-test/r/rpl_loaddata.result:
  ul
mysql-test/r/rpl_loaddata_rule_m.result:
  ul
mysql-test/r/rpl_log.result:
  ul
mysql-test/r/rpl_max_relay_size.result:
  ul
mysql-test/r/rpl_relayrotate.result:
  ul
mysql-test/r/rpl_replicate_do.result:
  ul
mysql-test/r/rpl_rotate_logs.result:
  ul
mysql-test/r/rpl_temporary.result:
  ul
mysql-test/r/rpl_timezone.result:
  ul
mysql-test/r/rpl_until.result:
  ul
mysql-test/r/rpl_user_variables.result:
  ul
mysql-test/r/user_var.result:
  ul
 2005-02-14 21:50:09 +01:00
unknown
4810f300d2 Fix for bug #8477 (Embedded query_cache test crashes) 
libmysqld/emb_qcache.cc:
  Querycahce data transition fixed
 2005-02-12 20:09:40 +04:00
unknown
91db48e35a Precision Math implementation 
BitKeeper/etc/ignore:
  Added client/decimal.c client/my_decimal.cc client/my_decimal.h to the ignore list
 2005-02-09 02:50:45 +04:00
unknown
5c3c40798d small Makefile.am cleanup 
clean: targets removed
    generated *.h files moved to include/


Docs/Images/Makefile.am:
  no clean: targets please!
client/Makefile.am:
  generated *.h files moved to include/
extra/Makefile.am:
  generated *.h files moved to include/
include/Makefile.am:
  no clean: targets please!
libmysql/Makefile.am:
  generated *.h files moved to include/
libmysql_r/Makefile.am:
  generated *.h files moved to include/
libmysqld/Makefile.am:
  generated *.h files moved to include/
libmysqld/examples/Makefile.am:
  generated *.h files moved to include/
  no clean: target please!
ndb/docs/Makefile.am:
  no clean: targets please!
scripts/Makefile.am:
  SUPERCLEANFILES means nothing
server-tools/instance-manager/Makefile.am:
  generated *.h files moved to include/
sql/Makefile.am:
  generated *.h files moved to include/
sql/share/Makefile.am:
  instead of (incorrectly) duplicating comp_err command line,
  call do make in extra/
tools/Makefile.am:
  generated *.h files moved to include/
BitKeeper/etc/ignore:
  Added include/mysqld_ername.h include/mysqld_error.h include/sql_state.h to the ignore list
 2005-01-28 17:14:03 +01:00
unknown
042448aa33 query_id and my_xid -> ulonglong 
fix for binlog+autocommit+tclog
comments, style fixes


libmysqld/libmysqld.rc:
  Change mode to -rw-rw-r--
libmysqld/resource.h:
  Change mode to -rw-rw-r--
configure.in:
  check for getpagesize
include/my_global.h:
  typo ?
include/my_pthread.h:
  bug in thread_safe_decrement_and_test()
mysql-test/r/bdb.result:
  results updated
mysql-test/r/innodb.result:
  results updated
mysql-test/r/mix_innodb_myisam_binlog.result:
  results updated
mysql-test/r/rpl_relayrotate.result:
  results updated
sql/ha_berkeley.cc:
  style fixes
sql/ha_innodb.cc:
  fixes to follow innodb coding style
sql/handler.cc:
  more comments. XA COMMIT ONE PHASE fix.
sql/handler.h:
  my_xid -> ulonglong. comments
sql/item_func.cc:
  DO RELEASE_LOCK("...") is no cache_stmt
sql/log.cc:
  comments, better error messages
sql/log_event.cc:
  even in autocommit mode we may need to cache_stmt
  xid is ulonglong
sql/log_event.h:
  more comments.
sql/mysql_priv.h:
  query_id is ulonglong
sql/mysqld.cc:
  default value for --log-tc changed
sql/share/errmsg.txt:
  better error messages
sql/sql_class.h:
  cleanup, comments
sql/sql_delete.cc:
  deleting from temporary tables is not always transactional
sql/sql_insert.cc:
  insert into temporary table is not always transactional
sql/sql_load.cc:
  load data into temp table is not always transactional
sql/sql_parse.cc:
  comments. bad merge fixed. xa_state_names[]
sql/sql_table.cc:
  create/drop temp table is not always transactional
sql/sql_update.cc:
  update temp table is not always transactional
 2005-01-27 22:38:56 +01:00
unknown
56bf2ce986 change to Makefile.am per Serg's request 
libmysqld/examples/Makefile.am:
  Change to Makefile.pm per serg's request, was to go out with federated push, but this fix is needed asap for Lenz. This has passed 'make test'
 2005-01-25 23:52:47 -08:00
unknown
64fcbec855 fix for make error in Makefile.am of mysql_client_test.c 2005-01-25 09:47:00 +01:00
unknown
c312cf2762 Merge 
BitKeeper/etc/ignore:
  auto-union
include/my_global.h:
  Auto merged
libmysql/libmysql.c:
  Auto merged
libmysqld/examples/Makefile.am:
  Auto merged
scripts/make_binary_distribution.sh:
  Auto merged
sql/mysqld.cc:
  Auto merged
tests/mysql_client_test.c:
  Auto merged
 2005-01-24 13:48:48 -08:00
unknown
4e1e23a174 - fixed one missing occasion from the mysql_client_test renaming 
libmysqld/examples/Makefile.am:
  - fixed a missing rename (mysql_client_test -> mysql_client_test_embedded)
 2005-01-20 17:00:30 +01:00
unknown
c03aaf85f2 - renamed client_test -> mysql_client_test 
- renamed the tests that use the embedded server (client_test -> 
  mysql_client_test_embedded, mysqltest -> mysql_test_embedded
  and changed some Makefiles and scripts so they are installed in $bindir
  (required to be able to run the test suite against the embedded server)


tests/mysql_client_test.c:
  Rename: tests/client_test.c -> tests/mysql_client_test.c
libmysql/libmysql.c:
  - renamed client_test.c to mysql_client_test.c in a comment
libmysqld/examples/Makefile.am:
  - renamed client_test -> mysql_client_test_embedded
  - renamed mysqltest -> mysqltest_embedded
  - both will be installed in $bindir
scripts/make_binary_distribution.sh:
  - install mysql_client_test, mysql_client_test_embedded and mysqltest_embedded
    into bin directory
tests/Makefile.am:
  - renamed client_test to mysql_client_test
BitKeeper/etc/ignore:
  Added tests/mysql_client_test to the ignore list
 2005-01-20 16:25:38 +01:00
unknown
54b281a37a Add ha_federated.cc to libmysqld/Makefile.am so that configuring with both 
embedded server and federated storage engine compiles. (Bug #7920)


libmysqld/Makefile.am:
  Add ha_federated.cc to sources
 2005-01-18 16:50:09 -08:00
unknown
46f5c1f1a3 Merge here.mwagner.org:/Users/mwagner/work/bk/mysql-4.1 
into here.mwagner.org:/Users/mwagner/work/bk/mysql-5.0
 2005-01-12 21:09:07 -06:00
unknown
8191a28b97 libmysqld.def, libmysql.def: 
Use the invisible tabs (!)


libmysql/libmysql.def:
  Use the invisible tabs (!)
libmysqld/libmysqld.def:
  Use the invisible tabs (!)
 2005-01-12 21:04:31 -06:00
unknown
f7f077be82 Merge here.mwagner.org:/Users/mwagner/work/bk/mysql-4.1 
into here.mwagner.org:/Users/mwagner/work/bk/mysql-5.0
 2005-01-12 19:58:49 -06:00