Commit graph

37842 commits

Author SHA1 Message Date
unknown
28232df2ae Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.0-maint
into  sin.intern.azundris.com:/home/tnurnberg/31227/50-31227
2007-10-05 10:04:45 +02:00
unknown
1b3d25d561 Bug#31227: memory overrun with decimal (6,6) and zerofill and group_concat
Reserve the space for the leading 0 (before the decimal point) in DECIMAL(a,a) ZEROFILL.


mysql-test/r/type_decimal.result:
  show that we allocate a large enough buffer for output of DECIMAL(a,a) [ZEROFILL].
mysql-test/t/type_decimal.test:
  show that we allocate a large enough buffer for output of DECIMAL(a,a) [ZEROFILL].
  without patch for bug#31227, valgrind will complain here; so will a
  debug build.
sql/my_decimal.cc:
  Reserve the space for the leading 0 (before the decimal point) in DECIMAL(a,a) ZEROFILL.
  Doxygenise preamble of my_decimal2string().
2007-10-05 09:38:57 +02:00
unknown
c038fe2d92 Merge sita.local:/Users/tsmith/m/bk/50-5.0.48
into  sita.local:/Users/tsmith/m/bk/maint/50


sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
2007-10-04 13:58:40 -06: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
e96d53642a Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.0-maint
into  sin.intern.azundris.com:/home/tnurnberg/30444/50-30444
2007-10-04 19:02:31 +02:00
unknown
b055562b8b Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-4.1-maint
into  sin.intern.azundris.com:/home/tnurnberg/30444/41-30444
2007-10-04 18:58:54 +02:00
unknown
4d0ef0cc85 Backport of the 5.0 patch to 4.1
Bug#28878: InnoDB tables with UTF8 character set and indexes cause  wrong result for DML
When making key reference buffers over CHAR fields whitespace (0x20) must be used to fill in the remaining space in the field's buffer. This is what Field_string::store() does. Fixed Field_string::get_key_image() to do the same.


mysql-test/r/innodb_mysql.result:
  Bug#28878: test case
mysql-test/t/innodb_mysql.test:
  Bug#28878: test case
sql/field.cc:
  Bug#28878: Fill with space instead of binary zeros.
2007-10-04 14:22:35 +04: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
ea46c11662 Merge ssh://bk-internal.mysql.com//home/bk/mysql-5.0-maint
into  polly.(none):/home/kaa/src/maint/mysql-5.0-maint
2007-10-04 13:52:41 +04: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
227bf9ad66 Merge polly.(none):/home/kaa/src/maint/bug5731/my50-bug5731
into  polly.(none):/home/kaa/src/maint/mysql-5.0-maint
2007-10-04 13:29:37 +04:00
unknown
698e9b4f0f Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint
into  mysql.com:/home/ram/work/b31070/b31070.5.0
2007-10-04 14:14:11 +05:00
unknown
78348d4ed1 Issue a warning if a user sets an option or a variable to a value that is greater than a defined maximum for the option/variable.
This is for bug #29446 "Specifying a myisam_sort_buffer > 4GB on 64 bit machines not possible". Support for myisam_sort_buffer_size > 4 GB on 64-bit Windows will be looked at later in 5.2.


mysql-test/r/variables.result:
  Fixed the test.
mysql-test/t/variables.test:
  Fixed the test.
mysys/my_getopt.c:
  Print a warning to the error log if a user sets an option to a value greater than the option's maximum value.
sql/set_var.cc:
  Issue an SQL warning if a user assignes a value greater than the variable's maximum value.
2007-10-04 12:34:00 +04:00
unknown
6dc4dfb363 merging: results adjusted 2007-10-04 12:09:22 +05:00
unknown
66fed4ae52 Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.0-maint
into  sin.intern.azundris.com:/home/tnurnberg/30444/50-30444


client/mysqldump.c:
  Auto merged
2007-10-04 08:42:36 +02:00
unknown
bb050c0e4c Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-4.1-maint
into  sin.intern.azundris.com:/home/tnurnberg/30444/41-30444
2007-10-04 08:37:43 +02:00
unknown
fd7d13540e Merge sin.intern.azundris.com:/home/tnurnberg/30444/41-30444
into  sin.intern.azundris.com:/home/tnurnberg/30444/50-30444


