Commit graph

5765 commits

Author SHA1 Message Date
unknown
b16e8d58f1 (please merge into 4.1 and onwards)
- re-added missing pre- and post(un)install scripts to server subpackage
- added config file /etc/my.cnf to the file list (just for completeness)
- make sure to create the datadir with 755 permissions


support-files/mysql.spec.sh:
  - re-added missing pre- and post(un)install scripts to server subpackage
  - added config file /etc/my.cnf to the file list (just for completeness)
  - make sure to create the datadir with 755 permissions
2003-02-11 12:27:53 +01:00
unknown
ee189173cb Merge work:/my/mysql-4.0 into mashka.mysql.fi:/home/my/mysql-4.0 2003-02-10 17:07:48 +02:00
unknown
03865c5fb1 Better fix for count(distinct) bug
include/my_sys.h:
  Remove compiler warning
mysql-test/mysql-test-run.sh:
  Don't examine log files when you run with --extern
2003-02-10 17:03:27 +02:00
unknown
1846f7320a Merge sergbook.mysql.com:/usr/home/serg/Abk/mysql
into sergbook.mysql.com:/usr/home/serg/Abk/mysql-4.0


Build-tools/Do-compile:
  Auto merged
bdb/dist/configure.in:
  Auto merged
scripts/mysqlhotcopy.sh:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
2003-02-10 14:56:30 +01:00
unknown
556bb7bb3d error message fixed (new error code will be introduced in 4.1) 2003-02-10 14:47:39 +01:00
unknown
7910884c5c count(distint) on an empty table crash fixed
BitKeeper/etc/ignore:
  Added support-files/MacOSX/Description.plist support-files/MacOSX/Info.plist to the ignore list
2003-02-10 12:01:47 +01:00
unknown
c896662662 Fixed memory reference error when doing key_column <=> NULL on column that is defined as NOT NULL
BUILD/FINISH.sh:
  Abort if one of configuration script fails
2003-02-10 01:21:09 +02:00
unknown
4cf749e6c4 Merge work:/my/mysql-4.0 into mashka.mysql.fi:/home/my/mysql-4.0 2003-02-08 10:56:41 +02:00
unknown
0cf63e826a Check how much stack we got; Needed to be able to run crash-me
sql-bench/limits/mysql.cfg:
  Updated results
2003-02-08 01:55:16 +02:00
unknown
b759ce90d6 mysqld.xdc:
new file
2003-02-07 20:05:03 +01:00
unknown
133ed0bf6f Fixed problem that caused automake to fail 2003-02-07 18:47:13 +02:00
unknown
05ffd915ff Merge work:/my/mysql-4.0 into mashka.mysql.fi:/home/my/mysql-4.0 2003-02-07 18:01:08 +02:00
unknown
5db7246f78 Fix problem in MIN/MAX optimisation (from last patch)
Don't make OLD_PASSWORD() a reserved word


mysql-test/r/explain.result:
  Test select count(*)
mysql-test/r/func_crypt.result:
  Test old_password()
mysql-test/t/explain.test:
  Test select count(*)
mysql-test/t/func_crypt.test:
  Test old_password()
sql/item_create.cc:
  Don't make OLD_PASSWORD() a reserved word
sql/item_create.h:
  Don't make OLD_PASSWORD() a reserved word
sql/lex.h:
  Don't make OLD_PASSWORD() a reserved word
sql/opt_range.cc:
  Remove blank space
sql/opt_sum.cc:
  Fix problem in MIN/MAX optimisation
2003-02-07 17:57:07 +02:00
unknown
c161bbdbe4 page0cur.c:
Disable PAGE_CUR_LE_OR_EXTENDS because it does not work for non-latin1 char sets now


innobase/page/page0cur.c:
  Disable PAGE_CUR_LE_OR_EXTENDS because it does not work for non-latin1 char sets now
2003-02-07 17:44:09 +02:00
unknown
a811b06b30 ha_innodb.cc:
Clarify the meaning of HA_READ_PREFIX_LAST as a search flag. InnoDB assumed the meaning wrong.


sql/ha_innodb.cc:
  Clarify the meaning of HA_READ_PREFIX_LAST as a search flag. InnoDB assumed the meaning wrong.
