1
0
mirror of https://github.com/MariaDB/server.git synced 2025-05-10 02:01:19 +03:00

29103 Commits

Author SHA1 Message Date
unknown
811532f56f Fixed optimizer bug in ORDER BY where some ORDER BY parts where ignored.
Extended default arguments to be up to 4095 characters


Docs/manual.texi:
  Update lof LOCK TABLES
mysql-test/r/order_by.result:
  Test for optimizer bug in ORDER BY
mysql-test/t/order_by.test:
  Test for optimizer bug in ORDER BY
mysys/default.c:
  Extended default arguments to be up to 4095 characters
sql/sql_select.cc:
  Fixed optimizer bug in ORDER BY
2001-07-30 22:49:39 +03:00
unknown
a774d56149 do not log stray error codes in Query_log_event
sql/log_event.h:
  do not log stray error codes
2001-07-28 11:46:22 -06:00
unknown
07ed42de31 Merge work:/home/bk/mysql-4.0
into mysql.sashanet.com:/home/sasha/src/bk/mysql-4.0
2001-07-27 16:56:17 -06:00
unknown
589a346953 Merge work:/home/bk/mysql-4.0
into serg.mysql.com:/usr/home/serg/Abk/mysql-4.0


Docs/manual.texi:
  Auto merged
2001-07-25 18:04:45 +02:00
unknown
3dd85d861c Merge sinisa@work.mysql.com:/home/bk/mysql-4.0
into sinisa.nasamreza.org:/mnt/hdc/Sinisa/mysql-4.0


sql/sql_parse.cc:
  Auto merged
2001-07-25 15:32:48 +03:00
unknown
c39344528e UNION's
sql/sql_insert.cc:
  Some tweaking for unions
sql/sql_parse.cc:
  Init of options for unions
sql/sql_unions.cc:
  T
2001-07-25 15:28:37 +03:00
unknown
22a5241f28 Add test case for update/replace bug in bdb.
Remove unused argument to ha_berkeley::remove_key().


mysql-test/r/bdb.result:
  Add test case for update/replace bug in bdb.
BitKeeper/etc/ignore:
  Added .gdbinit .vimrc to the ignore list
mysql-test/t/bdb.test:
  Add test case for update/replace bug in bdb.
sql/ha_berkeley.cc:
  The packed_record argument to ha_berkeley::remove_key() was never
  used; remove it.
sql/ha_berkeley.h:
  The packed_record argument to ha_berkeley::remove_key() was never
  used; remove it.
2001-07-24 12:23:17 -04:00
unknown
710fb9998b ha_berkeley.cc Fix bug in remove_key(), when key != primary_key it would
ha_berkeley.cc	core dump if cursor was invalid.


sql/ha_berkeley.cc:
  Fix bug in remove_key(), when key != primary_key it would
  core dump if cursor was invalid.
2001-07-24 12:00:23 -04:00
unknown
55fbccfd81 Merge work.mysql.com:/home/bk/mysql-4.0
into x153.internalnet:/home/tonu/mysql-x


BitKeeper/etc/logging_ok:
  auto-union
sql/mysqld.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
libmysql/libmysql.c:
  Auto merged
2001-07-24 15:00:36 +08:00
unknown
2ec8dce13d OpenSSL fixes. Should not affect anything else.
Makefile.am:
  Moved bio dir into server_dirs in acinclude.in
client/Makefile.am:
  We need OpenSSL includes here
include/global.h:
  Workaround for OPENSSL librar bug with defining crypt()
include/violite.h:
  small fixes
libmysql/Makefile.am:
  We need OpenSSL includes here
libmysql/Makefile.shared:
  Yes, we need to compile more programs whtn --with-openssl is used
libmysql/libmysql.c:
  Make it work! (openssl)
libmysql_r/Makefile.am:
  We need OpenSSL includes here
sql/mysqld.cc:
  Memory was not freed before
sql/sql_parse.cc:
  fix
vio/Makefile.am:
  Added testprogram compilation and openssl libraries linking
vio/viossl.c:
  Cleanups, fixes, etc...
vio/viosslfactories.c:
  Copyright was missing. Fixed renamed macros for newer OpenSSL
vio/viotest-ssl.c:
  Made testprogram work again
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2001-07-24 14:07:46 +08:00
unknown
2502770aab Merge work:/home/bk/mysql-4.0
into mysql.sashanet.com:/home/sasha/src/bk/mysql-4.0
2001-07-23 14:38:40 -06:00
unknown
6092c21371 clean-up, more work on LOAD DATA INFILE
sql/log_event.h:
  more work on LOAD DATA INFILE