client/mysqldump.c:
  Auto merged
2007-10-04 08:32:43 +02:00
unknown
3f4eaf57e9 Bug #30444: 5.0 mysqldump silently allows wrong backup to be taken against a 4.0 database
The combination of --single-transaction and --master-data requires
START TRANSACTION WITH CONSISTENT SNAPSHOT which is available from
mysqld 4.1 on. When trying this against an older server, print
diagnostic, then, if --force is not given, abort.

No test-case given since it would require a mysqld < 4.1.


client/mysqldump.c:
  Bug #30444: 5.0 mysqldump silently allows wrong backup to be taken against a 4.0 database
  
  The combination of --single-transaction and --master-data requires
  START TRANSACTION WITH CONSISTENT SNAPSHOT which is available from
  mysqld 4.1 on. When trying this against an older server, print
  diagnostic, then, if --force is not given, abort.
2007-10-04 08:27:03 +02:00
unknown
1981008587 Merge mysql.com:/home/ram/work/b31070/b31070.4.1
into  mysql.com:/home/ram/work/b31070/b31070.5.0


mysql-test/r/ctype_big5.result:
  Auto merged
mysql-test/r/ctype_gbk.result:
  Auto merged
mysql-test/r/ctype_uca.result:
  Auto merged
strings/ctype-big5.c:
  Auto merged
strings/ctype-euc_kr.c:
  Auto merged
strings/ctype-gb2312.c:
  Auto merged
strings/ctype-sjis.c:
  Auto merged
BitKeeper/deleted/.del-ctype-cp932.c:
  Auto merged
2007-10-04 10:54:51 +05:00
unknown
db2d3104f9 Fix for bug #31069: crash in 'sounds like'
and for bug #31070: crash during conversion of charsets

Problem: passing a 0 byte length string to some my_mb_wc_XXX() 
functions leads to server crash due to improper argument check.

Fix: properly check arguments passed to my_mb_wc_XXX() functions.


mysql-test/include/ctype_common.inc:
  Fix for bug #31069: crash in 'sounds like'
  and bug #31070: crash during conversion of charsets
    - test case.
mysql-test/r/ctype_big5.result:
  Fix for bug #31069: crash in 'sounds like'
  and bug #31070: crash during conversion of charsets
    - test result.
mysql-test/r/ctype_euckr.result:
  Fix for bug #31069: crash in 'sounds like'
  and bug #31070: crash during conversion of charsets
    - test result.
mysql-test/r/ctype_gb2312.result:
  Fix for bug #31069: crash in 'sounds like'
  and bug #31070: crash during conversion of charsets
    - test result.
mysql-test/r/ctype_gbk.result:
  Fix for bug #31069: crash in 'sounds like'
  and bug #31070: crash during conversion of charsets
    - test result.
mysql-test/r/ctype_uca.result:
  Fix for bug #31069: crash in 'sounds like'
  and bug #31070: crash during conversion of charsets
    - test result.
strings/ctype-big5.c:
  Fix for bug #31069: crash in 'sounds like'
  and bug #31070: crash during conversion of charsets
    - check the string length before testing its first byte.
strings/ctype-cp932.c:
  Fix for bug #31069: crash in 'sounds like'
  and bug #31070: crash during conversion of charsets
    - check the string length before testing its first byte.
strings/ctype-euc_kr.c:
  Fix for bug #31069: crash in 'sounds like'
  and bug #31070: crash during conversion of charsets
    - check the string length before testing its first byte.
strings/ctype-gb2312.c:
  Fix for bug #31069: crash in 'sounds like'
  and bug #31070: crash during conversion of charsets
    - check the string length before testing its first byte.
strings/ctype-sjis.c:
  Fix for bug #31069: crash in 'sounds like'
  and bug #31070: crash during conversion of charsets
    - check the string length before testing its first byte.
