1
0
mirror of https://github.com/MariaDB/server.git synced 2025-04-24 18:27:21 +03:00

4128 Commits

Author SHA1 Message Date
unknown
c498794d70 Merge work:/home/bk/mysql-4.0
into mysql.sashanet.com:/home/sasha/src/bk/mysql-4.0


sql/sql_class.h:
  Auto merged
2001-06-14 14:13:31 -06:00
sasha@mysql.sashanet.com
7cf284b78a Merge work:/home/bk/mysql-4.0
into mysql.sashanet.com:/home/sasha/src/bk/mysql-4.0
2001-06-14 14:13:31 -06:00
unknown
7bf5eb91f0 Added slave log event to record the master position in of slave thread
in slave binlog - needed for synchronization slave during recovery


sql/log.cc:
  slave log event
sql/log_event.cc:
  slave log event
sql/log_event.h:
  slave log event
sql/slave.cc:
  slave log event
sql/sql_class.h:
  slave log event
2001-06-14 14:12:40 -06:00
sasha@mysql.sashanet.com
7ce33f90fb Added slave log event to record the master position in of slave thread
in slave binlog - needed for synchronization slave during recovery
2001-06-14 14:12:40 -06:00
unknown
48bc7b7822 cleanup; Fixed type bug in new delete code.
sql/sql_class.h:
  Fixed types
sql/sql_delete.cc:
  Fixed typo-bug.
2001-06-14 15:12:01 +03:00
monty@hundin.mysql.fi
c417a276ac cleanup; Fixed type bug in new delete code. 2001-06-14 15:12:01 +03:00
unknown
1f07c0b7a5 Second phase of UNIONS (please do not test it yet) and some other
changes. This is mostly a merge between my repository and central 
one, so that I can take a test for multi table delete and fix it.


sql/mysql_priv.h:
  Added new functions needed for UNIONS, EXCEPT's etc
sql/sql_class.h:
  A little change in multi_delete class
sql/sql_lex.h:
  Added command for UNION's
sql/sql_parse.cc:
  One new function and SQLCOM_UNION_SELECT.
  
  Please do not test UNION's. This is just a start of the work on them
sql/sql_yacc.yy:
  Parsing stuff for the UNION's
2001-06-13 13:36:53 +03:00
Sinisa@sinisa.nasamreza.org
0d0ca68e48 Second phase of UNIONS (please do not test it yet) and some other
changes. This is mostly a merge between my repository and central 
one, so that I can take a test for multi table delete and fix it.
2001-06-13 13:36:53 +03:00
unknown
823586b2c7 Enhancing both multi-table delete and division of LEX
sql/filesort.cc:
  removing of some extra comments
sql/sql_class.h:
  Clear division between new and old stripping code
sql/sql_delete.cc:
  Stripping of unnecessary code and making it more efficient
sql/sql_parse.cc:
  Better split of LEX into two and enhancements in multi table delete
sql/sql_yacc.yy:
  More efficient division of LEX and optional syntax in multi - table delete
sql/uniques.cc:
  fixing some additional bugs
2001-06-07 14:10:58 +03:00
Sinisa@sinisa.nasamreza.org
62f5630197 Enhancing both multi-table delete and division of LEX 2001-06-07 14:10:58 +03:00
unknown
4e886689b2 These are actually two changesets. One for splitting LEX in two and
the other for multi-table delete


sql/filesort.cc:
  Fixed some bugs for Unique class
sql/item.cc:
  Changes caused by splitting lex into two parts, in order to 
  implement UNION's etc
sql/item_sum.cc:
  Changes caused by splitting lex into two parts, in order to 
  implement UNION's etc
sql/mysql_priv.h:
  Changes caused by splitting lex into two parts, in order to 
  implement UNION's etc
sql/sql_class.h:
  Adding multi table delete
sql/sql_delete.cc:
  Added multi-table delete
sql/sql_lex.cc:
  Changes caused by splitting lex into two parts, in order to 
  implement UNION's etc
sql/sql_lex.h:
  Changes caused by splitting lex into two parts, in order to 
  implement UNION's etc
sql/sql_parse.cc:
  Changes caused by splitting lex into two parts, in order to 
  implement UNION's etc, plus added multi-table delete
sql/sql_select.cc:
  Changes caused by splitting lex into two parts, in order to 
  implement UNION's etc
sql/sql_update.cc:
  Changes caused by splitting lex into two parts, in order to 
  implement UNION's etc
