Commit graph

5458 commits

Author SHA1 Message Date
unknown
12c336e710 Syncing with 4.0 docs. 2002-10-08 12:47:24 +10:00
unknown
6d6cf0864d Syncing with 4.1 docs. 2002-10-08 12:46:15 +10:00
unknown
a1517908c1 touchup to last fix
sql/log.cc:
  moved mutex back to after is_open() test,
  but still protecting name dereference (the real problem)
2002-10-07 16:39:52 -06:00
unknown
2ab04c8cee Merge mysql.com:/home/nick/mysql/repository/mysql-3.23
into mysql.com:/home/nick/mysql/mysql-3.23
2002-10-07 15:44:00 -06:00
unknown
642b759333 fixed race that caused sig11s on simultaneous FLUSH LOGS
(possibly also fixes binlog filename corruption problems--hasn't
been reproduced since)


sql/log.cc:
  Fixed race caused by calling MYSQL_LOG::is_open() outside of critical section.
sql/sql_parse.cc:
  added missing args to calls to MYSQL_LOG::new_file(bool)
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2002-10-07 15:42:10 -06:00
unknown
da4d153124 fixed query cache with system database
FN_NO_CASE_SENCE used instead of __WIN__ in table name handling of quary cache


mysql-test/r/query_cache.result:
  query cache with system database test
mysql-test/t/query_cache.test:
  query cache with system database test
sql/sql_cache.cc:
  fixed query cache with system database
  FN_NO_CASE_SENCE used instead of __WIN__
2002-10-08 00:26:15 +03:00
unknown
7e05d7b4a6 Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/work-4.1
2002-10-07 22:22:26 +03:00
unknown
31568581c5 fixed error handling bug
mysql-test/r/subselect.result:
  test for error handling bug
mysql-test/t/subselect.test:
  test for error handling bug
2002-10-07 22:21:17 +03:00
unknown
e2f911d88e Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/work-full-4.1
2002-10-07 19:16:34 +03:00
unknown
0f623dcdea fixed dbd test results after EXPLAIN output changing 2002-10-07 19:15:03 +03:00
unknown
a30eaeb083 manual.texi Document IO_THREAD and SQL_THREAD for SLAVE START/STOP.
Docs/manual.texi:
  Document IO_THREAD and SQL_THREAD for SLAVE START/STOP.
2002-10-07 09:53:17 -05:00
unknown
fc2634d04b small fix from bugs@.. list
mysql-test/Makefile.am:
  small fix based on user's input ..
2002-10-07 16:30:39 +03:00
unknown
c5805cbc71 Merge rkalimullin@work.mysql.com:/home/bk/mysql-4.1
into mysql.r18.ru:/usr/home/ram/mysql-4.1


mysql-test/r/create.result:
  Auto merged
2002-10-07 17:51:05 +05:00
unknown
9195963f56 auto_increment for heap tables
test case


heap/hp_create.c:
  auto_increment for heap tables
heap/hp_hash.c:
  auto_increment for heap tables
heap/hp_info.c:
  auto_increment for heap tables
heap/hp_test1.c:
  auto_increment for heap tables
heap/hp_test2.c:
  auto_increment for heap tables
heap/hp_update.c:
  auto_increment for heap tables
heap/hp_write.c:
  auto_increment for heap tables
include/heap.h:
  auto_increment for heap tables
mysql-test/r/create.result:
  auto_increment for heap tables
mysql-test/t/create.test:
  auto_increment for heap tables
sql/ha_heap.cc:
  auto_increment for heap tables
sql/ha_heap.h:
  auto_increment for heap tables
2002-10-07 17:49:03 +05:00
unknown
1ecd0c97b4 Merge sinisa@work.mysql.com:/home/bk/mysql-4.0
into sinisa.nasamreza.org:/mnt/work/mysql-4.0
2002-10-07 15:19:26 +03:00
unknown
e1e93f7c99 a fix for the typo in the last push 2002-10-07 15:17:41 +03:00
unknown
03be0476ab fix for a small typo in the last push
scripts/safe_mysqld.sh:
  fix for a small type
2002-10-07 15:07:45 +03:00
unknown
ff30ac26ed Merge work.mysql.com:/home/bk/mysql-4.0
into work.mysql.com:/d1/users/mwagner/work/bk/mysql-4.0


Docs/manual.texi:
  Auto merged
