Commit graph

49978 commits

Author SHA1 Message Date
unknown
d7a8509795 Merge bk-internal.mysql.com:/home/bk/mysql-5.1
into  mysql.com:/home/my/mysql-5.1
2007-10-07 09:54:17 +03:00
unknown
03bef972d3 Merge trift2.:/MySQL/M50/push-5.0
into  trift2.:/MySQL/M51/push-5.1


storage/ndb/test/ndbapi/testScanFilter.cpp:
  Auto merged
2007-10-04 19:31:32 +02:00
unknown
f4b6234c48 Merge trift2.:/MySQL/M50/mysql-5.0
into  trift2.:/MySQL/M50/push-5.0
2007-10-04 19:24:32 +02:00
unknown
a006263f8b Merge production.mysql.com:/usersnfs/jperkin/bk/build/5.0
into  production.mysql.com:/usersnfs/jperkin/bk/build/5.1


mysql-test/mysql-test-run.pl:
  Auto merged
scripts/mysql_install_db.sh:
  Auto merged
2007-10-04 12:21:51 +02:00
unknown
61e8c53898 Merge production.mysql.com:/usersnfs/jperkin/bk/build/5.0
into  production.mysql.com:/usersnfs/jperkin/bk/bug-27692/5.0
2007-10-04 12:06:13 +02:00
unknown
549cbcd547 Restore creation of test databases and the anonymous user which
were accidentally removed during a previous rototill of this
code.  Fixes bug#27692.
  
While it can be argued we should strive to provide a 'secure by
default' installation, this happens to be the setup currently
documented in the manual as the default, so defer changes that
improve security out of the box to a co-ordinated effort later
on.
  
For now, make a note about the test databases and anonymous user
in mysql_install_db and recommend that mysql_secure_installation
be ran for users wishing to remove these defaults.

[..re-commit of previously lost change..]


scripts/mysql_system_tables_data.sql:
  Add anonymous accounts.
scripts/mysql_install_db.sh:
  Point users at the mysql_secure_installation script.
mysql-test/mysql-test-run.pl:
  Add a comment where removing anonymous users.
2007-10-04 11:30:30 +02:00
unknown
019c20bf93 testScanFilter.cpp:
Updated variable size arrays to use vector like Jonas did for 5.1 so that my build would not break


ndb/test/ndbapi/testScanFilter.cpp:
   Updated variable size arrays to use vector like Jonas did for 5.1 so that my build would not break
2007-10-02 21:21:45 +02:00
unknown
88f1ad8cd6 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1-build
into  mysql.com:/home/kent/bk/make-install/mysql-5.1-build
2007-10-01 18:52:25 +02:00
unknown
ebc5495f65 make_binary_distribution.sh:
Added special handling of "mysql_install_db" and "mysql.server" scripts,
  find executables relative to the current directory.


scripts/make_binary_distribution.sh:
  Added special handling of "mysql_install_db" and "mysql.server" scripts,
  find executables relative to the current directory.
2007-10-01 18:41:38 +02:00
unknown
5b79e3c8d2 Merge bk-internal.mysql.com:/home/bk/mysql-5.1
into  mysql.com:/home/my/mysql-5.1


client/mysql_upgrade.c:
  Auto merged
client/mysqldump.c:
  Auto merged
client/mysqlslap.c:
  Auto merged
client/mysqltest.c:
  Auto merged
sql/handler.cc:
  Auto merged
2007-10-01 15:33:21 +03:00
unknown
0741a4d1b0 Removed extra spaces
Added extra debug


client/mysql_upgrade.c:
  Removed extra space
client/mysqlcheck.c:
  Removed extra space
client/mysqldump.c:
  Removed extra space
client/mysqlimport.c:
  Removed extra space
client/mysqlshow.c:
  Removed extra space
client/mysqlslap.c:
  Removed extra space
client/mysqltest.c:
  Removed extra space
sql/handler.cc:
  Added extra debug
2007-10-01 15:32:07 +03:00
unknown
0247dc1f2a Merge trift2.:/MySQL/M50/push-5.0
into  trift2.:/MySQL/M51/push-5.1


configure.in:
  5.0 version change does not affect 5.1 - "use local".