sql/sql_yacc.yy:
  Changes caused by splitting lex into two parts, in order to 
  implement UNION's etc, plus added multi-table delete
sql/uniques.cc:
  Fixed some bugs in duplicate stripping
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2001-06-03 17:07:26 +03:00
Sinisa@sinisa.nasamreza.org
338b51b5a7 These are actually two changesets. One for splitting LEX in two and
the other for multi-table delete
2001-06-03 17:07:26 +03:00
unknown
704becf228 updates for LOAD DATA FROM MASTER + some cleanup of replication code
include/mysqld_error.h:
  new errors
mysql-test/r/rpl000009.result:
  test load data from master
mysql-test/t/rpl000009.test:
  test load data from master
sql/mini_client.cc:
  extra functionality needed for load data from master and other things
sql/mini_client.h:
  addition to API
sql/mysql_priv.h:
  mysql_create_db()/mysql_rm_db() now return a value
sql/share/english/errmsg.txt:
  more error messages
sql/slave.cc:
  cleanup of fetch_nx_table()
sql/slave.h:
  cleanup of fetch_nx_table()
sql/sql_base.cc:
  remove unused code originally written for retrieving a non-existent table in slave thread
sql/sql_class.cc:
  remove unused replication variables
sql/sql_class.h:
  remove unused replication variabled
sql/sql_db.cc:
  make mysql_create_db()/mysql_rm_db() work with thd == 0 
  (do not write messages to the net) and instead return success/error
sql/sql_lex.h:
  added SQLCOM_LOAD_MASTER_DATA
sql/sql_parse.cc:
  LOAD MASTER DATA, cleanup of LOAD TABLE FROM MASTER
sql/sql_repl.cc:
  LOAD DATA FROM MASTER
sql/sql_repl.h:
  LOAD DATA FROM MASTER
sql/sql_yacc.yy:
  LOAD DATA FROM MASTER
2001-05-28 19:18:23 -06:00
sasha@mysql.sashanet.com
8f6b34f950 updates for LOAD DATA FROM MASTER + some cleanup of replication code 2001-05-28 19:18:23 -06:00
unknown
a542f858bf Added Unique class to be used for duplicate removal in multi-table delete.
mysys/ptr_cmp.c:
  Removed old comments
pstack/bucomm.c:
  Change to use mkstemp.
sql/Makefile.am:
  Added Unique class
sql/filesort.cc:
  Changes to let the Unique class use the old filesort code.
sql/sql_class.h:
  Added Unique class
sql/sql_handler.cc:
  Removed warning.
sql/sql_select.cc:
  Cleaned up typo.
2001-05-23 23:47:08 +03:00
monty@donna.mysql.fi
02f007436f Added Unique class to be used for duplicate removal in multi-table delete. 2001-05-23 23:47:08 +03:00
unknown
83e3058c3e Merge
Docs/manual.texi:
  Auto merged
sql/lex.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_yacc.yy:
  SCCS merged
2001-05-15 20:55:40 +02:00
serg@serg.mysql.com
f2dee22a7f Merge 2001-05-15 20:55:40 +02:00
unknown
5e52875b8f ALTER TABLE ... DISABLE KEYS / ALTER TABLE ... ENABLE KEYS 2001-05-11 22:26:12 +02:00
serg@serg.mysql.com
8b2a9517a6 ALTER TABLE ... DISABLE KEYS / ALTER TABLE ... ENABLE KEYS 2001-05-11 22:26:12 +02:00
unknown
9192600eb7 Merged with 3.23, needs further fix-up
BitKeeper/etc/ignore:
  auto-union
BitKeeper/etc/logging_ok:
  auto-union
acconfig.h:
  Auto merged
acinclude.m4:
  Auto merged
include/myisam.h:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
BitKeeper/deleted/.del-ib_config.h.in~9e57db8504e55b7:
  Auto merged
BitKeeper/deleted/.del-ib_config.h~7539e26ffc614439:
  Auto merged
client/mysqltest.c:
  Auto merged
sql/lex.h:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.h:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/table.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_class.h:
  Auto merged
Docs/manual.texi:
  merged
client/errmsg.c:
  merged
configure.in:
  merged
sql/mysqld.cc:
  merged
sql/sql_select.cc:
  merged, needs manual fixing
sql/sql_yacc.yy:
  merged, needs manual fixing
