1
0
mirror of https://github.com/MariaDB/server.git synced 2025-05-08 15:01:49 +03:00

4151 Commits

Author SHA1 Message Date
unknown
e8d81970be Fixed bug in LEFT JOIN
Docs/manual.texi:
  ChangeLog
myisam/mi_locking.c:
  Remove wrong optimistic locking. (Doesn't affect MySQL)
mysys/my_init.c:
  Release character sets at end
scripts/mysqlhotcopy.sh:
  RAID tables are now copied
2001-12-05 23:15:05 +02:00
unknown
d06b344ab5 use $MASTER_PORT 2001-12-01 15:00:32 -07:00
unknown
9dae47bbae added build-tags
added test case that supposedly will crash mysqld built with 2.96
2001-11-30 22:09:44 -07:00
unknown
95e94560ea Update test results
mysql-test/r/fulltext.result:
  Update results
2001-11-29 22:27:58 +02:00
unknown
ace649189d Better optimization for InnoDB and BDB tables for ORDER BY
Build-tools/Do-compile:
  Merge with 4.0
Docs/manual.texi:
  Changelog
mysql-test/r/innodb.result:
  New tests cases for ORDER BY
mysql-test/r/myisam.result:
  New tests cases for ORDER BY
mysql-test/t/innodb.test:
  New tests cases for ORDER BY
mysql-test/t/myisam.test:
  New tests cases for ORDER BY
2001-11-29 15:34:37 +02:00
unknown
d987ee7651 Merge
sql/sql_select.cc:
  Auto merged
Docs/manual.texi:
  SCCS merged
2001-11-28 18:01:50 +01:00
unknown
f3918c8413 boolean fulltext search without an index
myisam/ft_dump.c:
  some help added
2001-11-28 17:55:45 +01:00
unknown
caa13ea3e7 Fix of testcases after merge.
Small improvement to write caching.


Docs/manual.texi:
  Updated Changelog
mysql-test/r/rpl000013.result:
  Fix after merge
mysql-test/r/rpl000016.result:
  Fix after merge
mysys/mf_iocache2.c:
  Small improvement to write caching.
sql/sql_select.cc:
  Removed warning
2001-11-28 16:11:05 +02:00
unknown
b631ea0188 merge
Docs/manual.texi:
  Auto merged
mysql-test/t/rpl000013.test:
  Auto merged
mysql-test/t/rpl000016.test:
  Auto merged
extra/resolveip.c:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
2001-11-28 14:52:11 +02:00
unknown
38da1f9853 Fix for IO_CACHE.
Portability fixes.


BUILD/compile-alpha-debug:
  Update to newer version
libmysqld/lib_vio.c:
  dbug_assert -> DBUG_ASSERT
mysql-test/r/symlink.result:
  Update for new tests
mysql-test/t/symlink.test:
  Update for new test format
mysys/mf_iocache2.c:
  Fixed bug when reading in old buffer
sql-bench/test-transactions.sh:
  Update with delete tests
sql/mysqld.cc:
  Updates for amiga
sql/sql_string.cc:
  Fix typo
sql/stacktrace.c:
  Portability fix
2001-11-28 03:47:15 +02:00
unknown
08fc358542 fixed alias drop bug in binlog
fixed skip counter to do the RightThing (TM) when the user messes up.
Still do RightThing when he gets it right.


mysql-test/r/rpl000016.result:
  updated test result
mysql-test/t/rpl000013.test:
  test alias bug
mysql-test/t/rpl000016.test:
  test for proper skip when the user messes up
sql/slave.cc:
  proper skip even when the user goofs up
sql/sql_base.cc:
  drop real name, not last used alias in the log
2001-11-27 18:20:24 -07:00
unknown
da9b7e0c87 Merge hundin:/my/mysql-4.0 into bitch.mysql.fi:/my/mysql-4.0 2001-11-28 02:59:54 +02:00
unknown
06e1e27557 New improved IO_CACHE
include/my_global.h:
  Remove dbug_assert()  (One should use DBUG_ASSERT() instead)
mysql-test/mysql-test-run.sh:
  Fixed that xterm works on Solaris 2.8.
  Fixed printing of errors
mysql-test/r/isam.result:
  Removed MyISAM test from ISAM test
mysql-test/t/isam.test:
  Removed MyISAM test from ISAM test
mysys/my_alloc.c:
  Removed warnings
mysys/my_bitmap.c:
  Use DBUG_ASSERT
mysys/my_pthread.c:
  Use DBUG_ASSERT
mysys/my_seek.c:
  More DBUG
sql/ha_berkeley.cc:
  Use DBUG_ASSERT
sql/ha_innobase.cc:
  Use DBUG_ASSERT
sql/log.cc:
  Use DBUG_ASSERT
sql/opt_range.cc:
  Use DBUG_ASSERT
sql/sql_base.cc:
  Use DBUG_ASSERT
sql/sql_handler.cc:
  Use DBUG_ASSERT
sql/sql_load.cc:
  Cleanup
sql/sql_parse.cc:
  Use DBUG_ASSERT
sql/sql_repl.cc:
  Cleanup
sql/sql_select.cc:
  Use DBUG_ASSERT
tools/mysqlmanager.c:
  Cleanup
2001-11-28 02:55:52 +02:00
unknown
312e5e82c0 Fixed bug when joining with caching.
Fixed race condition when using the binary log and INSERT DELAYED which could cause the binary log to have rows that was not yet written to MyISAM tables.


Docs/manual.texi:
  Changelog
mysql-test/r/null_key.result:
  Fix of testcase after changing optimizer to only use range keys if it would use a long part of the SAME key.
sql/sql_insert.cc:
  Fixed race condition with binary log and INSERT DELAYED
sql/sql_select.cc:
  Fixed bug when joining with caching
2001-11-27 02:50:20 +02:00
unknown
d34100d0e0 Changed incomplete testcase to another incomplete testcase which works even if localhost.localdomain is first in /etc/hosts file for 127.0.0.1 2001-11-27 02:33:15 +02:00
unknown
01f7289dba func_encrypt.result Drop table here too....
mysql-test/r/func_encrypt.result:
  Drop table here too....
2001-11-26 17:13:06 +02:00
unknown
ebcee2e59a func_encrypt.test Drop table uncommented again
mysql-test/t/func_encrypt.test:
  Drop table uncommented again
2001-11-26 17:04:43 +02:00
unknown
310b23540f Merge work.mysql.com:/home/bk/mysql-4.0
into volk.internalnet:/home/tonu/mysql-4.0
2001-11-26 15:58:01 +02:00
unknown
a2cafe2cdc des_encrypt()/des_decrypt() are now ASCII protected and pass testsuite 2001-11-26 15:54:33 +02:00
unknown
f33fb18677 Patch for SCO
Update test results for MySQL 4.0


extra/resolveip.c:
  Fix for SCO
mysql-test/r/backup.result:
  Update test results for MySQL 4.0
mysql-test/r/bdb-crash.result:
  Update test results for MySQL 4.0
mysql-test/r/bdb-deadlock.result:
  Update test results for MySQL 4.0
mysys/mf_casecnv.c:
  Patch for SCO
mysys/mf_qsort.c:
  Patch for SCO
mysys/my_compress.c:
  Patch for SCO
strings/ctype.c:
  Patch for SCO
2001-11-26 03:52:23 +02:00
unknown
00d82156b2 merge
Docs/manual.texi:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/records.cc:
  Auto merged
sql/sql_repl.h:
  Auto merged
sql/sql_table.cc:
  Auto merged
mysql-test/t/bdb-crash.test:
  Auto merged
sql/sql_repl.cc:
  use local file
2001-11-26 03:30:16 +02:00
unknown
4615e50093 Fix race condition in ANALYZE TABLE.
Fixed bug where one got an empty set instead of a DEADLOCK error when using BDB tables.


Docs/manual.texi:
  Cleanup
configure.in:
  Version number change
mysql-test/t/backup.test:
  drop used tables
mysql-test/t/bdb-crash.test:
  cleanup
mysys/thr_lock.c:
  cleanup
sql/mysqld.cc:
  safety fix
sql/records.cc:
  Fixed bug where one got an empty set instead of a DEADLOCK error when using
  BDB tables.
sql/sql_table.cc:
  Fix race  condition in ANALYZE TABLE.
2001-11-26 02:16:38 +02:00
unknown
f2a42796d8 merge
sql/mysqld.cc:
  Auto merged
2001-11-25 13:56:03 +02:00
unknown
2239aa172b Fixes for embedded version.
BitKeeper/deleted/.del-WHITEPAPER~da1226799debcf3f:
  Delete: libmysqld/WHITEPAPER
Docs/manual.texi:
  Changelog
client/mysqltest.c:
  Fix things that crashed embedded MySQL
libmysqld/examples/test-run:
  Cleanup of old BDB files.
mysql-test/r/innodb.result:
  Fix for embedded library
mysql-test/t/innodb.test:
  Fix for embedded library
mysys/mf_keycache.c:
  Safety
sql/ha_berkeley.cc:
  Added DBUG statements
sql/ha_innobase.cc:
  Fixed bug for embedded version
sql/ha_innobase.h:
  Fix to use index when doing an ORDER BY on a whole InnoDB table
sql/handler.h:
  Fix to use index when doing an ORDER BY on a whole InnoDB table
sql/mysqld.cc:
  Safety fix
sql/sql_base.cc:
  cleanup
sql/sql_select.cc:
  Fix to use index when doing an ORDER BY on a whole InnoDB table
2001-11-25 13:50:48 +02:00
unknown
056c71f1ae memory leak fixed 2001-11-24 17:45:22 +01:00
unknown
b0da89d3ac Merge work:/home/bk/mysql-4.0
into serg.mysql.com:/usr/home/serg/Abk/mysql-4.0


sql/mysqld.cc:
  Auto merged
2001-11-22 19:40:50 +01:00
unknown
8b5eedb725 ft_boolean_syntax variable
myisam/ft_nlq_search.c:
  comments cleanup
2001-11-22 19:35:35 +01:00
unknown
38357b30e6 Fixed fulltext after merge from 3.23.45
First (incomplete) version of transaction and as3ap tests.


BitKeeper/etc/ignore:
  Added sql-bench/test-transactions to the ignore list
mysql-test/r/fulltext.result:
  Update fulltext results after merge
sql-bench/Makefile.am:
  Added transaction test
sql-bench/run-all-tests.sh:
  Added transaction test
sql-bench/server-cfg.sh:
  Added transaction test
sql-bench/test-ATIS.sh:
  Cleanup
sql/item_func.cc:
  Fix bad merge
sql/mysqld.cc:
  Cleanup
sql/sql_base.cc:
  Fix bad merge
sql/sql_delete.cc:
  Cleanup
sql/sql_parse.cc:
  Fix bad merge
sql/sql_select.cc:
  Fix bad merge
sql/sql_union.cc:
  Fix bad merge
tools/mysqlmanager.c:
  C
2001-11-22 17:55:18 +02:00
unknown
198df9007e fixes for ft-boolean and range optimizer 2001-11-22 16:00:11 +01:00
unknown
e673b6dcf8 merge
BitKeeper/etc/logging_ok:
  auto-union
Docs/manual.texi:
  Auto merged
innobase/srv/srv0srv.c:
  Auto merged
myisam/mi_check.c:
  Auto merged
myisam/mi_open.c:
  Auto merged
myisam/mi_packrec.c:
  Auto merged
myisam/myisamdef.h:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
mysql-test/t/fulltext.test:
  Auto merged
sql/stacktrace.c:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged
2001-11-22 14:40:38 +02:00
unknown
d576cd65d0 Fix bug when repairing compressed MyISAM files
LOCATE() is now case sensitive


BUILD/compile-alpha-cxx:
  Don't build manager because it fails with linker error on Linux Alpha
Docs/manual.texi:
  Changelog
myisam/mi_check.c:
  Fix bug when repairing compressed MyISAM files
myisam/mi_open.c:
  Fix bug when repairing compressed MyISAM files
myisam/mi_packrec.c:
  Fix bug when repairing compressed MyISAM files
myisam/myisamchk.c:
  Fix bug when repairing compressed MyISAM files
myisam/myisamdef.h:
  Fix bug when repairing compressed MyISAM files
mysql-test/r/func_group.result:
  Fix result for new RND function
mysql-test/r/func_math.result:
  Fix result for new RND function
mysql-test/r/func_str.result:
  test of new locate()
mysql-test/t/func_str.test:
  test of new locate()
sql/item_func.cc:
  LOCATE() is now case sensitive
sql/sql_string.cc:
  LOCATE() is now case sensitive
sql/sql_string.h:
  LOCATE() is now case sensitive
2001-11-22 13:50:50 +02:00
unknown
1bdd19639d bad merge fixed 2001-11-21 19:58:25 +01:00
unknown
d237b46bf5 broken merge, fix required
Docs/manual.texi:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
mysql-test/t/fulltext.test:
  Auto merged
mysql-test/t/myisam.test:
  Auto merged
sql/ha_myisam.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
innobase/btr/btr0btr.c:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged
innobase/btr/btr0cur.c:
  Auto merged
innobase/dict/dict0dict.c:
  Auto merged
innobase/srv/srv0srv.c:
  Auto merged
configure.in:
  no merge - used local
mysql-test/r/fulltext.result:
  no merge - used local
mysql-test/r/myisam.result:
  no merge - used local
sql/item_func.cc:
  no merge - used local
sql/sql_delete.cc:
  no merge - used local
sql/sql_parse.cc:
  no merge - used local
sql/sql_select.cc:
  no merge - used local
2001-11-21 19:08:33 +01:00
unknown
dfbeb93550 (UPDATE|DELETE) ...WHERE MATCH bugfix 2001-11-21 18:25:44 +01:00
unknown
5975e23649 Merge work:/home/bk/mysql-4.0 into hundin.mysql.fi:/my/bk/mysql-4.0
Docs/manual.texi:
  Auto merged
2001-11-21 15:39:01 +02:00
unknown
e6309ed96d typo fixed 2001-11-21 12:36:05 +01:00
unknown
9a722eda62 fixes: --gdb does not implies --manager
--manager implies --skip-gdb-magic
(which was introduced to make --gdb usable w/o manager)
2001-11-20 17:59:57 +01:00
unknown
62d2ecb170 tests added
mysql-test/r/fulltext_distinct.result:
  boolean test added
mysql-test/t/fulltext_distinct.test:
  boolean test added
mysql-test/r/fulltext_left_join.result:
  boolean test added
mysql-test/t/fulltext_left_join.test:
  boolean test added
2001-11-20 17:58:00 +01:00
unknown
c282bbf0ff ./mysql-test-run test1 test2 test3 2001-11-20 14:18:57 +01:00
unknown
079f110a4a fixed problem in rpl_log test
mysql-test/fix-result:
  updated version
mysql-test/r/rpl_log.result:
  fixed result to be portable
2001-11-19 12:03:30 -07:00
unknown
c9e2debfe3 Merge work:/home/bk/mysql-4.0 into hundin.mysql.fi:/my/bk/mysql-4.0
Docs/manual.texi:
  Auto merged
sql/mysqld.cc:
  Auto merged
2001-11-18 14:34:52 +02:00
unknown
b87029d80c Merge
Docs/manual.texi:
  Auto merged
innobase/btr/btr0btr.c:
  Auto merged
innobase/btr/btr0cur.c:
  Auto merged
innobase/dict/dict0dict.c:
  Auto merged
sql/ha_myisam.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
mysql-test/t/myisam.test:
  Auto merged
2001-11-18 14:33:53 +02:00
unknown
21259d25f3 Test of optimize table.
Docs/manual.texi:
  Updated changelog.
  Update info about MERGE tables.
  Moved section 'Why so many open tables'
mysql-test/r/create.result:
  Added test of types in CREATE
mysql-test/t/create.test:
  Added test of types in CREATE
sql/item_func.cc:
  More different values for RAND(nr) and RAND(nr+1)
2001-11-18 14:13:09 +02:00
unknown
421595c12e Fixed bug in OPTIMIZE TABLE that reset index cardinality if it
was up to date.


Docs/manual.texi:
  ChangeLog
configure.in:
  Version number change
mysql-test/r/myisam.result:
  Test of optimize table
mysql-test/t/myisam.test:
  Test of optimize table
2001-11-18 14:08:17 +02: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
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
unknown
83aeee648a Merge work:/home/bk/mysql-4.0
into mysql.sashanet.com:/home/sasha/src/bk/mysql-4.0
2001-11-08 22:29:29 -07:00
unknown
1c809563c2 fixed memory leak in replication
fixed bugs in new IO_CACHE code so that the old calls work
fixed shutdown bug
clean-up of mysql-test-run


include/my_sys.h:
  fixes for IO_CACHE
mysql-test/mysql-test-run.sh:
  fixed missing \ bug
  added --skip-gdb-magic to skip Sergei's automatic mysql_parse break
  do not delete the breakpoint in command - it crashes gdb sometimes
mysys/mf_iocache2.c:
  rc_pos->write_pos in my_b_seek for WRITE_CACHE
sql/mysqld.cc:
  fixed shutdown bug when singals DO break read introduced by the fix for 
  when they don't.
sql/repl_failsafe.cc:
  fixed memory leak
2001-11-08 22:27:55 -07:00
unknown
30052a4901 Fixed bug in UPDATE .. ORDER BY
Docs/manual.texi:
  Changelog
mysql-test/r/update.result:
  Test found bug in UPDATE .. ORDER BY
mysql-test/t/update.test:
  Test found bug in UPDATE .. ORDER BY
2001-11-08 22:30:27 +02:00
unknown
897e7453d6 Don't use IGNORE by default in INSERT ... SELECT
Docs/manual.texi:
  Changelog
mysql-test/r/insert_select.result:
  Add testcase for INSERT IGNORE
mysql-test/t/insert_select.test:
  Add testcase for INSERT IGNORE
2001-11-08 14:17:56 +02:00