2003-02-07 17:33:15 +02:00
unknown
f06b0d9f3c Merge work:/my/mysql-4.0 into mashka.mysql.fi:/home/my/mysql-4.0 2003-02-07 15:06:23 +02:00
unknown
2760ecc829 ha_innodb.cc:
Since MySQL uses HA_READ_PREFIX_LAST in a wrong place, we make InnoDB to convert it to a right search condition


sql/ha_innodb.cc:
  Since MySQL uses HA_READ_PREFIX_LAST in a wrong place, we make InnoDB to convert it to a right search condition
2003-02-07 13:28:18 +02:00
unknown
7f84171381 Added test for SHOW CREATE 2003-02-07 12:54:10 +02:00
unknown
4c7fa21510 Allow 4.0 to read new 4.1 .frm files
Makefile.am:
  Remove blank lines
configure.in:
  Keep version gamma
2003-02-07 10:35:08 +02:00
unknown
b2f8f07d92 page0cur.c:
Sinisas patch to InnoDB ORDER BY DESC bug, push it now so that Jani has it available


innobase/page/page0cur.c:
  Sinisas patch to InnoDB ORDER BY DESC bug, push it now so that Jani has it available
2003-02-07 00:44:32 +02:00
unknown
dacf7f8fe5 Added START TRANSACTION syntax
Added ALL as parameter option for all group functions.
Make join handling uniform. This allows us to use ',', JOIN and INNER JOIN the same way.
Sort NULL last if DESC is used (ANSI SQL 99 requirement)


include/my_global.h:
  Moved LL from mysql_priv (as this is also in config-win.h)
mysql-test/r/distinct.result:
  Updated results
mysql-test/r/func_group.result:
  Updated results
mysql-test/r/innodb.result:
  Updated results
mysql-test/r/join.result:
  Updated results
mysql-test/r/order_by.result:
  Updated results
mysql-test/t/func_group.test:
  Added test for SUM(ALL ...)
mysql-test/t/innodb.test:
  Added test for START TRANSACTION
mysql-test/t/join.test:
  Test different join syntaxes
mysql-test/t/order_by.test:
  Added new test of NULL ordering.
sql/filesort.cc:
  Sort NULL last if DESC is used
sql/lex.h:
  Added OLD_PASSWORD() as synonym for PASSWORD.
sql/mysql_priv.h:
  Removed LL()
sql/opt_range.cc:
  Sort NULL last if DESC is used
sql/opt_range.h:
  Sort NULL last if DESC is used
sql/slave.cc:
  Indentation changes
sql/sql_parse.cc:
  After merge fix
sql/sql_select.cc:
  Added comment
sql/sql_yacc.yy:
  Added START TRANSACTION syntax
  Added ALL as parameter option for all group functions.
  Make join handling uniform.
2003-02-06 16:55:59 +02:00
unknown
98b953fddf Small enhancements for Do-compile:
- add version number to build log files (e.g. Logs/build-4.1-standard.log)
 - add host name and uname to Subject line of build failure mails
   (e.g. "Subject: build(Linux): mysql-4.1-standard compilation failed")

 -> Please merge with all other trees!


Build-tools/Do-compile:
  Small enhancements:
   - add version number to build log files (e.g. Logs/build-4.1-standard.log)
   - add host name and uname to Subject line of build failure mails
     (e.g. "Subject: build(Linux): mysql-4.1-standard compilation failed")
2003-02-05 18:02:12 +01:00
unknown
b7318885f4 - added word of warning about providing the password as cleartext using
the --password parameter (better add it to my.cnf instead) (Thanks to
   Christian Hammers for the suggestion)


scripts/mysqlhotcopy.sh:
   - added word of warning about providing the password as cleartext using
     the --password parameter (better add it to my.cnf instead)
2003-02-05 12:22:28 +01:00
unknown
9160f2cbb2 - Yves mail address does not seem to be valid anymore - changed mail
address to report bugs to bugs@mysql.com (thanks to Christian Hammers
   for pointing this out) - please merge this into all other trees!


scripts/mysqlaccess.sh:
   - Yves mail address does not seem to be valid anymore - changed mail
     address to report bugs to bugs@mysql.com (thanks to Christian Hammers
     for pointing this out)
2003-02-05 11:49:51 +01:00
unknown
c5a26332d5 Many files:
new file
.del-overlay.tar.gz~5bd3087e191e7574:
  Delete: netware/overlay.tar.gz