2002-10-07 13:29:20 +02:00
unknown
18d8d96f01 manual.texi Added docs about how to clone public 4.1 repository
Docs/manual.texi:
  Added docs about how to clone public 4.1 repository
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2002-10-07 11:32:10 +02:00
unknown
cae4e7e542 manual.texi Change --full to --all for mysqldump references.
Docs/manual.texi:
  Change --full to --all for mysqldump references.
2002-10-06 20:21:48 -05:00
unknown
72a3c80dbb after merging fix 2002-10-07 00:56:21 +03:00
unknown
c2c414edbf manual.texi UPDATE description mentioned ORDER BY, but it was
manual.texi	missing from the syntax diagram.


Docs/manual.texi:
  UPDATE description mentioned ORDER BY, but it was
  missing from the syntax diagram.
2002-10-06 14:07:25 -05:00
unknown
03af773b7b os0file.c:
SHOW INNODB STATUS always showed average bytes read as 0 in Unix


innobase/os/os0file.c:
  SHOW INNODB STATUS always showed average bytes read as 0 in Unix
2002-10-06 14:53:49 +03:00
unknown
25b2d47517 btr0cur.c:
Do not let range estimator to return over 1 / 2 of total rows in table; use longlong in range estimation
btr0cur.h, ha_innobase.cc:
  Use longlong in range estimation, in case there are > 4 billion rows


sql/ha_innobase.cc:
  Use longlong in range estimation, in case there are > 4 billion rows
innobase/include/btr0cur.h:
  Use longlong in range estimation, in case there are > 4 billion rows
innobase/btr/btr0cur.c:
  Do not let range estimator to return over 1 / 2 of total rows in table; use longlong in range estimation
2002-10-05 22:23:51 +03:00
unknown
4ada989cce manual.texi minor change note cleanups.
Docs/manual.texi:
  minor change note cleanups.
2002-10-05 12:07:57 -05:00
unknown
bbbbe68dbb Merge sinisa@work.mysql.com:/home/bk/mysql
into sinisa.nasamreza.org:/mnt/work/mysql
2002-10-05 16:00:56 +03:00
unknown
987474a6c3 Small fix in mysqld_safe for some shells 2002-10-05 15:57:18 +03:00
unknown
9d26d238f3 a small fix for some shells 2002-10-05 15:45:24 +03:00
unknown
d319dea894 Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/work-explain_union-4.1
2002-10-04 17:49:57 +03:00
unknown
b6e1ae891c Small fixes in mysql and myisampack
client/mysql.cc:
  Made i-am-a-dummy option to be identical with safe-updates.
myisam/myisampack.c:
  Fixed a typo.
2002-10-04 17:18:41 +03:00
unknown
9e5a4be460 a bit speeding-up of key_cmp() function 2002-10-04 16:41:09 +05:00
unknown
05c5908a9e merging
include/mysql_com.h:
  Auto merged
mysql-test/r/create.result:
  Auto merged
mysql-test/r/distinct.result:
  Auto merged
mysql-test/r/group_by.result:
  Auto merged
mysql-test/r/innodb.result:
  Auto merged
mysql-test/r/key_primary.result:
  Auto merged
mysql-test/r/merge.result:
  Auto merged
mysql-test/r/odbc.result:
  Auto merged
mysql-test/r/order_by.result:
  Auto merged
mysql-test/r/union.result:
  Auto merged
mysql-test/r/user_var.result:
  Auto merged
mysql-test/r/varbinary.result:
  Auto merged
mysql-test/t/union.test:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_derived.cc:
  Auto merged
sql/sql_select.h:
  Auto merged
sql/sql_update.cc:
  Auto merged
sql/table.h:
  Auto merged
2002-10-04 14:15:59 +03:00
unknown
ed175a5ebd lock0lock.c:
Fix bug: if SHOW INNODB STATUS or innodb_monitor printed several hundred transactions, the output was truncated and we forgot to release the kernel mutex


innobase/lock/lock0lock.c:
  Fix bug: if SHOW INNODB STATUS or innodb_monitor printed several hundred transactions, the output was truncated and we forgot to release the kernel mutex
2002-10-03 23:07:32 +03:00
unknown
5a6c52f17c Merge mysql.com:/my/mysql-4.0
into mysql.com:/space/my/mysql-4.0-automake


configure.in:
  Auto merged
