Commit graph

29311 commits

Author SHA1 Message Date
unknown
7bf8a9e6ca Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/opt/local/work/mysql-5.0-merge
2006-01-04 21:47:00 +03:00
unknown
58d4830c63 Post-merge fixes.
sql/sql_acl.cc:
  A post-merge fix.
sql/sql_base.cc:
  A post-merge fix.
2006-01-04 21:39:39 +03:00
unknown
a6b0029f4d EADDRINUSE is not defined on Windows. 2006-01-04 16:38:54 +01:00
unknown
de307de5cf Merge neptunus.(none):/home/msvensson/mysql/yassl_link_problem/my50-yassl_link_problem
into  neptunus.(none):/home/msvensson/mysql/yassl_link_problem/my51-yassl_link_problem


include/Makefile.am:
  Auto merged
2006-01-04 16:34:03 +01:00
unknown
6f2eb6e00d Add yassl libs to libmysqlclient_r as well.
Add a link to extra/yassl/include/openssl to inlude when compiling with yassl
Similiar to readline)


config/ac-macros/yassl.m4:
  Link extra/yassl/include/openssl dir to include/
include/Makefile.am:
  Call yassl_h_ln_cmd when linking sources, this will create symlink to openssl in include when compiling with yassl
libmysql_r/Makefile.am:
  Inlude yassl libs into libmysqlclient_r(just as we do in libmysqlclient)
2006-01-04 16:33:06 +01:00
unknown
bd88ee1aac Merge lthalmann@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/users/lthalmann/bkroot/mysql-5.1-new
2006-01-04 16:27:57 +01:00
unknown
d102b5457c BUG#16188: Could not compile
sql/sql_class.cc:
  Needed to be able to compile without RBR
2006-01-04 16:24:58 +01:00
unknown
0d9edb36c7 Merge mysql.com:/usr/local/mysql/mysql-5.0-qnxfix
into  mysql.com:/usr/local/mysql/mysql-5.0
2006-01-04 16:14:49 +01:00
unknown
920cbc79d6 Merge mysql.com:/usr/local/mysql/mysql-5.0-qnxfix
into  mysql.com:/usr/local/mysql/mysql-5.1-new
2006-01-04 16:04:21 +01:00
unknown
b6e0d940d6 Fix QNX test abort in release builds and pushbuild, avoid killing our
parent when we are not the process group leader.
2006-01-04 16:02:41 +01:00
unknown
3456c4be3a Merge mysql.com:/opt/local/work/mysql-4.1-7209-new
into  mysql.com:/opt/local/work/mysql-5.0-merge


mysys/hash.c:
  Auto merged
ndb/src/kernel/blocks/dbtup/DbtupCommit.cpp:
  Auto merged
sql/lock.cc:
  Auto merged
sql/sql_cache.cc:
  Auto merged
sql/sql_acl.cc:
  Manual merge.
sql/sql_base.cc:
  Manual merge.
2006-01-04 17:49:45 +03:00
unknown
f577d864cd A fix for Bug#7209 "Client error with "Access Denied" on updates
when high concurrency": remove HASH::current_record and make it
an external search parameter, so that it can not be the cause of a 
race condition under high concurrent load.
The bug was in a race condition in table_hash_search,
when column_priv_hash.current_record was overwritten simultaneously
by multiple threads, causing the search for a suitable grant record
to fail.
No test case as the bug is repeatable only under concurrent load.


include/hash.h:
  - remove current_record from HASH, instead modify hash_first,
  hash_next to accept HASH_SEARCH_STATE as an IN/OUT parameter
mysys/hash.c:
  - remove HASH::current_record
  - change declarations of functions that use HASH in read-only mode
    to accept const HASH * instead of HASH *. 
  - implement hash_search; move the old implementation of hash_search
  to hash_first
mysys/testhash.c:
  - adjust the test case to changed function declarations
sql/lock.cc:
  - adjust to changed declarations of hash_search, hash_next
sql/sql_acl.cc:
  - adjust to changed declarations of hash_search, hash_next
sql/sql_base.cc:
  - adjust to changed declarations of hash_search, hash_nex
sql/sql_cache.cc:
  - adjust to a changed declaration of hash_replace
