diff options
| author | unknown <monty@hundin.mysql.fi> | 2001-12-15 06:00:01 +0200 |
|---|---|---|
| committer | unknown <monty@hundin.mysql.fi> | 2001-12-15 06:00:01 +0200 |
| commit | b63538f1f5a75b35d48b5101cfd712798b754534 (patch) | |
| tree | a7cb6d7348ca9a70b9d06176c2dc8f3af6b78486 /libmysqld | |
| parent | 63e4dec2446382bf0331d2c483daee665064b925 (diff) | |
| download | mariadb-git-b63538f1f5a75b35d48b5101cfd712798b754534.tar.gz | |
Last changes after merge with 3.23.47
libmysqld/lib_sql.cc:
Fix for new bitmap
mysql-test/r/rpl_get_lock.result:
Fix results after merge
mysql-test/r/rpl_skip_error.result:
Fix results after merge
sql/log_event.cc:
Finish merge of slave.cc
sql/slave.cc:
Finish merge
Diffstat (limited to 'libmysqld')
| -rw-r--r-- | libmysqld/lib_sql.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libmysqld/lib_sql.cc b/libmysqld/lib_sql.cc index a1023d04080..f9d5ccfec72 100644 --- a/libmysqld/lib_sql.cc +++ b/libmysqld/lib_sql.cc @@ -448,7 +448,7 @@ int STDCALL mysql_server_init(int argc, char **argv, char **groups) #ifdef USE_REGEX regex_init(); #endif - if (use_temp_pool && bitmap_init(&temp_pool,1024)) + if (use_temp_pool && bitmap_init(&temp_pool,1024,1)) { mysql_server_end(); return 1; |