1
0
mirror of https://github.com/MariaDB/server.git synced 2025-08-05 13:16:09 +03:00
Commit Graph

1045 Commits

Author SHA1 Message Date
gni@dev3-221.dev.cn.tlan
305d0eaf02 Merge dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.1/mysql-5.1-new-ndb-bj
into  dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.1/mysql-5.1-new-ndb
2007-05-08 09:52:27 +08:00
unknown
cd3ced79e9 WL#2936
Move copying of global variables into thd.variables into plugin_thdvar_init().
  plugin_thdvar_init() may be called multiple times when THD::change_user() is called.
  This fixes a plugin ref-count leak when running the test mysql_client_test


sql/sql_class.cc:
  wl2936
    Initialize thd.variables to zero in constructor.
    Move copying of global variables into thd.variables into plugin_thdvar_init()
sql/sql_plugin.cc:
  wl2936
    Move copying of global variables into thd.variables into plugin_thdvar_init().
    plugin_thdvar_init() may be called multiple times when THD::change_user() is called.
    This fixes a plugin ref-count leak when running the test mysql_client_test
2007-05-04 16:44:07 -07:00
acurtis/antony@xiphis.org/ltamd64.xiphis.org
0f0ef2fe14 WL#2936
Move copying of global variables into thd.variables into plugin_thdvar_init().
  plugin_thdvar_init() may be called multiple times when THD::change_user() is called.
  This fixes a plugin ref-count leak when running the test mysql_client_test
2007-05-04 16:44:07 -07:00
unknown
6cb6bb8594 WL#2936
Fix compiler warnings,
  Fix help output - this fixes im test failures.
  Fix incomplete change of SET plugin vars to ulonglong.
  Allow ER() to work without crashing when errmsg.sys has not been loaded.


include/mysql/plugin.h:
  wl2936
    slip in const modifier for default values,
    this removes compiler warnings when assigning a string const as default value.
sql/derror.cc:
  WL2936
    Allow init_errmessage() to return upon failure.
    Initialize errmesg to an array of empty strings if it failed to load errmsg.sys
sql/mysqld.cc:
  wl2936
    Include Ingo's compiler-warnings fix.
    If init_errmessage() failed to load errmsg.sys, abort.
    Failure to set working directory not fatal when '--help' is specified, as
    server will terminate anyway after displaying help information.
sql/sql_plugin.cc:
  wl2936
    complete change of SET vars from ulong to ulonglong.
2007-05-01 18:25:29 -07:00
acurtis/antony@xiphis.org/ltamd64.xiphis.org
9126286a6a WL#2936
Fix compiler warnings,
  Fix help output - this fixes im test failures.
  Fix incomplete change of SET plugin vars to ulonglong.
  Allow ER() to work without crashing when errmsg.sys has not been loaded.
2007-05-01 18:25:29 -07:00
unknown
ed22886bcd Merge acurtis@bk-internal.mysql.com:/home/bk/mysql-5.1-engines
into  xiphis.org:/home/antony/work2/mysql-5.1-engines.fixme


sql/sql_plugin.cc:
  Auto merged
2007-04-30 16:44:02 -07:00
acurtis/antony@ltamd64.xiphis.org
16e3cd37a2 Merge acurtis@bk-internal.mysql.com:/home/bk/mysql-5.1-engines
into  xiphis.org:/home/antony/work2/mysql-5.1-engines.fixme
2007-04-30 16:44:02 -07:00
unknown
eba2079397 WL#2936
Change SET variables to be ulonglong type (64bit)


include/mysql/plugin.h:
  WL2936
    Change SET variables to be unsigned long long type
    Changed use of ulonglong to unsigned long long
sql/sql_plugin.cc:
  WL2936
    Change SET variables to be ulonglong type (64bit)
2007-04-30 16:42:15 -07:00
acurtis/antony@xiphis.org/ltamd64.xiphis.org
853fc26252 WL#2936
Change SET variables to be ulonglong type (64bit)
2007-04-30 16:42:15 -07:00
unknown
0f824dc212 WL#2936 - Falcon & MySQL plugin interface: server variables
Avoid compiler warnings