2001-05-10 15:06:35 -06:00
sasha@mysql.sashanet.com
7c9b9f471c Merged with 3.23, needs further fix-up 2001-05-10 15:06:35 -06:00
unknown
6ca7bfb9e0 Merge work:/home/bk/mysql into donna.mysql.fi:/home/my/bk/mysql
Docs/manual.texi:
  Auto merged
client/mysqltest.c:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
sql/log.cc:
  Auto merged
sql/mysqlbinlog.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
2001-04-25 22:44:57 +03:00
monty@donna.mysql.fi
f01a7fceb2 Merge work:/home/bk/mysql into donna.mysql.fi:/home/my/bk/mysql 2001-04-25 22:44:57 +03:00
unknown
97907ee8d7 Portability fixes for Ia64 and Sgi compiler
DROP DATABASE in mysqladmin asks for confirmation (again)
Added examined_rows to slow query log
SHOW CREATE for TEMPORARY table


BitKeeper/deleted/.del-shw000001.result~8b20b03d8319b9a5:
  Delete: mysql-test/r/shw000001.result
BitKeeper/deleted/.del-shw000001.test~770d96a2c1c65b20:
  Delete: mysql-test/t/shw000001.test
Docs/manual.texi:
  Added information about InnoDB and TEMPORARY tables
acinclude.m4:
  Portability fixes
client/errmsg.c:
  merge with libmysqd/errmsg.c
client/mysqladmin.c:
  DROP DATABASE asks for confirmation (again)
client/mysqltest.c:
  Portability fixes
configure.in:
  Portability fixes for SGI compiler on Ia64
extra/resolve_stack_dump.c:
  Portability fixes
include/global.h:
  Portability fixes
isam/_dbug.c:
  Portability fixes
mysql-test/mysql-test-run.sh:
  Portability fixes
mysql-test/r/show_check.result:
  New test for SHOW CREATE
mysql-test/t/show_check.test:
  New test for SHOW CREATE
scripts/make_binary_distribution.sh:
  Added missing files
sql/filesort.cc:
  Added examined_rows to slow query log
sql/log.cc:
  Added examined_rows to slow query log
sql/mysql_priv.h:
  Added examined_rows to slow query log
sql/mysqlbinlog.cc:
  Fixed core dump when using wrong option
sql/mysqld.cc:
  Removed not used argument
sql/sql_base.cc:
  Fixed name problem with SHOW CREATE for TEMPORARY table
sql/sql_class.h:
  Added examined_rows to slow query log
sql/sql_parse.cc:
  Added examined_rows to slow query log
sql/sql_select.cc:
  Added examined_rows to slow query log
sql/sql_select.h:
  Added examined_rows to slow query log
sql/sql_show.cc:
  Fixed SHOW CREATE for TEMPORARY table
sql/sql_table.cc:
  Added examined_rows to slow query log
2001-04-25 22:44:27 +03:00
monty@donna.mysql.fi
21e7c668ff Portability fixes for Ia64 and Sgi compiler
DROP DATABASE in mysqladmin asks for confirmation (again)
Added examined_rows to slow query log
SHOW CREATE for TEMPORARY table
2001-04-25 22:44:27 +03:00
unknown
dc394cb9b5 fixed redundant repetition of use db in mysqlbinlog
added support for virtual master ( replicating from a directory with binlogs)
test case for backup/restore with virtual master


client/mysqltest.c:
  fix to accomodate for new test case
mysql-test/mysql-test-run.sh:
  do not automagically start slave
sql/log.cc:
  support for virtual master
sql/log_event.cc:
  fix for mysqlbinlog
sql/log_event.h:
  fix for mysqlbinlog
sql/mysqlbinlog.cc:
  fix for mysqlbinlog
sql/slave.cc:
  virtual master
sql/slave.h:
  virtual master
sql/sql_class.h:
  clean-up/fixes for virtual master
sql/sql_repl.cc:
  cleanup/fixes for virtual master
sql/sql_repl.h:
  virtual master
2001-04-24 17:39:26 -06:00
sasha@mysql.sashanet.com
be8f18e020 fixed redundant repetition of use db in mysqlbinlog
added support for virtual master ( replicating from a directory with binlogs)
test case for backup/restore with virtual master
2001-04-24 17:39:26 -06:00
unknown
cb02f1671d merged 2001-04-13 21:29:06 +02:00
serg@serg.mysql.com
6a41e1f3a5 merged 2001-04-13 21:29:06 +02:00
unknown
ce3b58d6c9 this won't be pushed
Docs/manual.texi:
  HANDLER documented
