Commit graph

15309 commits

Author SHA1 Message Date
unknown
370fa1d0e1 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
2004-10-20 13:43:17 +00:00
unknown
e4a86f3237 compile warning fixes
mysql-test/ndb/ndbcluster.sh:
  corrected shell test syntax
2004-10-20 13:42:41 +00:00
unknown
6875cf36d1 NDB dbtux compile fix for sol9x86
ndb/src/kernel/blocks/dbtux/Dbtux.hpp:
  compile fix for sol9x86
ndb/src/kernel/blocks/dbtux/DbtuxDebug.cpp:
  compile fix for sol9x86
ndb/test/ndbapi/testOIBasic.cpp:
  testing continues..
2004-10-20 12:25:48 +02:00
unknown
2da1cbd97d Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mishka.local:/home/my/mysql-4.1


client/mysqlimport.c:
  Auto merged
libmysql/libmysql.c:
  Auto merged
ndb/src/ndbapi/ndberror.c:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/ha_ndbcluster.h:
  Auto merged
sql/item.cc:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
2004-10-20 02:55:03 +03:00
unknown
ca1a24e0ad fix for platforms that have lower_case_table_names == 2 2004-10-19 23:55:02 +00:00
unknown
4736d0fe99 Review of all code pushed since last review
Simple optimzations and cleanups
Removed compiler warnings and fixed portability issues
Added client functions 'mysql_embedded()' to allow client to check if we are using embedded server
Fixes for purify


client/mysqlimport.c:
  Remove not used variable
client/mysqltest.c:
  Remove usage of MAXPATHLEN (all MySQL code uses FN_REFLEN)
  Simplified code
  Remove usage of sprintf("%llu") as this is not portable
include/mysql.h:
  Added mysql_embedded() to be able to easily check if we are using the embedded server
innobase/srv/srv0start.c:
  Don't use memcmp() when using purify (to avoid false warnings)
libmysql/libmysql.c:
  Added mysql_embedded() to be able to easily check if we are using the embedded server
libmysql/libmysql.def:
  Added mysql_embedded() to be able to easily check if we are using the embedded server
myisam/myisam_ftdump.c:
  Remove compiler warning
myisam/myisamchk.c:
  Remove compiler warning
myisam/rt_test.c:
  #ifdef not used code
mysys/hash.c:
  Remove compiler warning (from last push)
mysys/my_gethwaddr.c:
  Remove compiler warning
ndb/src/ndbapi/ndberror.c:
  #ifdef not used code
regex/regcomp.c:
  Remove not used code
regex/regcomp.ih:
  Remove not used code (to remove compiler warnings)
sql-common/client.c:
  Remove compiler warnings
sql/field.cc:
  Simple optimization
sql/ha_innodb.cc:
  Rename mysql_embedded -> mysqld_embedded
sql/item.cc:
  Fix comments
  Move variables first on block
  Remove else after return
  Simple optimizations
  (no logic changes)
sql/item_cmpfunc.cc:
  Added comment
sql/mysql_priv.h:
  Rename mysql_embedded -> mysqld_embedded
sql/mysqld.cc:
  Rename mysql_embedded -> mysqld_embedded
sql/sql_acl.cc:
  Added comments
  simple optimization
  Fixed 'very unlikely' bug when doing REVOKE ALL PRIVILEGES
sql/sql_select.cc:
  More comments
  Simple optimization
sql/sql_show.cc:
  Simple changes to make similar code similar
  More comments
sql/sql_string.cc:
  Trivial optimization and better code layout
strings/Makefile.am:
  Change xml.c to use bcmp to avoid warnings from purify
strings/xml.c:
  Change xml.c to use bcmp to avoid warnings from purify
tests/client_test.c:
  Remove usage of MAXPATHLEN (all MySQL code uses FN_REFLEN)