cmd-line-utils/readline/rltty.c:
  Avoid a compiler warning
config/ac-macros/misc.m4:
  Avoid a compiler warning, which could abort ./configure
  if CFLAGS contain -Werror.
2007-04-30 18:49:38 +02:00
istruewing@chilla.local
581b8504f3 WL#2936 - Falcon & MySQL plugin interface: server variables
Avoid compiler warnings
2007-04-30 18:49:38 +02:00
unknown
c73135fd83 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-engines
into  sergbook.mysql.com:/usr/home/serg/Abk/mysql-5.1-wl2936


sql/sql_plugin.cc:
  merged
2007-04-29 08:29:18 -07:00
serg@sergbook.mysql.com
28feb8937d Merge bk-internal.mysql.com:/home/bk/mysql-5.1-engines
into  sergbook.mysql.com:/usr/home/serg/Abk/mysql-5.1-wl2936
2007-04-29 08:29:18 -07:00
unknown
9167311465 compilation error 2007-04-29 08:24:33 -07:00
serg@sergbook.mysql.com
960f009a34 compilation error 2007-04-29 08:24:33 -07:00
unknown
5301516367 compile-dist failure
fix compile error when DBUG_OFF


sql/sql_plugin.cc:
  fix compile error when DBUG_OFF
2007-04-29 08:12:44 -07:00
antony@ppcg5.local
cfa3f9106e compile-dist failure
fix compile error when DBUG_OFF
2007-04-29 08:12:44 -07:00
unknown
860217e5f4 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-wl2936
into  chilla.local:/home/mydev/mysql-5.1-wl2936-two


sql/sql_plugin.cc:
  Auto merged
2007-04-28 14:16:12 +02:00
istruewing@chilla.local
bb1c3722e4 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-wl2936
into  chilla.local:/home/mydev/mysql-5.1-wl2936-two
2007-04-28 14:16:12 +02:00
unknown
f3bb323455 WL#2936 - Falcon & MySQL plugin interface: server variables
Changed back (type != OPT_SESSION) to (type == OPT_GLOBAL)
2007-04-27 23:42:22 +02:00
istruewing@chilla.local
352c273dfc WL#2936 - Falcon & MySQL plugin interface: server variables
Changed back (type != OPT_SESSION) to (type == OPT_GLOBAL)
2007-04-27 23:42:22 +02:00
unknown
2f664e46c6 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-engines
into  chilla.local:/home/mydev/mysql-5.1-wl2936-two


client/mysql.cc:
  Auto merged
client/mysqltest.c:
  Auto merged
include/my_global.h:
  Auto merged
include/my_sys.h:
  Auto merged
mysql-test/lib/mtr_cases.pl:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/ndb_dd_basic.result:
  Auto merged
mysql-test/r/variables.result:
  Auto merged
mysql-test/t/ndb_dd_basic.test:
  Auto merged
mysql-test/t/variables.test:
  Auto merged
mysys/hash.c:
  Auto merged
sql/event_queue.cc:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/ha_partition.cc:
  Auto merged
sql/handler.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/log.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_cache.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_connect.cc:
  Auto merged
sql/sql_delete.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_plugin.cc:
  Auto merged
sql/sql_repl.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/structs.h:
  Auto merged
sql/table.cc:
  Auto merged
storage/innobase/handler/ha_innodb.cc:
  Auto merged
storage/innobase/handler/ha_innodb.h:
  Auto merged
include/typelib.h:
  WL#2936 - Falcon & MySQL plugin interface: server variables
  Manual merge
mysys/typelib.c:
  WL#2936 - Falcon & MySQL plugin interface: server variables
  Manual merge
2007-04-27 19:09:39 +02:00
istruewing@chilla.local
e327818c28 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-engines
into  chilla.local:/home/mydev/mysql-5.1-wl2936-two
2007-04-27 19:09:39 +02:00
unknown
6cc76eb61c fixed: memleak in --help, sigsegv on shutdown
Ingo's patch:
WL#2936 - Falcon & MySQL plugin interface: server variables
Added initialization for plugin string variables with their
default values.
Added deallocation of string values before a plugin and its
variables is deleted.
Added examples to plugin_example


