1
0
mirror of https://github.com/MariaDB/server.git synced 2025-08-07 00:04:31 +03:00
Commit Graph

3321 Commits

Author SHA1 Message Date
sasha@mysql.sashanet.com
6980a24e9d fixes for slave backward compat
fixed bug in LOAD DATA FROM MASTER
fixed rpl000001.result
Slave now replicates 3.23 master, with the exception of LOAD DATA INFILE, 
which is still buggy. Will push this one after the pull/merge
2002-02-07 15:29:46 -07:00
unknown
d6a4362687 New error messages
Test of unsigned BIGINT values
Fixes for queries-per-hour
Cleanup of replication code (comments and portability fixes)
Make most of the binary log code 4G clean
Changed syntax for GRANT ... QUERIES PER HOUR


Docs/manual.texi:
  Fixed Changelog, upgrading to 4.0 and 4.1 TODO sections.
Docs/mysqld_error.txt:
  Added error message.
configure.in:
  Fix for autoconf 2.52
include/my_getopt.h:
  Portability fix.
include/my_global.h:
  Portablity fix.
include/mysqld_error.h:
  New error messages
mysql-test/r/bigint.result:
  Test of unsigned BIGINT values.
mysql-test/r/func_op.result:
  Test of unsigned BIGINT values.
mysql-test/r/varbinary.result:
  Test of unsigned BIGINT values.
mysql-test/t/bigint.test:
  Test of unsigned BIGINT values.
sql/item_func.h:
  Optimized Item_int_func() usage.
sql/lock.cc:
  Cleanup comments
sql/log.cc:
  Cleanup
sql/log_event.cc:
  Cleanup and portability fixes.
sql/log_event.h:
  Cleanup and portability fixes.
sql/mini_client.cc:
  Cleanup and portability fixes.
sql/mysqld.cc:
  Fix for queries-per-hour
sql/repl_failsafe.cc:
  Prepare for making binary log 2G clean.
sql/share/czech/errmsg.txt:
  New error messages
sql/share/danish/errmsg.txt:
  New error messages
sql/share/dutch/errmsg.txt:
  New error messages
sql/share/english/errmsg.txt:
  New error messages
sql/share/estonian/errmsg.txt:
  New error messages
sql/share/french/errmsg.txt:
  New error messages
sql/share/german/errmsg.txt:
  New error messages
sql/share/greek/errmsg.txt:
  New error messages
sql/share/hungarian/errmsg.txt:
  New error messages
sql/share/italian/errmsg.txt:
  New error messages
sql/share/japanese/errmsg.txt:
  New error messages
sql/share/korean/errmsg.txt:
  New error messages
sql/share/norwegian-ny/errmsg.txt:
  New error messages
sql/share/norwegian/errmsg.txt:
  New error messages
sql/share/polish/errmsg.txt:
  New error messages
sql/share/portuguese/errmsg.txt:
  New error messages
sql/share/romanian/errmsg.txt:
  New error messages
sql/share/russian/errmsg.txt:
  New error messages
sql/share/slovak/errmsg.txt:
  New error messages
sql/share/spanish/errmsg.txt:
  New error messages
sql/share/swedish/errmsg.txt:
  New error messages
sql/share/ukrainian/errmsg.txt:
  New error messages
sql/slave.cc:
  Cleanup
sql/slave.h:
  Cleanup
sql/sql_acl.cc:
  Cleanup and removal of possible reserved words
sql/sql_base.cc:
  More DBUG
sql/sql_cache.cc:
  Cleanup & portability fixes
sql/sql_class.h:
  Make binary log 4G clean
sql/sql_delete.cc:
  More DBUG
sql/sql_handler.cc:
  Cleanup & portability fixes
sql/sql_parse.cc:
  Cleanup of queries-per-hours code
sql/sql_rename.cc:
  Add missing DBUG_RETURN
sql/sql_repl.cc:
  Cleanup & portability fixes
sql/sql_select.cc:
  Cleanup & portability fixes
sql/sql_show.cc:
  Cleanup & portability fixes
sql/sql_update.cc:
  Small cleanup of multi-update-code (need second pass)
sql/sql_yacc.yy:
  Changed syntax for GRANT ... QUERIES PER HOUR
strings/str2int.c:
  Cleanup & portability fixes
2002-01-29 18:32:16 +02:00
monty@hundin.mysql.fi
be46289855 New error messages
Test of unsigned BIGINT values
Fixes for queries-per-hour
Cleanup of replication code (comments and portability fixes)
Make most of the binary log code 4G clean
Changed syntax for GRANT ... QUERIES PER HOUR
2002-01-29 18:32:16 +02:00
unknown
de172721ed more predicatable slave behaviour with wait_for_slave_stop in mysqltest
fixed a couple of bugs with SEQ_READ_APPEND cache
rpl000016 still has non-deterministic result, but I am going to commit and
push since what I have is now better than what is in the main repository


client/mysqltest.c:
  added wait_for_slave_to_stop
  cleaned up TODO and comments
