diff options
| author | Michael Widenius <monty@askmonty.org> | 2011-02-23 02:06:58 +0200 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2011-02-23 02:06:58 +0200 |
| commit | 39616eb9ef974c69e73bcb80cd7e3c40228910fd (patch) | |
| tree | 092aec15bb2404ab11a594dae191d07a4bae2298 /sql-common/client_plugin.c | |
| parent | ab6d450639ce8b031929080be579148264989aa5 (diff) | |
| download | mariadb-git-39616eb9ef974c69e73bcb80cd7e3c40228910fd.tar.gz | |
Fixed compiler warnings and some test failures found by buildbot
dbug/dbug.c:
Fixed compiler warnings on windows
mysql-test/r/index_intersect_innodb.result:
Don't print number of rows as this varies
mysql-test/suite/funcs_1/r/processlist_val_no_prot.result:
Update to use new State
mysql-test/suite/handler/heap.result:
Update results
mysql-test/suite/handler/heap.test:
Changed key used in test as the key 'b' will not guarantee order of the two last elements (as the key value is the same)
mysql-test/suite/pbxt/r/lock_multi.result:
Update to use new State
mysql-test/t/index_intersect.test:
Don't print number of rows as this varies
mysql-test/valgrind.supp:
Added suppression for linux
mysys/hash.c:
Fixed compiler warnings on windows
plugin/handler_socket/handlersocket/database.cpp:
Fixed compiler warnings
sql-common/client_plugin.c:
Changed variable to define to avoid compiler warnings when variable is not used
sql-common/my_time.c:
Initialize all my_time elements to avoid compiler warnings
storage/oqgraph/ha_oqgraph.cc:
Use right function (to avoid compiler warning)
storage/pbxt/src/table_xt.cc:
Initialize variables (to avoid compiler warnings)
Diffstat (limited to 'sql-common/client_plugin.c')
| -rw-r--r-- | sql-common/client_plugin.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql-common/client_plugin.c b/sql-common/client_plugin.c index c609f165d1c..433942199e5 100644 --- a/sql-common/client_plugin.c +++ b/sql-common/client_plugin.c @@ -50,7 +50,8 @@ struct st_client_plugin_int { static my_bool initialized= 0; static MEM_ROOT mem_root; -static const char *plugin_declarations_sym= "_mysql_client_plugin_declaration_"; +#define plugin_declarations_sym "_mysql_client_plugin_declaration_" + static uint plugin_version[MYSQL_CLIENT_MAX_PLUGINS]= { 0, /* these two are taken by Connector/C */ |