mysys/my_getopt.c:
  Ingo's patch:
  WL#2936 - Falcon & MySQL plugin interface: server variables
  Added initialization for string options. Since string variables
  do often have their default value assigned already, assign the
  default value only if the variable value is NULL.
plugin/fulltext/plugin_example.c:
  Ingo's patch:
  WL#2936 - Falcon & MySQL plugin interface: server variables
  Added examples for thread variables, which have a SESSION and
  a GLOBAL value.
sql/mysqld.cc:
  removed second fix_paths() in --help output (memory leak).
  removed invalid string defaul values (binlog_format)
  don't hide the error message in the help text
sql/sql_plugin.cc:
  don't do plugin_dl_del for built-in plugins (sigsegv).
  Ingo's patch:
  WL#2936 - Falcon & MySQL plugin interface: server variables
  Clearing newly allocated variable value space. This is important
  for string variables. They are initialized to their default
  value only if their initial value is NULL.
  Setting default values for strings.
  Added a function to free global value space for string variables.
  Call the function before deleting a plugin and its variables.
2007-04-26 21:26:04 +02:00
serg@sergbook.mysql.com
31c1a1c9c3 fixed: memleak in --help, sigsegv on shutdown
Ingo's patch:
WL#2936 - Falcon & MySQL plugin interface: server variables
Added initialization for plugin string variables with their
default values.
Added deallocation of string values before a plugin and its
variables is deleted.
Added examples to plugin_example
2007-04-26 21:26:04 +02:00
unknown
d413ffa924 Merge dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.1/mysql-5.1-new-ndb-bj
into  dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.1/bug18676


sql/ha_ndbcluster.cc:
  Auto merged
sql/handler.cc:
  Auto merged
sql/sql_plugin.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
2007-04-24 17:34:36 +08:00
gni@dev3-221.dev.cn.tlan
1869b2c4d0 Merge dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.1/mysql-5.1-new-ndb-bj
into  dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.1/bug18676
2007-04-24 17:34:36 +08:00
unknown
04c015fbda Merge bk-internal.mysql.com:/home/bk/mysql-5.1-wl2936
into  chilla.local:/home/mydev/mysql-5.1-wl2936-two


sql/sql_plugin.cc:
  Auto merged
2007-04-24 11:23:12 +02:00
istruewing@chilla.local
a90109dd2b Merge bk-internal.mysql.com:/home/bk/mysql-5.1-wl2936
into  chilla.local:/home/mydev/mysql-5.1-wl2936-two
2007-04-24 11:23:12 +02:00
unknown
67a9f239f0 Merge pilot.blaudden:/home/msvensson/mysql/my51-m-mysql_upgrade
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint


scripts/mysql_system_tables_fix.sql:
  Auto merged
sql/sql_plugin.cc:
  Auto merged
sql/sql_udf.cc:
  Auto merged
2007-04-24 11:11:45 +02:00
msvensson@pilot.blaudden
a4ee7302e6 Merge pilot.blaudden:/home/msvensson/mysql/my51-m-mysql_upgrade
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
2007-04-24 11:11:45 +02:00
unknown
ac0fb49f18 WL#2936 - Falcon & MySQL plugin interface: server variables
Added initialization for the plugin structure created in
plugin_add().
Made a correct argument vector in mysql_install_plugin():
handle_options() assumes that arg0 (program name) always exists.


mysys/my_getopt.c:
  WL#2936 - Falcon & MySQL plugin interface: server variables
  Added DBUG_ASSERTs. handle_options() assumes that arg0
  (program name) always exists.
plugin/fulltext/plugin_example.c:
  WL#2936 - Falcon & MySQL plugin interface: server variables
  Extended the fulltext parser example plugin with system variables.