2007-10-01 12:31:24 +02:00
unknown
c8cb61bef3 Merge trift2.:/MySQL/M50/mysql-5.0
into  trift2.:/MySQL/M50/push-5.0
2007-10-01 12:19:06 +02:00
unknown
90a23c9683 Fix bug#31150 "Test case does not cleanup":
Add the cleanup by dropping the database 'track' in test "rpl_bug31076".


mysql-test/suite/rpl/r/rpl_bug31076.result:
  Fix bug#31150 "Test case does not cleanup":
  Drop the database 'track' which was newly created for this test.
mysql-test/suite/rpl/t/rpl_bug31076.test:
  Fix bug#31150 "Test case does not cleanup":
  Drop the database 'track' which was newly created for this test.
2007-10-01 12:10:46 +02:00
unknown
1d6626f5f7 Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1-build
into  trift2.:/MySQL/M51/push-5.1
2007-09-29 22:04:44 +02:00
unknown
eba50ef4c8 Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.1-build
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
2007-09-29 09:33:05 +02:00
unknown
d340f19706 Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build-work
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
2007-09-29 09:28:05 +02:00
unknown
a069b89bf4 align types 2007-09-29 09:26:33 +02:00
unknown
ec90b2c5a4 Merge trift2.:/MySQL/M51/clone-5.1
into  trift2.:/MySQL/M51/push-5.1

This is mysql-5.1.22-rc.


mysql-test/r/innodb_mysql.result:
  Auto merged
scripts/mysqld_safe.sh:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/sql_select.cc:
  Manual merge - the 31001 bug is already fixed.
mysql-test/include/mix1.inc:
  Manual merge - should not have conflicted at all.
2007-09-28 20:33:46 +02:00
unknown
a38aaaec67 Preliminary fix for
Bug #30759  	mysql_install_db fails to set $extra_bindir properly in all cases.


scripts/mysql_install_db.sh:
  Preliminary fix for
     Bug #30759  	mysql_install_db fails to set $extra_bindir properly in all cases.
  
  Provided by Daniel for the 5.1.22-rc build, to be superseded by a better patch when that is available.
2007-09-28 17:33:14 +02:00
unknown
7571c81f24 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1-build
into  mysql.com:/home/kent/bk/make-dist-stable/mysql-5.1-build


Makefile.am:
  Auto merged
configure.in:
  Auto merged
2007-09-27 21:40:07 +02:00
unknown
4bba9ecec0 Makefile.am, configure.in:
Handle pstack like other optional directories
  Check if a directory exists relative to $srcdir


Makefile.am:
  Handle pstack like other optional directories
  Check if a directory exists relative to $srcdir
configure.in:
  Handle pstack like other optional directories
  Check if a directory exists relative to $srcdir
pstack/Makefile.am:
  Handle pstack like other optional directories
  Check if a directory exists relative to $srcdir
2007-09-27 21:39:23 +02:00
unknown
5d6fac2784 Merge trift-lap.fambruehe:/MySQL/M51/push-5.1
into  trift-lap.fambruehe:/MySQL/M51/antony-5.1


Makefile.am:
  Auto merged
configure.in:
  Auto merged
storage/innobase/handler/ha_innodb.cc:
  Auto merged
mysql-test/suite/funcs_1/r/innodb__datadict.result:
  Use most current version of test results.
mysql-test/suite/funcs_1/r/memory__datadict.result:
  Use most current version of test results.
mysql-test/suite/funcs_1/r/myisam__datadict.result:
  Use most current version of test results.
mysql-test/suite/funcs_1/r/ndb__datadict.result:
  Use most current version of test results.
2007-09-27 16:51:40 +02:00
unknown
3e95b39882 Makefile.am, make_binary_distribution.sh:
Use custom 'pkgduppdir'
mysql.server.sh:
  The server is installed in 'libexecdir'


scripts/Makefile.am:
  Use custom 'pkgduppdir'
scripts/make_binary_distribution.sh:
  Use custom 'pkgduppdir'
support-files/mysql.server.sh:
  The server is installed in 'libexecdir'
2007-09-27 12:21:56 +02:00
unknown
13bd3dbff2 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1-build
into  mysql.com:/home/kent/bk/make-install/mysql-5.1-build
2007-09-27 10:33:59 +02:00
unknown
21628547b2 Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.1-build
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
2007-09-27 10:01:28 +02:00
unknown
ac95db38c2 Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
2007-09-27 09:49:46 +02:00
unknown
d8ed4e2a57 Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work-vista
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
2007-09-27 09:46:28 +02:00
unknown
bfa18c9a11 Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work-vista
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build


