Commit graph

7752 commits

Author SHA1 Message Date
unknown
0f18ab7897 Missed one file from Novell changes in 1.1686
netware/mysqld_safe.c:
  Changes to argument handling, spawn, etc
2003-03-21 16:14:52 -05:00
unknown
0ea383e048 Changes from Novell for various NetWare-only files, post-4.0.12
include/config-netware.h:
  Define USE_OLD_FUNCTIONS, remove NKS header includes
netware/BUILD/mwenv:
  Changes to compiler flags
netware/BUILD/nwbootstrap:
  bk changes syntax
netware/Makefile.am:
  Remove isamchk.def, mysqld.xdc, add comp_err.def to netware_build_files
netware/isamchk.def:
  Add XDCDATA
netware/isamlog.def:
  Add XDCDATA
netware/libmysql.def:
  Add XDCDATA
netware/my_manage.c:
  Changes in argument handling, use procve
netware/my_manage.h:
  Changes to argument handling, spawn
netware/my_print_defaults.def:
  Add XDCDATA
netware/myisamchk.def:
  Add XDCDATA
netware/myisamlog.def:
  Add XDCDATA
netware/myisampack.def:
  Add XDCDATA
netware/mysql.def:
  Add XDCDATA
netware/mysql_install.def:
  Add XDCDATA
netware/mysql_install_db.c:
  Argument handling changes, etc
netware/mysql_install_db.def:
  Add XDCDATA
netware/mysql_test_run.c:
  Argument handling, spawn changes, etc
netware/mysql_test_run.def:
  Add XDCDATA
netware/mysqladmin.def:
  Add XDCDATA
netware/mysqlbinlog.def:
  Add XDCDATA
netware/mysqlcheck.def:
  Add XDCDATA
netware/mysqld.def:
  Add XDCDATA
netware/mysqld_safe.def:
  Add XDCDATA
netware/mysqldump.def:
  Add XDCDATA
netware/mysqlimport.def:
  Add XDCDATA
netware/mysqlshow.def:
  Add XDCDATA
netware/mysqltest.def:
  Add XDCDATA
netware/pack_isam.def:
  Add XDCDATA
netware/perror.def:
  Add XDCDATA
netware/replace.def:
  Add XDCDATA
netware/resolveip.def:
  Add XDCDATA
2003-03-21 15:43:38 -05:00
unknown
f33c97281a Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/mysql_src/mysql-4.1
2003-03-21 21:10:20 +01:00
unknown
696962c4e6 Fix for bug #174 (charset 0 caused segfault) 2003-03-21 21:08:56 +01:00
unknown
746926e71e Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into narttu.mysql.fi:/my/mysql-4.1


sql/mysqld.cc:
  Auto merged
2003-03-21 18:54:53 +02:00
unknown
e4ae47ff36 Fixes for fill_help_tables.sql
innobase/ha/ha0ha.c:
  Removed compiler warnings
mysql-test/t/innodb.test:
  Another fix for cardinality
scripts/Makefile.am:
  Install fill_help_tables.sql in prefix/share/mysql
  Don't install make_binary_distribution
scripts/fill_help_tables.sh:
  use INSERT IGNORE to avoid errors
scripts/make_binary_distribution.sh:
  Install and use fill_help_tables.sql
scripts/mysql_install_db.sh:
  Search for and use fill_help_tables.sql
sql/mysqld.cc:
  Don't write shutdown message when called from mysql_install_db
support-files/Makefile.am:
  Don't install binary-configure
support-files/binary-configure.sh:
  Don't use config files
2003-03-21 18:53:55 +02:00
unknown
8b71664441 crash-me.sh:
add foreign key value update test


sql-bench/crash-me.sh:
  add foreign key value update test
2003-03-21 21:42:51 +05:00
unknown
92f5103df4 item_cmpfunc.cc:
IFNULL() now honors collations


sql/item_cmpfunc.cc:
  IFNULL() now honors collations
2003-03-21 19:02:07 +04:00
unknown
ce17ac5af2 IF() and LEAST() now honors coercibility 2003-03-21 18:31:41 +04:00
unknown
a0e2d75aa0 All charset related actions have been moved from fix_fields() to fix_length_and_dec() 2003-03-21 17:21:45 +04:00
unknown
8b9d8b2966 Fixed a bug in comment handling. 2003-03-21 14:14:36 +02:00
unknown
9a8637339a sql_yacc.yy:
Reduce/reduce conflict
  fix. 


sql/sql_yacc.yy:
  Reduce/reduce conflict
  fix.
2003-03-21 15:44:15 +04:00
unknown
c51c782c55 New variable to turn off automatic charset conversion of query results
Some speed improvements
2003-03-21 15:18:52 +04:00
unknown
c2df88fa22 Merge abarkov@build.mysql.com:/home/bk/mysql-4.1
into bar.mysql.r18.ru:/usr/home/bar/mysql-4.1
2003-03-21 15:09:40 +04:00
unknown
75ad5e96e1 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into narttu.mysql.fi:/my/mysql-4.1
2003-03-21 11:49:56 +02:00
unknown
08733cbd5b Fixed reference to uninitialized memory
mysql-test/t/innodb.test:
  Another fix to take InnoDB cardinality changes into account