2001-07-23 14:35:25 -06:00
unknown
cab947d58a Merge sinisa@work.mysql.com:/home/bk/mysql-4.0
into sinisa.nasamreza.org:/mnt/hdc/Sinisa/mysql-4.0


sql/sql_parse.cc:
  Auto merged
2001-07-22 13:28:02 +03:00
unknown
309b112344 UNIONs : further work
sql/sql_lex.h:
  Addition for UNION ALL
sql/sql_parse.cc:
  Init for UNION ALL
sql/sql_unions.cc:
  Bug fixes in UNION's
sql/sql_yacc.yy:
  UNION ALL
2001-07-22 13:25:56 +03:00
unknown
556bb5fb9c Updated Translation English->Protuguese
sql/share/portuguese/errmsg.txt:
  Updated the translation English->Portuguese.
2001-07-21 13:51:40 -03:00
unknown
b282f42905 merged
configure.in:
  Auto merged
myisam/mi_check.c:
  Auto merged
myisam/myisamchk.c:
  Auto merged
mysql-test/t/rpl_sporadic_master.test:
  Auto merged
sql/Makefile.am:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_delete.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged
2001-07-20 16:32:13 -06:00
unknown
e642692a5d added pre/post read callbacks to IO_CACHE
#ifdefed out code not used in the server from log events
started on new LOAD DATA INFILE events


include/my_sys.h:
  added pre/post read callbacks to IO_CACHe
mysys/mf_iocache.c:
  pre/post read callbacks
sql/log_event.cc:
  cleanup to #ifdef out unneeded code in the server
  started work on new Load data infile events
sql/log_event.h:
  clean-up plus start of new LOAD DATA INFILE events work
sql/mf_iocache.cc:
  pre/post read callbacks
sql/sql_class.cc:
  file_id
sql/sql_class.h:
  file_id
2001-07-20 16:22:54 -06:00
unknown
b8d6bc0674 Merge serg.mysql.com:/usr/home/serg/Abk/mysql
into serg.mysql.com:/usr/home/serg/Abk/mysql-4.0
2001-07-20 14:00:54 +02:00
unknown
1116aced39 srv0srv.h Support raw disk as a data file
srv0start.c	Support raw disk as a data file
srv0srv.c	Support raw disk as a data file
ha_innobase.cc	Some error messages and support raw disk as a data file


sql/ha_innobase.cc:
  Some error messages and support raw disk as a data file
innobase/srv/srv0srv.c:
  Support raw disk as a data file
innobase/srv/srv0start.c:
  Support raw disk as a data file
innobase/include/srv0srv.h:
  Support raw disk as a data file
2001-07-19 22:46:41 +03:00
unknown
b588c60646 Merge sinisa@work.mysql.com:/home/bk/mysql-4.0
into sinisa.nasamreza.org:/mnt/hdc/Sinisa/mysql-4.0


sql/sql_insert.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
2001-07-19 13:34:45 +03:00
unknown
cccb3aaf70 Changes for the furtherment of UNIONS 2001-07-19 13:31:54 +03:00
unknown
61c04f0e9c merge
myisam/mi_check.c:
  Auto merged
myisam/myisamchk.c:
  Auto merged
sql/mysqld.cc:
  Auto merged
mysql-test/t/bdb.test:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sql_delete.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged
configure.in:
  New version
2001-07-18 23:58:10 +02:00
unknown
dece009c8b Merge
Docs/manual.texi:
  SCCS merged
2001-07-18 23:35:13 +03:00
unknown
0e66a78a4d Upgrade TL_WRITE_CONCURRENT_INSERT to TL_WRITE_LOW_PRIORITY if
--low-priority-updates is used and the file has holes.


Docs/manual.texi:
  Changelog
sql/sql_insert.cc:
  Fixed that sleeptime is 0 for new insert delayed threads.
2001-07-18 23:34:04 +03:00
unknown
76eaa2595f fixed mysterious offset confusion bug
added a test case for it - took some creative work to figure out
how to make it happen at will
updated the manual


Docs/manual.texi:
  fixed wrong info on SLAVE_SKIP_COUNTER
  fixed wrong info in BitKeeper tree build instructions
  updated change history about bug fix
mysql-test/t/rpl_sporadic_master.test:
  tried hard to get slave confused, but failed. nevertheless, a more
  exhaustive test case does not hurt
sql/slave.cc:
  fixed mysterious offset confusion bug
2001-07-18 14:26:43 -06:00
unknown
653d19af02 Fixed problem with part keys and BDB tables
Docs/manual.texi:
  Changelog
2001-07-18 11:31:18 +03:00
unknown
bab169b692 merged with 3.23
configure.in:
  Auto merged
myisam/mi_check.c:
  Auto merged
myisam/myisamchk.c:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sql_delete.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged
Docs/manual.texi:
  merged
