Commit graph

22527 commits

Author SHA1 Message Date
unknown
0228f89725 Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/hf/work/mysql-5.0.clean
2005-05-07 12:13:12 +05:00
unknown
52db68ca48 Small fix for the test
mysql-test/t/type_newdecimal.test:
  these lines work differently in ps-protocol mode so should always work in
  normal here
2005-05-07 12:11:05 +05:00
unknown
f291fb7285 Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/svoj/devel/mysql/test1-mysql-5.0
2005-05-07 12:08:14 +05:00
unknown
12380536bd Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/svoj/devel/mysql/test1-mysql-5.0
2005-05-07 12:05:56 +05:00
unknown
a1494918f3 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mishka.local:/home/my/mysql-5.0
2005-05-07 10:00:34 +03:00
unknown
af6ba3866d Merge mysql.com:/home/hf/work/mysql-5.0.clean
into mysql.com:/home/hf/work/mysql-5.0.10004
2005-05-07 02:26:45 +05:00
unknown
1c3529013a Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mishka.local:/home/my/mysql-5.0


sql/sql_show.cc:
  Auto merged
2005-05-07 00:26:45 +03:00
unknown
930a245913 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/ram/work/mysql-5.0
2005-05-07 02:26:44 +05:00
unknown
6397471f88 Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/gluh/MySQL/Bugs/5.0.8998
2005-05-06 21:26:43 +00:00
unknown
fb760acf62 Fix for bug#8998: information_schema: Table SCHEMATA should report default collations
DEFAULT_COLLTION_NAME field is added to SCHEMATA table


mysql-test/r/information_schema.result:
  Fix for bug#8998: information_schema: Table SCHEMATA should report default collations
sql/sql_show.cc:
  Fix for bug#8998: information_schema: Table SCHEMATA should report default collations
2005-05-06 20:14:22 +00:00
unknown
c90926e055 Fix FC3 yaSSL compilation problem.
This fix is about WL#2286 - Compile MySQL w/YASSL support


extra/yassl/include/yassl_int.hpp:
  Use instance as static class member to fix FC compilation problem.
extra/yassl/src/yassl_int.cpp:
  Remove local static variable, use static class member instead.
extra/yassl/taocrypt/include/integer.hpp:
  Use instance as static class member to fix FC compilation problem.
extra/yassl/taocrypt/src/integer.cpp:
  Remove local static variable, use static class member instead.
2005-05-06 20:54:38 +05:00
unknown
843b47b16b merging
strings/decimal.c:
  Auto merged
2005-05-06 20:31:50 +05:00
unknown
38d43503e5 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/ram/work/mysql-5.0
2005-05-06 20:11:02 +05:00
unknown
9c3a41f388 Merge mysql.com:/home/ram/work/mysql-4.1
into mysql.com:/home/ram/work/mysql-5.0


include/my_global.h:
  Auto merged
BitKeeper/etc/logging_ok:
  auto-union
sql/share/charsets/Index.xml:
  Auto merged
2005-05-06 20:11:01 +05:00
unknown
a67043dbd8 Bug#6611: wrong sorting order.
Adding cp1250_croatian_ci collation.
2005-05-06 20:11:00 +05:00
unknown
f98913819b Fix for bug #10004 (Decimal operation crashes server)
mysql-test/r/type_newdecimal.result:
  test result fixed
mysql-test/t/type_newdecimal.test:
  test case added
strings/decimal.c:
  old code didn't work when both decimals had zero before the decimal point
2005-05-06 20:06:25 +05:00
unknown
9207ef4b39 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mishka.local:/home/my/mysql-5.0
2005-05-06 17:55:30 +03:00
unknown
1586eea573 Fixed bugs 9820, 9799 and 9800.
mysql-test/r/select.result:
  Added test cases for bugs 9799, 9800 and 9820
mysql-test/t/select.test:
  Added test cases for bugs 9799, 9800 and 9820
2005-05-06 17:32:46 +03:00
unknown
f1def25a89 Trimmed fix for bug #9546 (Crashing with huge decimals)
mysql-test/r/type_newdecimal.result:
  test result fixed
mysql-test/t/type_newdecimal.test:
  test case added
sql/my_decimal.cc:
  error message fixed
strings/decimal.c:
  do_add function fixed
2005-05-06 19:04:58 +05:00
unknown
d1b7eda581 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/ram/work/4.1
2005-05-06 18:41:42 +05:00
unknown
cdbf493997 Bug#6505 Wrong sorting order:
latin2_croatian_ci collation was fixed.
2005-05-06 18:41:41 +05:00
unknown
8f0acd5042 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mishka.local:/home/my/mysql-5.0