2002-10-03 21:12:28 +02:00
unknown
04913b565a fixed typo: s/ft_max_word_len_sort/ft_max_word_len_for_sort/ 2002-10-03 19:12:27 +00:00
unknown
b05f22d997 ha_innobase.cc:
Remove unintentionally pushed assert


sql/ha_innobase.cc:
  Remove unintentionally pushed assert
2002-10-03 19:48:24 +03:00
unknown
050fd27c4f Merge heikki@work.mysql.com:/home/bk/mysql
into hundin.mysql.fi:/home/heikki/mysql
2002-10-03 19:48:23 +03:00
unknown
b7c46250bb Merge lgrimmer@work.mysql.com:/home/bk/mysql
into mysql.com:/space/my/mysql-3.23
2002-10-03 18:48:22 +02:00
unknown
e607221a3c Fixed bug that causes select test to fail
Now MySQL 4.1 is up to date with all patches from 4.0.4 and passes the test suite.


mysql-test/r/rpl_log_pos.result:
  Fix results
sql/sql_select.cc:
  Fixed bug that causes select test to fail
2002-10-03 19:44:46 +03:00
unknown
3c1e16c574 - rearranged test order in Do-compile (BDB tends to fail more often than
InnoDB, so test it after InnoDB)


Build-tools/Do-compile:
   - Test BDB after InnoDB (BDB tends to fail more often than InnoDB)
2002-10-03 18:30:49 +02:00
unknown
3a088a328d ha_innobase.cc, ha_innobase.h:
Backport from 4.0.4 the bug fix of the crash when a temporary table was created inside LOCK TABLES and used


sql/ha_innobase.h:
  Backport from 4.0.4 the bug fix of the crash when a temporary table was created inside LOCK TABLES and used
sql/ha_innobase.cc:
  Backport from 4.0.4 the bug fix of the crash when a temporary table was created inside LOCK TABLES and used
2002-10-03 19:10:49 +03:00
unknown
f094b6af4c fixing EXPLAIN select types 2002-10-03 18:47:04 +03:00
unknown
28ebf117dd os0thread.h:
Fix the probable reason why InnoDB versions after July 2, 2002 did not start properly in some Win 95/98/ME computers


innobase/include/os0thread.h:
  Fix the probable reason why InnoDB versions after July 2, 2002 did not start properly in some Win 95/98/ME computers
2002-10-03 18:10:34 +03:00
unknown
be565cfbf7 Merge work:/my/mysql-4.1 into mashka.mysql.fi:/home/my/mysql-4.1
BitKeeper/etc/logging_ok:
  auto-union
sql/mysql_priv.h:
  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_yacc.yy:
  Auto merged
2002-10-03 16:56:09 +03:00
unknown
8f7a2b2785 Update after last merge. Fixes some wrong test results.
libmysql/libmysql.c:
  Removed obsolete function (now in strings library)
mysql-test/r/rpl_log.result:
  Updated results for 4.1
mysql-test/r/rpl_log_pos.result:
  Updated results for 4.1
sql/item_strfunc.cc:
  Added missing system_charset_info
sql/log_event.cc:
  Portability fixes. More debugging.
sql/net_pkg.cc:
  Added back setting of query_error as slave code is depeneding on this.
sql/sql_acl.cc:
  Update after last merge
sql/sql_lex.cc:
  Update after last merge
sql/sql_parse.cc:
  Update after last merge
sql/sql_prepare.cc:
  Update after last merge
sql/time.cc:
  Update after last merge.
  More comments
2002-10-03 16:54:26 +03:00
unknown
392ba75773 Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/work-merge_lex-4.1
2002-10-03 16:37:41 +03:00
unknown
e57cd00a6f after merging bugfix 2002-10-03 16:35:08 +03:00
unknown
c9c47144dc Merge mysql.r18.ru:/usr/home/ram/mysql-4.1.last
into mysql.r18.ru:/usr/home/ram/mysql-4.1


BitKeeper/etc/logging_ok:
  auto-union
sql/ha_heap.cc:
  Auto merged
2002-10-03 17:26:05 +05:00
unknown
1d41862975 Additional key segment (HA_KEYTYPE_END) creation has been moved from handler to hp_create.c
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2002-10-03 14:55:02 +05:00
unknown
0d82e49fe1 Failed to compile on FreeBSD:
no ulong type, one should use unsigned long instead


include/mysql.h:
  Failed to compile on FreeBSD
2002-10-03 13:12:31 +05:00