Commit graph

50036 commits

Author SHA1 Message Date
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 : 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 : 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 : crash in 'sounds like'
and for bug : 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 : crash in 'sounds like'
  and bug : crash during conversion of charsets
    - test case.
mysql-test/r/ctype_big5.result:
  Fix for bug : crash in 'sounds like'
  and bug : crash during conversion of charsets
    - test result.
mysql-test/r/ctype_euckr.result:
  Fix for bug : crash in 'sounds like'
  and bug : crash during conversion of charsets
    - test result.
mysql-test/r/ctype_gb2312.result:
  Fix for bug : crash in 'sounds like'
  and bug : crash during conversion of charsets
    - test result.
mysql-test/r/ctype_gbk.result:
  Fix for bug : crash in 'sounds like'
  and bug : crash during conversion of charsets
    - test result.
mysql-test/r/ctype_uca.result:
  Fix for bug : crash in 'sounds like'
  and bug : crash during conversion of charsets
    - test result.
strings/ctype-big5.c:
  Fix for bug : crash in 'sounds like'
  and bug : crash during conversion of charsets
    - check the string length before testing its first byte.
strings/ctype-cp932.c:
  Fix for bug : crash in 'sounds like'
  and bug : crash during conversion of charsets
    - check the string length before testing its first byte.
strings/ctype-euc_kr.c:
  Fix for bug : crash in 'sounds like'
  and bug : crash during conversion of charsets
    - check the string length before testing its first byte.
strings/ctype-gb2312.c:
  Fix for bug : crash in 'sounds like'
  and bug : crash during conversion of charsets
    - check the string length before testing its first byte.
strings/ctype-sjis.c:
  Fix for bug : crash in 'sounds like'
  and bug : crash during conversion of charsets
    - check the string length before testing its first byte.
2007-10-04 10:20:00 +05:00
unknown
3b148edb34 Merge bk-internal:/home/bk/mysql-5.1-maint
into  pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-new-maint
2007-10-03 13:44:37 +02: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
126f7c3d27 Merge pilot.mysql.com:/data/msvensson/mysql/bug31167/my51-bug31167
into  pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-new-maint
2007-10-03 11:46:55 +02:00
unknown
5a1db3a9ad Merge pilot.mysql.com:/data/msvensson/mysql/bug31167/my50-bug31167
into  pilot.mysql.com:/data/msvensson/mysql/bug31167/my51-bug31167


scripts/mysql_system_tables_data.sql:
  Merge 5.0->5.1
2007-10-03 11:19:24 +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
7f5bf01c12 Merge polly.(none):/home/kaa/src/maint/mysql-5.0-maint
into  polly.(none):/home/kaa/src/maint/mysql-5.1-maint


sql/mysqld.cc:
  Auto merged
2007-10-02 13:43:50 +04:00
unknown
309b7b1604 Merge polly.(none):/home/kaa/src/maint/bug5731/my51-bug5731
into  polly.(none):/home/kaa/src/maint/mysql-5.1-maint


include/my_global.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
2007-10-02 13:39:00 +04: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
79fcc28560 Merge polly.(none):/home/kaa/src/maint/bug5731/my50-bug5731
into  polly.(none):/home/kaa/src/maint/bug5731/my51-bug5731


sql/mysqld.cc:
  Null merge
2007-10-02 13:12:44 +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
73cb92767d Merge polly.(none):/home/kaa/src/maint/bug5731/my50-bug5731
into  polly.(none):/home/kaa/src/maint/bug5731/my51-bug5731


sql/mysqld.cc:
  Auto merged
include/keycache.h:
  Manual merge.
include/my_global.h:
  Manual merge.
include/my_sys.h:
  Manual merge.
mysys/mf_keycache.c:
  Manual merge.
mysys/my_largepage.c:
  Manual merge.
mysys/my_malloc.c:
  Manual merge.
mysys/safemalloc.c:
  Manual merge.
