- 28 Oct, 2005 6 commits
-
-
unknown authored
support-files/mysql.spec.sh: - added man page for mysqlmanager
-
unknown authored
BitKeeper/deleted/.del-isamchk.1.in~9d44303f6d951962: Auto merged BitKeeper/deleted/.del-isamlog.1.in~416d91adbf665b19: Auto merged configure.in: Auto merged netware/BUILD/compile-linux-tools: Auto merged netware/BUILD/compile-netware-END: Auto merged man/Makefile.am: - after merge fix support-files/mysql.spec.sh: - after merge fix
-
unknown authored
support-files/mysql.spec.sh: - fixed file list after merge, removed dupes
-
unknown authored
into ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0-tmp
-
unknown authored
Added "base64.h" to enable "make dist" to work include/Makefile.am: Added "base64.h" to enable "make dist" to work
-
unknown authored
into ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0-tmp
-
- 27 Oct, 2005 28 commits
-
-
unknown authored
mysql-test/r/insert_select.result: Merge from 4.1 to 5.0. mysql-test/r/select.result: Merge from 4.1 to 5.0. mysql-test/t/insert_select.test: Merge from 4.1 to 5.0. mysys/my_handler.c: Merge from 4.1 to 5.0. sql/item.cc: Merge from 4.1 to 5.0. sql/item_timefunc.cc: Imported bug fix from 4.1 to 5.0. (Bug#14016) sql/item_timefunc.h: Imported bug fix from 4.1 to 5.0. (Bug#14016)
-
unknown authored
into ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0-tmp heap/_check.c: Auto merged heap/hp_create.c: Auto merged include/config-netware.h: Auto merged include/my_base.h: Auto merged include/my_handler.h: Auto merged include/myisam.h: Auto merged innobase/include/Makefile.am: Auto merged myisam/mi_check.c: Auto merged myisam/mi_delete.c: Auto merged myisam/mi_rnext_same.c: Auto merged myisam/mi_search.c: Auto merged myisam/mi_write.c: Auto merged myisam/myisamdef.h: Auto merged myisam/sort.c: Auto merged mysql-test/mysql-test-run.sh: Auto merged mysql-test/r/date_formats.result: Auto merged mysql-test/r/update.result: Auto merged mysql-test/t/date_formats.test: Auto merged mysql-test/t/select.test: Auto merged mysql-test/t/update.test: Auto merged mysys/my_getopt.c: Auto merged mysys/my_handler.c: Auto merged scripts/make_binary_distribution.sh: Auto merged sql/ha_myisam.cc: Auto merged sql/item_timefunc.cc: Auto merged sql/records.cc: Auto merged sql/sql_load.cc: Auto merged sql/sql_select.cc: Auto merged sql/structs.h: Auto merged strings/conf_to_src.c: Auto merged strings/ctype-win1250ch.c: Auto merged Makefile.am: Merged from 4.1 myisam/myisamchk.c: Merged from 4.1 mysql-test/mysql-test-run.pl: Merged from 4.1 mysql-test/r/insert_select.result: Merged from 4.1 mysql-test/r/myisam.result: Merged from 4.1 mysql-test/r/select.result: Merged from 4.1 mysql-test/t/insert_select.test: Merged from 4.1 mysql-test/t/myisam.test: Merged from 4.1 netware/mysql_test_run.c: Merged from 4.1 sql/item.cc: Merged from 4.1 sql/mysqld.cc: Merged from 4.1 sql/sql_update.cc: Merged from 4.1 tests/mysql_client_test.c: Merged from 4.1
-
unknown authored
Cleaned up xxxx_gis.test's and made gis_generic.inc independent of ndb (Note that archive_gis.test fails, but this is independent of this patch) client/mysqldump.c: Add DROP TABLE to be able to re-run mysqldump if it fails after 'table-named-as-view' is created mysql-test/include/gis_generic.inc: Remove dependency of ndb mysql-test/include/have_archive.inc: Fix syntax mysql-test/include/have_geometry.inc: Fix syntax mysql-test/r/mysqldump.result: New test results after adding 'drop table' mysql-test/t/archive_gis.test: gis_generic tests for have_geometry.inc mysql-test/t/bdb_gis.test: gis_generic tests for have_geometry.inc mysql-test/t/innodb_gis.test: gis_generic tests for have_geometry.inc mysql-test/t/ndb_gis.test: gis_generic tests for have_geometry.inc sql/item_func.cc: Simplify code (as signal_divide_by_null sets 'null_value')
-
unknown authored
into mysql.com:/home/my/mysql-5.0
-
unknown authored
into mysql.com:/data0/mysqldev/lenz/mysql-4.1 netware/BUILD/compile-linux-tools: Auto merged
-
unknown authored
- cleanup: removed obsolete support-files/MacOSX/make_mysql_pkg.pl script (we now use Do-pkg for building OS X packages) BitKeeper/deleted/.del-.cvsignore~4c7a1f88a5a62a24: Delete: NEW-RPMS/.cvsignore BitKeeper/deleted/.del-make_mysql_pkg.pl~caac82eb901cc206: Delete: support-files/MacOSX/make_mysql_pkg.pl netware/BUILD/compile-linux-tools: - removed reference to the NEW-RPMS directory netware/BUILD/compile-netware-END: - removed reference to the NEW-RPMS directory netware/BUILD/compile-netware-src: - removed reference to the NEW-RPMS directory
-
unknown authored
configure.in: Auto merged support-files/mysql.spec.sh: - after-merge fix
-
unknown authored
into moonbone.local:/work/13855-bug-4.1-mysql
-
unknown authored
After merge fix mysql-test/r/select.result: After merge fix
-
unknown authored
include/config-netware.h: Auto merged sql/sql_select.cc: Auto merged mysql-test/r/select.result: Manually merged fix for bug#13855 mysql-test/t/select.test: Manuall merged fix for bug#13855
-
unknown authored
into mysql.com:/home/alexi/dev/mysql-4.1-innobase
-
unknown authored
into selena.:H:/MYSQL/src/#13377-mysql-5.0a
-
unknown authored
Code that closes current relay log is moved to purge_relay_logs().
-
unknown authored
directory - these files are now maintained in the mysqldoc repository and included in the source distribution during the release build. Updated the configure.in script and Makefiles to create the man page file list at build time - Updated the file list in the RPM spec file to include all currently available man pages (this can not be done with wildcards, as the man pages are spread across several subpackages. However, RPM warns about unpackaged files, so newly added man pages can be spotted) BitKeeper/deleted/.del-isamchk.1.in~9d44303f6d951962: Delete: man/isamchk.1.in BitKeeper/deleted/.del-isamlog.1.in~416d91adbf665b19: Delete: man/isamlog.1.in BitKeeper/deleted/.del-mysql.1.in~3f4dbf65d31fea3a: Delete: man/mysql.1.in BitKeeper/deleted/.del-mysqlaccess.1.in~2adf98feb44a0dbf: Delete: man/mysqlaccess.1.in BitKeeper/deleted/.del-mysqladmin.1.in~81703c6092a1f769: Delete: man/mysqladmin.1.in BitKeeper/deleted/.del-mysqld.1.in~42371a82eb27d87c: Delete: man/mysqld.1.in BitKeeper/deleted/.del-mysqld_multi.1.in~b3f1c5343b8481e6: Delete: man/mysqld_multi.1.in BitKeeper/deleted/.del-mysqld_safe.1.in~6f34e14acc0c5e0b: Delete: man/mysqld_safe.1.in BitKeeper/deleted/.del-mysqldump.1.in~9520980bfec710d5: Delete: man/mysqldump.1.in BitKeeper/deleted/.del-mysql_fix_privilege_tables.1.in~7422405bb0e64325: Delete: man/mysql_fix_privilege_tables.1.in BitKeeper/deleted/.del-mysql_zap.1.in~df5cf8089b50c624: Delete: man/mysql_zap.1.in BitKeeper/deleted/.del-mysqlshow.1.in~81ce953dcc1a282f: Delete: man/mysqlshow.1.in BitKeeper/deleted/.del-perror.1.in~60d1efcbe71bdd9c: Delete: man/perror.1.in BitKeeper/deleted/.del-replace.1.in~e92dc1aea682608c: Delete: man/replace.1.in configure.in: - dynamically add man pages included in the man directory (the BK tree only contains one dummy file, the directory is populated by the Bootstrap script by copying current man pages from the documentation server) man/Makefile.am: - removed hard-coded list of man pages, the list is populated during the configure stage. When building from BK, only one placeholder file exists. For the release builds, this directory is populated by the Bootstrap script, which takes man page files from the documentation server. man/mysqlman.1: - removed version number support-files/mysql.spec.sh: - adjusted file list: added man pages that are now part of the official source distribution (taken from the documentation server)
-
unknown authored
Dump MY_CS_CSSORT when it's necessary. strings/conf_to_src.c: Dump MY_CS_CSSORT when it's necessary.
-
unknown authored
into mysql.com:/home/my/mysql-5.0
-
unknown authored
Added back missing return in mysql_delete() mysql-test/my_manage.c: Cleanup: Remove some #ifdef mysql-test/r/drop_temp_table.result: Delete database that may be left from other test mysql-test/t/drop_temp_table.test: Delete database that may be left from other test sql/log.cc: false -> FALSE true -> TRUE Wait until readers_count is 0 (not just for a signal) NOTE: it's very likely that the way to handle readers_count is wrong. (We are in pthread_cond_wait freeing a mutex that is not the innermost mutex, which can lead to deadlocks) I will talk with Guilhem about this ASAP sql/log_event.h: Remove number from last even to help future merges (all compilers I know of can handle this properly) sql/sql_delete.cc: Add back missing RETURN (was lost in a merge) Indentation fixes
-
unknown authored
into mysql.com:/home/cps/mysql/trees/mysql-5.0-virgin
-
unknown authored
server-tools/instance-manager/listener.cc: reinitialize timer used in select(), as on linux it is modified to reflect amout of time not slept (e.g. set ot zero)
-
unknown authored
Updating to conform the current CHARSET_INFO structure. strings/conf_to_src.c: Updating to conform the current structure.
-
unknown authored
into mysql.com:/usr/home/bar/mysql-4.1.b13347
-
unknown authored
into mysql.com:/usr/home/ram/work/5.0.b14290
-
unknown authored
into mysql.com:/space/pekka/ndb/version/my50
-
unknown authored
ndb/test/src/HugoCalculator.cpp: does not use Base64.hpp which was renamed to base64.h
-
unknown authored
into mysql.com:/home/mydev/mysql-5.0-bug12166
-
unknown authored
into mysql.com:/usr/home/ram/work/5.0.b14290
-
unknown authored
into mysql.com:/home/cps/mysql/trees/mysql-5.0-virgin
-
unknown authored
server-tools/instance-manager/manager.cc: Additional comment for the bugfix
-
- 26 Oct, 2005 6 commits
-
-
unknown authored
into mysql.com:/home/jimw/my/mysql-5.0-clean
-
unknown authored
into mysql.com:/home/jimw/my/mysql-5.0-clean mysql-test/std_data/loaddata_dq.dat: Merge rename: mysql-test/std_data/loaddata5.dat -> mysql-test/std_data/loaddata_dq.dat sql/item.cc: Auto merged sql/sql_load.cc: Auto merged mysql-test/r/loaddata.result: Resolve conflicts, deal with renamed dat file mysql-test/t/loaddata.test: Resolve conflicts, deal with renamed dat file
-
unknown authored
Change in gis test to allow NDB to be able to call generic tests. Fix for Archive so that ALTER TABLE doesn't issue a warning. Also added test case for alter table. mysql-test/include/gis_generic.inc: Change in test for NDB (needs order by) mysql-test/r/archive.result: Change for gis_generic mysql-test/r/archive_gis.result: Change in test gis_generic mysql-test/r/bdb_gis.result: Change in gis test means new results mysql-test/r/innodb_gis.result: Change in gis test means change in results. mysql-test/r/ndb_gis.result: Change in gis means result change mysql-test/t/archive.test: Added alter table test to fix bug in alter table mysql-test/t/archive_gis.test: Change in syntax mysql-test/t/ndb_gis.test: Change to test both with and not with pushdown conditions sql/ha_archive.cc: Removed ARN temp file from exts[] to solve warning messages in alter table.
-
unknown authored
into zim.(none):/home/brian/mysql/mysql-5.0
-
unknown authored
and innobase/*/makefilewin (which are unused now). BitKeeper/deleted/.del-makefilewin.i~5c8479dcb8a455b2: Delete: innobase/include/makefilewin.i BitKeeper/deleted/.del-makefilewin~78000390c783b1c5: Delete: innobase/btr/makefilewin BitKeeper/deleted/.del-makefilewin~2fc379bd4065c995: Delete: innobase/buf/makefilewin BitKeeper/deleted/.del-makefilewin~d37b6b303348c871: Delete: innobase/data/makefilewin BitKeeper/deleted/.del-makefilewin~5104767c73775697: Delete: innobase/dict/makefilewin BitKeeper/deleted/.del-makefilewin~d90f35fdc3f2ee5f: Delete: innobase/dyn/makefilewin BitKeeper/deleted/.del-makefilewin~c7b621c745e5de95: Delete: innobase/eval/makefilewin BitKeeper/deleted/.del-makefilewin~4d139e182457e553: Delete: innobase/fil/makefilewin BitKeeper/deleted/.del-makefilewin~d1a9d1f7d33fcb73: Delete: innobase/fsp/makefilewin BitKeeper/deleted/.del-makefilewin~ef3a208fa0e9b0db: Delete: innobase/fut/makefilewin BitKeeper/deleted/.del-makefilewin~f1e3b890aa1c9ea3: Delete: innobase/ha/makefilewin BitKeeper/deleted/.del-makefilewin~1c53f31b88dd36e: Delete: innobase/ibuf/makefilewin BitKeeper/deleted/.del-makefilewin~7a9d7d5a42bbfaf5: Delete: innobase/lock/makefilewin BitKeeper/deleted/.del-makefilewin~b643e38d8da389ac: Delete: innobase/log/makefilewin BitKeeper/deleted/.del-makefilewin~a40ea12eebdd6ef0: Delete: innobase/mach/makefilewin BitKeeper/deleted/.del-makefilewin~1dbc058d76ebf1db: Delete: innobase/mem/makefilewin BitKeeper/deleted/.del-makefilewin~6ba64863bce3d0b8: Delete: innobase/mtr/makefilewin BitKeeper/deleted/.del-makefilewin~15e9e5c9e8fa870b: Delete: innobase/os/makefilewin BitKeeper/deleted/.del-makefilewin~aeea7c82f21f7cf5: Delete: innobase/page/makefilewin BitKeeper/deleted/.del-makefilewin~dea10ec1c94f7be: Delete: innobase/pars/makefilewin BitKeeper/deleted/.del-makefilewin~608ed49dcd88e0f7: Delete: innobase/que/makefilewin BitKeeper/deleted/.del-makefilewin~2e0407fe123f8365: Delete: innobase/read/makefilewin BitKeeper/deleted/.del-makefilewin~fdda94ad32fa9e34: Delete: innobase/rem/makefilewin BitKeeper/deleted/.del-makefilewin~dc4b8ad5ea53bd: Delete: innobase/row/makefilewin BitKeeper/deleted/.del-makefilewin~63acd666293282a: Delete: innobase/srv/makefilewin BitKeeper/deleted/.del-makefilewin~13888739357b3025: Delete: innobase/sync/makefilewin BitKeeper/deleted/.del-makefilewin~c8273a47b90f52bb: Delete: innobase/thr/makefilewin BitKeeper/deleted/.del-makefilewin~f4b7b99a887b7de: Delete: innobase/trx/makefilewin BitKeeper/deleted/.del-makefilewin~72a64128bacce71b: Delete: innobase/usr/makefilewin BitKeeper/deleted/.del-makefilewin~389ee2dcf79afb79: Delete: innobase/ut/makefilewin BitKeeper/deleted/.del-makefilewin~14f24a4a173e2fcd: Delete: innobase/makefilewin BitKeeper/deleted/.del-my_cnf~977f69858affc57b: Delete: innobase/my_cnf innobase/include/Makefile.am: Removed ref to Makefilewin.i (it is unused now).
-
unknown authored
into selena.:H:/MYSQL/src/#14137-mysql-5.0 sql/mysqld.cc: Auto merged
-