2006-01-04 17:35:30 +03:00
unknown
a7bb8a977b BUG#14931: Temporarily add synchronization to avoid sporadic test failures until
the bug is fixed.


mysql-test/t/rpl_row_sp000.test:
  BUG#14931: Temporarily add synchronization to avoid sporadic failures until
  the bug is fixed.
mysql-test/r/rpl_row_sp000.result:
  BUG#14931: Temporarily add synchronization to avoid sporadic failures until
  the bug is fixed.
mysql-test/r/rpl_stm_sp.result:
  BUG#14931: Temporarily add synchronization to avoid sporadic failures until
  the bug is fixed.
mysql-test/t/rpl_stm_sp.test:
  BUG#14931: Temporarily add synchronization to avoid sporadic failures until
  the bug is fixed.
2006-01-04 15:25:51 +01:00
unknown
95cecbf815 BUG#14931: Temporarily add synchronization to avoid sporadic test failures until
the bug is fixed.


mysql-test/r/rpl_sp.result:
  BUG#14931: Temporarily add synchronization to avoid sporadic failures until
  the bug is fixed.
mysql-test/t/rpl_sp.test:
  BUG#14931: Temporarily add synchronization to avoid sporadic failures until
  the bug is fixed.
2006-01-04 15:25:32 +01:00
unknown
b0d716a5db Post-merge fixes. 2006-01-04 15:04:36 +01:00
unknown
1fa7eb82bf Merge mkindahl@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/home/bkroot/mysql-5.1-new
2006-01-04 14:10:34 +01:00
unknown
776a123d22 Merge mysql.com:/home/bkroot/mysql-5.1-new
into  mysql.com:/home/bk/b15924-mysql-5.1-new
2006-01-04 14:05:50 +01:00
unknown
2f13d1c0ac Merge mysql.com:/home/bkroot/mysql-5.1-new
into  mysql.com:/home/bk/b15924-mysql-5.1-new


sql/sql_class.cc:
  Auto merged
mysql-test/t/disabled.def:
  Merge with mysql-5.1-new
2006-01-04 14:00:35 +01:00
unknown
ecd7ee5eb5 Merge mysql.com:/home/bkroot/mysql-5.1-new
into  mysql.com:/home/bk/b15942-mysql-5.1-new


sql/handler.cc:
  Auto merged
2006-01-04 13:57:02 +01:00
unknown
7c398b0aaf Merge mysql.com:/usr/local/mysql/mysql-5.0-qnxtestsock
into  mysql.com:/usr/local/mysql/mysql-5.1-new


mysql-test/mysql-test-run.pl:
  Auto merged
2006-01-04 10:36:54 +01:00
unknown
88469c807e cleanup
include/my_sys.h:
  sort_dynamic()
mysys/my_once.c:
  MY_ZEROFILL support in my_once_alloc
plugin/fulltext/Makefile.am:
  no lib prefix for modules. really build .so
scripts/mysql_create_system_tables.sh:
  remove obsolete syntax (and warnings)
sql/sql_parse.cc:
  don't call add_to_status/bzero in a loop