include/my_sys.h:
  fixed race in flush_io_cache in SEQ_READ_APPEND cache
mysql-test/r/rpl000016.result:
  updated result
mysql-test/t/rpl000016.test:
  use wait_for_slave_to_stop to have deterministic slave behaviour for the test
mysys/mf_iocache.c:
  fixed race in flush_io_cache()
  fixed failure to unlock mutex in my_b_append()
sql/log.cc:
  be compatible with 3.23 master
sql/log_event.cc:
  3.23 master compat
sql/slave.cc:
  3.23 master compat
sql/sql_class.h:
  compat with 3.23 master
2002-01-24 22:49:47 -07:00
sasha@mysql.sashanet.com
171948ba86 more predicatable slave behaviour with wait_for_slave_stop in mysqltest
fixed a couple of bugs with SEQ_READ_APPEND cache
rpl000016 still has non-deterministic result, but I am going to commit and
push since what I have is now better than what is in the main repository
2002-01-24 22:49:47 -07:00
unknown
11f04648f2 post-merge fixes, including slave-skip-errors backport
fixed too quick timeout in mysql-test-run which caused a race with the
 new server getting started before the old one completely finished 
 shutdown. This should fix the pid warning we've been getting as well as
 inconsistent results when running tests with the manager


libmysqld/lib_sql.cc:
  post-merge fix
mysql-test/mysql-test-run.sh:
  fixed start/stop timeout and cleanup of log directory
mysql-test/r/rpl000014.result:
  post-merge fix
mysql-test/r/rpl000015.result:
  post-merge fix
mysql-test/r/rpl000016.result:
  post-merge fix
mysql-test/r/rpl_log.result:
  post-merge fix
sql/log_event.cc:
  post-merge fix
sql/slave.cc:
  post-merge fix
sql/slave.h:
  post-merge fix
sql/sql_class.h:
  post-merge fix
tools/mysqlmanager.c:
  added debug message
2002-01-22 15:05:11 -07:00
sasha@mysql.sashanet.com
8e43ad12c3 post-merge fixes, including slave-skip-errors backport
fixed too quick timeout in mysql-test-run which caused a race with the
 new server getting started before the old one completely finished 
 shutdown. This should fix the pid warning we've been getting as well as
 inconsistent results when running tests with the manager
2002-01-22 15:05:11 -07:00
unknown
5df61c3cdc Here comes a nasty patch, although I am not ready to push it yet. I will
first pull, merge,test, and get it to work.

The main change is the new replication code - now we have two slave threads
SQL thread and I/O thread. I have also re-written a lot of the code to 
prepare for multi-master implementation. 

I also documented IO_CACHE quite extensively and to some extend, THD class.


Makefile.am:
  moved tags target script into a separate file
include/my_sys.h:
  fixes in IO_CACHE for SEQ_READ_APPEND + some documentation
libmysqld/lib_sql.cc:
  updated replication locks, but now I see I did it wrong and it won't compile. Will fix
  before the push.
mysql-test/r/rpl000014.result:
  test result update
mysql-test/r/rpl000015.result:
  test result update
mysql-test/r/rpl000016.result:
  test result update
mysql-test/r/rpl_log.result:
  test result update
mysql-test/t/rpl000016-slave.sh:
  remove relay logs
mysql-test/t/rpl000017-slave.sh:
  remove relay logs
mysql-test/t/rpl_log.test:
  updated test
mysys/mf_iocache.c:
  IO_CACHE updates to make replication work
mysys/mf_iocache2.c:
  IO_CACHE update to make replication work
mysys/thr_mutex.c:
  cosmetic change
sql/item_func.cc:
  new replication code
sql/lex.h:
  new replication
sql/log.cc:
  new replication
sql/log_event.cc:
  new replication
sql/log_event.h:
  new replication
sql/mini_client.cc:
  new replication
sql/mini_client.h:
  new replication
sql/mysql_priv.h:
  new replication
sql/mysqld.cc:
  new replication
sql/repl_failsafe.cc:
  new replication
sql/slave.cc:
  new replication
sql/slave.h:
  new replication
sql/sql_class.cc:
  new replication
sql/sql_class.h:
  new replication
sql/sql_lex.h:
  new replication
sql/sql_parse.cc:
  new replication
sql/sql_repl.cc:
  new replication
sql/sql_repl.h:
  new replication
sql/sql_show.cc:
  new replication
sql/sql_yacc.yy:
  new replication
sql/stacktrace.c:
  more robust stack tracing
sql/structs.h:
  new replication code
BitKeeper/etc/ignore:
  Added mysql-test/r/rpl000002.eval mysql-test/r/rpl000014.eval mysql-test/r/rpl000015.eval mysql-test/r/rpl000016.eval mysql-test/r/slave-running.eval mysql-test/r/slave-stopped.eval to the ignore list
2002-01-19 19:16:52 -07:00
sasha@mysql.sashanet.com
56129ce634 Here comes a nasty patch, although I am not ready to push it yet. I will
first pull, merge,test, and get it to work.