2007-04-24 10:40:23 +02:00
istruewing@chilla.local
98ff6f0a95 WL#2936 - Falcon & MySQL plugin interface: server variables
Added initialization for the plugin structure created in
plugin_add().
Made a correct argument vector in mysql_install_plugin():
handle_options() assumes that arg0 (program name) always exists.
2007-04-24 10:40:23 +02:00
unknown
66acd82f19 warning added 2007-04-23 19:05:38 +02:00
serg@janus.mylan
3e87e65b0a warning added 2007-04-23 19:05:38 +02:00
unknown
2b14696099 mysql-test/t/ndb_dd_basic.test
fixed the test
sql/ha_ndbcluster.cc
    LOCK_plugin is used in ha_ndbcluster.cc
sql/sql_plugin.cc
    LOCK_plugin is used in ha_ndbcluster.cc


mysql-test/t/ndb_dd_basic.test:
  fixed the test
sql/ha_ndbcluster.cc:
  LOCK_plugin is used in ha_ndbcluster.cc
sql/sql_plugin.cc:
  LOCK_plugin is used in ha_ndbcluster.cc
2007-04-19 11:05:25 +02:00
serg@janus.mylan
f49eb3fde8 mysql-test/t/ndb_dd_basic.test
fixed the test
sql/ha_ndbcluster.cc
    LOCK_plugin is used in ha_ndbcluster.cc
sql/sql_plugin.cc
    LOCK_plugin is used in ha_ndbcluster.cc
2007-04-19 11:05:25 +02:00
unknown
9bafb1a7ed comment 2007-04-18 20:46:26 +02:00
serg@janus.mylan
1901fe6e3a comment 2007-04-18 20:46:26 +02:00
unknown
c43979f554 WL#2936 - Falcon & MySQL plugin interface: server variables
Fixed a compiler dependent expression to be more portable.
Initialized 'dummy' in construct_help_options() so that loaded
plugin show themselves as TRUE in the help output.


mysys/hash.c:
  WL#2936 - Falcon & MySQL plugin interface: server variables
  Fixed a compiler dependent expression to be more portable.
sql/handler.cc:
  WL#2936 - Falcon & MySQL plugin interface: server variables
  Added a DBUG_PRINT.
sql/sql_plugin.cc:
  WL#2936 - Falcon & MySQL plugin interface: server variables
  Initialized 'dummy' in construct_help_options() so that loaded
  plugin show themselves as TRUE in the help output.
  Fixed a DBUG_ENTER, added a DBUG_PRINT.
  Added comments.
2007-04-18 14:37:57 +02:00
istruewing@chilla.local
3a0d2806df WL#2936 - Falcon & MySQL plugin interface: server variables
Fixed a compiler dependent expression to be more portable.
Initialized 'dummy' in construct_help_options() so that loaded
plugin show themselves as TRUE in the help output.
2007-04-18 14:37:57 +02:00
unknown
dcef028f71 wl#2936 post-merge fixes
client/mysqltest.c:
  warnings
extra/comp_err.c:
  warnings
sql/event_queue.cc:
  warnings
sql/handler.h:
  warnings
sql/opt_range.cc:
  warnings
sql/opt_range.h:
  warnings
sql/rpl_mi.cc:
  warnings
sql/sql_class.cc:
  wl#2936 post-merge fixes, warnings
2007-04-16 18:16:17 +02:00
serg@janus.mylan
00479a441d wl#2936 post-merge fixes 2007-04-16 18:16:17 +02:00
unknown
7cb8a33b1a Merge bk-internal.mysql.com:/home/bk/mysql-5.1
into  sergbook.mysql.com:/usr/home/serg/Abk/mysql-5.1-wl2936


client/mysql.cc:
  Auto merged
include/my_global.h:
  Auto merged
include/my_sys.h:
  Auto merged
include/mysql.h:
  Auto merged
mysql-test/r/im_utils.result:
  Auto merged
mysql-test/r/variables.result:
  Auto merged
mysql-test/t/ndb_dd_basic.test:
  Auto merged
mysql-test/t/partition_innodb.test:
  Auto merged
mysql-test/t/variables.test:
  Auto merged
mysys/array.c:
  Auto merged
mysys/typelib.c:
  Auto merged
sql/event_queue.cc:
  Auto merged
sql/ha_partition.cc:
  Auto merged
sql/ha_partition.h:
  Auto merged
sql/handler.cc:
  Auto merged
sql/handler.h:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/log.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/set_var.h:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_cache.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_delete.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_partition.cc:
  Auto merged
