Commit graph

29422 commits

Author SHA1 Message Date
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
2e253c1ed8 Merge mysql.com:/space/pekka/ndb/version/my51
into  mysql.com:/space/pekka/ndb/version/my51-rbr


storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp:
  Auto merged
2006-01-02 09:58:59 +01: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
unknown
d105ee3cc6 ndb - wl#2972 (4.1) copy detached trigger fix from 5.0
ndb/src/kernel/blocks/dbtup/DbtupCommit.cpp:
  detached trigger fix from 5.0
2005-12-31 10:54:36 +01:00
unknown
bb1e8bd5e4 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
into serg.mylan:/usr/home/serg/Abk/mysql-5.1
2005-12-31 10:16:19 +01:00
unknown
85cf4646f2 libarchive.a and storage/archive/Makefile should be specified in
MYSQL_STORAGE_ENGINE macro (and nowhere else)
2005-12-31 10:13:45 +01:00
unknown
04ed04461c Making old tables seen with "#mysql50#" prefix,
which makes it possible to run RENAME TABLE
  on old tables when upgrading from 5.0.
  TODO: A stored procedure to rename all tables and
  databases with old name format into new format,
  it will simplify upgrade.
sql_table.cc:
  Making old tables seen with "#mysql50#" prefix.
  Adding warning into .err log when an old name is found.
sql_show.cc:
  Skip non-directories before filename_to_tablename
  call, to avoid unnecessary warnings.
strfunc.cc:
  Adding "error" argument to strconvert()
mysql_priv.h:
  Adding "error" agrument to strconvert()


sql/mysql_priv.h:
  Adding "error" agrument to strconvert()
sql/strfunc.cc:
  Adding "error" argument to strconvert()
sql/sql_show.cc:
  Skip non-directories before filename_to_tablename
  call, to avoid warning.
sql/sql_table.cc:
  Making old tables seen with "#mysql50#" prefix,
  which makes it possible to run RENAME TABLE
  on old tables.
  Adding warning into .err log when an old name is found.
2005-12-31 12:34:39 +04:00
unknown
91f2109a35 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/usr/home/bar/mysql-5.1-new.fscs3


sql/mysqld.cc:
  Auto merged
sql/table.cc:
  Auto merged
2005-12-31 09:02:56 +04:00
unknown
9c7412cae8 WL#1324 table name to file name encoding
- Encoding itself, implemented as a charset
  "filename". Originally planned to use '.'
  as an escape character, but now changed to '@'
  for two reasons: "ls" does not return
  file names starting with '.' considering them
  as a kind of hidden files; some platforms
  do not allow several dots in a file name.
- replacing many calls of my_snprintf() and
  strnxmov() to the new build_table_filename().
- Adding MY_APPEND_EXT mysys flag, to append
  an extention rather that replace it.
- Replacing all numeric constants in fn_format
  flag arguments to their mysys definitions, e.g.
  MY_UNPACK_FILENAME,
- Predictability in several function/methods:
  when a table name can appear with or withot .frm
  extension. Some functions/methods were changed
  so accept names strictly with .frm, other - strictly
  without .frm extensions. Several DBUG_ASSERTs were
  added to check whether an extension is passed.
Many files:
  table name to file name encoding
mysql_priv.h:
  Prototypes for new table name encoding tools.
ctype-utf8.c:
  Implementing "filename" charset for
  table name to file name encoding.
row0mysql.c:
  Fixing table name prefix.
mf_format.c:
  Adding MY_APPEND_EXT processing.
Many files:
  Fixing tests.
my_sys.h:
  Adding new flag to append rather than replace an extension.
m_ctype.h:
  Adding "filename" charset definition.


include/m_ctype.h:
  Adding "filename" charset definition.
include/my_sys.h:
  Adding new flag to append rather than replace an extension.
mysql-test/t/alter_table.test:
  Fixing tests.
mysql-test/t/create.test:
  Fixing tests.
mysql-test/t/show_check.test:
  Fixing tests.
mysql-test/r/alter_table.result:
  Fixing tests.
mysql-test/r/create.result:
  Fixing tests.
mysql-test/r/mysqldump.result:
  Fixing tests.
mysys/mf_format.c:
  Adding MY_APPEND_EXT processing.
sql/discover.cc:
  table name to file name encoding
sql/ha_berkeley.cc:
  table name to file name encoding
sql/ha_innodb.cc:
  table name to file name encoding
sql/ha_myisam.cc:
  table name to file name encoding
sql/ha_myisammrg.cc:
  table name to file name encoding
sql/ha_ndbcluster.cc:
  table name to file name encoding
sql/ha_partition.cc:
  table name to file name encoding
sql/handler.cc:
  table name to file name encoding.
sql/init.cc:
  table name to file name encoding
sql/mysqld.cc:
  table name to file name encoding
sql/parse_file.cc:
  table name to file name encoding
sql/sql_acl.cc:
  table name to file name encoding
sql/sql_base.cc:
  table name to file name encoding
sql/sql_db.cc:
  table name to file name encoding
sql/sql_delete.cc:
  table name to file name encoding
sql/sql_rename.cc:
  table name to file name encoding
