Commit graph

5397 commits

Author SHA1 Message Date
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
unknown
b22c123c62 Clarify wildcards in dbname of GRANT command. 2002-10-03 09:52:30 +10:00
unknown
5b975a555c Update for Visual Studio Projects Files
VC++Files/client/mysqlclient.dsp:
  Updated the sources files:  < net.c >net_serv.cpp
VC++Files/innobase/innobase.dsp:
  Added configuration for to compile all the dependencies options for the other projects.
VC++Files/libmysql/libmysql.dsp:
  Modified the xcopy command for to avoid an error for waiting the confirmation of the copy
VC++Files/myisampack/myisampack.dsp:
  Updated source location
VC++Files/mysql.dsw:
  Added project files: the embedded static library; my_print_defaults; comp_err
VC++Files/mysqldemb/mysqldemb.dsp:
  Updated flags
VC++Files/mysqlserver/mysqlserver.dsp:
  Updated flags
VC++Files/pack_isam/pack_isam.dsp:
  Updated source location
VC++Files/sql/mysqld.dsp:
  Added UDF and updated flags
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2002-10-02 18:37:28 -03:00
unknown
df4ddb2c69 manual.texi:
InnoDB does allow a foreign key constraint name to be specified


Docs/manual.texi:
  InnoDB does allow a foreign key constraint name to be specified
2002-10-02 20:54:21 +03:00
unknown
086e93d54a manual.texi:
InnoDB does allow a foreign key constraint name to be specified, though it is not used in any way


Docs/manual.texi:
  InnoDB does allow a foreign key constraint name to be specified, though it is not used in any way
2002-10-02 20:44:44 +03:00
unknown
345c5044c3 Merge paul@work.mysql.com:/home/bk/mysql-4.0
into teton.kitebird.com:/home/paul/mysql-4.0


Docs/manual.texi:
  Auto merged
2002-10-02 12:36:06 -05:00
unknown
e5c2da0114 manual.texi behavior -> behaviour
Docs/manual.texi:
  behavior -> behaviour
2002-10-02 12:34:25 -05:00
unknown
95e772b656 Merge with 4.0.4
BitKeeper/etc/logging_ok:
  auto-union
client/mysqldump.c:
  Auto merged
include/Makefile.am:
  Auto merged
include/my_base.h:
  Auto merged
include/my_sys.h:
  Auto merged
include/sslopt-case.h:
  Auto merged
libmysql/libmysql.c:
  Auto merged
libmysql/libmysql.def:
  Auto merged
libmysqld/lib_sql.cc:
  Auto merged
myisam/ft_boolean_search.c:
  Auto merged
myisam/mi_check.c:
  Auto merged
myisam/mi_create.c:
  Auto merged
myisam/myisamchk.c:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
mysql-test/r/create.result:
  Auto merged
mysql-test/r/innodb.result:
  Auto merged
mysql-test/r/myisam.result:
  Auto merged
mysql-test/r/select.result:
  Auto merged
mysql-test/r/type_set.result:
  Auto merged
mysql-test/t/create.test:
  Auto merged
mysql-test/t/myisam.test:
  Auto merged
sql/Makefile.am:
  Auto merged
sql/filesort.cc:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/ha_myisam.cc:
  Auto merged
sql/handler.h:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/item_strfunc.h:
  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_pkg.cc:
  Auto merged
sql/net_serv.cc:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/set_var.h:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_load.cc:
  Auto merged
sql/share/english/errmsg.txt:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_udf.cc:
  Auto merged
sql/sql_union.cc:
  Auto merged
sql/unireg.h:
  Auto merged
sql/sql_cache.cc:
  Code cleanup (removed ifdef)
2002-10-02 17:55:12 +03:00
unknown
421514ae81 - applied fix from 4.0 configure.in required to build shared libraries
with static glibc installed


configure.in:
   - Better fix for building shared libraries with a patched glibc
     (from 4.0 tree)
   - removed obsolete comment
2002-10-02 13:20:17 +02:00
unknown
896bc7d089 Update libmysqld to use 4.1 protocol.
BitKeeper/etc/ignore:
  added sql_error.cc sql_prepare.cc
BitKeeper/deleted/.del-sql_error.cc~2f1caca8d2485dbe:
  deleted
BitKeeper/deleted/.del-sql_prepare.cc~f703729793935ed6:
  deleted
libmysqld/libmysqld.c:
  Update to use 4.1 protocol.
  Added mysql_warning_count() and mysql_warnings()
myisam/rt_test.c:
  Added missing variable
2002-10-02 14:14:36 +03:00
unknown
a829c4c0cb Merge mysql.com:/space/my/mysql-3.23
into mysql.com:/space/my/mysql-3.23-spec
2002-10-02 13:07:01 +02:00
unknown
8bc99030a1 - Small fix for support-files/mysql.spec.sh
- Updated scripts/make_binary_distribution.sh to include the correct
   ChangeLog and the LICENSE file for non-GPL builds


scripts/make_binary_distribution.sh:
   - Add BK ChangeLog (if existing) instead of sql/ChangeLog, which is
     not updated anymore since we switched to BK
   - Add LICENSE, if exists (required for non-GPL binary builds)
support-files/mysql.spec.sh:
   - MySQL-Max now requires MySQL to be the same version (to
     avoid version mismatches e.g. mixing 3.23.xx and 4.0 packages)
2002-10-02 13:06:04 +02:00