2004-10-20 01:28:42 +03:00
unknown
31d1e2a516 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
2004-10-19 20:38:06 +00:00
unknown
9723accc77 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-ndb
2004-10-19 20:33:38 +00:00
unknown
9f2fc33f0f Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
2004-10-19 20:25:30 +00:00
unknown
f0a6f2b6a5 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-ndb-merge
2004-10-19 15:00:02 +00:00
unknown
3466b8d548 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-ndb-merge
2004-10-19 14:57:11 +00:00
unknown
4c0b22b0f7 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
2004-10-19 14:54:13 +00:00
unknown
193628565b os0file.c:
InnoDB: print info about how many bytes we were able to read if a file read is not able to read as many bytes as we requested


innobase/os/os0file.c:
  InnoDB: print info about how many bytes we were able to read if a file read is not able to read as many bytes as we requested
2004-10-19 14:44:14 +03:00
unknown
b42ab12527 Merge marko@bk-internal.mysql.com:/home/bk/mysql-4.1
into hundin.mysql.fi:/home/marko/j/mysql-4.1
2004-10-19 11:00:02 +03:00
unknown
5d14a6eef4 CHARSET_INFO.txt:
minor fixes


strings/CHARSET_INFO.txt:
  minor fixes
2004-10-19 13:00:01 +05:00
unknown
ad8865cbd7 sql_union.cc:
Check DERIVATION_NONE only for UNIONS.


sql/sql_union.cc:
  Check DERIVATION_NONE only for UNIONS.
2004-10-19 11:45:33 +05:00
unknown
234a8ec061 Dumping BLOBs in HEX notation. The patch was orinigally
contributed by Takeshi. I also added HEX support for 
"extended-inserts".
2004-10-19 10:40:59 +05:00
unknown
46b36a3d8c bumped up ndb version to 3.5.3 2004-10-18 14:14:21 +00:00
unknown
0cef3945a4 ha_innodb.cc:
Replace a tolower() loop with innobase_casedn_str()


sql/ha_innodb.cc:
  Replace a tolower() loop with innobase_casedn_str()
2004-10-18 16:59:15 +03:00
unknown
4cbb9917cb Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
into mysql.com:/space/pekka/ndb/version/my41-tux
2004-10-18 15:39:20 +02:00
unknown
012de9d742 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-ndb
2004-10-18 13:39:19 +00:00
unknown
e49389334c InnoDB: Treat UTF-8 strings properly in case insensitive operations
innobase/dict/dict0dict.c:
  Use innobase_strcasecmp() and innobase_casedn_str()
  instead of ut_cmp_in_lower_case() and ut_cpy_in_lower_case()
innobase/include/ut0byte.h:
  Remove ut_cpy_in_lower_case() and ut_cmp_in_lower_case()
innobase/ut/ut0byte.c:
  Remove ut_cpy_in_lower_case() and ut_cmp_in_lower_case()
sql/ha_innodb.cc:
  Add innobase_strcasecmp() and innobase_casedn_str()
  Replace tolower() loop with innobase_casedn_str()
  Replace my_casedn_str() with innobase_casedn_str()
  Replace ut_cmp_in_lower_case() with innobase_strcasecmp()
2004-10-18 16:00:57 +03:00
unknown
1412365a3f Bug UNION doesn't understand collate in the column of second select 2004-10-18 17:56:25 +05:00
unknown
bdde67e57e Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
2004-10-18 12:53:40 +00:00
unknown
a8b7ac32d0 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-ndb
2004-10-18 12:12:02 +00:00
unknown
f8f7e45919 srv0srv.c:
If innodb_thread_concurrency would be exceeded, let a thread sleep 10 ms before entering the FIFO queue; previously, the value was 50 ms, which Peter Z considered too long


innobase/srv/srv0srv.c:
  If innodb_thread_concurrency would be exceeded, let a thread sleep 10 ms before entering the FIFO queue; previously, the value was 50 ms, which Peter Z considered too long
