Commit graph

23674 commits

Author SHA1 Message Date
unknown
0d68fcf91b Merge bk-internal:/home/bk/mysql-5.0
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2005-06-04 10:23:44 +02:00
unknown
0602da4d0c BUG#10948 NDB Replication: Race condition with ALTER/DROP table
BUG#9826  Server crash on schema change ("drop table", "alter table") with NDB

See note on 10948 for detailed explanation.

struct a { void* a; long long b[1]; };

on PPC32 (and 32bit pa risc): 16
on x86: 12

so a malloc(sizeof(void*)+extra_bits) is wrong.

Assuming that the long long is 64 bit aligned as non-aligned 64bit accesses
are rather expensive on ppc.

Thanks to paulus for doing the PPC port of valgrind.
Without which I would no doubt still be trying to find this.


ndb/src/ndbapi/DictCache.cpp:
  Fix allocation size for Ndb_local_table_info for architectures such as PPC and PA-RISC (32bit)
  where
  struct a { void* a; long long b;};
  is 64 bit aligned (i.e. sizeof(struct a)==16)
ndb/src/ndbapi/DictCache.hpp:
  Add warning about having to be the last member in the structure
2005-06-04 18:14:34 +10:00
unknown
a681af904d mergemerged
sql/mysql_priv.h:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
2005-06-04 07:28:26 +02:00
unknown
61c12aa299 after mergemerge 2005-06-04 07:15:11 +02:00
unknown
c72c3e4ca4 Merge mysql.com:/home/jimw/my/mysql-5.0-10590
into  mysql.com:/home/jimw/my/mysql-5.0-clean


sql/item_timefunc.cc:
  Auto merged