mysys/mf_tempfile.c:
  Auto merged
2007-09-27 09:42:54 +02:00
unknown
5b770e3a98 avoid using GetTempFileName in a way it's documented to not work on windows
mysys/mf_tempfile.c:
  Try to avoid passing null as first parameter to GetTempFileName, since it's documented that it won't work.
2007-09-27 08:56:06 +02:00
unknown
f401917c4a Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1-build
into  mysql.com:/home/kent/bk/make-install/mysql-5.1-build


scripts/Makefile.am:
  Auto merged
scripts/make_binary_distribution.sh:
  Auto merged
2007-09-26 20:21:23 +02:00
unknown
16c09e69f6 make_binary_distribution.sh:
Use 'make install' to create the package
Makefile.am:
  Added 'pkgsuppdir' to control location separately
  Pass on mandir and infodir
  Don't install headers


scripts/Makefile.am:
  Pass on mandir and infodir
scripts/make_binary_distribution.sh:
  Use 'make install' to create the package
support-files/Makefile.am:
  Added 'pkgsuppdir' to control location separately
cmd-line-utils/readline/Makefile.am:
  Don't install headers
cmd-line-utils/libedit/Makefile.am:
  Don't install headers
2007-09-26 20:19:33 +02:00
unknown
4a0e561f49 Makefile.am:
Corrected typo


libmysql_r/Makefile.am:
  Corrected typo
2007-09-26 19:41:46 +02:00
unknown
adb1d7a327 Raise version number after cloning 5.0.50 2007-09-26 19:15:42 +02:00
unknown
d8352a39ee Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1-build
into  mysql.com:/home/kent/bk/make-dist-stable/mysql-5.1-build


configure.in:
  Auto merged
mysql-test/Makefile.am:
  Auto merged
2007-09-26 18:49:09 +02:00
unknown
fb5f16f992 Makefile.am:
Always include all sub directories in "make dist"
  Removed incorrect comment
configure.in:
  Unconditionally list make files in AC_CONFIG_FILES
  Removed 'thread_dirs', it is not used
  Minor cleanup
compile-dist:
  Simplified the configure line needed for "make dist" to get it all
zlib.m4, ssl.m4:
  Unconditionally list make files in AC_CONFIG_FILES
Makefile.am:
  Removed DIST_SUBDIRS not needed
  Don't copy soft links as files into source package


BUILD/compile-dist:
  Simplified the configure line needed for "make dist" to get it all
config/ac-macros/ssl.m4:
  Unconditionally list make files in AC_CONFIG_FILES
config/ac-macros/zlib.m4:
  Unconditionally list make files in AC_CONFIG_FILES
libmysql/Makefile.am:
  Removed incorrect comment
Makefile.am:
  Always include all sub directories in "make dist"
mysql-test/Makefile.am:
  Removed DIST_SUBDIRS not needed
libmysql_r/Makefile.am:
  Don't copy soft links as files into source package
libmysqld/Makefile.am:
  Don't copy soft links as files into source package
libmysqld/examples/Makefile.am:
  Don't copy soft links as files into source package
sql/Makefile.am:
  Don't copy soft links as files into source package
extra/Makefile.am:
  Always include all sub directories in "make dist"
plugin/Makefile.am:
  Always include all sub directories in "make dist"
configure.in:
  Unconditionally list make files in AC_CONFIG_FILES
  Removed 'thread_dirs', it is not used
  Minor cleanup
2007-09-26 18:47:55 +02:00
unknown
9a640f848e Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
2007-09-25 17:53:01 +02:00
unknown
87f50228f4 Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build


mysql-test/suite/rpl/r/rpl_row_tabledefs_2myisam.result:
  Auto merged
mysql-test/suite/rpl/r/rpl_row_tabledefs_3innodb.result:
  Auto merged
2007-09-25 17:44:53 +02:00
unknown
0d6ec6cdc8 Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
2007-09-25 17:42:25 +02:00
unknown
1f1975681b Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1-target-5.1.22
into  trift-lap.fambruehe:/MySQL/M51/antony-5.1


mysql-test/suite/funcs_1/include/ndb_tb2.inc:
  Auto merged