mysql-test/t/rpl_sporadic_master.test:
  merged
sql/Makefile.am:
  merged
sql/slave.h:
  merged
2001-07-17 16:23:36 -06:00
unknown
4c26f24575 Merge work:/home/bk/mysql
into mysql.sashanet.com:/home/sasha/src/bk/mysql
2001-07-17 14:23:44 -06:00
unknown
52d241dec7 added slave_net_timeout
sql/mysqld.cc:
  slave_net_timeout
sql/slave.cc:
  slave_net_timeout
sql/slave.h:
  slave_net_timeout
2001-07-17 14:22:52 -06:00
unknown
703f4d7b02 Merge work:/home/bk/mysql into hundin.mysql.fi:/my/bk/mysql
Docs/manual.texi:
  Auto merged
2001-07-17 21:05:38 +03:00
unknown
9302266bde Removed wrong warning from thr_lock
Fixed problem with UPDATE and BDB tables
Fixed problem with GRANT FILE privilege on database level
mysqld --warnings works now
Fixed problem with SHOW OPEN TABLES when not using BDB
Added some tests for ALTER TABLE to the test scripts


Docs/manual.texi:
  Added link to copyleft license.
  Updated Changelog
configure.in:
  Fixed typo
mysys/thr_lock.c:
  Removed wrong warning
sql/ha_berkeley.cc:
  Fixed problem with UPDATE
sql/sql_acl.cc:
  Fixed problem with GRANT FILE privilege on database level
sql/sql_parse.cc:
  Fixed that you don't get aborted connection error if you are not using --warning
sql/sql_show.cc:
  Fixed problem with SHOW OPEN TABLES when not using BDB
tests/fork2_test.pl:
  Added test of ALTER TABLE
tests/fork_big.pl:
  Added test of ALTER TABLE
2001-07-17 21:04:01 +03:00
unknown
6be4a56aad ha_innobase.cc Fix a bug in showing of Auto_increment in SHOW TABLE STATUS
ha_innobase.h	Fix a bug in showing of Auto_increment in SHOW TABLE STATUS


sql/ha_innobase.h:
  Fix a bug in showing of Auto_increment in SHOW TABLE STATUS
sql/ha_innobase.cc:
  Fix a bug in showing of Auto_increment in SHOW TABLE STATUS
2001-07-16 21:10:29 +03:00
unknown
fb1b1ba26b Merge
Docs/manual.texi:
  SCCS merged
2001-07-16 03:07:45 +03:00
unknown
2a18a762e1 Patch for netBSD
Added warning for tables where the auto_increment key is 0
Fixed DELETE ... LIMIT 0
Fixed UPDATE ..LIMIT 0


Docs/manual.texi:
  Changelog + Update to CHECK TABLE
configure.in:
  Patch for netBSD
mit-pthreads/gen/ctime.c:
  Patch for netBSD
mit-pthreads/machdep/netbsd-1.1/__signal.h:
  Patch for netBSD
mit-pthreads/stdio/strerror.c:
  Patch for netBSD
myisam/mi_check.c:
  Added warning for tables where the auto_increment key is 0
myisam/myisamchk.c:
  Added warning for tables where the auto_increment key is 0
mysql-test/r/auto_increment.result:
  Added warning for tables where the auto_increment key is 0
mysql-test/r/limit.result:
  Test of DELETE ... LIMIT 0
mysql-test/t/auto_increment.test:
  Added warning for tables where the auto_increment key is 0
mysql-test/t/limit.test:
  Test of DELETE ... LIMIT 0
sql/Makefile.am:
  Don't add mysqld_LDADD to mysqlbinlog (portability patch)
sql/ha_gemini.cc:
  Changed copyright (have got ok from NuSphere previously)
sql/ha_gemini.h:
  Changed copyright (have got ok from NuSphere previously)
sql/sql_delete.cc:
  Fixed DELETE ... LIMIT 0
sql/sql_update.cc:
  Fixed UPDATE ..LIMIT 0
2001-07-16 03:04:30 +03:00
unknown
e0d818f3ab Merge sinisa@work.mysql.com:/home/bk/mysql-4.0
into sinisa.nasamreza.org:/mnt/hdc/Sinisa/mysql-4.0
2001-07-13 13:43:50 +03:00
unknown
3a7d827d09 Further work on UNION's
sql/sql_delete.cc:
  Removed some unnecessary stuff
2001-07-13 13:41:40 +03:00
unknown
ff0e718de6 merged
BitKeeper/etc/logging_ok:
  auto-union
myisam/ft_update.c:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sql_repl.cc:
  Auto merged
