1
0
mirror of https://github.com/MariaDB/server.git synced 2025-11-13 21:42:58 +03:00
Commit Graph

19274 Commits

Author SHA1 Message Date
unknown
b2ffb29ad7 improving of fields list creation in derived tables and unions
fixed length of fields created in fubselect
fixed resolving fields of reduced in derived table subselect


mysql-test/r/subselect.result:
  test of created with subselect fields
mysql-test/t/subselect.test:
  test of created with subselect fields
sql/item.cc:
  fixed length of fields created in fubselect
  fixed resolving fields of reduced in derived table subselect
sql/item_subselect.cc:
  improving of fields list creation in derived tables and unions
sql/mysql_priv.h:
  improving of fields list creation in derived tables and unions
sql/sql_derived.cc:
  improving of fields list creation in derived tables and unions
sql/sql_lex.h:
  improving of fields list creation in derived tables and unions
sql/sql_parse.cc:
  improving of fields list creation in derived tables and unions
sql/sql_prepare.cc:
  improving of fields list creation in derived tables and unions
sql/sql_select.cc:
  improving of fields list creation in derived tables and unions
sql/sql_select.h:
  improving of fields list creation in derived tables and unions
sql/sql_union.cc:
  improving of fields list creation in derived tables and unions
sql/sql_update.cc:
  improving of fields list creation in derived tables and unions
2003-01-29 19:42:39 +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
307ed01440 Move latin1 into a separarte file 2003-01-29 17:31:20 +04:00
unknown
2c2b14f9a2 Reorganization to restore generating charset C files from conf files 2003-01-29 15:08:09 +04:00
unknown
b343de721e Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/work-select-4.1


mysql-test/r/subselect.result:
  Auto merged
mysql-test/t/subselect.test:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_prepare.cc:
  Auto merged
2003-01-29 11:03:53 +02: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
e63630be7d Merge work.mysql.com:/home/bk/mysql-4.1
into myvenu.com:/home/venu/bk/src-4.1
2003-01-28 21:08:42 -08: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
f2ebd03972 fixed memory leak in ROW code (SCRUM 577)
sql/item_cmpfunc.cc:
  fixed memory leak in ROW code
sql/item_cmpfunc.h:
  fixed memory leak in ROW code
2003-01-28 22:28:11 +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
b6315f6d9b Fix leak when the client disconnects with open prep statements
sql/sql_prepare.cc:
  Fix leak when the client disconnects with open statements
tests/client_test.c:
  Enable stmt_close test
2003-01-28 09:24:27 -08:00
unknown
a0ffb52a3a SIGNAL_WITH_VIO_CLOSES bugfix
sql/sql_class.cc:
  This should be #ifdefed
2003-01-28 21:03:05 +04:00
unknown
7b137f15bd A feature of doing automatick result buffering when INSERT is
done from the select containing a table to be inserted to.
2003-01-28 18:55:52 +02: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
d7db6beec7 Merge
sql/item.cc:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_cmpfunc.h:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/item.h:
  SCCS merged
2003-01-28 15:34:59 +02:00
unknown
ca0d06d599 fixed bugs in temporary tables in subselect implementation (SCRUM)
merging with switching on static tables optimization (SCRUM)
fixed subselects with uncacheable results
added test for fixed bugs from bugreports


mysql-test/r/subselect.result:
  changes in subselect test after switching on static tables optimization
  fixed bug test added
  uncacheable subselects
mysql-test/t/subselect.test:
  changes in subselect test after switching on static tables optimization
  fixed bug test added
  uncacheable subselects
sql/item_create.cc:
  fixed subselects with uncacheable results
sql/item_func.cc:
  fixed subselects with uncacheable results
sql/item_subselect.cc:
  fixed subselects with uncacheable results
  clean up
sql/item_subselect.h:
  fixed subselects with uncacheable results
sql/sql_lex.cc:
  fixed subselects with uncacheable results
sql/sql_lex.h:
  fixed subselects with uncacheable results
sql/sql_select.cc:
  fixed bugs in temporary tables in subselect implementation
  fixed subselects with uncacheable results
sql/sql_union.cc:
  fixed subselects with uncacheable results
sql/sql_yacc.yy:
  fixed subselects with uncacheable results
2003-01-28 14:48:12 +02:00
unknown
d2b6620621 Merge sinisa@work.mysql.com:/home/bk/mysql-5.0
into sinisa.nasamreza.org:/mnt/work/petica


mysql-test/r/sp.result:
  Auto merged
mysql-test/t/sp.test:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
2003-01-28 14:44:13 +02:00
unknown
7120b66884 Merge abotchkov@work.mysql.com:/home/bk/mysql-4.1
into deer.mysql.r18.ru:/home/hf/work/mysql-default


sql/field.h:
  Auto merged
2003-01-28 15:06:23 +04:00
unknown
4f6e3d2284 resolve 2003-01-28 15:03:33 +04:00
unknown
ee7c5f13fa New "fill" function in charset_info_st structure 2003-01-28 14:58:06 +04:00
unknown
a831430e62 Merge abotchkov@work.mysql.com:/home/bk/mysql-4.1
into deer.mysql.r18.ru:/home/hf/work/mysql-default


sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
2003-01-28 12:59:07 +04: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
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
1220b05c3d correct parameter of hash_search 2003-01-28 03:28:06 +05:00
unknown
6958e3289d Added option hostname.err
sql/sql_parse.cc:
  added option hostname.err
2003-01-27 15:37:25 -02:00
unknown
ec44c88165 Merge work:/home/bk/mysql-4.1
into serg.mysql.com:/usr/home/serg/Abk/mysql-4.1
2003-01-27 17:41:30 +01:00
unknown
b5f740addf field.cc:
Use cs->scan() instead of my_isspace()


sql/field.cc:
  Use cs->scan() instead of my_isspace()
2003-01-27 18:46:51 +04:00
unknown
9040fd7d75 Merge work:/home/bk/mysql-4.1
into serg.mysql.com:/usr/home/serg/Abk/mysql-4.1
2003-01-27 15:38:33 +01:00
unknown
2275a161d0 select count(*) from t1 procedure analyse(); bug fixed 2003-01-27 15:37:05 +01:00
unknown
e9ff6fbd0c field.cc:
tis620 normalization will be implemented ad a SQL function, without automatic normalization on INSERT


sql/field.cc:
  tis620 normalization will be implemented ad a SQL function, without automatic normalization on INSERT
2003-01-27 17:31:46 +04:00
unknown
e7660c64d7 wb_wc and wc_mb now checks length inside 2003-01-27 16:46:03 +04: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
unknown
dee921691d ft_stopword_file added to 'SHOW VARIABLES' output 2003-01-27 11:15:54 +01:00
unknown
ecb55f4307 sql_yacc.yy:
Semicolon has been added


sql/sql_yacc.yy:
  Semicolon has been added
2003-01-27 13:46:33 +04:00
unknown
42ba47184c Merge sanja.is.com.ua:/home/bell/mysql/work-leak-4.1
into sanja.is.com.ua:/home/bell/mysql/work-select-4.1


sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
2003-01-26 21:34:14 +02:00