client/mysqlmanagerc.c:
fix to make it compile after merge
sql/lex.h:
fixes for GRANT ... REQUIRE
sql/sql_lex.h:
GRANT ... REQUIRE
sql/sql_yacc.yy:
GRANT ... REQUIRE
tools/mysqlmanager.c:
fix to make compile after merge
BitKeeper/etc/ignore:
auto-union
BitKeeper/deleted/.del-test-ssl~ed0a50364f2a51d7:
Auto merged
include/Makefile.am:
Auto merged
include/mysql.h:
Auto merged
libmysql/libmysql.c:
Auto merged
mysys/md5.c:
Auto merged
sql/Makefile.am:
Auto merged
Fixed that --enable-assembler works on newer Linux system
Makefile.am:
Another attempt to get pstack into the binary distribution
configure.in:
Fixed that --enable-assembler works on newer Linux system
Fixes for pstack
pstack/Makefile.am:
Another attempt to get pstack into the binary distribution
Fix to get libmysqld examples to be included in distribution
BitKeeper/deleted/.del-test-ssl~ed0a50364f2a51d7:
Delete: vio/test-ssl
BitKeeper/etc/ignore:
Added libmysqld/examples/mysql libmysqld/examples/mysqltest to the ignore list
configure.in:
Fix to get pstack included in distribution
libmysqld/Makefile.am:
Fix to get libmysqld examples to be included in distribution
libmysqld/examples/Makefile.am:
Fix to get libmysqld examples to be included in distribution
sql/sql_parse.cc:
Fixed bug in grant
into work.mysql.com:/home/bk/mysql-4.0
Docs/manual.texi:
Auto merged
extra/perror.c:
Auto merged
include/myisam.h:
Auto merged
myisam/mi_check.c:
Auto merged
mysql-test/mysql-test-run.sh:
Auto merged
mysql-test/t/rpl000017-slave.sh:
Auto merged
sql/ha_myisam.cc:
Auto merged
sql/handler.cc:
Auto merged
sql/slave.cc:
Auto merged
Fixed some wrong test cases
Docs/manual.texi:
Changelog
extra/perror.c:
Added BDB table errors
include/myisam.h:
Fix for LOAD DATA FROM MASTER when using tables with checksum
myisam/mi_check.c:
Fix for LOAD DATA FROM MASTER when using tables with checksum
mysql-test/mysql-test-run.sh:
Better logging
mysql-test/r/join.result:
Fixed missing results
mysql-test/r/rpl000006.result:
Updated result
mysql-test/t/join.test:
Fixed wrong test
mysql-test/t/rpl000001.test:
Fixed wrong test
mysql-test/t/rpl000006.test:
Cleanup
mysql-test/t/rpl000017-slave.sh:
Fixed too long password
mysql-test/t/rpl000017.test:
Fixed too long password
sql/ha_myisam.cc:
Fix for LOAD DATA FROM MASTER when using tables with checksum
sql/handler.cc:
Unique error for DEADLOCK
sql/slave.cc:
Fix for LOAD DATA FROM MASTER when using tables with checksum
Docs/manual.texi:
Auto merged
extra/perror.c:
Auto merged
include/my_base.h:
Auto merged
include/mysql.h:
Auto merged
scripts/make_binary_distribution.sh:
Auto merged
sql/ha_berkeley.cc:
Auto merged
sql/handler.h:
Auto merged
sql/mysqld.cc:
Auto merged
client/mysqltest.c:
Auto merged
myisam/mi_extra.c:
More debugging information
mysql-test/r/union.result:
Added test for UNION bug
mysql-test/t/union.test:
Added test for UNION bug
sql/sql_base.cc:
Clear field->query_id when using UNION
sql/sql_parse.cc:
Fix for UNION bug
sql/sql_union.cc:
Cleanup
sql/table.h:
Fix for UNION bug
tools/Makefile.am:
Fix for compiling with MIT-threads
buf0buf.c Fix uninitilaized flush field noticed with Purify
innobase/buf/buf0buf.c:
Fix uninitilaized flush field noticed with Purify
innobase/log/log0log.c:
Eliminate a Purify warning
Fixed array overrun when using drop_db
Portability fixes
BitKeeper/etc/ignore:
Added libmysqld/examples/completion_hash.cc libmysqld/examples/completion_hash.h libmysqld/examples/my_readline.h libmysqld/examples/mysql.cc libmysqld/examples/mysqltest.c libmysqld/examples/readline.cc libmysqld/examples/sql_string.cc libmysqld/examples/sql_string.h to the ignore list
acinclude.m4:
Fixed reference to top_builddir
myisam/mi_write.c:
Fixed locking problem when using bulk insert
sql/sql_db.cc:
Fixed array overrun when using drop_db
client/mysql.cc:
Increased version number
client/mysqltest.c:
Changed to use default path
include/mysql.h:
Changed prototype of mysql_server_init
libmysql/libmysql.c:
Changed prototype of mysql_server_init
libmysqld/lib_sql.cc:
Changed prototype of mysql_server_init
mysql-test/r/union.result:
Added test for UNION bug
mysql-test/t/union.test:
Added test for UNION bug
mysql test suite.
A few minor libmysqld fixes.
Add mysql_server_init() and _end() to mysql.cc and mysqltest.c, so they
can be linked against libmysqlclient or libmysqld.
sql/mysqld.cc:
have unireg_end() exit(), instead of pthread_exit()
if inside the EMBEDDED_LIBRARY. This is a hack
which hopefully won't be needed. But without it,
the program hangs at end.
client/mysql.cc:
Don't call mysql_ssl_clear() unless HAVE_OPENSSL.
client/mysqltest.c:
Add mysql_server_init() and _end().
acinclude.m4:
change .. to $(top_builddir) in innodb_libs
Makefile.am:
Add libmysqld/examples to link_sources target
configure.in:
output libmysqld/examples/Makefile
Also, change .. to $(top_builddir) in readline_link
BitKeeper/etc/ignore:
added linked_libmysqldex_sources
mysql-test/mysql-test-run.sh:
use latin1, not latin1_de, in tests
libmysqld/libmysqld.c:
Add replication functions.
updated mysql-test-run with features from 4.0
added a test case for broken load data from master for MyISAM tables
with checksum
client/mysqltest.c:
fixed parser bug
mysql-test/mysql-test-run.sh:
backported changes from 4.0 ( needed to be able to run client in gdb)
mysql-test/t/rpl000006.test:
updated test case for a bug
