Commit graph

5683 commits

Author SHA1 Message Date
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
unknown
7a7407535c crash-me.sh:
restore nake_time and make_time_r


sql-bench/crash-me.sh:
  restore nake_time and make_time_r
2003-01-29 14:00:08 +05:00
unknown
cec5bc1de7 fixed functions to be able work with group function as argument
made bisone 1.75 compatible code


mysql-test/r/group_by.result:
  test of function with agregate function inside
mysql-test/t/group_by.test:
  test of function with agregate function inside
sql/item_cmpfunc.cc:
  fixed functions to be able work with group function as argument
sql/item_cmpfunc.h:
  fixed functions to be able work with group function as argument
sql/item_func.cc:
  fixed functions to be able work with group function as argument
sql/item_func.h:
  fixed functions to be able work with group function as argument
sql/item_strfunc.cc:
  fixed functions to be able work with group function as argument
sql/item_strfunc.h:
  fixed functions to be able work with group function as argument
sql/sql_yacc.yy:
  made bisone 1.75 compatible code
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2003-01-29 10:38:56 +02:00
unknown
7e78a9490b - fixed typo for better portability (many shells don't support the "=="
operator)
2003-01-29 09:22:20 +01:00
unknown
6dc436fa86 ha_innodb.cc:
Cleanup of the previous bug fix: replace code is either SQLCOM_REPLACE or SQLCOM_REPLACE_SELECT


sql/ha_innodb.cc:
  Cleanup of the previous bug fix: replace code is either SQLCOM_REPLACE or SQLCOM_REPLACE_SELECT
2003-01-29 02:19:00 +02:00
unknown
25aa3098be ha_innodb.cc:
Fix a bug REPLACE INTO t SELECT ... did not work if t has an auto-inc column


sql/ha_innodb.cc:
  Fix a bug REPLACE INTO t SELECT ... did not work if t has an auto-inc column
2003-01-29 00:31:56 +02:00
unknown
ad2c3cdf1b Merge work:/home/bk/mysql-4.0 into hynda.(none):/home/my/bk/mysql-4.0 2003-01-28 23:30:35 +02:00
unknown
2ea4eedc15 Fixed a bug in --auto-repair. 2003-01-28 23:29:59 +02:00
unknown
baa10e3114 Merge pzaitsev@work.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/pz/mysql/mysql-4.0-root
2003-01-28 22:08:53 +03:00
unknown
24167f94c0 merge
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Use local vrsion
2003-01-28 20:59:41 +02:00
unknown
b533cd5c83 Only write to the error log if --log-error is specified and --console is not specified
(On Windows --log-error is enabled by default)



mysys/my_getopt.c:
  Call get_one_option() also for boolean values.
scripts/mysqld_safe.sh:
  Add option --log-error
sql/log.cc:
  Fix for --log-error
sql/mysql_priv.h:
  Fix for --log-error
sql/mysqld.cc:
  Fix for --log-error
sql/sql_udf.cc:
  Lock the mysql/func table properly
2003-01-28 20:56:35 +02:00
unknown
9753cea1aa Fix predicted first rand() call
sql/sql_class.cc:
  Fix Random hash initialization on for new connections to make result
  it more random
2003-01-28 20:33:47 +03:00
unknown
8b790656f1 - added netware subdirectory to distribution
Makefile.am:
   - added netware to SUBDIRS
netware/Makefile.am:
   - add netware.patch to distribution
2003-01-28 17:49:21 +01:00
unknown
73284c9384 low-level error messages cleanup
extra/perror.c:
  error messages fixups
include/my_base.h:
  error codes fixups
myisam/mi_open.c:
  correct error reported
myisam/myisamchk.c:
  correct error reported
myisammrg/myrg_open.c:
  correct error reported
sql/ha_innodb.cc:
  correct error reported
sql/ha_isam.cc:
  reorder table file extensions to get better error on "cannot open the table"
sql/ha_myisam.cc:
  reorder table file extensions to get better error on "cannot open the table"
sql/ha_myisammrg.cc:
  correct error reported
sql/handler.cc:
  correct error reported
2003-01-28 17:42:08 +01:00
unknown
3758c92b3a Use on Unix hostname.err only when --log-error=path.
Asked by Heikki and Peter.


sql/mysqld.cc:
  Use on Unix hostname.err only when --log-error=path.