2007-10-04 10:20:00 +05:00
unknown
34c494cc6f Merge pilot.mysql.com:/data/msvensson/mysql/bug31167/my50-bug31167
into  pilot.mysql.com:/data/msvensson/mysql/mysql-5.0-maint
2007-10-03 11:49:59 +02:00
unknown
61c8e6ca16 Bug #20358: InnoDB hang on the adaptive hash index latch in btr0sea.c
Add --skip-innodb-adaptive-hash-index option, which is a way to
work around the bug (by disabling the adaptive hash feature entirely).

This may be useful even once the bug is fixed, for benchmarking purposes.
There are some workloads for which the adaptive hash index is not effective.


sql/ha_innodb.cc:
  Add --skip-innodb-adaptive-hash-index option.
sql/ha_innodb.h:
  Add --skip-innodb-adaptive-hash-index option.
sql/mysqld.cc:
  Add --skip-innodb-adaptive-hash-index option.
sql/set_var.cc:
  Add --skip-innodb-adaptive-hash-index option.
2007-10-02 23:47:30 -06: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
27eff217b4 Bug#27597 mysqld-debug broken
- "on" -> "restore" to avoid warning in MSVC when compiling with debug


mysys/my_init.c:
  Fix spelling error that cause MSVC to throw a warning
  when compiling with debug.
  Use "restore" instaed of "on" to turn runtime checks back on
2007-10-02 20:44:37 +02:00
unknown
bc8d42f96d Merge polly.(none):/home/kaa/src/maint/bug5731/my50-bug5731
into  polly.(none):/home/kaa/src/maint/mysql-5.0-maint


sql/mysqld.cc:
  Auto merged
2007-10-02 13:34:33 +04:00
unknown
2b8748ca6e Merge polly.(none):/home/kaa/src/maint/bug5731/my50-bug5731_buffer_limits
into  polly.(none):/home/kaa/src/maint/bug5731/my50-bug5731


sql/mysqld.cc:
  Auto merged
2007-10-02 12:41:08 +04:00
unknown
05055a45b3 Merge polly.(none):/home/kaa/src/maint/bug5731.old/my50-bug5731-read_buffer_size
into  polly.(none):/home/kaa/src/maint/bug5731/my50-bug5731


include/my_global.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
2007-10-02 11:18:00 +04:00
unknown
043e5a1192 Merge polly.(none):/home/kaa/src/maint/bug5731/my50-bug5731_keycache
into  polly.(none):/home/kaa/src/maint/bug5731/my50-bug5731
2007-10-02 11:14:19 +04: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
ba0cd51eb1 Merge ramayana.hindu.god:/home/tsmith/m/bk/50
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/50


configure.in:
  Auto merged
scripts/mysql_config.sh:
  Auto merged
libmysql/libmysql.c:
  Manual merge
2007-09-28 10:54:49 -06: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
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
db55af7c40 Merge bk-internal:/home/bk/mysql-5.0-maint
into  pilot.(none):/data/msvensson/mysql/mysql-5.0-maint


libmysql/libmysql.c:
  Auto merged
2007-09-27 08:49:23 +02:00
unknown
d63f8305d8 Move DBUG_ENTER to begining of function to avoid build failure with debug on windows 2007-09-27 08:48:39 +02:00
unknown
adb1d7a327 Raise version number after cloning 5.0.50 2007-09-26 19:15:42 +02:00
unknown
f700bf2d0d Bug#31167 Introduction of @@hostname breaks replication in a ring
- Use a local uservariable to avoid @@hostname in binlog


scripts/mysql_system_tables_data.sql:
  Load @@hostname into a local user variable to avoid
  writing @@hostname to the binary log that potentially
  would be replicated to a slave server that not yet was upgraded
  to have @@hostname.
2007-09-26 17:04:41 +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
bc09b357fa Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0-maint
into  sita.local:/Users/tsmith/m/bk/maint/50
2007-09-24 13:22:39 +02:00
unknown
562deff31c Add test for named pipes on windows
Improve test for  shm on windows


mysql-test/include/windows.inc:
  improve "skip message" and don't require a result file
mysql-test/r/shm.result:
  Update result after adding more tests
mysql-test/t/shm-master.opt:
  Add $MTR_BUILD_THREAD to get a unique shared memory base name
mysql-test/t/shm.test:
  Run a bunch of more test to check shm
mysql-test/r/named_pipe.result:
  New BitKeeper file ``mysql-test/r/named_pipe.result''