sql/sql_plugin.cc:
  Auto merged
sql/sql_repl.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/table.cc:
  Auto merged
sql/table.h:
  Auto merged
storage/example/ha_example.cc:
  Auto merged
storage/federated/ha_federated.cc:
  Auto merged
storage/heap/ha_heap.cc:
  Auto merged
storage/innobase/include/trx0trx.h:
  Auto merged
storage/myisam/ha_myisam.cc:
  Auto merged
storage/myisammrg/ha_myisammrg.cc:
  Auto merged
storage/ndb/src/mgmsrv/InitConfigFileParser.cpp:
  Auto merged
include/typelib.h:
  merged
mysql-test/mysql-test-run.pl:
  merged
mysql-test/r/flush2.result:
  merged
mysql-test/r/ndb_dd_basic.result:
  merged
mysql-test/r/partition_innodb.result:
  merged
mysql-test/r/ps_1general.result:
  merged
mysql-test/t/ps_1general.test:
  merged
sql/ha_ndbcluster.cc:
  merged
sql/item_create.cc:
  merged
sql/mysqld.cc:
  merged
sql/rpl_utility.h:
  merged
sql/set_var.cc:
  merged
sql/sql_class.cc:
  merged
sql/sql_yacc.yy:
  merged
storage/innobase/handler/ha_innodb.cc:
  merged
storage/innobase/handler/ha_innodb.h:
  merged
2007-04-16 10:37:50 +02:00
serg@sergbook.mysql.com
6bc9bc92df Merge bk-internal.mysql.com:/home/bk/mysql-5.1
into  sergbook.mysql.com:/usr/home/serg/Abk/mysql-5.1-wl2936
2007-04-16 10:37:50 +02:00
unknown
44271d49a0 BUG#18676 In order to coincide with 5.0 mysqld error code after bug#18676, Map the 4009 ndb error code to 157 mysql error code
mysql-test/r/ndb_autodiscover.result:
  changes ndbd error code 4009 to mysqld error code 157 when no cluster connection
sql/ha_ndbcluster.cc:
  define return codes to ndbcluster_table_exists_in_engine to something useful
sql/handler.cc:
  define return codes to ha_table_exists_in_engine to something useful
sql/sql_plugin.cc:
  Add a comment
sql/sql_table.cc:
  clearly define what happens on create table if exists/not exists/not connected to engine
storage/ndb/src/ndbapi/ndberror.c:
  map 4009 ndb error code to 157 mysqld error code
2007-04-16 15:15:47 +08:00
gni/root@dev3-221.dev.cn.tlan
648b03aa14 BUG#18676 In order to coincide with 5.0 mysqld error code after bug#18676, Map the 4009 ndb error code to 157 mysql error code 2007-04-16 15:15:47 +08:00
unknown
add3787615 more wl#2936 fixes: removed implicit ha_thd() calls (too error-prone),
fixed an assert crash


include/mysql/plugin.h:
  more wl#2936 fixes: no implicit ha_thd() calls
mysql-test/mysql-test-run.pl:
  don't load system-wide plugins
mysql-test/r/partition_innodb.result:
  fix the test
mysql-test/t/partition_innodb.test:
  fix the test
sql/handler.cc:
  more wl#2936 fixes: no implicit ha_thd() calls
sql/handler.h:
  more wl#2936 fixes: no implicit ha_thd() calls
sql/sql_class.cc:
  more wl#2936 fixes: no implicit ha_thd() calls
sql/sql_plugin.cc:
  more wl#2936 fixes: assert crash
storage/innobase/handler/ha_innodb.cc:
  more wl#2936 fixes: no implicit ha_thd() calls
2007-04-15 15:47:27 +02:00
serg@sergbook.mysql.com
c53037af36 more wl#2936 fixes: removed implicit ha_thd() calls (too error-prone),
fixed an assert crash
2007-04-15 15:47:27 +02:00
unknown
18f02e0aeb sql/sql_plugin.cc
remove endspaces and tabs


sql/sql_plugin.cc:
  remove endspaces and tabs
2007-04-13 19:24:46 +02:00