The main change is the new replication code - now we have two slave threads
SQL thread and I/O thread. I have also re-written a lot of the code to 
prepare for multi-master implementation. 

I also documented IO_CACHE quite extensively and to some extend, THD class.
2002-01-19 19:16:52 -07:00
unknown
4bcb4f4dae use env vars for socket/port in connect in mysqltest
--local-master option in mysql-test-run
do not log CREATE TABLE when doing table dump
fix replication to slave off 3.23 master


client/mysqltest.c:
  fix to be able to use env vars for socket and port in connect
mysql-test/include/master-slave.inc:
  connect to port specified in environment
mysql-test/mysql-test-run.sh:
  added --local-master option - will assume master is on port 3306 on localhost
sql/log_event.cc:
  fixes to slave off 3.23 master
sql/log_event.h:
  fixes to slave off 3.23 master
sql/slave.cc:
  do not log CREATE TABLE when doing table dump
2001-11-17 17:23:46 -07:00
sasha@mysql.sashanet.com
586e812452 use env vars for socket/port in connect in mysqltest
--local-master option in mysql-test-run
do not log CREATE TABLE when doing table dump
fix replication to slave off 3.23 master
2001-11-17 17:23:46 -07:00
unknown
640fadf2f8 work to enable reading 3.23 logs - not yet finished
moved fail-safe replication routines from sql_repl.cc to repl_failsafe.cc
write start event only in the first log


client/mysqlbinlog.cc:
  work to enable reading 3.23 logs
libmysql/Makefile.shared:
  added mf_iocache2 to libmysqlclient - needed for mysqlbinlog
mysql-test/mysql-test-run.sh:
  added --start-and-exit
mysql-test/r/rpl000002.result:
  result clean-up
mysql-test/r/rpl000016.result:
  result update
mysql-test/r/rpl_log.result:
  result update
mysql-test/t/rpl000016.test:
  test cleanup
mysys/mf_iocache.c:
  fixed new bug
sql/log.cc:
  write start event only on server start or after reset master
sql/log_event.cc:
  work to enable reading 3.23 log format
sql/log_event.h:
  work to enable reading 3.23 format
sql/repl_failsafe.cc:
  code restructuring
sql/repl_failsafe.h:
  re-organized code
sql/slave.cc:
  check master version
sql/slave.h:
  old_format member
sql/sql_class.h:
  allow user to specify io cache type
  need_start_event member to allow writing start event only in the first log
sql/sql_parse.cc:
  code re-organization
sql/sql_repl.cc:
  code reorganization
sql/sql_repl.h:
  reorganized code
2001-11-10 22:24:12 -07:00
sasha@mysql.sashanet.com
beaf95b09d work to enable reading 3.23 logs - not yet finished
moved fail-safe replication routines from sql_repl.cc to repl_failsafe.cc
write start event only in the first log
2001-11-10 22:24:12 -07:00
unknown
d18a6cc33a Fixes up things after merge from 3.23.44
Portability fixes.
Don't delete temporary tables on FLUSH tables.


client/client_priv.h:
  Fix after merge
client/mysqldump.c:
  Fix after merge
include/my_global.h:
  Change CMP -> CMP_NUM because CMP was used in other places
include/violite.h:
  Added missing prototype
myisam/ft_boolean_search.c:
  Removed warnings
myisam/ft_nlq_search.c:
  Removed warnings
myisam/mi_search.c:
  CMP -> CMP_NUM
mysql-test/mysql-test-run.sh:
  Write all logs to log directory
mysql-test/r/func_time.result:
  Fix test results after merge
mysql-test/r/having.result:
  Fix test results after merge
mysql-test/r/join.result:
  Fix test results after merge
mysql-test/r/rpl000012.result:
  Fix test results after merge
mysys/mf_iocache.c:
  Allow multiple call to end_iocache.
sql/ha_innobase.cc:
  Removed possible problem with using uninitialized variable
sql/log_event.cc:
  Don't delete temporary tables on FLUSH tables.
  (Needs to be fixed properly)
2001-11-05 01:04:08 +02:00
monty@hundin.mysql.fi
3afb157ca2 Fixes up things after merge from 3.23.44
Portability fixes.
Don't delete temporary tables on FLUSH tables.
2001-11-05 01:04:08 +02:00
unknown
b9e1b930f7 Portability fixes.
BitKeeper/deleted/.del-configure.in~c6fc04d4e3d6e291:
  Delete: libmysql/configure.in
BitKeeper/deleted/.del-db_ext.h~a1e210bbd0de0a48:
  Delete: bdb/include/db_ext.h
BitKeeper/deleted/.del-mutex_ext.h~f20f47ddc346598b:
  Delete: bdb/include/mutex_ext.h
