| Commit message (Collapse) | Author | Age | Files | Lines |
|\
| |
| |
| |
| |
| |
| |
| | |
into tetra.spaceapes.com:/usr/home/jcole/bk/mysql
BitKeeper/etc/logging_ok:
auto-union
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
SET @foo=bar;
This would cause a deadlock in mysqld, it now generates the error:
ER_SET_CONSTANTS_ONLY as follows:
mysql> set @foo=bar;
ERROR 1204: You may only use constant expressions with SET
include/mysqld_error.h:
Added a new error message for SET
sql/share/czech/errmsg.txt:
Added a new error message for SET
sql/share/danish/errmsg.txt:
Added a new error message for SET
sql/share/dutch/errmsg.txt:
Added a new error message for SET
sql/share/english/errmsg.txt:
Added a new error message for SET
sql/share/estonian/errmsg.txt:
Added a new error message for SET
sql/share/french/errmsg.txt:
Added a new error message for SET
sql/share/german/errmsg.txt:
Added a new error message for SET
sql/share/greek/errmsg.txt:
Added a new error message for SET
sql/share/hungarian/errmsg.txt:
Added a new error message for SET
sql/share/italian/errmsg.txt:
Added a new error message for SET
sql/share/japanese/errmsg.txt:
Added a new error message for SET
sql/share/korean/errmsg.txt:
Added a new error message for SET
sql/share/norwegian-ny/errmsg.txt:
Added a new error message for SET
sql/share/norwegian/errmsg.txt:
Added a new error message for SET
sql/share/polish/errmsg.txt:
Added a new error message for SET
sql/share/portuguese/errmsg.txt:
Added a new error message for SET
sql/share/romanian/errmsg.txt:
Added a new error message for SET
sql/share/russian/errmsg.txt:
Added a new error message for SET
sql/share/slovak/errmsg.txt:
Added a new error message for SET
sql/share/spanish/errmsg.txt:
Added a new error message for SET
sql/share/swedish/errmsg.txt:
Added a new error message for SET
BitKeeper/etc/logging_ok:
Logging to logging@openlogging.org accepted
|
|\ \
| | |
| | |
| | |
| | |
| | |
| | | |
Docs/manual.texi:
Auto merged
mysql-test/t/fulltext.test:
merged
|
| |\ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
into mysql.sashanet.com:/home/sasha/src/bk/mysql
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
mysql-test/t/bdb.test:
added space
mysql-test/t/fulltext.test:
comment out the test for the last bug until Serg pushes the change
sql/field.cc:
fixed coredump in INSERT into BDB table
|
| |/ /
| | |
| | |
| | |
| | | |
sql/ha_innobase.cc:
Fixed a bug in ha_innobase.cc in auto_increment
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
item_func.cc MATCH ... AGAINST (NULL) bug fixed
fulltext.test MATCH ... AGAINST (NULL) bug fixed
fulltext.result MATCH ... AGAINST (NULL) bug fixed
mysql-test/r/fulltext.result:
MATCH ... AGAINST (NULL) bug fixed
mysql-test/t/fulltext.test:
MATCH ... AGAINST (NULL) bug fixed
sql/item_func.cc:
MATCH ... AGAINST (NULL) bug fixed
sql/sql_select.cc:
MATCH ... AGAINST (NULL) bug fixed
|
|\ \ \
| |/ /
| | |
| | |
| | |
| | |
| | | |
BitKeeper/etc/logging_ok:
auto-union
Docs/manual.texi:
Auto merged
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
update for the fix
sql/slave.cc
re-merged Jeremy's message changes, got the code to compile and run again
after a mess-up in the merge
Docs/manual.texi:
update for the fix
sql/slave.cc:
re-merged Jeremy's message changes, got the code to compile and run again
after a mess-up in the merge
|
| |\ \
| | |/
| |/|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
merged
sql/slave.cc:
merged
BitKeeper/etc/logging_ok:
Logging to logging@openlogging.org accepted
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
more verbose messages when slave thread exits
sql/slave.cc:
ulonglong -> uint32 for log offset
sql/slave.h:
ulonglong -> uint32 for log offset
|
|\ \ \
| |/ /
|/| |
| | |
| | | |
BitKeeper/etc/logging_ok:
Logging to logging@openlogging.org accepted
|
| |\ \
| | | |
| | | |
| | | |
| | | | |
sql/sql_select.cc:
merged
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
fulltext_cache.result (at last) fulltext/cache bug fixed
mysql-test/r/fulltext_cache.result:
(at last) fulltext/cache bug fixed
sql/sql_select.cc:
(at last) fulltext/cache bug fixed
|
| | | |
| | | |
| | | |
| | | |
| | | | |
sql/ha_innobase.cc:
Fix autocommit in ha_innobase.cc
|
|\ \ \ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
into tetra.spaceapes.com:/usr/home/jcole/bk/mysql
BitKeeper/etc/logging_ok:
Logging to logging@openlogging.org accepted
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Added test for ALTER TABLE ORDER BY
BUILD/FINISH.sh:
Fixes for innobase
BUILD/compile-pentium-debug:
Fixes for innobase
Docs/manual.texi:
Fixes for innobase
include/my_pthread.h:
Fixes for innobase
innobase/Makefile.am:
Fixes for innobase
innobase/btr/Makefile.am:
Fixes for innobase
innobase/data/Makefile.am:
Fixes for innobase
innobase/eval/Makefile.am:
Fixes for innobase
innobase/include/Makefile.i:
Fixes for innobase
innobase/os/Makefile.am:
Fixes for innobase
mysql-test/t/alter_table.test:
Added test for ALTER TABLE ORDER BY
mysys/my_error.c:
Skip 'l' in '%lu'
mysys/my_vsnprintf.c:
cleanup
sql/ha_innobase.cc:
Fixed type + remove warnings
sql/ha_innobase.h:
Remove warnings
sql/handler.cc:
cleanup
sql/sql_class.cc:
remove warnings
sql/sql_parse.cc:
remove warnings
sql/sql_table.cc:
Fixed bug in ALTER TABLE ... ORDER BY
BitKeeper/etc/logging_ok:
Logging to logging@openlogging.org accepted
|
| |\ \ \ \
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
into donna.mysql.com:/home/tim/my/work
innobase/os/os0sync.c:
Auto merged
|
| |\ \ \ \ \
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
into donna.mysql.com:/home/tim/my/work
innobase/configure.in:
Auto merged
innobase/include/lock0types.h:
Auto merged
innobase/include/os0sync.h:
Auto merged
innobase/include/sync0types.h:
Auto merged
sql/ha_innobase.cc:
Auto merged
BitKeeper/etc/logging_ok:
Logging to logging@openlogging.org accepted
|
| | | |/ / /
| | |/| | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Add --with-innobase-db to configure.
acconfig.h:
HAVE_INNOBASE_DB
acinclude.m4:
add MYSQL_CHECK_INNOBASE
configure.in:
use MYSQL_CHECK_INNOBASE and configure innobase directory
innobase/configure.in:
add AM_MAINTAINER_MODE
innobase/include/lock0types.h:
define lock_t
innobase/include/os0file.h:
define S_IRWX[UGO] if needed
innobase/include/os0sync.h:
use pthread_cond_t instead of mutex
innobase/include/sync0types.h:
define mutex_t
innobase/os/os0sync.c:
use pthread_cond_t instead of mutex
sql/Makefile.am:
add @innobase_{includes,libs}@
sql/ha_innobase.cc:
fix casts
|
|\ \ \ \ \ \
| | |_|/ / /
| |/| | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
into tetra.spaceapes.com:/usr/home/jcole/bk/mysql
sql/mysqld.cc:
Auto merged
|
| |/ / / /
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
BUILD/compile-pentium-debug:
Added --with-innobase
Docs/manual.texi:
Added documentation for -O max_user_connections
innobase/os/os0sync.c:
Fix for Heikki
|
| |\ \ \ \
| | |_|_|/
| |/| | | |
|
| | |/ /
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Fixes for Innobase
Don't reset whole to-buffer in strxnmov
BUILD/compile-pentium-debug:
Added innobase
include/mysqld_error.h:
New error messages
innobase/configure.in:
Update from heikki
innobase/include/lock0types.h:
Update from heikki
innobase/include/os0sync.h:
Update from heikki
innobase/include/sync0types.h:
Update from heikki
innobase/os/os0file.c:
Update from heikki
innobase/srv/srv0start.c:
Update from heikki
sql/ha_innobase.cc:
Update from Heikki
Changed assert -> dbug_assert
Changed return -> DBUG_RETURN
sql/mysql_priv.h:
Added max_user_connections
sql/mysqld.cc:
Added max_user_connections
sql/share/czech/errmsg.txt:
Added max_user_connections
sql/share/danish/errmsg.txt:
Added max_user_connections
sql/share/dutch/errmsg.txt:
Added max_user_connections
sql/share/english/errmsg.txt:
Added max_user_connections
sql/share/estonian/errmsg.txt:
Added max_user_connections
sql/share/french/errmsg.txt:
Added max_user_connections
sql/share/german/errmsg.txt:
Added max_user_connections
sql/share/greek/errmsg.txt:
Added max_user_connections
sql/share/hungarian/errmsg.txt:
Added max_user_connections
sql/share/italian/errmsg.txt:
Added max_user_connections
sql/share/japanese/errmsg.txt:
Added max_user_connections
sql/share/korean/errmsg.txt:
Added max_user_connections
sql/share/norwegian-ny/errmsg.txt:
Added max_user_connections
sql/share/norwegian/errmsg.txt:
Added max_user_connections
sql/share/polish/errmsg.txt:
Added max_user_connections
sql/share/portuguese/errmsg.txt:
Added max_user_connections
sql/share/romanian/errmsg.txt:
Added max_user_connections
sql/share/russian/errmsg.txt:
Added max_user_connections
sql/share/slovak/errmsg.txt:
Added max_user_connections
sql/share/spanish/errmsg.txt:
Added max_user_connections
sql/share/swedish/errmsg.OLD:
Added max_user_connections
sql/share/swedish/errmsg.txt:
Added max_user_connections
sql/sql_class.h:
cleanup
strings/str_test.c:
Added tests for strxnmov
strings/strxnmov.c:
Don't reset whole to buffer
|
| |/ /
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Docs/manual.texi:
updates from Matthias Urlichs
mysql-test/r/rpl000016.result:
position sanity check - hope to catch the timing bug
mysql-test/t/rpl000016.test:
position sanity check - hope to catch timing bug
sql/log_event.cc:
limit event length by max_allowed_packet
sql/log_event.h:
abolish MAX_EVENT_LEN
sql/sql_repl.cc:
error for events larger than max_allowed_packet
|
|/ / |
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Fix for BSDI 4.0
Docs/manual.texi:
Added MySQL AB information
configure.in:
Fix for BSDI 4.0
myisam/mi_rprev.c:
Fixed problem with concurrent inserts and read-previous
mysys/mf_format.c:
Fix for BSDI 4.0
sql/handler.cc:
Fixed type
|
| |
| |
| |
| |
| | |
sql/ha_innobase.cc:
Removed some whitespace
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Fixed mutex problem when doing automatic repair of MyISAM tables
Docs/manual.texi:
changelog
include/thr_lock.h:
Added TL_READ_WITH_SHARED_LOCKS for Innobase
mysql-test/r/update.result:
Added 'select' to verify update results
mysql-test/t/update.test:
Better code coverage
mysys/getvar.c:
Allow space in to --set-variable
mysys/thr_lock.c:
Added TL_READ_WITH_SHARED_LOCKS
sql/ha_myisam.cc:
Added comment
sql/lock.cc:
Added missing broadcast
sql/sql_base.cc:
Fixed some mutex problem when doing automatic repair of MyISAM tables
sql/sql_update.cc:
Purecoverage
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Docs/manual.texi:
Clearify when logging is done
myisam/myisamchk.c:
Better error message
mysql-test/r/merge.result:
Added test for SHOW CREATE on MERGE table
scripts/safe_mysqld.sh:
Search by default in database directory
sql/ha_myisammrg.h:
Add UNION() to SHOW CREATE TABLE
sql/sql_update.cc:
removed compiler warning
|
|\ \
| | |
| | |
| | |
| | |
| | |
| | | |
configure.in:
Auto merged
Docs/manual.texi:
Auto merged
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Docs/manual.texi:
Added Innobase documentation
configure.in:
Incremented version
include/my_base.h:
Added option for Innobase
myisam/mi_check.c:
cleanup
mysql-test/t/bdb.test:
cleanup
mysql-test/t/innobase.test:
Extended with new tests from bdb.test
mysql-test/t/merge.test:
Added test of SHOW create
mysys/my_init.c:
Fix for UNIXWARE 7
scripts/mysql_install_db.sh:
Always write how to start mysqld
scripts/safe_mysqld.sh:
Fixed type
sql/ha_innobase.cc:
Update to new version
sql/ha_innobase.h:
Update to new version
sql/handler.h:
Added 'update_table_comment()' and 'append_create_info()'
sql/sql_delete.cc:
Fixes for Innobase
sql/sql_select.cc:
Fixes for Innobase
sql/sql_show.cc:
Append create information (for MERGE tables)
sql/sql_update.cc:
Fixes for Innobase
|
|\ \ \
| |/ /
|/| |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
into tetra.spaceapes.com:/usr/home/jcole/bk/mysql
BitKeeper/etc/logging_ok:
auto-union
sql/sql_parse.cc:
Auto merged
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
to the slow query log.
BitKeeper/etc/logging_ok:
Logging to logging@openlogging.org accepted
|
|\ \ \ |
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Removed a ' that casued 'make paper' to fail
Docs/manual.texi:
Updated myisamchk section; Removed a ' that casued 'make paper' to fail
sql/handler.cc:
Updates for innobase
sql/mysqld.cc:
Updates for innobase
sql/sql_parse.cc:
Fixed possible overrun if the mysqld server name is too big
sql/sql_select.cc:
Updates for innobase
|
|\ \ \ \
| |/ / /
|/| | |
| | | |
| | | |
| | | |
| | | |
| | | | |
into mysql.sashanet.com:/home/sasha/src/bk/mysql
sql/slave.cc:
Auto merged
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
mysql-test/r/rpl000002.result:
test timestamp replication
mysql-test/t/rpl000002.test:
test timestamp replication
|
|\ \ \ \
| |/ / /
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Docs/manual.texi:
Auto merged
mysql-test/r/fulltext.result:
Auto merged
sql/slave.cc:
Auto merged
|
| |/ /
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
fixed skipping bug in bi-directional replication
sql/slave.cc:
fixed skipping bug in bi-directional replication
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Changed errmsg -> my_errmsg (portability issue)
Fixed that mysqlbinlog writes SET TIMESTAMP before all queries
Fixed comments in default my.cnf files
Docs/manual.texi:
Updated information about character sets
client/mysqladmin.c:
Added missing help text
client/mysqltest.c:
Changed --replace to --replace_result to not conflict with SQL replace command
include/my_sys.h:
change errmsg -> my_errmsg (portability issue)
libmysql/errmsg.c:
change errmsg -> my_errmsg (portability issue)
myisam/mi_cache.c:
Changed seek+read to pread
myisam/mi_check.c:
Fix bug that caused myisamchk to be very slow under some specific error conditions
myisam/mi_dynrec.c:
cleanup
myisam/myisamchk.c:
Write out value of checksum
myisam/myisamdef.h:
cleanup
mysql-test/r/backup.result:
Fixed the case where backup caused different error messages
mysql-test/r/bdb.result:
Added new test case
mysql-test/r/fulltext.result:
Fix for new CREATE TABLE format
mysql-test/t/backup.test:
Use --replace_result and --send
mysql-test/t/bdb.test:
New test case
mysql-test/t/status.test:
Use --send
mysys/errors.c:
change errmsg -> my_errmsg (portability issue)
mysys/my_error.c:
change errmsg -> my_errmsg (portability issue)
mysys/typelib.c:
Only accept full type names
sql/derror.cc:
change errmsg -> my_errmsg (portability issue)
sql/ha_berkeley.cc:
Fixed bug when using key parts that could be NULL
sql/log_event.cc:
Log SET TIMESTAMP before all queries
sql/mysqlbinlog.cc:
Incremented version number
sql/mysqld.cc:
change errmsg -> my_errmsg (portability issue)
Always accept --skip-gemeni, --skip-bdb and --skip-innobase
sql/slave.cc:
cleanup
sql/sql_base.cc:
cleanup
sql/sql_db.cc:
cleanup
support-files/my-huge.cnf.sh:
Remove usage of # at end of line
support-files/my-large.cnf.sh:
Remove usage of # at end of line
support-files/my-medium.cnf.sh:
Remove usage of # at end of line
support-files/my-small.cnf.sh:
Remove usage of # at end of line
|
|\ \ \
| |/ /
|/| |
| | |
| | | |
Docs/manual.texi:
Auto merged
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Fixed that GROUP BY can take DESC
Docs/manual.texi:
Cleanups
client/mysqltest.c:
Added --replace to mysqltest
mysql-test/t/backup.test:
Fix to handle different error codes from backup table
sql-bench/crash-me.sh:
Fixed error in create_index test
sql/item_func.cc:
Cleanup
sql/sql_yacc.yy:
Fixed that GROUP BY can take DESC
|
|/ /
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
CREATE TABLE statement
sql_show.cc Fix to add space in SHOW CREATE TABLE between index name and column definitions
sql/sql_show.cc:
Fix to add space in SHOW CREATE TABLE between index name and column definitions
client/mysqldump.c:
Fix to add space between index name and column definition in CREATE TABLE statement
|
|/ |
|
|\ |
|
| | |
|
|\ \
| |/
|/|
| |
| |
| |
| | |
into threads.polyesthetic.msg:/usr/local/src/my/work
|
| |
| |
| |
| |
| |
| |
| |
| | |
reading while the table was being backed up.
sql/sql_table.cc:
open_for_modify should be FALSE in mysql_backup_table
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Changed BITMAP to MY_BITMAP to avoid type conflict on windows
configure.in:
Force sockets to be blocking on HPUX 11.0
include/my_bitmap.h:
Changed BITMAP to MY_BITMAP to avoid type conflict on windows
mysys/my_bitmap.c:
Changed BITMAP to MY_BITMAP to avoid type conflict on windows
mysys/my_init.c:
Removed LOCK_bitmap
sql/mysql_priv.h:
Changed BITMAP to MY_BITMAP to avoid type conflict on windows
sql/mysqld.cc:
Changed BITMAP to MY_BITMAP to avoid type conflict on windows
sql/violite.c:
Force sockets to be blocking on HPUX 11.0
|