2003-01-28 13:50:36 -02:00
unknown
a29d85072d Merge work:/home/bk/mysql-4.0
into serg.mysql.com:/usr/home/serg/Abk/mysql-4.0


sql/mysql_priv.h:
  Auto merged
sql/sql_table.cc:
  Auto merged
2003-01-28 14:37:12 +01:00
unknown
d490b56ed1 fixed "DROP table_open_in_handler" hang 2003-01-28 14:36:22 +01:00
unknown
2d9a417d56 Updated results for 4.0 2003-01-28 09:17:10 +02:00
unknown
c97ddd06f4 merge
include/my_sys.h:
  Auto merged
sql/item_create.cc:
  Auto merged
sql/log.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
innobase/btr/btr0cur.c:
  Use local file
scripts/make_binary_distribution.sh:
  Add mysql_waitpid
sql/mysqld.cc:
  Simple cleanup
2003-01-28 09:02:51 +02:00
unknown
88b405c4e2 Merge with 3.23.56 (Replace manual with 'empty' document)
Fix for bug when using auto_increment column and LAST_INSERT_ID()


Makefile.am:
  Auto merged
ltconfig:
  Auto merged
innobase/btr/btr0cur.c:
  Auto merged
sql/Makefile.am:
  Auto merged
Docs/Makefile.am:
  Merge with 3.23.56
Docs/manual.texi:
  Merge with 3.23.56 (Replace manual with 'empty' document)
libmysql/libmysql.c:
  Use local version
sql/log.cc:
  Fix for bug when using auto_increment column and LAST_INSERT_ID()
sql/sql_base.cc:
  Use local version
2003-01-28 08:51:03 +02:00
unknown
84f81dc593 Fixes for Netware
Call pthread_mutex_destroy() on not used mutex.
Changed comments in .h and .c files from // -> /* */
Added detection of mutex on which one didn't call pthread_mutex_destroy()
Fixed bug in create_tmp_field() which causes a memory overrun in queries that uses "ORDER BY constant_expression"
Added optimisation for ORDER BY NULL


BitKeeper/deleted/.del-ChangeLog~dfc92e15bee6fc75:
  Delete: sql/ChangeLog
BUILD/compile-pentium-valgrind-max:
  Don't use valgrind with safemalloc as this can hide some bugs
Makefile.am:
  Added platform dirs
bdb/os/os_handle.c:
  Portability fix
client/mysql.cc:
  Fixes for Netware.
  Fixed duplicate output when using 'tee'
  Simple optimisations
client/mysqldump.c:
  Portability fix
client/mysqltest.c:
  Portability fix
configure.in:
  Fixes for Netware
extra/resolveip.c:
  Fixes for Netware
include/Makefile.am:
  Fixes for Netware
include/config-win.h:
  Portability fix
include/my_global.h:
  Fixes for Netware
include/my_net.h:
  Fixes for Netware
include/my_pthread.h:
  Fixes for Netware
  Added detection of mutexes that was not destroyed
include/my_sys.h:
  Fixes for Netware
  Added 'extern' before external functions
include/mysql.h:
  Fixes for Netware
innobase/configure.in:
  Fixes for Netware
innobase/include/os0thread.h:
  Fixes for Netware
innobase/os/os0sync.c:
  Fixes for Netware
innobase/os/os0thread.c:
  Fixes for Netware
innobase/srv/srv0srv.c:
  Fixes for Netware
innobase/srv/srv0start.c:
  Fixes for Netware
innobase/sync/sync0sync.c:
  Fixes for Netware
isam/test3.c:
  Disable test on Netware
libmysql/Makefile.shared:
  Added my_sleep
libmysql/get_password.c:
  Fixes for Netware
libmysql/libmysql.c:
  Fixes for Netware
  Made mysql_once_init() global
libmysql/manager.c:
  Fixes for Netware
myisam/mi_test3.c:
  Disable test for netware
mysql-test/mysql-test-run.sh:
  Give warning if output file contains errors
mysql-test/r/count_distinct.result:
  More tests
mysql-test/r/group_by.result:
  Test of ORDER BY NULL
mysql-test/t/backup.test:
  Fixes for Netware
mysql-test/t/count_distinct.test:
  More tests
mysql-test/t/func_crypt.test:
  Fixes for Netware
mysql-test/t/grant_cache.test:
  Fixes for Netware
mysql-test/t/group_by.test:
  Tests of ORDER BY NULL
mysql-test/t/rpl000015.test:
  Fixes for Netware