2004-10-18 15:00:39 +03:00
unknown
5eedc72e1d Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
2004-10-18 11:06:15 +00:00
unknown
85828f4a1b CHARSET_INFO.txt:
new file
2004-10-18 15:25:28 +05:00
unknown
5267ec8a5a Bug can't retrieve records with umlaut characters in case insensitive manner 2004-10-18 15:23:24 +05:00
unknown
932f830d24 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
2004-10-18 10:12:43 +00:00
unknown
e7e86d20f9 remove possibility of connectstring error like "hostname=..."
+ some fixed string length cleanup
+ fixed a better error printout
2004-10-18 09:37:48 +00:00
unknown
2310f00af2 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
into gw.mysql.r18.ru:/usr/home/ram/work/4.1.b6057
2004-10-18 14:05:11 +05:00
unknown
0ada8d1b4f ctype-mb.c:
Remove unnesessary code: use_mb is always TRUE for the multibyte charsets.


strings/ctype-mb.c:
  Remove unnesessary code: use_mb is always TRUE for the multibyte charsets.
2004-10-18 13:32:30 +05:00
unknown
069d54fdf1 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-ndb-merge


ndb/src/mgmapi/mgmapi.cpp:
  Auto merged
2004-10-18 07:51:52 +00:00
unknown
70f28e9d6a Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
into gw.mysql.r18.ru:/usr/home/ram/work/4.1.b6057
2004-10-18 12:48:11 +05:00
unknown
037f07006d A fix (bug : Data Type Problem in manager.c).
libmysql/manager.c:
  Code clean-up: as my_net_read() returns ulong value we should use ulong here.
2004-10-18 12:43:52 +05:00
unknown
a4d8ed871a Fix for broken --with-csv-storage-engine build.
Now we use TABLE::timestamp_field_type instead of
TABLE::timestamp_default_now/on_update_now for determining
if we should auto-set value of TIMESTAMP field during this operation.
We are also use Field_timestamp::set_time() instead of
handler::update_timestamp().


sql/examples/ha_example.cc:
  Now we use TABLE::timestamp_field_type instead of
  TABLE::timestamp_default_now/on_update_now for determining
  if we should auto-set value of TIMESTAMP field during this operation.
  We are also use Field_timestamp::set_time() instead of
  handler::update_timestamp().
sql/examples/ha_tina.cc:
  Now we use TABLE::timestamp_field_type instead of
  TABLE::timestamp_default_now/on_update_now for determining
  if we should auto-set value of TIMESTAMP field during this operation.
  We are also use Field_timestamp::set_time() instead of
  handler::update_timestamp().
2004-10-18 10:32:52 +04:00
unknown
4a9f774560 NDB wl-1533 tux optim: after wl-1942 can remove signal from many methods
ndb/src/kernel/blocks/dbtux/Dbtux.hpp:
  wl-1533 tux optim: after wl-1942 can remove signal from many methods
ndb/src/kernel/blocks/dbtux/DbtuxDebug.cpp:
  wl-1533 tux optim: after wl-1942 can remove signal from many methods
ndb/src/kernel/blocks/dbtux/DbtuxMaint.cpp:
  wl-1533 tux optim: after wl-1942 can remove signal from many methods
ndb/src/kernel/blocks/dbtux/DbtuxNode.cpp:
  wl-1533 tux optim: after wl-1942 can remove signal from many methods
ndb/src/kernel/blocks/dbtux/DbtuxScan.cpp:
  wl-1533 tux optim: after wl-1942 can remove signal from many methods
ndb/src/kernel/blocks/dbtux/DbtuxSearch.cpp:
  wl-1533 tux optim: after wl-1942 can remove signal from many methods
ndb/src/kernel/blocks/dbtux/DbtuxTree.cpp:
  wl-1533 tux optim: after wl-1942 can remove signal from many methods
ndb/test/ndbapi/testOIBasic.cpp:
  wl-1533 tux optim: after wl-1942 can remove signal from many methods
2004-10-17 16:24:23 +02:00
unknown
aa6fb64662 NDB wl-1942 dbtux - move scans correctly at index tree re-org 2004-10-17 13:12:25 +02:00
unknown
05c86c7a95 4006 is temporary
ndb/src/ndbapi/ndberror.c:
  4006