sql/ha_innodb.cc:
  Auto merged
2005-05-06 16:34:09 +03:00
unknown
0efb151d46 Merge bk-internal.mysql.com:/data0/bk/mysql-4.1
into bk-internal.mysql.com:/users/rburnett/bug10245


BitKeeper/etc/logging_ok:
  auto-union
2005-05-06 15:24:07 +02:00
unknown
0430cdb7c5 Merge bk-internal.mysql.com:/users/rburnett/bug10245
into bk-internal.mysql.com:/users/rburnett/mysql-5.0


BitKeeper/etc/logging_ok:
  auto-union
client/mysql.cc:
  Auto merged
2005-05-06 15:21:30 +02:00
unknown
4576776010 Merge bk-internal.mysql.com:/users/rburnett/bug9721
into bk-internal.mysql.com:/users/rburnett/mysql-5.0


BitKeeper/etc/logging_ok:
  auto-union
include/violite.h:
  Auto merged
sql/net_serv.cc:
  Auto merged
vio/viosocket.c:
  Auto merged
vio/viossl.c:
  Auto merged
2005-05-06 15:15:48 +02:00
unknown
6b819860e5 Merge bk-internal.mysql.com:/data0/bk/mysql-4.1
into bk-internal.mysql.com:/users/rburnett/bug9721


BitKeeper/etc/logging_ok:
  auto-union
2005-05-06 15:10:01 +02:00
unknown
779ac9cf9e Bug #9721 net_write_timeout not used on Windows
viosocket.c:
  Use ?: syntax to simplify code for setting both timeouts


vio/viosocket.c:
  Use ?: syntax to simplify code for setting both timeouts