mysql-test/t/named_pipe-master.opt:
  New BitKeeper file ``mysql-test/t/named_pipe-master.opt''
mysql-test/t/named_pipe.test:
  New BitKeeper file ``mysql-test/t/named_pipe.test''
2007-09-24 12:42:44 +02:00
unknown
139b563ec4 Merge sita.local:/Users/tsmith/m/bk/50
into  sita.local:/Users/tsmith/m/bk/maint/50


client/mysql.cc:
  Auto merged
client/mysqldump.c:
  Auto merged
mysql-test/Makefile.am:
  Auto merged
sql/sql_select.cc:
  Auto merged
2007-09-24 11:33:27 +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
cfbb6fc632 Bug#30843 Bad Test addition to t/archive.test
mysql-test/r/archive.result:
  Don't care about the "after insert delayed" record when since
  we can't guarantee the order it's been inserted
mysql-test/t/archive.test:
  Don't care about the "after insert delayed" record when since
  we can't guarantee the order it's been inserted
2007-09-22 12:17:14 +02:00
unknown
150953a36a Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint
into  alf.(none):/src/bug15327/my50-bug15327


win/configure.js:
  Auto merged
2007-09-22 03:11:12 -04:00
unknown
1c078caa82 - Increase default connect_timeout to avoid intermittent
disconnects when test servers are put under load
2007-09-21 17:52:02 +02:00
unknown
e8972b7afb Bug #15327: configure: --with-tcp-port option being partially ignored
make sure that if builder configured with a non-standard (!= 3306)
default TCP port that value actually gets used throughout.


win/configure.js:
  Bug #15327: configure: --with-tcp-port option being partially ignored
      
  If MYSQL_TCP_PORT defaulted in configure (factory default 3306
  at the time of this writing), set MYSQL_TCP_PORT to factory
  default, then clear factory default after. That way, we lose no
  information, and we can distinguish between "defaulted" and the
  pathological case "builder specifically configured a port that
  coincides with factory default." This can in theory happen if
  builder configures and builds several servers from a script
  (--with-tcp-port=3306, --with-tcp-port=3316, --with-tcp-port=3326).
  Not all that probable, but much preferable to having more "magic"
  happen in the server when we can solve this without any guesswork.
2007-09-21 11:38:23 -04:00
unknown
885efe4c73 Bug#28359 Intermitted lost connection at 'reading authorization packet' errors
- Increase default 'connect_timeout' value to 10 seconds


sql/mysql_priv.h:
  Increase the default connect_timeout value to 10 seconds
2007-09-21 17:10:45 +02:00
unknown
89c7db5655 Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint
into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
2007-09-21 16:39:05 +02:00
unknown
8a42112692 Bug#30843 Bad Test addition to t/archive.test
- Add extra insert


mysql-test/r/archive.result:
  Add an extra insert to guarantee that the delayed
  insert shows up in the table
mysql-test/t/archive.test:
  Add an extra insert to guarantee that the delayed
  insert shows up in the table
2007-09-21 09:48:30 +02:00
unknown
eeeeec8edc Bug#19828: Case sensitivity in hostname leads to inconsistent behavior
clean up SHOW GRANTS so it will show host-names with case as entered.
make REVOKE and friends case-sensitive to make things more intuitive.
Patch by Martin Friebe.


mysql-test/r/grant.result:
  Bug#19828: Case sensitivity in hostname leads to inconsistent behavior
  
  clean up after test so random order of tests is possible
mysql-test/r/grant3.result:
  Bug#19828: Case sensitivity in hostname leads to inconsistent behavior
  
  Show that REVOKE, SHOW GRANTS etc. are now consistently case-sensitive.
mysql-test/t/grant.test:
  Bug#19828: Case sensitivity in hostname leads to inconsistent behavior
  
  clean up after test so random order of tests is possible
mysql-test/t/grant3.test:
  Bug#19828: Case sensitivity in hostname leads to inconsistent behavior
  
  Show that REVOKE, SHOW GRANTS etc. are now consistently case-sensitive.
2007-09-20 18:10:35 +02:00
unknown
ad57f91294 result fix 2007-09-20 14:38:41 +05:00