2004-10-17 09:06:15 +02:00
unknown
d49b8ac4bb NDB wl-1533 tux optim 17 - allow slack in interior nodes
ndb/include/kernel/ndb_limits.h:
  tux optim 17 - rewrote treeAdd/treeRemove + allow slack in interior nodes
ndb/src/kernel/blocks/dbtux/Dbtux.hpp:
  tux optim 17 - rewrote treeAdd/treeRemove + allow slack in interior nodes
ndb/src/kernel/blocks/dbtux/DbtuxDebug.cpp:
  tux optim 17 - rewrote treeAdd/treeRemove + allow slack in interior nodes
ndb/src/kernel/blocks/dbtux/DbtuxMeta.cpp:
  tux optim 17 - rewrote treeAdd/treeRemove + allow slack in interior nodes
ndb/src/kernel/blocks/dbtux/DbtuxNode.cpp:
  tux optim 17 - rewrote treeAdd/treeRemove + allow slack in interior nodes
ndb/src/kernel/blocks/dbtux/DbtuxSearch.cpp:
  tux optim 17 - rewrote treeAdd/treeRemove + allow slack in interior nodes
ndb/src/kernel/blocks/dbtux/DbtuxTree.cpp:
  tux optim 17 - rewrote treeAdd/treeRemove + allow slack in interior nodes
ndb/src/kernel/blocks/dbtux/Times.txt:
  tux optim 17 - rewrote treeAdd/treeRemove + allow slack in interior nodes
ndb/test/ndbapi/testOIBasic.cpp:
  tux optim 17 - rewrote treeAdd/treeRemove + allow slack in interior nodes
2004-10-16 15:44:55 +02:00
unknown
221d51ebb1 Merge jlindstrom@bk-internal.mysql.com:/home/bk/mysql-4.1
into hundin.mysql.fi:/home/jan/talle/mysql-4.1
2004-10-16 08:17:50 +03:00
unknown
f945555c17 Remove stale declaration, fix a typo in comment.
include/sql_common.h:
  Remove stale declaration.
2004-10-15 22:03:11 +04:00
unknown
fecadbbd9a texi2html:
Change @image argument parsing.


Docs/Support/texi2html:
  Change @image argument parsing.
2004-10-15 10:28:39 -05:00
unknown
f125849dd1 New tests for bug#1644 and bug#1676,
test for bug#1180 changed to table naming scheme 't#'.


mysql-test/r/ps_11bugs.result:
  Expected results of new tests for bug#1644 and bug#1676,
  test for bug#1180 changed to table naming scheme 't#'.
mysql-test/t/ps_11bugs.test:
  New tests to check bug#1644 and bug#1676,
  test for bug#1180 changed to table naming scheme 't#'.
2004-10-15 12:56:57 +02:00
unknown
c1a91f4b3e Merge mysql.com:/M41/mysql-4.1 into mysql.com:/M41/push-4.1 2004-10-15 10:34:40 +02:00
unknown
1927d24ec0 Use already parsed SQL-query in the current thread when determining
was the query REPLACE or LOAD DATA INFILE REPLACE.


innobase/row/row0ins.c:
  Find SQL-query directly from current thread and see if the
  query was REPLACE or LOAD DATA INFILE REPLACE.
sql/ha_innodb.cc:
  Find current thread and return true if SQL-query in the current
  thread was either REPLACE or LOAD DATA INFILE REPLACE.
2004-10-15 11:28:19 +03:00
unknown
aa43bc07d5 Merge mysql.com:/home/jonas/src/mysql-4.1
into mysql.com:/home/jonas/src/mysql-4.1-ndb
2004-10-15 08:11:45 +02:00
unknown
d942710916 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/jonas/src/mysql-4.1
2004-10-15 08:10:08 +02:00
unknown
f4ce3ec173 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
into mysql.com:/home/jonas/src/mysql-4.1-ndb
2004-10-15 08:09:11 +02:00