Build-tools/Do-all-build-steps:
  Portability fix (-j 2 doesn't always work)
configure.in:
  Added extra compiler options for libmysqld (required for HPUX)
libmysql/Makefile.am:
  Added extra compiler options for libmysqld (required for HPUX)
libmysql_r/Makefile.am:
  Added extra compiler options for libmysqld (required for HPUX)
sql/log_event.cc:
  Removed warning
2001-11-02 07:42:28 +02:00
monty@hundin.mysql.fi
daa4229a3d Portability fixes. 2001-11-02 07:42:28 +02:00
unknown
89055361b9 Merge
client/mysqltest.c:
  Auto merged
include/mysql.h:
  Auto merged
include/mysql_com.h:
  Auto merged
libmysql/libmysql.c:
  Auto merged
libmysqld/libmysqld.c:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
acinclude.m4:
  SCCS merged
2001-10-04 15:46:04 -06:00
sasha@mysql.sashanet.com
a71f818aa2 Merge 2001-10-04 15:46:04 -06:00
unknown
5a18acf35f fixed slave to clean up load data infile temp files
instrumented the server with DBUG_SYNC_POINT() macro


mysql-test/t/rpl_log.test:
  no change
sql/item_func.cc:
  debug_sync_point()
sql/log_event.cc:
  clead load data file tmpdir on slave on start/stop events
sql/mysql_priv.h:
  DBUG_SYNC_POINT
sql/sql_repl.cc:
  DBUG_SYNC_POINT in Create_file_event
2001-10-03 13:55:31 -06:00
sasha@mysql.sashanet.com
20ece90471 fixed slave to clean up load data infile temp files
instrumented the server with DBUG_SYNC_POINT() macro
2001-10-03 13:55:31 -06:00
unknown
664647d1f7 Portability fixes.
Build-tools/Do-compile:
  Don't delete distribution if not using --delete
Docs/manual.texi:
  Added information about default values
mysql-test/t/rpl000017.test:
  Fixed replication test to be more portable
mysys/mf_iocache2.c:
  More comments
sql/item_sum.cc:
  Cleanup
sql/log_event.cc:
  Cleanup
sql/mysqld.cc:
  Fixed typos in output
sql/sql_base.cc:
  Cleanup
sql/sql_delete.cc:
  Cleanup
sql/sql_select.cc:
  Cleanup
sql/uniques.cc:
  Portability fix
2001-10-03 17:02:14 +03:00
monty@hundin.mysql.fi
55a6911bb1 Portability fixes. 2001-10-03 17:02:14 +03:00
unknown
0cf4750f3d mysqltest can now talk to manager and start/stop servers with
server_start/server_stop
changed rpl000018 to use the new server restart feature instead of a
hack


BitKeeper/deleted/.del-rpl000018-master.sh~bc8072e13b26b005:
  Delete: mysql-test/t/rpl000018-master.sh
client/mysqltest.c:
  server_start/server_stop
mysql-test/mysql-test-run.sh:
  tell mysqltest about the manager
mysql-test/r/rpl000018.result:
  fixed bug
mysql-test/t/rpl000018.test:
  use server restart instead of fake binlog hack
sql/log_event.cc:
  so far useless change
2001-10-01 16:13:55 -06:00
sasha@mysql.sashanet.com
6b37cce2ae mysqltest can now talk to manager and start/stop servers with
server_start/server_stop
changed rpl000018 to use the new server restart feature instead of a
hack
2001-10-01 16:13:55 -06:00
unknown
c1a80bc061 Integrated table->ref_primary_key into table->part_of_key
Fixed bug in UNION


client/mysqlbinlog.cc:
  Added error message handling to read_log_event()
heap/hp_write.c:
  More debug info
myisam/myisampack.c:
  Cleanup
mysql-test/mysql-test-run.sh:
  Portability fixes.
mysql-test/r/union.result:
  More tests cases for UNION
mysql-test/t/union.test:
  More tests cases for UNION
sql/Makefile.am:
  Added mysql_embed.h
sql/item.cc:
  Fixed bug when using the same table multiple times in union.
sql/log_event.cc:
  Removed use of ## construct (Portability problem)
sql/log_event.h:
  Added error message handling to read_log_event()
sql/mysql_priv.h:
  Added mysql_embed.h
sql/opt_sum.cc:
  Cleanup
sql/slave.cc:
  cleanup
sql/sql_base.cc:
  Integrated table->ref_primary_key into table->part_of_key
sql/sql_union.cc:
  Cleanup
sql/table.cc:
  Integrated table->ref_primary_key into table->part_of_key
sql/table.h:
  Integrated table->ref_primary_key into table->part_of_key
2001-09-21 03:38:35 +03:00
monty@hundin.mysql.fi
5a14bb2a7e Integrated table->ref_primary_key into table->part_of_key
Fixed bug in UNION
2001-09-21 03:38:35 +03:00
unknown
7dc2f1a69e Portability fixes
libmysql/libmysql.c:
  Cleanup & portability fixes
2001-09-15 16:22:34 +03:00
monty@hundin.mysql.fi
0d72e5440f Portability fixes 2001-09-15 16:22:34 +03:00
unknown
9f6d389470 Cleanups
BitKeeper/etc/ignore:
  added vio/test-ssl
Docs/manual.texi:
  Cleanup
isam/isamchk.c:
  Cleanup
myisam/mi_check.c:
  Cleanup
myisam/myisamchk.c:
  Cleanup
myisam/myisamdef.h:
  Cleanup
sql/log_event.cc:
  Cleanup
sql/mysqld.cc:
  Cleanup
2001-09-15 05:03:16 +03:00
monty@hundin.mysql.fi
77ee990bca Cleanups 2001-09-15 05:03:16 +03:00
unknown
c96bf55b9c Merge with 3.23.42
configure.in:
  Auto merged
BitKeeper/deleted/.del-violite.c~d7b85be615595ace:
  Auto merged
BitKeeper/deleted/.del-violite.c~984c09cffe14a11b:
  Auto merged
client/Makefile.am:
  Auto merged
client/mysql.cc:
  Auto merged
client/mysqlbinlog.cc:
  Auto merged
heap/hp_test2.c:
  Auto merged
include/global.h:
  Auto merged
include/my_pthread.h:
  Auto merged
include/myisam.h:
  Auto merged
libmysql/libmysql.c:
  Auto merged
libmysql/net.c:
  Auto merged
myisam/sort.c:
  Auto merged
sql-bench/test-create.sh:
  Auto merged
sql/handler.cc:
  Auto merged
sql/handler.h:
  Auto merged
sql/lock.cc:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/mini_client.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/net_serv.cc:
  Auto merged
mysql-test/t/merge.test:
  Auto merged
sql/ha_innobase.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
support-files/mysql.spec.sh:
  Auto merged
mysql-test/t/bdb.test:
  Auto merged
Docs/manual.texi:
  merge
myisam/myisampack.c:
  merge
2001-09-13 09:52:35 +02:00
monty@work.mysql.com
18474d8419 Merge with 3.23.42 2001-09-13 09:52:35 +02:00
unknown
07a887b383 Portability fixes
libmysql/libmysql.c:
  Remove duplicated define
sql/log_event.cc:
  Portability fix
2001-09-06 01:23:01 +02:00
monty@work.mysql.com
9ad2cd8c45 Portability fixes 2001-09-06 01:23:01 +02:00
unknown
54e33e272d Merge work.mysql.com:/home/bk/mysql
into work.mysql.com:/home/bk/mysql-4.0


Docs/manual.texi:
  Auto merged
client/mysqldump.c:
  Auto merged
libmysql/Makefile.am:
  Auto merged
libmysql_r/Makefile.am:
  Auto merged
myisam/mi_check.c:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
2001-09-04 01:04:32 +02:00
monty@work.mysql.com
81006dd227 Merge work.mysql.com:/home/bk/mysql
into work.mysql.com:/home/bk/mysql-4.0
2001-09-04 01:04:32 +02:00
unknown
8efe675def Ensure that libmysqlclient doesn't use raid
Fix problem with MyISAM and rows of length 65517-65520


Docs/manual.texi:
  Changelog
include/raid.h:
  Ensure that libmysqlclient doesn't use raid
libmysql/Makefile.am:
  Ensure that libmysqlclient doesn't use raid
libmysql_r/Makefile.am:
  Ensure that libmysqlclient doesn't use raid
myisam/mi_check.c:
  Fix problem with rows of length 65517-65520
myisam/mi_dynrec.c:
  Fix problem with rows of length 65517-65520
mysql-test/r/myisam.result:
  Test for myisam tables with problematic row lengths
mysql-test/t/myisam.test:
  Test for myisam tables with problematic row lengths
sql/log_event.cc:
  Portability fix
strings/ctype-euc_kr.c:
  Portability fix
strings/ctype-sjis.c:
  Portability fix
2001-09-04 01:25:34 +03:00
monty@hundin.mysql.fi
0b2af6bdfd Ensure that libmysqlclient doesn't use raid
Fix problem with MyISAM and rows of length 65517-65520
2001-09-04 01:25:34 +03:00
unknown
ddee00a6ed merge with 3.23.42
config.guess:
  Auto merged
config.sub:
  Auto merged
ltconfig:
  Auto merged
BitKeeper/deleted/.del-violite.c~d7b85be615595ace:
  Auto merged
BitKeeper/deleted/.del-violite.c~984c09cffe14a11b:
  Auto merged
client/Makefile.am:
  Auto merged
include/errmsg.h:
  Auto merged
include/global.h:
  Auto merged
include/heap.h:
  Auto merged
include/my_sys.h:
  Auto merged
include/mysql_com.h:
  Auto merged
isam/isamlog.c:
  Auto merged
libmysql/libmysql.c:
  Auto merged
merge/open.c:
  Auto merged
myisam/ft_search.c:
  Auto merged
myisam/ftdefs.h:
  Auto merged
myisam/mi_test_all.sh:
  Auto merged
myisam/myisamchk.c:
  Auto merged
myisam/myisamlog.c:
  Auto merged
myisam/myisampack.c:
  Auto merged
myisam/sort.c:
  Auto merged
myisammrg/myrg_open.c:
  Auto merged
mysys/hash.c:
  Auto merged
mysys/mf_casecnv.c:
  Auto merged
mysys/mf_format.c:
  Auto merged
mysys/my_lib.c:
  Auto merged
mysys/tree.c:
  Auto merged
sql-bench/bench-init.pl.sh:
  Auto merged
sql/filesort.cc:
  Auto merged
sql/ha_myisam.cc:
  Auto merged
sql/ha_myisammrg.cc:
  Auto merged
sql/handler.cc:
  Auto merged
sql/handler.h:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/lex.h:
  Auto merged
sql/log.cc:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/net_serv.cc:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_db.cc:
  Auto merged
sql/sql_delete.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
mysql-test/r/func_time.result:
  Auto merged
mysql-test/r/innodb.result:
  Auto merged
mysql-test/t/bdb.test:
  Auto merged
mysql-test/t/err000001.test:
  Auto merged
mysql-test/t/func_time.test:
  Auto merged
mysql-test/t/innodb.test:
  Auto merged
mysql-test/t/overflow.test:
  Auto merged
mysql-test/t/show_check.test:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_test.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
strings/ctype.c:
  Auto merged
Docs/manual.texi:
  Change to 3.23 manual.
  (I will later add the changes for 4.0 to this copy)
client/mysql.cc:
  merge
client/mysqlbinlog.cc:
  merge
client/mysqldump.c:
  merge
client/mysqltest.c:
  merge
client/thread_test.c:
  merge
configure.in:
  merge
include/my_pthread.h:
  merge
include/mysqld_error.h:
  merge
libmysql/net.c:
  merge
myisam/mi_cache.c:
  merge
myisam/mi_check.c:
  merge
mysql-test/t/fulltext.test:
  merge
mysys/mf_qsort.c:
  merge
sql/lock.cc:
  merge
sql/md5.c:
  merge
sql/mini_client.cc:
  merge
sql/share/czech/errmsg.txt:
  merge
sql/share/danish/errmsg.txt:
  merge
sql/share/dutch/errmsg.txt:
  merge
sql/share/english/errmsg.txt:
  merge
sql/share/estonian/errmsg.txt:
  merge
sql/share/french/errmsg.txt:
  merge
sql/share/german/errmsg.txt:
  merge
sql/share/greek/errmsg.txt:
  merge
sql/share/hungarian/errmsg.txt:
  merge
sql/share/italian/errmsg.txt:
  merge
sql/share/japanese/errmsg.txt:
  merge
sql/share/korean/errmsg.txt:
  merge
sql/share/norwegian-ny/errmsg.txt:
  merge
sql/share/norwegian/errmsg.txt:
  merge
sql/share/polish/errmsg.txt:
  merge
sql/share/portuguese/errmsg.txt:
  merge
sql/share/romanian/errmsg.txt:
  merge
sql/share/russian/errmsg.txt:
  merge
sql/share/slovak/errmsg.txt:
  merge
sql/share/spanish/errmsg.txt:
  merge
sql/share/swedish/errmsg.txt:
  merge
sql/sql_load.cc:
  merge
sql/sql_repl.cc:
  merge
2001-09-02 18:38:33 +02:00
monty@work.mysql.com
447c18954e merge with 3.23.42 2001-09-02 18:38:33 +02:00
unknown
83c86c854a Portability fixes
Docs/manual.texi:
  Changelog
client/mysqlbinlog.cc:
  Portability fix
myisam/ft_test1.c:
  Portability fix
sql/log_event.cc:
  Portability fix
2001-08-30 21:16:39 +03:00
monty@hundin.mysql.fi
91db5836e0 Portability fixes 2001-08-30 21:16:39 +03:00
unknown
31b9e6e03f Fixes for OS2.
Fix bug in isamlog
Add argument types to function declarations.


Docs/manual.texi:
  Updated credits
client/mysql.cc:
  Fixes for OS2
client/mysqladmin.c:
  Fixes for OS2
client/mysqldump.c:
  Fixes for OS2
client/mysqlimport.c:
  Fixes for OS2
client/mysqltest.c:
  Fixes for OS2
dbug/dbug.c:
  Fixes for OS2.
  Use new C calling convention.
dbug/factorial.c:
  Fixes for OS2.
  Use new C calling convention.
include/errmsg.h:
  Fix for OS2
include/global.h:
  Fixes for OS2.
include/my_pthread.h:
  Fixes for OS2.
include/my_sys.h:
  Fixes for OS2.
include/mysql_com.h:
  Move defines to global.h
include/thr_alarm.h:
  Fixes for OS2.
isam/isamchk.c:
  Fixes for OS2.
  Add arguments to function declarations.
isam/isamlog.c:
  Fixes for OS2.
  Fix bug in logfile handling.
isam/test1.c:
  Add arguments to function decl
isam/test2.c:
  Add arguments to function declarations.
isam/test_all.res:
  Update result
libmysql/get_password.c:
  Fixes for OS2.
libmysql/libmysql.c:
  Fixes for OS2.
libmysql/net.c:
  Fixes for OS2.
libmysql/violite.c:
  Add arguments to function declarations.
merge/_locking.c:
  Add argument types to function declarations.
merge/close.c:
  Add argument types to function declarations.
merge/create.c:
  Add argument types to function declarations.
merge/extra.c:
  Add argument types to function declarations.
merge/open.c:
  Add argument types to function declarations.
merge/panic.c:
  Add argument types to function declarations.
merge/rsame.c:
  Add argument types to function declarations.
merge/update.c:
  Add argument types to function declarations.
myisam/ft_eval.c:
  Portability fix
myisam/ft_search.c:
  Portability fix
myisam/ft_test1.c:
  Portability fix
myisam/ftdefs.h:
  Portability fix
myisam/mi_check.c:
  Portability fix
myisam/mi_test1.c:
  Portability fix
myisam/mi_test2.c:
  Portability fix
myisam/mi_test_all.sh:
  Update to test for MACH variable
myisam/myisamlog.c:
  Cleanup
myisam/myisampack.c:
  Don't use variable 'new'
myisam/sort.c:
  Portability fix
myisammrg/myrg_delete.c:
  Add argument types to function declarations.
myisammrg/myrg_locking.c:
  Add argument types to function declarations.
myisammrg/myrg_open.c:
  Add argument types to function declarations.
myisammrg/myrg_panic.c:
  Add argument types to function declarations.
mysql-test/t/backup.test:
  Fix for OS2
mysql-test/t/show_check.test:
  Fix for OS2
mysys/charset.c:
  Dont use variable 'new'
mysys/default.c:
  Fixes for OS2.
mysys/getopt.c:
  Fixes for OS2.
mysys/getopt1.c:
  Fixes for OS2.
mysys/list.c:
  Don't use variable 'new'
mysys/mf_dirname.c:
  Fixes for OS2.
mysys/mf_format.c:
  Fixes for OS2.
mysys/mf_path.c:
  Fixes for OS2.
mysys/mf_qsort.c:
  Portability fix
mysys/mf_tempfile.c:
  Fixes for OS2.
mysys/my_clock.c:
  Fixes for OS2.
mysys/my_copy.c:
  Fixes for OS2.
mysys/my_create.c:
  Fixes for OS2.
mysys/my_getwd.c:
  Fixes for OS2.
mysys/my_init.c:
  Fixes for OS2.
mysys/my_lib.c:
  Fixes for OS2.
mysys/my_lock.c:
  Fixes for OS2.
mysys/my_malloc.c:
  Portability fix
mysys/my_mkdir.c:
  Fixes for OS2.
mysys/my_open.c:
  Fixes for OS2.
mysys/my_pthread.c:
  Fixes for OS2.
mysys/my_realloc.c:
  Fixes for OS2.
mysys/my_redel.c:
  Fixes for OS2.
mysys/my_static.c:
  Fixes for OS2.
mysys/my_tempnam.c:
  Fixes for OS2.
mysys/my_thr_init.c:
  Fixes for OS2.
mysys/my_write.c:
  Fixes for OS2.
mysys/test_charset.c:
  Fixes for OS2.
mysys/thr_alarm.c:
  Fixes for OS2.
mysys/tree.c:
  Fixes for OS2.
sql/field.cc:
  Fixes for OS2.
sql/field.h:
  Fixes for OS2.
sql/gen_lex_hash.cc:
  Fixes for OS2.
sql/hostname.cc:
  Fixes for OS2.
sql/item_func.cc:
  Fixes for OS2.
sql/item_strfunc.cc:
  Fixes for OS2.
sql/log_event.cc:
  Fixes for OS2.
sql/md5.c:
  Fixes for OS2.
sql/mini_client.cc:
  Fixes for OS2.
sql/mysql_priv.h:
  Fixes for OS2.
sql/mysqld.cc:
  Fixes for OS2.
sql/net_serv.cc:
  Fixes for OS2.
sql/slave.cc:
  Fixes for OS2.
sql/sql_base.cc:
  Fixes for OS2.
sql/sql_db.cc:
  Portability fix
sql/sql_insert.cc:
  Fixes for OS2.
sql/sql_load.cc:
  Fixes for OS2.
sql/sql_parse.cc:
  Fixes for OS2.
sql/sql_table.cc:
  Fixes for OS2.
sql/sql_udf.cc:
  Fixes for OS2.
sql/violite.c:
  Fixes for OS2.
strings/ctype-big5.c:
  Fixes for OS2.
strings/ctype-gbk.c:
  Fixes for OS2.
strings/ctype-sjis.c:
  Fixes for OS2.
strings/ctype-tis620.c:
  Fixes for OS2.
strings/ctype.c:
  Fixes for OS2.
strings/strnlen.c:
  Fixes for OS2.
2001-08-22 01:45:07 +03:00
monty@hundin.mysql.fi
733f865f54 Fixes for OS2.
Fix bug in isamlog
Add argument types to function declarations.
2001-08-22 01:45:07 +03:00
unknown
9326aa42ac fixes in mysqltest and mysqlbinlog
trying to understand why --bootstrap option does not create tables
on disk, hope the problem will be fixed when I pull, if not will
debug, but need to commit in order to pull


client/mysqltest.c:
  added safe_connect() and chaned all calls to mysql_real_connect() to
  safe_connect()
mysql-test/install_test_db.sh:
  more diagnostic
sql/log_event.cc:
  fixed compile error in mysqlbinlog
2001-08-20 11:20:47 -06:00
sasha@mysql.sashanet.com
845fc9e0c6 fixes in mysqltest and mysqlbinlog
trying to understand why --bootstrap option does not create tables
on disk, hope the problem will be fixed when I pull, if not will
debug, but need to commit in order to pull
2001-08-20 11:20:47 -06:00
unknown
87a85f7fe7 make LOAD DATA INFILE replication work with multi-character
delimiters/starters/terminators

started work on server management daemon


mysql-test/r/rpl_log.result:
  fixed result
sql/log_event.cc:
  make LOAD DATA INFILE replication
  work with multi-character delimiters/starters/terminators
sql/log_event.h:
  make LOAD DATA INFILE replication
  work with multi-character delimiters/starters/terminators
2001-08-18 20:22:20 -06:00
sasha@mysql.sashanet.com
10cac63f82 make LOAD DATA INFILE replication work with multi-character
delimiters/starters/terminators

started work on server management daemon
2001-08-18 20:22:20 -06:00
unknown
410dd0779c Remove warnings and portability fixes
New global read lock code
Fixed bug in DATETIME with WHERE optimization
Made UNION code more general.


include/global.h:
  Remove warning on Linux Alpha
include/mysql_com.h:
  Move some C variables inside extern "C" block.
include/mysqld_error.h:
  New error mesages
myisam/mi_write.c:
  cleanup
mysql-test/r/select.result:
  Fix because of table lists now always has a database argument.
mysql-test/r/type_datetime.result:
  Test for bug with datetime and where optimization
mysql-test/r/union.result:
  Updated result
mysql-test/t/type_datetime.test:
  New test for datetime
mysql-test/t/union.test:
  More testing of error conditions
sql/item_sum.cc:
  Remove warnings on Linux Alpha
sql/item_sum.h:
  Cleanup
sql/lock.cc:
  Cleaned up global lock handling
sql/log_event.cc:
  Removed default arguments from declarations (not allowed in cxx)
sql/mysql_priv.h:
  New prototypes
sql/mysqld.cc:
  Fix for global locks
sql/opt_range.cc:
  Cleanup
sql/share/czech/errmsg.txt:
  New errors
sql/share/danish/errmsg.txt:
  New errors
sql/share/dutch/errmsg.txt:
  New errors
sql/share/english/errmsg.txt:
  New errors
sql/share/estonian/errmsg.txt:
  New errors
sql/share/french/errmsg.txt:
  New errors
sql/share/german/errmsg.txt:
  New errors
sql/share/greek/errmsg.txt:
  New errors
sql/share/hungarian/errmsg.txt:
  New errors
sql/share/italian/errmsg.txt:
  New errors
sql/share/japanese/errmsg.txt:
  New errors
sql/share/korean/errmsg.txt:
  New errors
sql/share/norwegian-ny/errmsg.txt:
  New errors
sql/share/norwegian/errmsg.txt:
  New errors
sql/share/polish/errmsg.txt:
  New errors
sql/share/portuguese/errmsg.txt:
  New errors
sql/share/romanian/errmsg.txt:
  New errors
sql/share/russian/errmsg.txt:
  New errors
sql/share/slovak/errmsg.txt:
  New errors
sql/share/spanish/errmsg.txt:
  New errors
sql/share/swedish/errmsg.OLD:
  New errors
sql/share/swedish/errmsg.txt:
  New errors
sql/sql_acl.cc:
  Use thd->host_or_ip
sql/sql_class.cc:
  Use new global lock code
sql/sql_class.h:
  host_or_ip
sql/sql_db.cc:
  host_or_ip
sql/sql_delete.cc:
  Use now global lock code
sql/sql_lex.h:
  Cleanup of not used states and variables
sql/sql_parse.cc:
  Use now global locks.
  Made UNION code more general.
  Change to use thd->hosts_or_ip.
  TABLE_LIST now always has 'db' set.
sql/sql_repl.cc:
  Portability fixes.
  Changed wrong usage of my_vsnprintf -> my_snprintf
sql/sql_select.cc:
  Changes for UNION
sql/sql_show.cc:
  Cleanup
sql/sql_union.cc:
  Handle 'select_result' outside of mysql_union().
sql/sql_yacc.yy:
  Fixes for union
2001-08-14 20:33:49 +03:00