mysql-test/t/handler.test:
  more tests
2001-04-13 16:18:44 +02:00
serg@serg.mysql.com
ca0ba8e0ab this won't be pushed 2001-04-13 16:18:44 +02:00
unknown
65575f94d1 Added SQL_CALC_FOUND_ROWS and FOUND_ROWS()
myisam/ft_boolean_search.c:
  Cleanup
myisam/ft_parser.c:
  Cleanup
myisam/ft_update.c:
  Cleanup
myisam/sort.c:
  Cleanup
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2001-04-12 00:54:35 +03:00
monty@donna.mysql.fi
417dd72856 Added SQL_CALC_FOUND_ROWS and FOUND_ROWS() 2001-04-12 00:54:35 +03:00
unknown
7006b51823 Preliminary commit of HANDLER syntax (w/o LIMIT or column-list) 2001-04-07 00:18:33 +02:00
serg@serg.mysql.com
a6ebe74e3c Preliminary commit of HANDLER syntax (w/o LIMIT or column-list) 2001-04-07 00:18:33 +02:00
unknown
e7e243ed03 Changed pthread_mutex_init() to use new MY_MUTEX_INIT.. macro
(For glibc 2.2)


client/thread_test.c:
  Changed pthread_mutex_init() to use new MY_MUTEX_INIT.. macro
dbug/dbug.c:
  Changed pthread_mutex_init() to use new MY_MUTEX_INIT.. macro
heap/hp_open.c:
  Changed pthread_mutex_init() to use new MY_MUTEX_INIT.. macro
isam/open.c:
  Changed pthread_mutex_init() to use new MY_MUTEX_INIT.. macro
myisam/mi_open.c:
  Changed pthread_mutex_init() to use new MY_MUTEX_INIT.. macro
mysys/thr_alarm.c:
  Changed pthread_mutex_init() to use new MY_MUTEX_INIT.. macro
mysys/thr_lock.c:
  Changed pthread_mutex_init() to use new MY_MUTEX_INIT.. macro
mysys/thr_rwlock.c:
  Changed pthread_mutex_init() to use new MY_MUTEX_INIT.. macro
sql/ha_berkeley.cc:
  Changed pthread_mutex_init() to use new MY_MUTEX_INIT.. macro
sql/ha_innobase.cc:
  Changed pthread_mutex_init() to use new MY_MUTEX_INIT.. macro
sql/hash_filo.h:
  Changed pthread_mutex_init() to use new MY_MUTEX_INIT.. macro
sql/hostname.cc:
  Changed pthread_mutex_init() to use new MY_MUTEX_INIT.. macro
sql/item_func.cc:
  Changed pthread_mutex_init() to use new MY_MUTEX_INIT.. macro
sql/log.cc:
  Changed pthread_mutex_init() to use new MY_MUTEX_INIT.. macro
sql/mysqld.cc:
  Changed pthread_mutex_init() to use new MY_MUTEX_INIT.. macro
sql/slave.h:
  Changed pthread_mutex_init() to use new MY_MUTEX_INIT.. macro
sql/sql_class.cc:
  Changed pthread_mutex_init() to use new MY_MUTEX_INIT.. macro
sql/sql_class.h:
  Changed pthread_mutex_init() to use new MY_MUTEX_INIT.. macro
sql/sql_insert.cc:
  Changed pthread_mutex_init() to use new MY_MUTEX_INIT.. macro
sql/sql_udf.cc:
  Changed pthread_mutex_init() to use new MY_MUTEX_INIT.. macro
2001-03-26 01:05:04 +03:00
monty@donna.mysql.fi
add70fc1ba Changed pthread_mutex_init() to use new MY_MUTEX_INIT.. macro
(For glibc 2.2)
2001-03-26 01:05:04 +03:00
unknown
b4098ead83 Add support for Gemini table handler, Monty has checked and approved
Fix bug when read return error


acconfig.h:
  Add Gemini to configure
acinclude.m4:
  Add Gemini to configure
include/my_base.h:
  Add error codes for tables handlers
mysql-test/t/select.test:
  Force temporary tables to MyISAM
sql-bench/server-cfg.sh:
  Allow Gemini to run sql-bench
sql/Makefile.am:
  Add Gemini to configure
sql/handler.cc:
  Add support for Gemini table handler