mysql-test/t/rpl000017.test:
  Fixes for Netware
mysql-test/t/rpl_rotate_logs.test:
  Fixes for Netware
mysys/Makefile.am:
  Added my_sleep.c and my_netware.c
mysys/charset.c:
  Fixes for Netware
mysys/default.c:
  Fixes for Netware
mysys/mf_tempfile.c:
  Fixes for Netware
mysys/my_clock.c:
  Fixes for Netware
mysys/my_copy.c:
  Fixes for Netware
mysys/my_getwd.c:
  Changed function comment from // -> /* */
mysys/my_init.c:
  Fixes for Netware
mysys/my_lock.c:
  Fixes for Netware
mysys/my_messnc.c:
  Fixes for Netware
mysys/my_os2cond.c:
  Removed comment
mysys/my_os2dirsrch.c:
  Changed function comment from // -> /* */
  Fixed indentation
mysys/my_os2dirsrch.h:
  Changed function comment from // -> /* */
  Fixed indentation
mysys/my_os2file64.c:
  Changed function comment from // -> /* */
  Fixed indentation
mysys/my_os2mutex.c:
  Changed function comment from // -> /* */
  Fixed indentation
mysys/my_os2thread.c:
  Changed function comment from // -> /* */
  Fixed indentation
mysys/my_os2tls.c:
  Changed function comment from // -> /* */
  Fixed indentation
mysys/my_pthread.c:
  Fixes for Netware
mysys/my_redel.c:
  Fixes for Netware
mysys/my_tempnam.c:
  Fixes for Netware
mysys/my_thr_init.c:
  Remove created mutexes when program ends.
mysys/mysys_priv.h:
  Cleanup
mysys/safemalloc.c:
  Prefix error messages with "Error:"
mysys/thr_alarm.c:
  Destroy internal mutex on end_thr_alarm.
mysys/thr_mutex.c:
  Added detection of mutex on which one didn't call pthread_mutex_destroy()
scripts/make_binary_distribution.sh:
  Fixes for Netware
sql/des_key_file.cc:
  Free mutex at end
sql/ha_innodb.cc:
  Free mutex at end
sql/ha_myisam.cc:
  Changed warnings from REPAIR Note:
  (For mysql-test-run)
sql/hostname.cc:
  Fixes for Netware
sql/item.h:
  Fixed bug in create_tmp_field() which causes a memory overrun
sql/item_func.cc:
  Free used mutexes
sql/item_sum.cc:
  Fixed bug in create_tmp_field() which causes a memory overrun
sql/log.cc:
  Free used mutexes
sql/my_lock.c:
  Fixes for Netware
sql/mysql_priv.h:
  Fixes for Netware
sql/mysqld.cc:
  Fixes for Netware
  Added Have_crypt
  Properly free mutexes from MYSQL_LOG by calling cleanup
  Free mutex before exit
sql/repl_failsafe.cc:
  Fixes for Netware
sql/set_var.cc:
  Added have_crypt
sql/share/english/errmsg.txt:
  Added version socket and port to stderr log
sql/slave.cc:
  Remove global MASTER_INFO variable and use instead an allocated variable.
  This allows us to correctly free used mutex.
sql/slave.h:
  Move constructors and destuctors to slave.cc
  (To make it easier to clear all needed variables)
sql/sql_base.cc:
  Safety fix
sql/sql_class.h:
  Portability fixes.
  Added 'cleanup' to log handling to be able to free mutexes.
sql/sql_insert.cc:
  Fixes for Netware
mysys/my_sleep.c:
  E
sql/sql_parse.cc:
  Fixes for Netware
sql/sql_select.cc:
  Added optimisation for ORDER BY NULL
sql/sql_select.h:
  Fixed bug in create_tmp_field() which causes a memory overrun
sql/sql_table.cc:
  Fixed bug in create_tmp_field() which causes a memory overrun
sql/sql_udf.cc:
  Free mutex on end
vio/test-ssl.c:
  Simple code cleanup
vio/test-sslclient.c:
  Simple code cleanup
vio/test-sslserver.c:
  Simple code cleanup
vio/viotest-ssl.c:
  Simple code cleanup
2003-01-28 08:38:28 +02:00
unknown
7245530084 Fix when using auto_increment and last_insert_id() in the same insert statement.
sql/sql_base.cc:
  S