2007-10-02 11:32:33 +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
b76788a942 Merge ramayana.hindu.god:/home/tsmith/m/bk/maint/50
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/51


libmysql/libmysql.c:
  Auto merged
scripts/mysql_config.sh:
  Auto merged
configure.in:
  Use local (manual merge)
2007-09-28 10:57:45 -06:00
unknown
d7e230e1fc Merge ramayana.hindu.god:/home/tsmith/m/bk/51
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/51


configure.in:
  Auto merged
libmysql/libmysql.c:
  Auto merged
scripts/mysql_config.sh:
  Auto merged
2007-09-28 10:55:28 -06: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
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
573f3a00de Update result file(s) for 5.1
mysql-test/r/named_pipe.result:
  Update result file for 5.1
mysql-test/r/shm.result:
  Update result file for 5.1
2007-09-26 17:28:20 +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
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
0b019146c7 Merge sita.local:/Users/tsmith/m/bk/maint/50
into  sita.local:/Users/tsmith/m/bk/maint/51


mysql-test/include/windows.inc:
  SCCS merged
2007-09-24 13:31:39 +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
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
c4655db842 Merge sita.local:/Users/tsmith/m/bk/maint/50
into  sita.local:/Users/tsmith/m/bk/maint/51


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:41:29 +02:00
unknown
07f1b717e0 Merge sita.local:/Users/tsmith/m/bk/51
into  sita.local:/Users/tsmith/m/bk/maint/51


client/mysql.cc:
  Auto merged
client/mysqldump.c:
  Auto merged
mysql-test/Makefile.am:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_select.cc:
  Auto merged
2007-09-24 11:37:26 +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
37d6773a30 Merge shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
into  shellback.(none):/home/msvensson/mysql/my51-bug30843


mysql-test/r/archive.result:
  Merge 5.0->5.1
mysql-test/t/archive.test:
  Merge 5.0->5.1
2007-09-22 12:19:49 +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
b1a33149a7 Merge shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
into  shellback.(none):/home/msvensson/mysql/my51-bug30843


BitKeeper/deleted/.del-configure.js:
  Auto merged
client/mysql.cc:
  Auto merged
client/mysql_upgrade.c:
  Auto merged
client/mysqldump.c:
  Auto merged
client/mysqltest.c:
  Auto merged
configure.in:
  Auto merged
libmysql/libmysql.c:
  Auto merged
mysql-test/Makefile.am:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/udf.result:
  Auto merged
mysql-test/t/udf.test:
  Auto merged
scripts/Makefile.am:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/udf_example.def:
  Auto merged
tests/mysql_client_test.c:
  Auto merged
sql/udf_example.c:
  Merge 5.0->5.1
2007-09-22 09:51:54 +02:00
unknown
959dfa7f83 Merge bk-internal:/home/bk/mysql-5.1-maint
into  shellback.(none):/home/msvensson/mysql/my51-bug30843
2007-09-22 09:45:38 +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
3b2ea70671 Bug : 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 : 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 12:05:54 -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
5f27888e99 Merge alf.(none):/src/bug15327/my50-bug15327
into  alf.(none):/src/bug15327/my51-bug15327


BitKeeper/deleted/.del-configure.js:
  Auto merged
2007-09-21 11:39:21 -04:00
unknown
e8972b7afb Bug : 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 : 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
cce60c643a Merge bk-internal:/home/bk/mysql-5.1-maint
into  shellback.(none):/home/msvensson/mysql/my51-bug30843
2007-09-21 17:36:41 +02: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
bd8e7fee1f fixed warnings by bug 30639 2007-09-21 12:17:09 +02:00
unknown
7d3e69f414 Merge shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
into  shellback.(none):/home/msvensson/mysql/my51-bug30843


mysql-test/t/archive.test:
  Auto merged
mysql-test/r/archive.result:
  SCCS merged
2007-09-21 10:51:23 +02:00