2005-05-06 15:08:10 +02:00
unknown
f547b03edb A fix (bug #7970: CONFIG_NR_CPUS not defined for kernel header percpu.h).
include/my_global.h:
  A fix (bug #7970: CONFIG_NR_CPUS not defined for kernel header percpu.h).
  We don't need to manipulate HAVE_ATOMIC_XXX here as we test it in the configure.
2005-05-06 16:12:42 +05:00
unknown
f43c581781 merge
sql/ha_innodb.cc:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_cmpfunc.h:
  Auto merged
sql/key.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/sp_head.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/unireg.cc:
  Auto merged
2005-05-06 13:51:58 +03:00
unknown
0baed276c3 Merge ibmlab.site:/home/my/bk/mysql-4.1
into ibmlab.site:/home/my/bk/mysql-5.0


BitKeeper/etc/logging_ok:
  auto-union
2005-05-06 13:42:30 +03:00
unknown
70bf6fd284 Merge jlindstrom@bk-internal.mysql.com:/home/bk/mysql-5.0
into hundin.mysql.fi:/home/jan/mysql-5.0


BitKeeper/etc/logging_ok:
  auto-union
configure.in:
  Auto merged
include/my_sys.h:
  Auto merged
mysql-test/t/ndb_restore.test:
  Auto merged
ndb/test/src/NDBT_ResultRow.cpp:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
2005-05-06 13:42:29 +03:00
unknown
8ab27c740a Merge hundin.mysql.fi:/home/jan/mysql-4.1
into hundin.mysql.fi:/home/jan/mysql-5.0


BitKeeper/etc/logging_ok:
  auto-union
configure.in:
  Auto merged
include/my_sys.h:
  Auto merged
mysql-test/t/ndb_restore.test:
  Auto merged
ndb/test/src/NDBT_ResultRow.cpp:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
2005-05-06 13:38:18 +03:00
unknown
9b2078d5a0 Merge ssmith@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
into mysql.com:/home/stewart/Documents/MySQL/4.1/ndb
2005-05-06 12:31:51 +02:00
unknown
fc80e4c121 Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-4.1
into ibmlab.site:/home/my/bk/mysql-4.1
2005-05-06 13:22:56 +03:00
unknown
a0aa453934 bug#6504 Upper/Lower conversion bug:
upper/lower conversion for LATIN LETTER D WITH STROKE
was wrong in latin2.
2005-05-06 15:22:55 +05:00
unknown
0b2ae60c62 Merge marko@bk-internal.mysql.com:/home/bk/mysql-5.0
into hundin.mysql.fi:/home/marko/mysql-5.0.4
2005-05-06 12:48:37 +03:00
unknown
698502867e After merge fix
innobase/include/srv0srv.h:
  Restore accidentally deleted comment.
2005-05-06 12:43:10 +03:00
unknown
7249019101 A fix for Bug#8467.
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2005-05-06 12:18:37 +03:00
unknown
f09d789cb4 Merge 2005-05-06 11:45:59 +03:00
unknown
8b49ccace4 Bug#10193
Invalid DataDir in config causes ndbd segfault


ndb/src/kernel/error/ErrorReporter.cpp:
  print error and return error if unable to open the file for error reporting.
2005-05-06 10:43:29 +02:00
unknown
ab54e16705 Fixes while reviewing new code
Added option --count to mysqlshow (to show number of rows)
Fixed possible core dump in information schema


client/client_priv.h:
  --count for mysqlshow
client/mysqlshow.c:
  Added option --count to be used when the user want's number of rows per table in the output
  (We shouldn't use count(*) as default as this can be a slow operation)
mysys/my_thr_init.c:
  Correct comment
sql/ha_berkeley.cc:
  Remove not used variable
sql/ha_berkeley.h:
  Remove not used variable
sql/ha_innodb.cc:
  Remove not used function
sql/ha_ndbcluster.cc:
  false -> FALSE
  true -> TRUE
sql/handler.cc:
  Added and fixed comments
  Remove 'strange' code to remove compiler warnings (better to do things like this with attribute)
sql/item.cc:
  false -> FALSE
sql/item_cmpfunc.cc:
  Fixed indentation
sql/item_cmpfunc.h:
  marked BETWEEN as a bool function
sql/item_func.cc:
  Simple optimzation
sql/key.cc:
  Removed wrong code
sql/log.cc:
  Check result from open_index_file()
sql/mysql_priv.h:
  Simplyfy some test of netware
sql/mysqld.cc:
  Fixed indentation
  Check result form open_index_file()
  Simplify code with IF_NETWARE()
sql/opt_range.cc:
  false -> FALSE
  true -> TRUE
  Fixed indentation
sql/opt_sum.cc:
  Fixed comments
sql/sp_head.cc:
  Simple optimzation
  Move variable declarations to begining of blocks
sql/sql_acl.cc:
  Fix long lines
  Rename xx -> column
  Move declaration to beginning of block
sql/sql_parse.cc:
  Removed comment
sql/sql_select.cc:
  Indentation fixes
sql/sql_show.cc:
  Fixed reference outside of array (possible core dump)
sql/sql_table.cc:
  Simplify code
  Combine common code
sql/sql_test.cc:
  false -> FALSE
sql/sql_trigger.cc:
  false -> false
  true -> TRUE
sql/sql_yacc.yy:
  Simpler test
sql/unireg.cc:
  Added comment
2005-05-06 11:39:30 +03:00
unknown
56426fca88 A fix (bug #10404: select 0/0 returns 0).
strings/decimal.c:
  A fix (bug #10404: select 0/0 returns 0).
  We should check the second argument (0?) first.
2005-05-06 13:31:48 +05:00
unknown
e5670bf248 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/root/mysql-5.0
2005-05-06 13:31:47 +05:00
unknown
6166821819 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/root/mysql-5.0


BitKeeper/etc/logging_ok:
  auto-union
2005-05-06 13:08:28 +05:00
unknown
e0313d67cf Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/dlenev/src/mysql-5.0-bg9841


mysql-test/r/sp.result:
  Auto merged
2005-05-06 11:18:37 +04:00
unknown
98eb8d7c16 Merge marko@bk-internal.mysql.com:/home/bk/mysql-4.1
into hundin.mysql.fi:/home/marko/mysql-4.1


sql/ha_innodb.cc:
  Auto merged
2005-05-06 10:15:58 +03:00
unknown
e5950cb153 merging cp932 from 4.1
BitKeeper/etc/logging_ok:
  auto-union
BitKeeper/deleted/.del-have_cp932.inc:
  Delete: mysql-test/include/have_cp932.inc
BitKeeper/deleted/.del-ctype_cp932.result:
  Delete: mysql-test/r/ctype_cp932.result
BitKeeper/deleted/.del-have_cp932.require:
  Delete: mysql-test/r/have_cp932.require
BitKeeper/deleted/.del-ctype_cp932.test:
  Delete: mysql-test/t/ctype_cp932.test
BitKeeper/deleted/.del-ctype-cp932.c:
  Delete: strings/ctype-cp932.c
include/m_ctype.h:
  Auto merged
mysys/charset-def.c:
  Auto merged
sql/mysqld.cc:
  Auto merged
2005-05-06 12:00:25 +05:00
unknown
ac3b760ff5 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/ram/work/5.0
2005-05-06 11:48:55 +05:00
unknown
930644731d Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/root/mysql-5.0


sql/sql_select.cc:
  Auto merged
2005-05-06 11:48:54 +05:00
unknown
97b7fbd495 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/ram/work/5.0


BitKeeper/etc/logging_ok:
  auto-union
2005-05-06 08:34:50 +05:00