BitKeeper/deleted/.del-overlay.tar.gz~5bd3087e191e7574:
  Delete: netware/overlay.tar.gz
2003-02-05 03:40:07 +01:00
unknown
c942025070 ha_innobase.cc:
Backport from 4.0: fix potential bug if store_lock is called with TL_IGNORE in the middle of a query


sql/ha_innobase.cc:
  Backport from 4.0: fix potential bug if store_lock is called with TL_IGNORE in the middle of a query
2003-02-05 01:42:07 +02:00
unknown
ed3b80e1b2 ha_innodb.cc:
Fix potential bug: if MySQL calls store_lock with the TL_IGNORE argument in the middle of query processing, then InnoDB select_lock_type could be reset to LOCK_NONE in a wrong place


sql/ha_innodb.cc:
  Fix potential bug: if MySQL calls store_lock with the TL_IGNORE argument in the middle of query processing, then InnoDB select_lock_type could be reset to LOCK_NONE in a wrong place
2003-02-05 01:24:59 +02:00
unknown
9e2c2fe8d0 - removed LIBOBJS hack (no longer required with newer versions of autoconf
and actually results in an error with very recent autoconf versions!
   (see http://www.gnu.org/manual/autoconf/html_node/autoconf_165.html or
    "AC_LIBOBJ vs. LIBOBJS" in the autoconf documentation)
   Please merge this into 4.0 as well!
2003-02-04 22:30:47 +01:00
unknown
dfbd628cd7 Merge work:/my/mysql-4.0 into mashka.mysql.fi:/home/my/mysql-4.0 2003-02-04 01:14:09 +02:00
unknown
d6ca74d272 Fixed bug in ulonglong parsing for constructs that only takes unsigned longlong as parameter.
mysql-test/r/bigint.result:
  Test if big LONG_NUM
mysql-test/t/bigint.test:
  Test if big LONG_NUM
2003-02-04 01:05:39 +02:00
unknown
718ff4df05 Merge mysql.com:/space/my/mysql-4.0
into mysql.com:/space/my/mysql-4.0-build


configure.in:
  Auto merged
2003-02-03 20:54:08 +01:00
unknown
46318870b0 - added support-files/MacOSX to include files specific for building
MacOSX packages using PackageMaker
 - renamed support-files/PKG -> support-files/SCO (PKG is used in MacOS X
   terminology as well)


support-files/SCO/INSTALL.sh:
  mvdir
support-files/SCO/compile.sh:
  mvdir
support-files/SCO/doc.sh:
  mvdir
support-files/SCO/mkpkg.sh:
  mvdir
support-files/SCO/patch:
  mvdir
support-files/SCO/pkginfo.ini:
  mvdir
support-files/SCO/postinstall:
  mvdir
support-files/SCO/preinstall:
  mvdir
support-files/SCO/preremove:
  mvdir
support-files/SCO/prototype.ini:
  mvdir
support-files/SCO/version:
  mvdir
support-files/MacOSX/make_mysql_pkg.pl:
  Rename: support-files/make_mysql_pkg.pl -> support-files/MacOSX/make_mysql_pkg.pl
configure.in:
   - added support-files/MacOSX
support-files/Makefile.am:
   - added MacOSX subdirectory
2003-02-03 20:39:48 +01:00
unknown
9b6726ae93 Merge work:/my/mysql-4.0 into mashka.mysql.fi:/home/my/mysql-4.0 2003-02-03 20:22:43 +02:00
unknown
c73dcb5e30 Fix for MIN/MAX with empty tables
MIN(key_column) could in some cases return NULL on a column with NULL and other values.
MIN(key_column) and MAX(key_column) could in some cases return wrong values when used in OUTER JOIN.


configure.in:
  Updated version number
libmysqld/libmysqld.c:
  Portability fix (for windows)
mysql-test/r/func_group.result:
  Added test case for MIN/MAX problems
mysql-test/t/func_group.test:
  Added test case for MIN/MAX problems
sql/item.h:
  Fix for MIN/MAX with empty tables
sql/item_sum.h:
  Fix for MIN/MAX with empty tables
sql/opt_sum.cc:
  MIN(key_column) could in some cases return NULL on a column
  with NULL and other values.
  MIN(key_column) and MAX(key_column) could in some cases
  return wrong values when used in OUTER JOIN.
sql/sql_select.cc:
  Fix for MIN/MAX with empty tables
2003-02-03 20:20:32 +02:00
unknown
39f46988e8 Makefile.am:
Added a conditional to prevent compilation of netware executables


netware/Makefile.am:
  Added a conditional to prevent compilation of netware executables
2003-02-03 18:15:48 +01:00
unknown
271dcc57e9 - really deleted makefile.w32 to resolve a namespace conflict on
case-insensitive File Systems (e.g. Mac OS X)
2003-02-03 14:39:15 +01:00
unknown
5bc41c8bea Merge work:/home/bk/mysql-4.0
into serg.mysql.com:/usr/home/serg/Abk/mysql-4.0
2003-02-03 14:11:15 +01:00
unknown
56ca80efae bug tests added 2003-02-03 09:17:47 +01:00
unknown
ac4dacaa29 Merge work:/my/mysql-4.0 into mashka.mysql.fi:/home/my/mysql-4.0 2003-02-02 05:13:51 +02:00
unknown
9ae3202e21 Fixed core dump bug in 'mysql' when using \p in prompt on Windows.
Fixed error when mysql_unix_port pointed to const string (not uncommon on windows)



client/mysql.cc:
  Fixed core dump bug when using \p in prompt on Windows.
sql/mysqld.cc:
  Fixed error when mysql_unix_port pointed to const string.
2003-02-02 05:13:09 +02:00
unknown
88301da1cd Many files:
new file
Makefile.am:
  Changes from Novell diff


netware/Makefile.am:
  Changes from Novell diff
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2003-02-01 00:42:26 +01:00
unknown
2479bdeae9 fixed crash with blobs in compressed table 2003-01-30 19:34:19 +01:00
unknown
8ff6a36b16 Merge work:/home/bk/mysql-4.0
into serg.mysql.com:/usr/home/serg/Abk/mysql-4.0


sql/ha_innodb.cc:
  Auto merged
2003-01-30 16:02:11 +01:00
unknown
9c356bf43c After merge fix 2003-01-29 19:33:48 +02:00
unknown
93ebd4d64d merge with 3.23.56 to get patches for --lower-case-table-names and
proper handling of SUM() in some functions.



BitKeeper/etc/logging_ok:
  auto-union
sql/item_cmpfunc.cc:
  Auto merged
sql/item_cmpfunc.h:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_func.h:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_db.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/table.cc:
  Auto merged
mysql-test/r/group_by.result:
  merge with 3.23.56
mysql-test/t/group_by.test:
  merge with 3.23.56
sql/item_strfunc.h:
  merge with 3.23.56
sql/mysqld.cc:
  merge with 3.23.56
sql/sql_parse.cc:
  merge with 3.23.56
sql/sql_yacc.yy:
  merge with 3.23.56
2003-01-29 19:22:22 +02:00
unknown
9c89ce7b3a Fixed compilation error on windows
sql/sql_table.cc:
  Added comments
2003-01-29 19:10:33 +02:00
unknown
3a180c331a Merge work:/home/bk/mysql into mashka.mysql.fi:/home/my/mysql-3.23 2003-01-29 18:56:59 +02:00
unknown
bdfa549779 Fixed handling of lower_case_table_names in SHOW TABLE STATUS, mysql_list_fields() and mysql_table_dump().
This fixes some Errcode 13 errors on Windows when deleting tables.



sql/mysql_priv.h:
  Moved lower case conversion of database names to check_db_name()
sql/mysqld.cc:
  Fix to be able to use 4.0 error message files
sql/sql_db.cc:
  Moved lower case conversion of database names to check_db_name()
sql/sql_parse.cc:
  Moved lower case conversion of database names to check_db_name()
  Added checking of lower_case_table_names for mysql_table_dump() and
  mysql_list_fields()
sql/sql_show.cc:
  Moved lower case conversion of database names to check_db_name()
sql/table.cc:
  Convert database names to lower case in check_db-name() if --lower-case-table-names is used.
2003-01-29 18:56:34 +02:00
unknown
0458a92197 Merge mysql.com:/space/my/mysql-4.0
into mysql.com:/space/my/mysql-4.0-build
2003-01-29 12:05:23 +01:00
unknown
88206d4def Merge akishkin@work.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/walrus/bk/40
2003-01-29 14:02:35 +05:00