diff options
| author | unknown <serg@sergbook.mysql.com> | 2005-08-14 23:20:06 +0200 |
|---|---|---|
| committer | unknown <serg@sergbook.mysql.com> | 2005-08-14 23:20:06 +0200 |
| commit | 6843d1d89c0f40a78d27ba2da694c842e96b1b68 (patch) | |
| tree | 6caa536b120ee9cce44b7734ac313048938fefaf | |
| parent | 33f04ca9975596a4d0e9e92afe71c8399769597e (diff) | |
| download | mariadb-git-6843d1d89c0f40a78d27ba2da694c842e96b1b68.tar.gz | |
forgotten 'return'
BitKeeper/etc/ignore:
Added support-files/MacOSX/postflight support-files/MacOSX/preflight to the ignore list
| -rw-r--r-- | .bzrignore | 2 | ||||
| -rw-r--r-- | sql/sql_class.cc | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/.bzrignore b/.bzrignore index 2c20c4daf22..24ac6e22c45 100644 --- a/.bzrignore +++ b/.bzrignore @@ -1121,3 +1121,5 @@ vio/test-ssl vio/test-sslclient vio/test-sslserver vio/viotest-ssl +support-files/MacOSX/postflight +support-files/MacOSX/preflight diff --git a/sql/sql_class.cc b/sql/sql_class.cc index 23e4ccd0172..792d3c62169 100644 --- a/sql/sql_class.cc +++ b/sql/sql_class.cc @@ -1863,8 +1863,8 @@ static void xid_free_hash (void *ptr) bool xid_cache_init() { pthread_mutex_init(&LOCK_xid_cache, MY_MUTEX_INIT_FAST); - hash_init(&xid_cache, &my_charset_bin, 100, 0, 0, - xid_get_hash_key, xid_free_hash, 0) != 0; + return hash_init(&xid_cache, &my_charset_bin, 100, 0, 0, + xid_get_hash_key, xid_free_hash, 0) != 0; } void xid_cache_free() |