sql/sql_show.cc:
  table name to file name encoding
sql/sql_table.cc:
  table name to file name encoding
sql/sql_trigger.cc:
  table name to file name encoding
sql/sql_view.cc:
  table name to file name encoding
sql/strfunc.cc:
  table name to file name encoding
sql/table.cc:
  table name to file name encoding
sql/unireg.cc:
  table name to file name encoding
storage/innobase/row/row0mysql.c:
  Fixing table name prefix.
  ,
storage/myisam/mi_create.c:
  table name to file name encoding
storage/myisam/mi_delete_table.c:
  table name to file name encoding
storage/myisam/mi_open.c:
  table name to file name encoding
storage/myisam/mi_rename.c:
  table name to file name encoding
strings/ctype-utf8.c:
  Implementing "filename" charset for
  table name to file name encoding.
sql/mysql_priv.h:
  Prototypes for new table name encoding tools.
storage/myisammrg/myrg_create.c:
  table name to file name encoding
storage/myisammrg/myrg_open.c:
  table name to file name encoding
2005-12-31 09:01:26 +04:00
unknown
d30410d31b New amd64 no-ndb build script.
BUILD/compile-amd64-debug-max-no-ndb:
  New no-ndb amd64 build script.
2005-12-30 08:06:00 -08:00
unknown
3846dff8a8 some casts and simple fixes to fix compile errors in Visual 2005
sql/log_event.cc:
  some casts to make Visual 2005 happy
sql/log_event.h:
  actually return a bool expression instead of assuming a pointer 
  expression is boolean
sql/sql_class.cc:
  some casts to make Visual 2005 happy
sql/handler.cc:
  actually return 0 as the function docs say
2005-12-30 06:32:33 -06:00
unknown
565e729e38 Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  april.(none):/home/svoj/devel/mysql/mysql-5.1-new
2005-12-30 16:32:32 +04:00
unknown
4ac9029de8 Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  april.(none):/home/svoj/devel/mysql/mysql-5.1-new


sql/mysqld.cc:
  Auto merged
2005-12-30 15:07:54 +04:00
unknown
80d3e73466 backup.result, backup.test:
t4 was not dropped, which made the "backup" test fail
  if one of the previous tests using t4 (e.g. "archive") failed.


mysql-test/t/backup.test:
  t4 was not dropped.
mysql-test/r/backup.result:
  t4 was not dropped.
2005-12-30 14:55:56 +04:00
unknown
694eca71c1 Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into mysql.com:/M51/mysql-5.1
2005-12-29 22:37:58 +01:00
unknown
79175e861c after pull fixes
client/mysqlslap.c:
  compilation errors
include/plugin.h:
  comments corrected
sql/sql_plugin.cc:
  LEX_STRING instead of char*,
  MYSQL_HANDLERTON_INTERFACE_VERSION instead of 0x0000
sql/sql_plugin.h:
  LEX_STRING instead of char*
sql/sql_show.cc:
  LEX_STRING instead of char*.
  STRING_WITH_LEN works only on string literals, not on expressions
2005-12-29 21:29:02 +01:00
unknown
e6b215bf4c Merge mysql.com:/M50/upward-5.0 into mysql.com:/M51/merge-5.1
sql/ha_innodb.cc:
  Auto merged
2005-12-29 19:11:36 +01:00
unknown
168a610472 Merge mysql.com:/home/mydev/mysql-5.0
into  mysql.com:/home/mydev/mysql-5.0-bug15591
2005-12-29 18:17:02 +01:00
unknown
44eda212f1 BUG#16068: Plugin related bugs
Fixed that --plugin_dir option doesn't work.
Fixed that parser name is not restored correctly from the table.


sql/mysqld.cc:
  Overwrite opt_plugin_dir_ptr _after_ loading the path.
sql/table.cc:
  Partition saves at least 5 bytes in .frm.
2005-12-29 17:28:59 +04:00
unknown
ca88190649 Merge mysql.com:/M50/clone-5.0 into mysql.com:/M50/mysql-5.0 2005-12-29 13:41:56 +01:00
unknown
f8df12908c Merge mysql.com:/home/mydev/mysql-5.0-bug15591
into  mysql.com:/home/mydev/mysql-5.1-bug15591


mysql-test/mysql-test-run.sh:
  Auto merged
sql/mysqld.cc:
  Bug#15591 - Occasional test suite abort due to port in use
  Manual merge.
2005-12-29 13:37:37 +01:00
unknown
a23e2eefd2 Fix the compile failure introduced by the previous cset. 2005-12-29 15:37:36 +03:00
unknown
3af57471f7 Merge mysql.com:/home/mydev/mysql-5.0
into  mysql.com:/home/mydev/mysql-5.0-bug15591
2005-12-29 11:07:27 +01:00
unknown
34729e41bc Merge neptunus.(none):/home/msvensson/mysql/wl2930/my50-wl2930-integration
into  neptunus.(none):/home/msvensson/mysql/wl2930/my51-wl2930-integration


client/mysqltest.c:
  Auto merged
mysql-test/t/mysqltest.test:
  Auto merged
2005-12-29 09:55:09 +01:00