2003-01-28 06:48:26 +02:00
unknown
c46c125827 Make PACKET_TOO_LARGE error handling safer in client
libmysql/libmysql.c:
  Make PACKET_TOO_LARGE error handling safer
2003-01-28 02:10:56 +02:00
unknown
3595556335 Merge work:/home/bk/mysql-4.0
into serg.mysql.com:/usr/home/serg/Abk/mysql-4.0
2003-01-28 00:57:13 +01:00
unknown
0d470b8d77 do not force CONNECTION_ID(), FOUND_ROWS(), PI(), CURRENT_USER(),
and VERSION() to be uppercase in e.g. "select pi()"


mysql-test/r/func_math.result:
  result updated
mysql-test/r/select_found.result:
  result updated
mysql-test/r/union.result:
  result updated
2003-01-28 00:55:41 +01:00
unknown
8d25a3fd94 btr0cur.c:
Backport from 4.0: Fix a major bug in InnoDB query estimator for queries of type SELECT ... WHERE col < x and SELECT ... WHERE col > x; MySQL could pick a table scan though the result set was only a few rows in a big table


innobase/btr/btr0cur.c:
  Backport from 4.0: Fix a major bug in InnoDB query estimator for queries of type SELECT ... WHERE col < x and SELECT ... WHERE col > x; MySQL could pick a table scan though the result set was only a few rows in a big table
2003-01-28 01:14:06 +02:00
unknown
55f66ee91e btr0cur.c:
Fix a major bug in InnoDB query estimator for queries of type SELECT ... WHERE col < x and SELECT ... WHERE col > x; MySQL could pick a table scan though the result set was only a few rows in a big table


innobase/btr/btr0cur.c:
  Fix a major bug in InnoDB query estimator for queries of type SELECT ... WHERE col < x and SELECT ... WHERE col > x; MySQL could pick a table scan though the result set was only a few rows in a big table
2003-01-28 01:04:48 +02:00
unknown
3967668e6b - removed unused CC and CXX variables
- CFLAGS and CXXFLAGS should honor RPM_OPT_FLAGS
2003-01-27 20:55:03 +01:00
unknown
6958e3289d Added option hostname.err
sql/sql_parse.cc:
  added option hostname.err
2003-01-27 15:37:25 -02:00
unknown
48f587a883 remove warnings 2003-01-27 17:52:55 +01:00
unknown
933e200810 - replaced manual.texi with a dummy placeholder file (manual.texi is
now maintained in a separate "mysqldoc" BK source tree) - it will be
   replaced with the correct manual.texi when building the official
   source distribution
 - fixed automake error about reservedwords.texi by moving it to EXTRA_DIST
   instead


Docs/Makefile.am:
   - moved reservedwords.texi from info_TEXINFOS to EXTRA_DIST since it is
     not a full-featured texi file and automake would complain about
     "missing @setfilename"
Docs/manual.texi:
   - replaced manual.texi with a dummy placeholder file (manual.texi is
     now maintained in a separate "mysqldoc" BK source tree) - it will be
     replaced with the correct manual.texi when building the official
     source distribution
2003-01-27 16:28:42 +01:00
unknown
c67dcb4bb7 - added a dummy file "reservedwords.texi" to the BK tree and the Makefiles,
so it's part of the distribution (manual.texi includes this file)
   It will be replaced with the correct one from the mysqldoc tree before
   building the distribution
 - removed generation and inclusion of MIRRORS file, since the mirror list
   is no longer part of manual.texi anyway
 - replaced YFLAGS with AM_YFLAGS in sql/Makefile.am to make automake happy
 - Redirect standard error when checking for dpkg-architecture in ltconfig
   to avoid error message showing during configuration


Docs/Makefile.am:
   - added reservedwords.texi (which gets included by manual.texi)
   - removed MIRRORS (mirror list is not part of the manual anymore)
Docs/reservedwords.texi:
   - Updated wording a bit after adding it to the tree
Makefile.am:
   - removed MIRRORS from EXTRA_DIST (it's not part of the manual anymore)
ltconfig:
   - Redirect standard error when checking for dpkg-architecture
     to avoid error message showing during configuration (thanks to
     John Wythe for the patch)
sql/Makefile.am:
   - replaced YFLAGS with AM_YFLAGS to make automake happy
2003-01-27 13:44:16 +01:00
unknown
73e6cc4fe4 fixes for SHOW VARIABLES and --ft-stopword-list 2003-01-27 12:12:12 +01:00