2003-03-21 11:49:17 +02:00
unknown
c3329ed674 Merge abarkov@build.mysql.com:/home/bk/mysql-4.1
into bar.mysql.r18.ru:/usr/home/bar/mysql-4.1
2003-03-21 12:05:04 +04:00
unknown
0f16578bff COLLATE precedence bug has been fixed:
"a LIKE b COLLATE c"  worked as "(a LIKE b) COLLATE c" which is not right
2003-03-21 12:04:08 +04:00
unknown
6665ead9ba Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.0
into sanja.is.com.ua:/home/bell/mysql/work-qcfile-4.0


sql/sql_yacc.yy:
  Auto merged
2003-03-21 10:03:43 +02:00
unknown
05adb8da6c Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into genie.(none):/home/hf/work/mysql-4.1.lck
2003-03-21 11:54:13 +04:00
unknown
2dc27531c8 A separate variable national_charset_info
Fixes according coercibility tables, p162, SQL Complete


include/my_sys.h:
  Declaration has been moved to /sql directory
sql/item.cc:
  Fixes acording SQL complete, page 162
sql/item_cmpfunc.cc:
  Fixes acording SQL complete, page 162
sql/mysql_priv.h:
  Declaration has been moved here from /include
sql/sql_string.cc:
  A separate variable national_charset_info
sql/sql_yacc.yy:
  A separate variable national_charset_info
2003-03-21 11:21:01 +04:00
unknown
4809dc7419 Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into genie.(none):/home/hf/work/mysql-4.1.lck


sql/item_create.cc:
  Auto merged
sql/item_create.h:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_func.h:
  Auto merged
sql/lex.h:
  Auto merged
2003-03-21 11:06:15 +04:00
unknown
d7bccdbe81 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into narttu.mysql.fi:/my/mysql-4.1


sql/password.c:
  Auto merged
sql/sql_update.cc:
  Auto merged
2003-03-20 21:35:17 +02:00
unknown
e968e3b18f After merge fixes
Fixed bug in Item::set_name()
Fix for memory leak with geometry type


mysql-test/r/create.result:
  Fixed results after merge
