Commit graph

19032 commits

Author SHA1 Message Date
unknown
062258ca7e Merge marko@bk-internal.mysql.com:/home/bk/mysql-4.1
into  hundin.mysql.fi:/home/marko/mysql-4.1
2005-07-26 23:15:12 +03:00
unknown
08216d3abf Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into  mysql.com:/usr/home/bar/mysql-4.1.b12109
2005-07-26 16:48:32 +05:00
unknown
f12ded495c ctype-big5.c:
ctype-cp932.c:
ctype-gbk.c:
ctype-mb.c:
ctype-simple.c:
ctype-sjis.c:
ctype-ucs2.c:
ctype-ujis.c:
ctype-utf8.c:

  Adding explicit cast to return type
  in pointer substructions to avoid
  warnings from some compilers.


strings/ctype-big5.c:
  Adding explicit cast to return type
  in pointer substructions to avoid
  warnings from some compilers.
  Adding explicit cast to return type
  in pointer substructions to avoid
  warnings from some compilers.
  Adding explicit cast to return type
  in pointer substructions to avoid
  warnings from some compilers.
strings/ctype-cp932.c:
  Adding explicit cast to return type
  in pointer substructions to avoid
  warnings from some compilers.
strings/ctype-gbk.c:
  Adding explicit cast to return type
  in pointer substructions to avoid
  warnings from some compilers.
strings/ctype-mb.c:
  Adding explicit cast to return type
  in pointer substructions to avoid
  warnings from some compilers.
strings/ctype-simple.c:
  Adding explicit cast to return type
  in pointer substructions to avoid
  warnings from some compilers.
strings/ctype-sjis.c:
  Adding explicit cast to return type
  in pointer substructions to avoid
  warnings from some compilers.
strings/ctype-ucs2.c:
  Adding explicit cast to return type
  in pointer substructions to avoid
  warnings from some compilers.
strings/ctype-ujis.c:
  Adding explicit cast to return type
  in pointer substructions to avoid
  warnings from some compilers.
strings/ctype-utf8.c:
  Adding explicit cast to return type
  in pointer substructions to avoid
  warnings from some compilers.