mysql-test/suite/funcs_1/r/innodb_views.result:
  Auto merged
mysql-test/suite/funcs_1/r/memory_views.result:
  Auto merged
mysql-test/suite/funcs_1/r/myisam_views.result:
  Auto merged
mysql-test/suite/funcs_1/r/ndb_cursors.result:
  Auto merged
mysql-test/suite/funcs_1/r/ndb_func_view.result:
  Auto merged
mysql-test/suite/funcs_1/r/ndb_storedproc_07.result:
  Auto merged
mysql-test/suite/funcs_1/r/ndb_storedproc_08.result:
  Auto merged
mysql-test/suite/funcs_1/r/ndb_trig_0102.result:
  Auto merged
mysql-test/suite/funcs_1/r/ndb_trig_03.result:
  Auto merged
mysql-test/suite/funcs_1/r/ndb_trig_03e.result:
  Auto merged
mysql-test/suite/funcs_1/r/ndb_trig_0407.result:
  Auto merged
mysql-test/suite/funcs_1/r/ndb_trig_08.result:
  Auto merged
mysql-test/suite/funcs_1/r/ndb_trig_09.result:
  Auto merged
mysql-test/suite/funcs_1/r/ndb_trig_1011ext.result:
  Auto merged
mysql-test/suite/funcs_1/r/ndb_views.result:
  Auto merged
mysql-test/suite/funcs_1/views/views_master.inc:
  Auto merged
sql/ha_partition.h:
  Auto merged
storage/innobase/handler/ha_innodb.cc:
  Auto merged
configure.in:
  Version is updated already.
sql/ha_partition.cc:
  Manual merge of 5.1.22 changes into main.
2007-09-24 15:33:46 +02:00
unknown
859e794679 Merge production.mysql.com:/usersnfs/jperkin/bk/build-5.0
into  production.mysql.com:/usersnfs/jperkin/bk/build-5.1


BitKeeper/deleted/.del-CMakeLists.txt~dd682cce1d53c0b4:
  Auto merged
2007-09-24 11:48:27 +02:00
unknown
96defb3b50 Merge kindahl-laptop.dnsalias.net:/home/bk/b31076-mysql-5.1-rpl
into  kindahl-laptop.dnsalias.net:/home/bkroot/mysql-5.1-release
2007-09-24 10:53:41 +02:00
unknown
a78445a7bc BUG#31076 (Server crashes when start slave is issued):
Second patch to initailize more uninitialized variables.


sql/log_event.cc:
  Intializing several uninitialized fields in the Table_map_log_event.
2007-09-24 10:50:57 +02:00
unknown
4b4680898f Revert previous attempt to fix bug#27693, the files removed from the
cmake list are auto-generated and thus still required.  Correct fix
not yet known.


bdb/CMakeLists.txt:
  Revert previous change, it is incorrect as those files are automatically
  generated.
2007-09-22 16:29:15 +02:00
unknown
bd8e7fee1f fixed warnings by bug 30639 2007-09-21 12:17:09 +02:00
unknown
92771001b3 fixed type conversion warnings revealed by bug 30639 2007-09-21 10:15:16 +02:00
unknown
52f3444917 Merge kindahl-laptop.dnsalias.net:/home/bkroot/mysql-5.1-release
into  kindahl-laptop.dnsalias.net:/home/bk/b31076-mysql-5.1-release
2007-09-20 16:38:36 +02:00
unknown
e40080ea66 BUG#31076 (Server crashes when start slave is issued):
Row-based replication crashes when replicating from pre-5.1.22 to 5.1.22
due to an uninitialized variable.


sql/log_event.cc:
  Initializing m_null_bits to null so that it can be detected that it
  was not initialized later.
mysql-test/suite/rpl/r/rpl_bug31076.result:
  New BitKeeper file ``mysql-test/suite/rpl/r/rpl_bug31076.result''
mysql-test/suite/rpl/t/rpl_bug31076.test:
  New BitKeeper file ``mysql-test/suite/rpl/t/rpl_bug31076.test''
2007-09-20 16:31:05 +02:00
unknown
c9f5a087f5 Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.1-opt
into  mysql.com:/home/gluh/MySQL/Merge/5.1-opt
2007-09-20 16:28:46 +05:00
unknown
ae270c4210 result fix 2007-09-20 16:27:58 +05:00