mysql-test/r/innodb.result:
  Hack to make test repeatable
  (InnoDB's cardinality numbers varies a bit between tests)
mysql-test/r/rpl_relayspace.result:
  After merge fix
mysql-test/t/innodb.test:
  Hack to make test repeatable
  (InnoDB's cardinality numbers varies a bit between tests)
sql/ha_myisam.cc:
  Indentation cleanup
sql/item.cc:
  Fixed bug in Item::set_name()
sql/password.c:
  After merge fix
sql/sql_update.cc:
  After merge fix
sql/table.cc:
  Fix for memory leak with geometry type
2003-03-20 21:35:03 +02:00
unknown
2b1b4abd98 Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.1
into sinisa.nasamreza.org:/mnt/work/mysql-4.1


sql/item.cc:
  Auto merged
2003-03-20 21:10:04 +02:00
unknown
9307bfe805 A test case for the bug fix as per PEM's reported bug #118.
Patch is already commited and approved by Sanja ..;o)
2003-03-20 20:44:56 +02:00
unknown
f27d55586d item_cmpfunc.cc:
cmp_charset was not initialized
  valgrind fix
  LIKE now works according to coercibility rules


sql/item_cmpfunc.cc:
  cmp_charset was not initialized
  valgrind fix
  LIKE now works according to coercibility rules
2003-03-20 22:43:40 +04:00
unknown
9e5a1ba67e SELECT N'string' 2003-03-20 22:01:03 +04:00
unknown
d0ae2c126e Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.r18.ru:/usr/home/ram/work/mysql-4.1.sp


sql/field.cc:
  Auto merged
2003-03-20 20:57:07 +04:00
unknown
83a4fcac5c R-tree bug fixes.
myisam/rt_index.c:
  Should call find_first() instead of find_next() after key deletion.
  Fixed type cast.
myisam/sp_key.c:
  Fixed spatial key creation.
sql/field.cc:
  To get rid of warning.
2003-03-20 20:55:53 +04:00
unknown
3112cd61ac NATIONAL CHARACTER VARYING(n)
NATIONAL CHAR VARYING(n)
NCHAR VARYING(n)

are now aliases for

VARCHAR(n) CHARACTER SET utf8
2003-03-20 20:04:21 +04:00
unknown
4637fa16b6 NCHAR(n) and NATIONAL CHARACTER(n)
is now synonim for
CHARACTER(n) CHARACTER SET utf8
2003-03-20 19:31:01 +04:00
unknown
dd94ef103e New syntax for character strings:
SELECT _latin1 0x345678;
SELECT _latin x'345678';
2003-03-20 19:11:15 +04:00
unknown
c6778cee9d another bad merge fixed 2003-03-20 12:09:20 +01:00
unknown
10096d9185 fixed bad merge (s/rnd/my_rnd/) 2003-03-20 11:48:02 +01:00
unknown
428794050f Merge pmartin@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/pem/work/mysql-4.1
2003-03-20 10:13:23 +01:00
unknown
5c21360390 Merge pmartin@bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/pem/work/mysql-4.0
2003-03-20 10:04:37 +01:00
unknown
97cd4fb127 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into narttu.mysql.fi:/my/mysql-4.1


configure.in:
  Auto merged
libmysqld/lib_sql.cc:
  Auto merged
sql/field.cc:
  Auto merged
sql/field.h:
  Auto merged
sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/lex.h:
  Auto merged
sql/log.cc:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/repl_failsafe.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_repl.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
2003-03-20 02:06:08 +02:00
unknown
161942e3ce Merge with 4.0.12
Docs/internals.texi:
  Auto merged
include/my_global.h:
  Auto merged
include/mysql_com.h:
  Auto merged
innobase/row/row0mysql.c:
  Auto merged
innobase/row/row0sel.c:
  Auto merged
libmysql/Makefile.am:
  Auto merged
libmysqld/Makefile.am:
  Auto merged
libmysqld/lib_vio.c:
  Auto merged
mysql-test/r/heap.result:
  Auto merged
mysql-test/r/innodb.result:
  Auto merged
mysql-test/t/heap.test:
  Auto merged
sql/ha_innodb.h:
  Auto merged
sql/ha_myisam.cc:
  Auto merged
BitKeeper/deleted/.del-password.c~76f30876e68eddb4:
  Auto merged
sql/handler.cc:
  Auto merged
sql/handler.h:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/key.cc:
  Auto merged
sql/lex.h:
  Auto merged
sql/log.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/slave.cc:
  Auto merged
sql/slave.h:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_repl.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/table.cc:
  Auto merged
strings/strto.c:
  Auto merged
2003-03-19 22:25:44 +02:00
unknown
7517a59a6d Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into narttu.mysql.fi:/my/mysql-4.0
2003-03-19 21:56:14 +02:00
unknown
0847c4f90e Print right hostname or IP in SHOW PROCESSLIST
Use SESSION TABLE_HANDLER as default table handler if given table handler doesn't exists


Docs/internals.texi:
  Updated description for how DATE, TIME and TIMESTAMP are stored
mysql-test/r/create.result:
  New tests
mysql-test/t/create.test:
  New tests
sql/handler.cc:
  Use SESSION TABLE_HANDLER as default table handler if given table handler doesn't exists.
sql/sql_parse.cc:
  Fix that we return hostname instead of IP in SHOW PROCESSLIST
sql/sql_show.cc:
  Print right hostname or IP in SHOW PROCESSLIST
2003-03-19 21:43:41 +02:00
unknown
d7bedeb998 Added support for ULONG division with DIV
Fixed non fatal memory leak in slave code.


mysql-test/r/func_test.result:
  Added test for DIV
mysql-test/t/func_test.test:
  Added test for DIV
mysys/my_alloc.c:
  More DBUG statements
sql/item_func.cc:
  Added support for ULONG division with DIV
sql/log_event.cc:
  Fixed memory leak (Wrong call to init_sql_alloc)
sql/slave.cc:
  Fixed memory leak (Wrong call to init_sql_alloc)
sql/sql_base.cc:
  More DBUG statements
sql/sql_class.cc:
  Added init_for_queries() to fix memory leak in slave code
sql/sql_class.h:
  Added init_for_queries() to fix memory leak in slave code
sql/sql_error.cc:
  More DBUG statements
sql/sql_parse.cc:
  Added init_for_queries() to fix memory leak in slave code
sql/unireg.h:
  Moved memory defaults to include file
2003-03-19 21:23:13 +02:00
unknown
72c8db0709 Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.1
into sinisa.nasamreza.org:/mnt/work/mysql-4.1


sql/item.cc:
  Auto merged
2003-03-19 20:27:11 +02:00
unknown
c2297fb5ec configure.in:
Always compile utf8


configure.in:
  Always compile utf8
2003-03-19 19:33:26 +04:00
unknown
53c5d448a2 Strings comparison is now done according to "Collating sequences used for
comparison" table, "SQL Complete, Really", page 162
2003-03-19 19:13:28 +04:00
unknown
e38d200c85 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-3.23
into mysql.com:/home/mysql_src/mysql-3.23
2003-03-19 15:18:26 +01:00
unknown
8f739cd674 Do not silently do RESET MASTER when one does 'mysqldump --master-data' ;
only do it if the user specifies --delete-master-logs (new option).
Safer + fixes bug #159.


client/client_priv.h:
  New option --delete-master-logs for mysqldump
client/mysqldump.c:
  New option --delete-master-logs for mysqldump
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2003-03-19 15:16:51 +01:00
unknown
676f986838 Produce an error when arguments are not compatible for CONCAT() 2003-03-19 17:24:46 +04:00
unknown
2af67065cb Fixed a few typos, and translated new messages. 2003-03-19 14:13:37 +01:00
unknown
3b4dd0963d Fixed lots of typos, and translated a few messages. 2003-03-19 14:04:30 +01:00