2005-06-03 16:06:51 -07:00
unknown
26bd158216 Bug #10901
After review fix
Copy from internal state to share state only when in lock write
mode (happens only when lock table x write has been performed since
update_state_info is only called when holding a TL_READ_NO_INSERT
lock normally. Previous patch would have failed in combination with
delayed writes.
2005-06-03 22:52:24 +02:00
unknown
15eb5a1f34 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/my/mysql-4.1
2005-06-03 23:46:44 +03:00
unknown
72dd44b9de Move USE_PRAGMA_IMPLEMENTATION to proper place
Ensure that 'null_value' is not accessed before val() is called in FIELD() functions
Fixed initialization of key maps. This fixes some problems with keys when you have more than 64 keys
Fixed that ROLLUP don't always create a temporary table. This fix ensures that func_gconcat.test results are now predictable


mysql-test/r/func_gconcat.result:
  Move innodb specific test to innodb.test
  Changed table name r2 -> t2
  More test to see how ROLLUP was optimized
mysql-test/r/innodb.result:
  Moved test here form func_gconcat
mysql-test/r/olap.result:
  New test results after optimization
mysql-test/t/func_gconcat.test:
  Move innodb specific test to innodb.test
  Changed table name r2 -> t2
  More test to see how ROLLUP was optimized
mysql-test/t/innodb.test:
  Moved test here form func_gconcat
sql/field.cc:
  Move USE_PRAGMA_IMPLEMENTATION to proper place
sql/ha_berkeley.cc:
  Move USE_PRAGMA_IMPLEMENTATION to proper place
sql/ha_blackhole.cc:
  Move USE_PRAGMA_IMPLEMENTATION to proper place
sql/ha_heap.cc:
  Move USE_PRAGMA_IMPLEMENTATION to proper place
sql/ha_innodb.cc:
  Move USE_PRAGMA_IMPLEMENTATION to proper place
sql/ha_isam.cc:
  Move USE_PRAGMA_IMPLEMENTATION to proper place
sql/ha_isammrg.cc:
  Move USE_PRAGMA_IMPLEMENTATION to proper place
sql/ha_myisam.cc:
  Move USE_PRAGMA_IMPLEMENTATION to proper place
sql/ha_myisammrg.cc:
  Move USE_PRAGMA_IMPLEMENTATION to proper place
sql/ha_ndbcluster.cc:
  Move USE_PRAGMA_IMPLEMENTATION to proper place
sql/handler.cc:
  Move USE_PRAGMA_IMPLEMENTATION to proper place
sql/hash_filo.cc:
  Move USE_PRAGMA_IMPLEMENTATION to proper place
sql/item.cc:
  Move USE_PRAGMA_IMPLEMENTATION to proper place
sql/item_cmpfunc.cc:
  Move USE_PRAGMA_IMPLEMENTATION to proper place
sql/item_func.cc:
  Move USE_PRAGMA_IMPLEMENTATION to proper place
  Ensure that 'null_value' is not accessed before val() is called
sql/item_geofunc.cc:
  Move USE_PRAGMA_IMPLEMENTATION to proper place
sql/item_strfunc.cc:
  Move USE_PRAGMA_IMPLEMENTATION to proper place
sql/item_subselect.cc:
  Move USE_PRAGMA_IMPLEMENTATION to proper place
sql/item_sum.cc:
  Move USE_PRAGMA_IMPLEMENTATION to proper place
sql/item_timefunc.cc:
  Move USE_PRAGMA_IMPLEMENTATION to proper place
sql/item_uniq.cc:
  Move USE_PRAGMA_IMPLEMENTATION to proper place
sql/log_event.cc:
  Move USE_PRAGMA_IMPLEMENTATION to proper place
sql/mysql_priv.h:
  Change key_map_full to not be const as we are giving it a proper value on startup
sql/mysqld.cc:
  Move key_map variables here and initialize key_map_full properly
sql/opt_range.cc:
  Move USE_PRAGMA_IMPLEMENTATION to proper place
sql/opt_range.h:
  Fix that test_quick_select() works with any ammount of keys
sql/procedure.cc:
  Move USE_PRAGMA_IMPLEMENTATION to proper place
sql/protocol.cc:
  Move USE_PRAGMA_IMPLEMENTATION to proper place
sql/protocol_cursor.cc:
  Move USE_PRAGMA_IMPLEMENTATION to proper place
sql/set_var.cc:
  Move USE_PRAGMA_IMPLEMENTATION to proper place
sql/sql_analyse.cc:
  Move USE_PRAGMA_IMPLEMENTATION to proper place
sql/sql_class.cc:
  Move USE_PRAGMA_IMPLEMENTATION to proper place
sql/sql_crypt.cc:
  Move USE_PRAGMA_IMPLEMENTATION to proper place
sql/sql_insert.cc:
  Fixed that max_rows is ulong
sql/sql_list.cc:
  Move USE_PRAGMA_IMPLEMENTATION to proper place
sql/sql_map.cc:
  Move USE_PRAGMA_IMPLEMENTATION to proper place
sql/sql_olap.cc:
  Move USE_PRAGMA_IMPLEMENTATION to proper place
sql/sql_select.cc:
  Move USE_PRAGMA_IMPLEMENTATION to proper place
  Fixed that ROLLUP don't have to always create a temporary table
  Added new argument to remove_const() to make above possible
  Fixed some errors that creapt up when we don't always do a temporary table for ROLLUP
sql/sql_string.cc:
  Move USE_PRAGMA_IMPLEMENTATION to proper place
sql/sql_table.cc:
  Simple optimizations
  Fixed wrong checking of build_table_path() in undef-ed code
sql/sql_udf.cc:
  Move USE_PRAGMA_IMPLEMENTATION to proper place
sql/sql_yacc.yy:
  removed extra {}
2005-06-03 23:46:03 +03:00
unknown
8376d81499 client/mysql.cc
make print_field_types() somewhat more useful


client/mysql.cc:
  make print_field_types() somewhat more useful
2005-06-03 21:59:33 +02:00
unknown
33022c529a mergemerged
BitKeeper/etc/logging_ok:
  auto-union
configure.in:
  Auto merged
scripts/make_binary_distribution.sh:
  Auto merged
sql/lock.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_handler.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_repl.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
2005-06-03 21:24:13 +02:00
unknown
7509b50054 after merge fixes 2005-06-03 21:08:45 +02:00
unknown
48078eea1e Merge hholzgraefe@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/hartmut/projects/mysql/dev/5.0
2005-06-03 20:08:38 +02:00
unknown
8331a7cd3c Merge mysql.com:/usr/local/bk/mysql-5.0
into mysql.com:/home/pem/work/mysql-5.0
2005-06-03 19:22:28 +02:00
unknown
2c44ef1748 Fixed BUG#10968: Stored procedures: crash if long loop
Free memory after all SP invokation.


sql/sp_head.cc:
  Fixed memory leaks in SP invokation. Have to release memory after each call,
  or items and contexts are not released until it's too late.
2005-06-03 19:21:12 +02:00
unknown
32c9799596 Merge mysql.com:/home/hartmut/projects/mysql/dev/4.1
into mysql.com:/home/hartmut/projects/mysql/dev/5.0
2005-06-03 19:15:16 +02:00
unknown
70442e0ab7 merged
BitKeeper/etc/logging_ok:
  auto-union
configure.in:
  Auto merged
scripts/make_binary_distribution.sh:
  Auto merged
sql/lock.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_handler.cc:
  Auto merged
sql/sql_repl.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
mysql-test/r/create.result:
  merged, need fixing
sql/sql_parse.cc:
  merged (perhaps wrong)
2005-06-03 18:29:36 +02:00
unknown
8e0760e7fb - include/config-win.h: removed double HAVE_CHARSET_cp932 #define
- mysql-test/Makefile.am: added a pattern match for t/*.sql 
  (t/mysql_delimiter.sql was missing from the source distribution)


include/config-win.h:
  - removed double HAVE_CHARSET_cp932 #define
mysql-test/Makefile.am:
  - added a pattern match for t/*.sql (t/mysql_delimiter.sql was missing from the
    source distribution)
2005-06-03 18:20:25 +02:00
unknown
f956ecd09a Bug #10901
Analyze table corrupts the state on
data_file_length, records, index_file_length...
by writing the shared state when there is an updated internal
state due to inserts or deletes
Fixed by synching the shared state with the internal state before
writing it to disk
Added test cases of 2 error cases and a normal case in new
analyze test case


BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2005-06-03 17:13:43 +02:00
unknown
ef30cc61ca Merge bk-internal:/home/bk/mysql-4.0/
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
2005-06-03 16:01:44 +02:00
unknown
78fc41727e *don't* mess with kernel defines, boy.
and HAVE_ATOMIC_ADD/HAVE_ATOMIC_SUB is tested in configure
2005-06-03 15:05:18 +02:00
unknown
a9ccff554a Merge bk-internal:/home/bk/mysql-5.0
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2005-06-03 15:00:53 +02:00
unknown
2906e27a7c yassl template instantiation - don't do too much
mysys/my_access.c: remove incorrect fix
comments


extra/yassl/taocrypt/src/integer.cpp:
  yassl template instantiation - don't do too much
extra/yassl/taocrypt/src/template_instnt.cpp:
  yassl template instantiation - don't do too much
mysys/my_access.c:
  remove incorrect fix
sql/item_func.cc:
  a couple of comment. assert added.
2005-06-03 13:43:17 +02:00
unknown
29f3b76f58 Merge mysql.com:/usr/local/bk/mysql-5.0
into mysql.com:/home/pem/work/mysql-5.0
2005-06-03 12:58:23 +02:00
unknown
6de5ae6816 Post review fix of BUG#10969.
sql/item.h:
  Return name as LEX_STRING instead of its components.
sql/sql_yacc.yy:
  Name returned as LEX_STRING instead of its components.
2005-06-03 12:56:51 +02:00
unknown
0298ebb579 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/my/mysql-4.1
2005-06-03 13:35:58 +03:00
unknown
fcb3be9f63 check-cpu fixes/improvements (Bug #11065)
- support additional platforms (OpenBSD, Darwin)
    - make use of /proc/cpuinfo CPU flag information
      (needed to distinguish EMT64 Xeons from normal ones)
    - chose the right CPU related options depending on 
      GCC version and target architecture
    - check if the chosen CPU type is actually supported
      by the GCC version , fallback to CPUs predecessor
      until test compile succeeds
2005-06-03 11:21:43 +02:00
unknown
74dd642177 sql_repl.cc:
Bug #11064  	some read error not detected in replication on 64-bit platform


sql/sql_repl.cc:
  Bug #11064  	some read error not detected in replication on 64-bit platform
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2005-06-03 11:16:37 +02:00
unknown
33992678e2 Merge mysql.com:/home/hartmut/projects/mysql/dev/4.1
into mysql.com:/home/hartmut/projects/mysql/dev/5.0


BUILD/Makefile.am:
  Auto merged
2005-06-03 10:35:14 +02:00
unknown
9979feb35c bundle the check-cpu helper script with source packages.
BUG#10696
2005-06-03 10:30:58 +02:00
unknown
8d0d79eda3 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/usr/home/bar/mysql-5.0
2005-06-03 11:20:43 +05:00
unknown
0305a3a112 Merge
mysql-test/r/ctype_utf8.result:
  Auto merged
sql/field.cc:
  merging from 4.1
2005-06-03 09:44:13 +05:00
unknown
0f7a57cb5a Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
2005-06-03 06:40:40 +02:00
unknown
52b70ceff7 ctype_utf8.result, ctype_utf8.test:
adding test
field.cc:
  bug#10714 Inserting double value into utf8 column crashes server:
  sprintf was executed with too big length, which caused
  crash on some Windows platforms.


sql/field.cc:
  bug#10714 Inserting double value into utf8 column crashes server
  sprintf was executed with too long length, which cau
  crashe on Windows.
mysql-test/t/ctype_utf8.test:
  adding test
mysql-test/r/ctype_utf8.result:
  adding test
2005-06-03 09:37:53 +05:00
unknown
9960fc709b Merge mysql.com:/usr/home/bar/mysql-4.1
into mysql.com:/usr/home/bar/mysql-5.0
2005-06-03 09:29:20 +05:00
unknown
74f3014cf7 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/my/mysql-4.1


sql/sql_parse.cc:
  Auto merged
2005-06-03 01:16:29 +03:00
unknown
1b99948246 Removed duplicated and wrong merged code
sql/sql_base.cc:
  Fixed wrong comment
2005-06-03 01:15:56 +03:00
unknown
b3ca69b114 Merge bk-internal:/home/bk/mysql-5.0
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2005-06-02 23:00:58 +02:00
unknown
4d81713cb8 assemble libmysqld.a 5-10 times faster! 2005-06-02 22:59:37 +02:00
unknown
805b16addf Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/opt/local/work/mysql-5.0-root
2005-06-03 00:23:29 +04:00
unknown
ae2e80d62d Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/svoj/devel/mysql/yassl-mysql-5.0
2005-06-03 01:10:26 +05:00
unknown
8e18a995e8 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/opt/local/work/mysql-5.0-root
2005-06-03 00:03:28 +04:00
unknown
892032a2c2 Give Item_arena::is_stmt_prepare a more descriptive name (it marks
the code that is active for SP as well in 5.0)


sql/item.cc:
  Rename of an Item_arena method.
sql/item_subselect.cc:
  Rename of an Item_arena method.
sql/sql_class.h:
  Rename of an Item_arena method.
sql/sql_parse.cc:
  Rename of an Item_arena method.
sql/sql_union.cc:
  Rename of an Item_arena method.
2005-06-03 00:02:47 +04:00
unknown
b442d912f9 Merge dl145b.mysql.com:/home/ndbdev/tomas/mysql-4.1
into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.0


ndb/src/mgmclient/CommandInterpreter.cpp:
  Auto merged
2005-06-02 21:31:25 +02:00
unknown
bdbace6666 WL#2286 - Compile MySQL w/YASSL support
Compilation errors fixes.


config/ac-macros/yassl.m4:
  Switch to -l/-L instead of passing file name directly. (more portable for ".a" archives)
extra/yassl/taocrypt/src/integer.cpp:
  Instantiate more templates (needed by some 64bit boxes).
extra/yassl/taocrypt/src/template_instnt.cpp:
  Instantiate more templates (needed by some 64bit boxes).
  Move tcArrayDelete to TaoCrypt namespace (more portable).
2005-06-03 00:28:18 +05:00
unknown
336d32b19c Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into dl145b.mysql.com:/home/ndbdev/tomas/tmp
2005-06-02 21:25:37 +02:00
unknown
28a467c6fa CommandInterpreter.cpp:
Bug #11050  	ndb_mgm "show" prints incorrectly after master data node fails


ndb/src/mgmclient/CommandInterpreter.cpp:
  Bug #11050  	ndb_mgm "show" prints incorrectly after master data node fails
2005-06-02 21:14:14 +02:00
unknown
7c62023bc7 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0


sql/sql_select.cc:
  Auto merged
2005-06-02 20:55:32 +02:00
unknown
fec4347fb3 Merge monster.:D:/Work/mysql-4.1 into monster.:D:/Work/mysql5.0
BitKeeper/etc/logging_ok:
  auto-union
2005-06-02 12:36:55 -05:00
unknown
dd8e174fa6 Additional tweak to fix for bug #10543, to prevent a change in
behavior when extending fields that were fully part of a
multi-part key.


mysql-test/r/key.result:
  Update results
mysql-test/t/key.test:
  Add test for behavior of extending fields in a multi-part key
  that were defined with a partial length the same as their
  field length.
sql/sql_table.cc:
  Reset key_part_length when old field length was the same as the
  old key_part_length.
2005-06-02 10:00:36 -07:00
unknown
33b114aac2 item_func.h:
Identation correction for the fix of bug #9939.


sql/item_func.h:
  Identation correction for the fix of bug #9939.
2005-06-02 10:00:32 -07:00