2006-01-04 10:36:49 +01:00
unknown
314f0fbf32 Merge mysql.com:/usr/local/mysql/mysql-5.0-qnxtestsock
into  mysql.com:/usr/local/mysql/mysql-5.0
2006-01-04 10:34:47 +01:00
unknown
e1fdf8b4f9 Avoid double slash (//) in socket paths, breaks on QNX. 2006-01-04 10:32:52 +01:00
unknown
9570a11832 cleaned up some of the casts as a result of Mats' review
sql/sql_class.cc:
  some casts to make Visual 2005 happy
2006-01-03 22:37:24 -06:00
unknown
1aacfd4fb4 BUG#16167: Disable mysqlslap test case until bug is fixed.
mysql-test/t/disabled.def:
  BUG#16167: Disable test case until bug is fixed.
2006-01-03 23:37:29 +01:00
unknown
799765f000 Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  fedora.(none):/home/reggie/bk/mysql-5.1-new2


sql/handler.cc:
  Auto merged
2006-01-03 07:46:09 -06:00
unknown
d2d09d60f7 Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into mysql.com:/M51/mysql-5.1
2006-01-03 14:46:08 +01:00
unknown
99966acd33 Test files in new subdirectory "mysql-test/extra" need to be propagated into binary distribution. 2006-01-03 14:36:31 +01:00
unknown
5e7cbbcbbc Fix for bug#15533 crash, information_schema, function, view
enable view prepared mode during getting metedata for I_S table


mysql-test/r/information_schema.result:
  Fix for bug#15533 crash, information_schema, function, view
    test case
mysql-test/t/information_schema.test:
  Fix for bug#15533 crash, information_schema, function, view
    test case
2006-01-03 14:25:19 +04:00
unknown
a74472c849 Fix memory problem: Both the allocation and pointer arithmetics on the
head_sptr array was wrong.
2006-01-03 11:09:18 +01:00
unknown
c81a379c5b cleanup of SHOW STATUS code, as a preparation for WL#2935
(MySQL plugin interface: status variables)

adding SHOW_FUNC, removing SHOW_some_specific_value,
only generic SHOW_LONG/SHOW_CHAR/etc are recognized.
changing to use SHOW_FUNC instead of ha_update_statistics


sql/ha_innodb.h:
  cleanup of SHOW STATUS code, as a preparation for WL#2935
  removing ha_update_statistics().
sql/handler.cc:
  cleanup of SHOW STATUS code, as a preparation for WL#2935
  removing ha_update_statistics().
sql/handler.h:
  cleanup of SHOW STATUS code, as a preparation for WL#2935
  removing ha_update_statistics().
sql/mysqld.cc:
  cleanup of SHOW STATUS code, as a preparation for WL#2935
  adding SHOW_FUNC, removing SHOW_some_specific_variable,
  only generic SHOW_LONG/SHOW_CHAR/etc are recognized.
  changing to use SHOW_FUNC instead of ha_update_statistics
sql/set_var.cc:
  cleanup of SHOW STATUS code, as a preparation for WL#2935
  adding SHOW_FUNC, removing SHOW_some_specific_variable,
  only generic SHOW_LONG/SHOW_CHAR/etc are recognized.
sql/sql_show.cc:
  cleanup of SHOW STATUS code, as a preparation for WL#2935
  adding SHOW_FUNC, removing SHOW_some_specific_variable,
  only generic SHOW_LONG/SHOW_CHAR/etc are recognized.
  changing to use SHOW_FUNC instead of ha_update_statistics
sql/structs.h:
  cleanup of SHOW STATUS code, as a preparation for WL#2935
  adding SHOW_FUNC, removing SHOW_some_specific_variable,
  only generic SHOW_LONG/SHOW_CHAR/etc are recognized.
2006-01-02 15:41:13 +01:00
unknown
a34b7ee82c Merge mkindahl@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/home/bkroot/mysql-5.1-new
2006-01-02 14:41:40 +01:00
unknown
c8570c5cf5 Fix mysqlslap problems when running multiple tests in parallel, by setting
the mysqlslap lock directory to value of --tmpdir.


mysql-test/mysql-test-run.pl:
  Set mysqlslap --lock-directory to avoid conflicts between parallel tests.
2006-01-02 14:14:48 +01:00
unknown
de1962cd66 Bug#13115 (CREATE TABLE t2 SELECT a inside SP is not replicated when using RBR):
Test passes. Bug was probably fixed in the implementation of WL#2867.


mysql-test/t/rpl_sp_effects.test:
  Removed check for statement-based replication.
2006-01-02 13:20:17 +01:00
unknown
d68fdc0e84 Fix compile failure, reapply changeset "05/12/29 15:37:36 sergefp@mysql.com"
apparently lost in merge.


client/mysqlslap.c:
  Fix compile failure.
2006-01-02 13:19:13 +01:00
unknown
8967d9645c Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  zim.(none):/home/brian/mysql/slap-5.1
2006-01-02 02:24:38 -08:00
unknown
03ad9cb577 Do not use C++ style comments (//) in C source (breaks compilation on aix52). 2006-01-02 09:58:58 +01:00
unknown
ad00c02079 Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  zim.(none):/home/brian/mysql/slap-5.1


client/mysqlslap.c:
  Merge of comments change
2006-01-01 20:27:24 -08:00
unknown
9b9af86ac0 Cleaned up memory allocation to be a little more staight forward (though I suspect someone will hate my sizeof() increment).
Nothing really to see here. Updated comments in code.

More comments are probably needed, but isn't that always the case?


client/mysqlslap.c:
  Updated docs. 
  Removed complicated malloc calls with a single malloc. Cleaned up the way statements were be free'd (aka its now a function instead of a bunch of copy/paste).
  Removed older and not so accurate timediff() call. Cleaned up call to parse out concurrency.
mysql-test/t/mysqlslap.test:
  Edited the tests to make sure we check default concurrency (we can't test concurrency normally since in theory the results could be random).
  You will noticed that the result was not changed.
2006-01-01 20:08:45 -08:00
unknown
67a6dd9fb9 Do not use C++ style comments (//) in C source (breaks compilation on aix52). 2006-01-02 02:45:26 +01:00
unknown
dcab4ab1ad Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  zim.(none):/home/brian/mysql/slap-5.1


client/mysqlslap.c:
  Resolve conflict
2006-01-01 16:47:03 -08:00
unknown
5f209e9036 Now uses a single pass testing loop. Dual pass made no sense.
Now does averaging when running iterations. 
Realligned a bunch of code and continued to remove global variables.
Added CSV output along with printable.
Structures are now provided for print options so adding XML, HTML, ... should now be trivial.


client/client_priv.h:
  Simplified options
client/mysqlslap.c:
  Giant cleanup.
  We now do single pass testing, not dual pass. The dual pass made no sense really especially when you started adding in more stats.
  Modified the testing loop so that it should not be possible to have both a fork() and thread version (which will make it easier to port to windows should someone want to).
mysql-test/r/mysqlslap.result:
  New results
mysql-test/t/mysqlslap.test:
  Adjusting for new options, and removed "archive" from the tests just in case archive is not compiled.
2006-01-01 16:40:02 -08:00
unknown
a3e0141898 Don't use C++ style (//) comments in C source (breaks compilation on aix52). 2006-01-02 01:35:30 +01:00
unknown
306bf0bf1b Merge bk-internal:/home/bk/mysql-5.1-new
into  mysql.com:/usr/local/mysql/mysql-5.1-new
2006-01-02 00:38:56 +01:00
unknown
b2168530d9 Compile fixes for hpita2.
sql/sql_plugin.cc:
  Can't initialize char * from const char *, so add cast.
2006-01-01 23:13:16 +01:00
unknown
61d43a6ce5 Revert error in changeset "1.1979 05/12/22 06:39:02 lars@mysql.com" which
caused wrong permissions in "make dist".


mysql-test/Makefile.am:
  *.sh files must use INSTALL_SCRIPT, not INSTALL_DATA.
2006-01-01 22:57:48 +01:00
unknown
ff8458c589 Compile fixes for aix52-64bit.
include/my_bitmap.h:
  Protect incluce of my_pthread.h with #ifdef THREAD, to make it work in non-thread environment.
sql/rpl_tblmap.h:
  Remove unused NO_TABLE enum which broke compilation on picky compilers (trying to put ULONG_MAX into an int...)
2006-01-01 22:18:02 +01:00
unknown
d7901a2afe Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/export/space/pekka/ndb/version/my51
2006-01-01 21:50:29 +01:00
unknown
758860dd77 ndb - wl#2972 (5.1) fix detached trigger opType
storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp:
  set non-update pk pre data to UNDEFINED (previously unspecified)
storage/ndb/src/kernel/blocks/dbtup/DbtupCommit.cpp:
  fix detached trigger opType
storage/ndb/src/kernel/blocks/dbtup/DbtupTrigger.cpp:
  fix detached trigger opType
storage/ndb/test/ndbapi/test_event_merge.cpp:
  exact verif post/pre data
2006-01-01 21:48:26 +01:00
unknown
c038b644d7 plugin versioning: we cannot assume that sizeof(st_mysql_plugin)
is the same in the plugin and in the mysqld.
store the size in the plugin.

To simplify access to plugin's st_mysql_plugin, copy it on open and
convert to the latest version, so that the rest of the code would
not need to care about versions.


include/plugin.h:
  plugin versioning: we cannot assume that sizeof(st_mysql_plugin)
  is the same in the plugin and in the mysqld.
  store the size in the plugin.
2006-01-01 16:43:34 +01:00