sql/handler.h:
  Add support for Gemini table handler
sql/lex.h:
  Add support for Gemini table handler
sql/mysqld.cc:
  Add support for Gemini table handler
sql/opt_range.cc:
  Fix bug when read return error
sql/records.cc:
  Fix bug when read return error
sql/sql_class.cc:
  Add support for Gemini table handler
sql/sql_class.h:
  Add support for Gemini table handler
sql/sql_lex.h:
  Add support for Gemini table handler
sql/sql_rename.cc:
  Add commit for table rename
sql/sql_table.cc:
  Add commit for table rename
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2001-03-21 15:34:16 -05:00
mikef@nslinux.bedford.progress.com
d145a6b97e Add support for Gemini table handler, Monty has checked and approved
Fix bug when read return error
2001-03-21 15:34:16 -05:00
unknown
6257ee7613 Added isolation levels
Added SELECT .. FOR UPDATE and SELECT .. IN SHARE MODE


Docs/manual.texi:
  Updated information about SET TRANSACTION ISOLATION LEVEL
configure.in:
  Upgraded version number
isam/_dbug.c:
  Fixed wrong fprintf
isam/isamchk.c:
  Added new error message
myisam/mi_check.c:
  Added new error message
mysql-test/mysql-test-run.sh:
  Don't wait too long for server start
mysys/mf_keycache.c:
  Cleaned up some error messages
scripts/mysqlhotcopy.sh:
  Applied patch for --resetmaster --resetslave
sql-bench/bench-init.pl.sh:
  Fix for windows
sql/handler.cc:
  Added isolation levels and gemini spinlocks
sql/handler.h:
  Added isolation levels
sql/item_strfunc.cc:
  Cleanup of CONCAT_WS()
sql/lex.h:
  Added isolation levels
sql/mysql_priv.h:
  Added isolation levels
sql/mysqld.cc:
  Added isolation levels
sql/sql_class.cc:
  Added isolation levels
  Moved variable initialization to different code segments
sql/sql_class.h:
  Added isolation levels
sql/sql_lex.h:
  Added isolation levels
sql/sql_parse.cc:
  Added isolation levels
sql/sql_update.cc:
  cleanup
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2001-03-21 01:02:22 +02:00
monty@tik.mysql.fi
6f9a73a1ba Added isolation levels
Added SELECT .. FOR UPDATE and SELECT .. IN SHARE MODE
2001-03-21 01:02:22 +02:00
unknown
c669254da7 Added tests if a user variable is changed in the same query.
Docs/manual.texi:
  Updated info about some common problems.
mysql-test/r/user_var.result:
  Added tests of using user variables.
mysql-test/t/user_var.test:
  Added tests of using user variables.
2001-03-15 11:55:44 +02:00
monty@donna.mysql.fi
c36f4fd0c2 Added tests if a user variable is changed in the same query. 2001-03-15 11:55:44 +02:00
unknown
79924f27ef Reversed SQL_ANSI_MODE per Monty's request.
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2001-03-14 07:15:45 -06:00
jcole@abel.spaceapes.com
84999eb5e2 Reversed SQL_ANSI_MODE per Monty's request. 2001-03-14 07:15:45 -06:00
unknown
5e90d39db9 changed signal by fd close to signal by vio_close
added support for kill expr
fixed coredump in set @a := foo;
added testcase for user_var
added testcase for kill


sql/slave.cc:
  fd -> vio
sql/sql_class.cc:
  fd->vio, fixed coredump on set @a := foo;
sql/sql_class.h:
  fd -> vio
sql/sql_repl.cc:
  fd -> vio
sql/sql_yacc.yy:
  added support for kill expr - needed this for a clean test case of kill
2001-03-13 23:07:12 -07:00
sasha@mysql.sashanet.com
0dd0d88e8f changed signal by fd close to signal by vio_close
added support for kill expr
fixed coredump in set @a := foo;
added testcase for user_var
added testcase for kill
2001-03-13 23:07:12 -07:00
unknown
10d5f95eee Merge work:/home/bk/mysql
into mysql.sashanet.com:/home/sasha/src/bk/mysql


Docs/manual.texi:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
2001-03-12 20:18:16 -07:00
sasha@mysql.sashanet.com
e8e1e88335 Merge work:/home/bk/mysql
into mysql.sashanet.com:/home/sasha/src/bk/mysql
2001-03-12 20:18:16 -07:00