Commit graph

50010 commits

Author SHA1 Message Date
unknown
bfc41161b4 Bug #30878: Crashing when alter an auto_increment non partitioned
table to partitioned

Problem:
Crashed because usage of an uninitialised mutex when auto_incrementing
  a partitioned temporary table

Fix:
Only locking (using the mutex) if not temporary table.


mysql-test/r/partition.result:
  Bug #30878: Crashing when alter an auto_increment non partitioned
    table to partitioned
  test result
mysql-test/t/partition.test:
  Bug #30878: Crashing when alter an auto_increment non partitioned
    table to partitioned
  testcase
sql/ha_partition.cc:
  Bug #30878: Crashing when alter an auto_increment non partitioned
    table to partitioned
  
  If the table is a temporary table, the table_share->mutex is not
    initialised.
  
  Checking if not temporary table, then OK to lock (else no need
    to lock)
2007-10-17 20:40:23 +02:00
unknown
9105a1d90b Merge stella.local:/home2/mydev/mysql-5.0-axmrg
into  stella.local:/home2/mydev/mysql-5.1-axmrg
2007-10-10 21:25:57 +02:00
unknown
da804f3088 Merge stella.local:/home2/mydev/mysql-5.1-amain
into  stella.local:/home2/mydev/mysql-5.1-axmrg


configure.in:
  Auto merged
sql/ha_partition.cc:
  Auto merged
2007-10-10 21:25:19 +02:00
unknown
82107254e4 Merge stella.local:/home2/mydev/mysql-5.0-amain
into  stella.local:/home2/mydev/mysql-5.0-axmrg
2007-10-10 20:44:05 +02:00
unknown
4273430f1c Merge bk-internal.mysql.com:/home/bk/mysql-5.1-engines
into  stella.local:/home2/mydev/mysql-5.1-bug15522
2007-10-10 16:52:56 +02:00
unknown
d67410b57d Merge bk-internal.mysql.com:/home/bk/mysql-5.1-engines
into  mattiasj-laptop.(none):/home/mattiasj/clones/mysql-5.1-bug30484
2007-10-10 08:30:02 +02:00
unknown
0249c0a540 Merge stella.local:/home2/mydev/mysql-5.0-bug15522
into  stella.local:/home2/mydev/mysql-5.1-bug15522


mysql-test/r/merge.result:
  Auto merged
mysql-test/t/merge.test:
  Auto merged
2007-10-09 14:18:10 +02:00
unknown
659c47785d Merge stella.local:/home2/mydev/mysql-5.0-bug15522-old
into  stella.local:/home2/mydev/mysql-5.0-bug15522
2007-10-09 13:38:46 +02:00
unknown
0c0042a5de Bug#15522 - create ... select and with merge tables
Added test case.
The fix for Bug#20662 does also fix this one.


mysql-test/r/merge.result:
  Bug#15522 - create ... select and with merge tables
  Added test result.
mysql-test/t/merge.test:
  Bug#15522 - create ... select and with merge tables
  Added test case.
2007-10-09 13:10:51 +02:00
unknown
89568a9d2a Merge xiphis.org:/anubis/antony/work/p1-bug31382.1.fix-5.1
into  xiphis.org:/anubis/antony/work/p1-bug31382.1.merge-5.1
2007-10-04 17:37:51 -07:00
unknown
4686a8c8d1 fix undefined variable which can lead to crash 2007-10-04 17:34:28 -07:00
unknown
12a6d72b0f Merge xiphis.org:/anubis/antony/work/mysql-5.1-engines
into  xiphis.org:/anubis/antony/work/p1-bug31382.1.merge-5.1
2007-10-04 11:22:52 -07:00
unknown
1c94c8e674 Bug#31382
"Disabled plugin is provoking Valgrind error"
  If there are any auto-alloced string plug-in options, memory is
  allocated during the call for handle_options(). We must free this
  memory if we are not installing the plug-in.


include/my_getopt.h:
  bug31382
    new function: my_cleanup_options()
mysys/my_getopt.c:
  bug31382
    new function: my_cleanup_options(), fini_one_value()
    alter init_variables() to take an extra option.
    forward declare init_one_value() and fini_one_value()
sql/sql_plugin.cc:
  bug31382
    after calling handle_options(), make sure to call my_cleanup_options()
    if we are not installing the plug-in.
2007-10-04 10:55:08 -07: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
b4d566a053 Bug #30484: Partitions: crash with self-referencing trigger
Two cases in ha_partition::extra() was missing
(HA_EXTRA_DELETE_CANNOT_BATCH and HA_EXTRA_UPDATE_CANNOT_BATCH)
which only is currently used by NDB (which not uses ha_partition)


mysql-test/r/partition.result:
  Added result for test of Bug #30484
mysql-test/t/partition.test:
  Added test for Bug #30484
sql/ha_partition.cc:
  Added HA_EXTRA_DELETE_CANNOT_BATCH and HA_EXTRA_UPDATE_CANNOT_BATCH
  in ha_partition::extra to do nothing
  (Only currently used in NDB, which is not dependent of ha_partition)
2007-10-04 14:56:33 +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
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
82e6e6fb66 Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.1-engines
into  mysql.com:/home/svoj/devel/mysql/BUG30583/mysql-5.1-engines


sql/ha_partition.cc:
  Auto merged
2007-10-01 14:23:16 +05: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
f0266eae8e Merge stella.local:/home2/mydev/mysql-5.0-axmrg
into  stella.local:/home2/mydev/mysql-5.1-axmrg


configure.in:
  Manual merge from 5.0
2007-09-28 15:13:10 +02:00
unknown
dc3e21a850 Merge stella.local:/home2/mydev/mysql-5.1-amain
into  stella.local:/home2/mydev/mysql-5.1-axmrg


mysql-test/include/have_bug25714.inc:
  Auto merged
2007-09-28 09:54:21 +02:00
unknown
11f05aa9ce Merge stella.local:/home2/mydev/mysql-4.1-axmrg
into  stella.local:/home2/mydev/mysql-5.0-axmrg
2007-09-28 09:13:50 +02:00
unknown
d992598ac8 Merge stella.local:/home2/mydev/mysql-5.0-amain
into  stella.local:/home2/mydev/mysql-5.0-axmrg
2007-09-28 09:13:21 +02:00
unknown
d244374f2b Merge stella.local:/home2/mydev/mysql-4.1-amain
into  stella.local:/home2/mydev/mysql-4.1-axmrg
2007-09-28 08:43:24 +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