2001-07-12 14:58:20 +02:00
unknown
f024c2e9d3 signal slave thread to stop during shutdown 2001-07-11 21:46:23 -06:00
unknown
7cc86549bc send kill signal to slave thread on shutdown
sql/slave.cc:
  fixed bug in end_slave() - must send kill signal to slave thread
2001-07-11 21:33:19 -06:00
unknown
02285d80de 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-07-11 20:59:55 -06:00
unknown
f93d5f314b fixed uninitialized use of variable in mysqltest
fixed race condition in binary log auto-rotation
get rid of extention in binary log to avoid non-rotatable logs


client/mysqltest.c:
  fixed uninitialized use of variable bug
sql/log.cc:
  fixed race condition on binary log auto-rotate
sql/mysqld.cc:
  get rid of extention on binary log
sql/sql_class.h:
  argument to new file (inside_mutex)
2001-07-11 20:59:17 -06:00
unknown
1f41db2905 fixed race condition in automatic binlog rotation
remove extension from binary log if the user specifies one to avoid
    non-rotatable logs
fixed possible use of unitialized IO_CACHE in debug mode


sql/log.cc:
  fixed race condition in automatic binlog rotation
sql/mysqld.cc:
  remove extension from binary log if the user specifies one to avoid
  non-rotatable logs
sql/slave.cc:
  fixed race condition with slave thread during server shutdown
sql/sql_class.h:
  new_file() needed an argument to know if it was called withing the 
  log mutex or not
sql/sql_repl.cc:
  fixed possible use of unitialized IO_CACHE in debug mode
2001-07-11 19:29:23 -06:00
unknown
51e3fb9e45 Merge sinisa@work.mysql.com:/home/bk/mysql-4.0
into sinisa.nasamreza.org:/mnt/hdc/Sinisa/mysql-4.0


sql/sql_delete.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
2001-07-11 14:19:34 +03:00
unknown
0eb9347a98 UNION stuff mainly.
sql/sql_class.h:
  Made some temporary changes for UNION's. Still waiting for Monty's 
  comments on this.
sql/sql_delete.cc:
  Added a comment as Monty suggested
sql/sql_parse.cc:
  Some speedups for UNIONs
sql/sql_unions.cc:
  First attempts at running UNION's. 
  
  Removed header temporarily because of some bug in my pre-processor.
2001-07-11 14:06:41 +03:00
unknown
e28dcf14ca Final fix for bad merge 2001-07-11 10:49:27 +03:00
unknown
b2c6f600eb Merge work.mysql.com:/home/bk/mysql-4.0
into tik.mysql.fi:/home/my/mysql-4.0


sql/sql_show.cc:
  Auto merged
2001-07-11 10:37:33 +03:00
unknown
961cd9e91a Added back old code that Sasha removed
mysql-test/r/show_check.result:
  Added back old code
sql/ha_myisam.h:
  Removed warning
sql/mysql_priv.h:
  Added back old code
sql/sql_base.cc:
  Added back old code
sql/sql_parse.cc:
  Added back old code
sql/sql_show.cc:
  Added back old code
2001-07-11 10:36:22 +03:00
unknown
bc059e42c3 mysql-test/t/rpl_sporadic_master.test
use truncate table
sql/slave.cc
    fixed race condition on server shutdown
sql/sql_repl.cc
    fixed uninitialized use of io_cache


mysql-test/t/rpl_sporadic_master.test:
  use truncate table
sql/slave.cc:
  fixed race condition on server shutdown
sql/sql_repl.cc:
  fixed uninitialized use of io_cache
2001-07-10 20:35:42 -06:00
unknown
586648ccc2 mysql-test/t/rpl_sporadic_master.test
fixed test case to produce same results on txn-enabled binary. 
    temporary fix - permanent fix is it make mysqld behave the same with
    MyISAM on auto_increment insert after delete from tbl_name regardless
    of how the binary was compiled
sql/slave.cc
    fixed concurrency bug with log_seq
sql/slave.h
    last_log_seq needs to be updated atomically with pos
sql/sql_repl.cc
    cleared up comment and fixed concurrency bug


mysql-test/t/rpl_sporadic_master.test:
  fixed test case to produce same results on txn-enabled binary. 
  temporary fix - permanent fix is it make mysqld behave the same with
  MyISAM on auto_increment insert after delete from tbl_name regardless
  of how the binary was compiled
sql/slave.cc:
  fixed concurrency bug with log_seq
sql/slave.h:
  last_log_seq needs to be updated atomically with pos
sql/sql_repl.cc:
  cleared up comment and fixed concurrency bug
2001-07-10 18:08:37 -06:00
unknown
4ecea7d3a0 cleanups
myisam/mi_write.c:
  cleanup
mysys/tree.c:
  cleanup
sql/sql_show.cc:
  bad merge fixed
2001-07-10 20:23:37 +02:00