2005-07-26 16:38:10 +05:00
unknown
aee8de3527 InnoDB: Do not flush after each write, not even when creating the
data files.  Previously, writes were flushed until the doublewrite
buffer was created.  That would be too slow on systems where
os_file_flush() [or fsync(2)] is slow.  (Bug #12125)


innobase/include/os0file.h:
  Disable os_do_not_call_flush_at_each_write unless #ifdef UNIV_DO_FLUSH
innobase/os/os0file.c:
  Disable os_do_not_call_flush_at_each_write unless #ifdef UNIV_DO_FLUSH
innobase/trx/trx0sys.c:
  Disable os_do_not_call_flush_at_each_write unless #ifdef UNIV_DO_FLUSH
2005-07-26 14:03:34 +03:00
unknown
d66d45ef8e Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into  mysql.com:/usr/home/bar/mysql-4.1.b10201
2005-07-26 12:53:06 +05:00
unknown
8624bcfdbe func_gconcat.result, func_gconcat.test:
Adding test
item_sum.cc:
  Adding a call for collation/charset aggregation,
      to collect attributes from the arguments. The actual bug fix.
item_func.h, item_func.cc, item.h, item.cc:
  - Removing collation aggrgation functions from Item_func class
      in item.cc, and adding it as non-class functions in item.cc
      to be able to reuse this code for group_concat.
      - Adding replacement for these functions into Item_func class
      as wrappers for moved functions, to minizize patch size,


sql/item.cc:
  - Removing collation aggrgation functions from Item_func class
      in item.cc, and adding it as non-class functions in item.cc
      to be able to reuse this code for group_concat.
      - Adding replacement for these functions into Item_func class
      as wrappers for moved functions, to minizize patch size,
sql/item.h:
  - Removing collation aggrgation functions from Item_func class
      in item.cc, and adding it as non-class functions in item.cc
      to be able to reuse this code for group_concat.
      - Adding replacement for these functions into Item_func class
      as wrappers for moved functions, to minizize patch size,
sql/item_func.cc:
  - Removing collation aggrgation functions from Item_func class
      in item.cc, and adding it as non-class functions in item.cc
      to be able to reuse this code for group_concat.
      - Adding replacement for these functions into Item_func class
      as wrappers for moved functions, to minizize patch size,
sql/item_func.h:
  - Removing collation aggrgation functions from Item_func class
      in item.cc, and adding it as non-class functions in item.cc
      to be able to reuse this code for group_concat.
      - Adding replacement for these functions into Item_func class
      as wrappers for moved functions, to minizize patch size,
sql/item_sum.cc:
  Adding a call for collation/charset aggregation,
      to collect attributes from the arguments. The actual bug fix.
mysql-test/t/func_gconcat.test:
  Adding test
mysql-test/r/func_gconcat.result:
  Adding test
2005-07-26 12:52:02 +05:00
unknown
6bac3d4309 Merge mysql.com:/home/jonas/src/mysql-4.1
into  mysql.com:/home/jonas/src/mysql-4.1-push
2005-07-26 08:02:23 +02:00
unknown
702f17ee89 ndb_config test requires ndb
mysql-test/t/ndb_config.test:
  test requires ndb
2005-07-26 07:59:10 +02:00
unknown
a6b225ba8d charset.c:
Bug#12109 possible locking bug in init_available_charset
  Recheck charset_initialized inside locked code,
  to garantee two threads are not entering
  consequently.


mysys/charset.c:
  Bug#12109 possible locking bug in init_available_charset
  Recheck charset_initialized inside locked code,
  to garantee two threads are not entering
  consequently.
2005-07-25 21:34:20 +05:00
unknown
bdc0c67195 Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/space/my/mysql-4.1
2005-07-25 15:22:42 +02:00
unknown
c4f59f2c31 Merge mysql.com:/space/my/mysql-4.1-merge
into mysql.com:/space/my/mysql-4.1
2005-07-25 15:19:27 +02:00
unknown
fe862aa987 - merge from 4.0: updated scripts/Makefile.am to properly create but not install
make_binary_distribution, make_sharedlib_distribution and make_win_src_distribution
- removed make_win_binary_distribution.sh


BitKeeper/deleted/.del-make_win_binary_distribution.sh~e0fbb0a75af0dcd3:
  Auto merged
scripts/Makefile.am:
  - after merge fix: removed the "all" target - these files are now built via
    noinst_SCRIPTS instead.
2005-07-25 14:39:23 +02:00
unknown
1f36f6f45b - Make sure the scripts make_binary_distribution, make_sharedlib_distribution and
make_win_src_distribution are created, but not installed
- removed make_win_binary_distribution.sh as it's obsolete and outdated


BitKeeper/deleted/.del-make_win_binary_distribution.sh~e0fbb0a75af0dcd3:
  Delete: scripts/make_win_binary_distribution.sh
scripts/Makefile.am:
  - Make sure the scripts make_binary_distribution, make_sharedlib_distribution and
    make_win_src_distribution are created, but not installed. This is the proper fix
    for what I began in the previous ChangeSet
  - removed make_win_binary_distribution.sh from the distribution, as it's obsolete
    and outdated
2005-07-25 14:14:24 +02:00
unknown
563f68b96b Merge mysql.com:/home/jonas/src/mysql-4.1
into  mysql.com:/home/jonas/src/mysql-4.1-push
2005-07-25 13:48:34 +02:00
unknown
bc10bd8e80 fix compile error 2005-07-25 13:47:40 +02:00
unknown
0c69ae9c32 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
into  mysql.com:/home/jonas/src/mysql-4.1-push
2005-07-25 12:48:24 +02:00
unknown
b68c1a71aa Merge mysql.com:/home/jonas/src/mysql-4.1
into  mysql.com:/home/jonas/src/mysql-4.1-push


ndb/src/mgmapi/mgmapi.cpp:
  Auto merged
ndb/src/mgmsrv/ConfigInfo.cpp:
  Auto merged
ndb/src/mgmsrv/ConfigInfo.hpp:
  Auto merged
2005-07-25 12:42:32 +02:00
unknown
ea010ef584 ndb - Fix LCP during SR parameters
ndb/include/mgmapi/mgmapi_config_parameters.h:
  Fix LCP during SR parameters
ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
  Fix LCP during SR parameters
ndb/src/kernel/blocks/dbtup/DbtupGen.cpp:
  Fix LCP during SR parameters
ndb/src/mgmsrv/ConfigInfo.cpp:
  Fix LCP during SR parameters
2005-07-25 12:41:25 +02:00
unknown
b08c3ca426 fix for bug #7924.
added export symbols mysql_server_init and 
mysql_server_end to allow client to connect to external and embedded
server using the same code (required for Connector/OO.org). (Backport from 5.0 - cs. 1.35)
2005-07-25 07:51:17 +02:00
unknown
aab6612309 ndb - add mysql-test-run test case for ndb_config
mysql-test/r/ndb_config.result:
  New BitKeeper file ``mysql-test/r/ndb_config.result''
mysql-test/t/ndb_config.test:
  New BitKeeper file ``mysql-test/t/ndb_config.test''
2005-07-24 17:35:39 +02:00
unknown
8dd5bd5e55 Add tool to extract config info from ndb_mgmd
ndb/include/mgmapi/mgmapi.h:
  Add feature to redirect error printouts
ndb/src/mgmapi/mgmapi.cpp:
  Add feature to redirect error printouts
ndb/src/mgmsrv/ConfigInfo.hpp:
  Make param info public
ndb/tools/Makefile.am:
  Add ndb_config
ndb/tools/config.cpp:
  New BitKeeper file ``ndb/tools/config.cpp''
2005-07-23 12:06:02 +02:00
unknown
bc8599b485 Undefined RINT for Netware. 2005-07-23 01:11:29 +03:00
unknown
a4217760b4 Merge mysql.com:/home/jimw/my/mysql-4.1-10407
into  mysql.com:/home/jimw/my/mysql-4.1-clean
2005-07-22 11:57:34 -07:00
unknown
657a5346e4 Fix calculation for length of LPAD() and RPAD() reported to
client via mysql_fetch_fields(). (Bug #11311)


mysql-test/r/func_str.result:
  Add new results
mysql-test/t/func_str.test:
  Add new regression test
sql/item_strfunc.cc:
  Fix length reported for LPAD() and RPAD() -- they always truncate to the
  length that is given.
2005-07-22 11:46:29 -07:00
unknown
bf45b6ba84 ctype-gbk.c:
Bug #11987
  mysql will truncate the text when the text contain GBK char:"0xA3A0" and "0xA1"
  Allow to store and retrieve even unassigned GBK codes.
  Like we did in Big5 earlier.
have_gbk.inc, have_gbk.require, ctype_gbk.result, ctype_gbk.test:
  new file


strings/ctype-gbk.c:
  Bug #11987
  mysql will truncate the text when the text contain GBK char:"0xA3A0" and "0xA1"
  Allow to store and retrieve even unassigned GBK codes.
  Like we did in Big5 earlier.
2005-07-22 21:06:02 +05:00
unknown
a68a2da0e7 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into  mysql.com:/usr/home/bar/mysql-4.1.b11754
2005-07-22 15:33:13 +05:00
unknown
112f86a5ec Merge ssmith@bk-internal.mysql.com:/home/bk/mysql-4.0
into  mysql.com:/home/stewart/Documents/MySQL/4.0/main
2005-07-22 19:53:32 +10:00
unknown
41b8f45c4e Merge ssmith@bk-internal.mysql.com:/home/bk/mysql-4.1
into  mysql.com:/home/stewart/Documents/MySQL/4.1/main
2005-07-22 19:49:50 +10:00
unknown
d1e96a25d7 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into  mysql.com:/usr/home/bar/mysql-4.1.b11754
2005-07-22 13:27:30 +05:00
unknown
afd6b4e8ae merging 2005-07-22 12:15:09 +05:00
unknown
002a020f6a Merge bk@192.168.21.1:/usr/home/bk/mysql-4.0
into deer.(none):/home/hf/work/mysql-4.0.clean
2005-07-22 12:01:28 +05:00
unknown
4198410528 Fix error message generated when trying to create a table in a
non-existent database. (Bug #10407)


mysql-test/r/create.result:
  Update results
mysql-test/t/create.test:
  Update error numbers
sql/mysql_priv.h:
  Adjust some other function signature so table and db information
  is passed down into create_frm().
sql/sql_table.cc:
  Check for database not existing after hitting an error when
  copying the .frm file for 'CREATE TABLE ... LIKE ...', and
  pass table and db name into rea_create_table().
sql/table.cc:
  Generate specific error message when .frm creation fails because
  the database does not exist.
sql/unireg.cc:
  Pass database and table name down into create_frm().
2005-07-21 20:08:54 -07:00
unknown
01ebc69db4 Merge ssmith@bk-internal.mysql.com:/home/bk/mysql-4.0
into  mysql.com:/home/stewart/Documents/MySQL/4.0/main
2005-07-22 12:52:06 +10:00
unknown
a6c56c71f8 Merge ssmith@bk-internal.mysql.com:/home/bk/mysql-4.1
into  mysql.com:/home/stewart/Documents/MySQL/4.1/main
2005-07-22 11:32:03 +10:00
unknown
be45e3a0f1 Fix for bug #12042 (User breakpoints calling free() in embedded library)
VC++Files/libmysqld/libmysqld.dsp:
  we should have SAFEMALLOC here
2005-07-21 17:17:46 +05:00
unknown
b5487d1a7e Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into  mysql.com:/usr/home/bar/mysql-4.1.b11216
2005-07-21 16:43:06 +05:00
unknown
824f512e49 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
into  mysql.com:/home/jonas/src/mysql-4.1-push
2005-07-21 13:27:09 +02:00
unknown
84904fbb15 ctype-latin1.c:
removing extra empty line
  ,


strings/ctype-latin1.c:
  removing extra empty line
  ,
2005-07-21 16:19:08 +05:00
unknown
e5c4a3e12f Bug#11216: 'show character set' describes latin1 incorrectly
Index.xml:
  Fixing latin1 comment:
  it is actually cp1252, not iso-8859-1
ctype_latin1.result:
  changeing test results accordingly.
ctype-latin1.c:
  Fixed to- and from-Unicode conversion maps
  for better Unicode round trip of undefined
  characters.



strings/ctype-latin1.c:
  Bug#11216: 'show character set' describes latin1 incorrectly
  Fixed to- and from-Unicode conversion maps.
mysql-test/r/ctype_latin1.result:
  changeing test results accordingly.
sql/share/charsets/Index.xml:
  Fixing comment: iso-8859-1 -> cp1252
2005-07-21 16:05:19 +05:00
unknown
dca732f13d Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/space/my/mysql-4.1
2005-07-21 12:55:39 +02:00
unknown
b54bec553c Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
into  mysql.com:/home/jonas/src/mysql-4.1-push
2005-07-21 12:43:38 +02:00
unknown
bacc9e9e24 Merge mysql.com:/home/jonas/src/mysql-4.1
into  mysql.com:/home/jonas/src/mysql-4.1-push
2005-07-21 11:15:44 +02:00
unknown
3f916d29b3 bug#11942 - ndb - backup during DDL
fix bug introduced in alter table
2005-07-21 11:13:07 +02:00
unknown
8bdfffbe24 Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/space/my/mysql-4.0
2005-07-21 10:15:28 +02:00
unknown
13ed403f4d Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/space/my/mysql-4.1
2005-07-21 10:15:08 +02:00
unknown
e9687c1025 ctype-cp932.c:
After backporting from 5.0 fix.
  There is no an extra argument in 4.1.


strings/ctype-cp932.c:
  After backporting from 5.0 fix.
  There is no an extra argument in 4.1.
2005-07-21 13:10:27 +05:00
unknown
a29829b75c Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
into  mysql.com:/home/jonas/src/mysql-4.1-push
2005-07-21 09:35:42 +02:00
unknown
8a1a13e570 Merge mysql.com:/space/my/mysql-4.1
into mysql.com:/space/my/mysql-4.1-build
2005-07-21 09:12:49 +02:00
unknown
31ebc6ef71 Fix merge 2005-07-20 22:30:34 -04:00
unknown
a3fe765249 Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-4.0
into  c-450ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/mysql-4.1


include/thr_lock.h:
  Auto merged
mysys/thr_lock.c:
  Auto merged
sql/lock.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_table.cc:
  Manual merge after 4.0 fix
2005-07-20 21:58:33 -04:00