Commit graph

7256 commits

Author SHA1 Message Date
unknown
b10c79a889 - added missing file mysql-test/std_data/des_key_file to source and binary
distribution to fix a test failure in test "func_encrypt"
2003-03-04 22:24:00 +01:00
unknown
c18b50d5e4 Merge gweir@work.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/greg/bk/mysql-4.1
2003-03-04 12:30:51 -05:00
unknown
5f1f2216b3 Many files:
Change mode to -rwxrwxr-x


netware/BUILD/compile-AUTOTOOLS:
  Change mode to -rwxrwxr-x
netware/BUILD/compile-linux-tools:
  Change mode to -rwxrwxr-x
netware/BUILD/compile-netware-END:
  Change mode to -rwxrwxr-x
netware/BUILD/compile-netware-START:
  Change mode to -rwxrwxr-x
netware/BUILD/compile-netware-all:
  Change mode to -rwxrwxr-x
netware/BUILD/compile-netware-debug:
  Change mode to -rwxrwxr-x
netware/BUILD/compile-netware-standard:
  Change mode to -rwxrwxr-x
netware/BUILD/mwasmnlm:
  Change mode to -rwxrwxr-x
netware/BUILD/mwccnlm:
  Change mode to -rwxrwxr-x
netware/BUILD/mwenv:
  Change mode to -rwxrwxr-x
netware/BUILD/mwldnlm:
  Change mode to -rwxrwxr-x
2003-03-04 12:30:29 -05:00
unknown
693d76ffe9 Merge abarkov@work.mysql.com:/home/bk/mysql-4.1
into bar.mysql.r18.ru:/usr/home/bar/mysql-4.1
2003-03-04 19:54:41 +04:00
unknown
92754ae2db SELECT BINARY expr
is now synonim for
SELECT expr COLLATE <expr_charset>_bin
2003-03-04 19:53:53 +04:00
unknown
4d9b1f3be6 novell41.patch
BitKeeper/deleted/.del-libmysqld.def~6ca0fa0537a3431c:
  Delete: netware/libmysqld.def
BitKeeper/deleted/.del-mwenv~35c8b56062f4b6aa:
  Delete: netware/mw/mwenv
BitKeeper/deleted/.del-nwconfigure~86da352b5e031ed9:
  Delete: netware/nwconfigure
netware/BUILD/mwasmnlm:
  Import patch novell41.patch
netware/BUILD/mwccnlm:
  Import patch novell41.patch
netware/BUILD/mwldnlm:
  Import patch novell41.patch
netware/BUILD/nwbootstrap:
  Import patch novell41.patch
scripts/make_binary_distribution.sh:
  Import patch novell41.patch
2003-03-04 10:34:32 -05:00
unknown
3cbb978d51 stringcmp() and sortcmp() have been unified
into the only one sortcmp() with additional
CHARSET_INFO *cmp_charset argument.
2003-03-04 18:01:59 +04:00
unknown
9dfa4eb60a Fix for reading variables from binary log. 2003-03-04 15:17:29 +02:00
unknown
6d1ab2314f Fix for using unitialized mutex when running version compiled with --debug
include/mysql_embed.h:
  Disable shared memory for embedded version
libmysqld/lib_sql.cc:
  Fix for --debug version (init_thread_environment was called in wrong place)
sql/log_event.h:
  Portability fix
sql/mysqld.cc:
  Fix for --debug version (init_thread_environment was called in wrong place)
sql/sql_parse.cc:
  Simply code cleanup
2003-03-04 15:02:49 +02:00
unknown
7e2aca564e Fix for SHOW, it didn't display CHARACTER SET and COLLATE clause
for binary collations
2003-03-04 12:33:52 +04:00
unknown
9d02a87cf3 Every character set now has binary collation 2003-03-04 11:04:19 +04:00
unknown
a49822237d Do not give an error when the user does START SLAVE on an already
running slave, just give a warning. Same thing for STOP SLAVE.
This will make scripts writing easier for users.


include/mysqld_error.h:
  New error codes (warning codes in fact) to warn that the slave was already started or stopped
mysql-test/include/master-slave.inc:
  STOP SLAVE now prints a warning, not an error, so we should expect a warning here
sql/share/czech/errmsg.txt:
  New messages to warn that the slave was already started or stopped
sql/share/danish/errmsg.txt:
  New messages to warn that the slave was already started or stopped
sql/share/dutch/errmsg.txt:
  New messages to warn that the slave was already started or stopped
sql/share/english/errmsg.txt:
  New messages to warn that the slave was already started or stopped
sql/share/estonian/errmsg.txt:
  New messages to warn that the slave was already started or stopped
sql/share/french/errmsg.txt:
  New messages to warn that the slave was already started or stopped
sql/share/german/errmsg.txt:
  New messages to warn that the slave was already started or stopped
sql/share/greek/errmsg.txt:
  New messages to warn that the slave was already started or stopped
sql/share/hungarian/errmsg.txt:
  New messages to warn that the slave was already started or stopped
sql/share/italian/errmsg.txt:
  New messages to warn that the slave was already started or stopped
sql/share/japanese/errmsg.txt:
  New messages to warn that the slave was already started or stopped
sql/share/korean/errmsg.txt:
  New messages to warn that the slave was already started or stopped
sql/share/norwegian-ny/errmsg.txt:
  New messages to warn that the slave was already started or stopped
sql/share/norwegian/errmsg.txt:
  New messages to warn that the slave was already started or stopped
sql/share/polish/errmsg.txt:
  New messages to warn that the slave was already started or stopped
sql/share/portuguese/errmsg.txt:
  New messages to warn that the slave was already started or stopped
sql/share/romanian/errmsg.txt:
  New messages to warn that the slave was already started or stopped
sql/share/russian/errmsg.txt:
  New messages to warn that the slave was already started or stopped
sql/share/serbian/errmsg.txt:
  New messages to warn that the slave was already started or stopped
sql/share/slovak/errmsg.txt:
  New messages to warn that the slave was already started or stopped
sql/share/spanish/errmsg.txt:
  New messages to warn that the slave was already started or stopped
sql/share/swedish/errmsg.txt:
  New messages to warn that the slave was already started or stopped
sql/share/ukrainian/errmsg.txt:
  New messages to warn that the slave was already started or stopped
sql/sql_repl.cc:
  Do not give an error when the user does START SLAVE on an already
  running slave, just give a warning. Same thing for STOP SLAVE.
2003-03-03 23:12:17 +01:00
unknown
c68620e6cc Merge rkalimullin@work.mysql.com:/home/bk/mysql-4.1
into mysql.r18.ru:/usr/home/ram/work/mysql-4.1
2003-03-03 17:20:48 +04:00
unknown
48df5b7537 Coercibility is now stored in user vars
sql/item.h:
  Change constant values order according to the word "coercibility" nature
sql/item_func.cc:
  Change constant values order according to the word "coercibility" nature
2003-03-03 13:16:39 +04:00
unknown
310545adf0 Strings which appear without charset context,
like number-to-string-convertion-result, now 
takes current database character set, instead of
thread character set. This makes it easy to be
SQL99 conformant and 4.0 compatible.

Item->thd_charset() is renamed to Item->default_charset()
as old name doesn't describe its nature anymore.
2003-03-03 10:53:08 +04:00
unknown
16cdf759a1 COLLATE tests 2003-03-02 16:19:26 +04:00
unknown
08387526d4 sql_yacc.yy:
Produce an error when a field collation and charset are not compatible


sql/sql_yacc.yy:
  Produce an error when a field collation and charset are not compatible
2003-03-02 14:47:56 +04:00
unknown
1019053392 New error message for situation like:
SELECT latin1_expr COLLATE anpther_charset_collation
2003-03-02 14:05:03 +04:00
unknown
0d19df2f5d Replication: give the slave I/O thread a higher priority than the slave SQL thread
so that it has fetched the most from the master's binlog before the master
accidently dies. SCRUM task #756.


sql/slave.cc:
  Replication: give the slave I/O thread a higher priority than the slave SQL thread
  so that it has fetched the most from the master's binlog before the master
  accidently dies.
sql/slave.h:
  Replication: give the slave I/O thread a higher priority than the slave SQL thread
  so that it has fetched the most from the master's binlog before the master
  accidently dies.
2003-03-01 23:59:27 +01:00
unknown
e376fa6186 Added options reconnect/enable-reconnect/disable-reconnect/skip-reconnect to the 'mysql' command-line client.
Disabling can be safer when the server silently dies & restarts.
This is for SCRUM task #727.


client/client_priv.h:
  Added options reconnect/enable-reconnect/disable-reconnect/skip-reconnect to the 'mysql' command-line client
client/mysql.cc:
  Added options reconnect/enable-reconnect/disable-reconnect/skip-reconnect to the 'mysql' command-line client.
  Disabling can be safer when the server silently dies & restarts.
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2003-03-01 23:34:34 +01:00
unknown
67b5eb7fa0 Merge work:/home/bk/mysql-4.1
into serg.mysql.com:/usr/home/serg/Abk/mysql-4.1


BitKeeper/etc/ignore:
  auto-union
sql/sql_select.cc:
  Auto merged
2003-03-01 14:18:55 +01:00
unknown
d9b08701b5 Test case for spatial objects. 2003-03-01 13:16:39 +04:00
unknown
9ef473b963 os_rename.c:
Typo fix.


bdb/os_win32/os_rename.c:
  Typo fix.
2003-03-01 12:43:09 +04:00
unknown
4d3713d64d os_rename.c:
Portability fix. GetLongPathName is not supported by Windows95.


bdb/os_win32/os_rename.c:
  Portability fix. GetLongPathName is not supported by Windows95.
2003-03-01 12:40:08 +04:00
unknown
77f8757a5e Added GeometryFromText, MultiPointFromText aliases.
Added GeometryCollection type.
2003-02-28 21:17:08 +04:00
unknown
da29142e84 item_func.cc:
Fix for coercibility of function


sql/item_func.cc:
  Fix for coercibility of function
2003-02-28 20:56:18 +04:00
unknown
26231c2363 item_strfunc.cc:
Charset conversion function changes coercibility to IMPLICIT


sql/item_strfunc.cc:
  Charset conversion function changes coercibility to IMPLICIT
2003-02-28 20:25:25 +04:00
unknown
882aed0d0b sql_yacc.yy:
_charset cast changes coercibility to implicit
item_strfunc.cc:
  Collation cast change coercibility to EXPLICIT


sql/item_strfunc.cc:
  Collation cast change coercibility to EXPLICIT
sql/sql_yacc.yy:
  _charset cast changes coercibility to implicit
2003-02-28 20:20:24 +04:00
unknown
1a2c7c18a1 Many files:
Coercibility, initial stage
item_func.h:
  Coercibility, initial stage


sql/item_func.h:
  Coercibility, initial stage
sql/item.cc:
   Coercibility, initial stage
sql/item_create.cc:
   Coercibility, initial stage
sql/item_create.h:
   Coercibility, initial stage
sql/item.h:
   Coercibility, initial stage
sql/item_func.cc:
   Coercibility, initial stage
sql/lex.h:
   Coercibility, initial stage
sql/sql_yacc.yy:
   Coercibility, initial stage
2003-02-28 19:22:20 +04:00
unknown
d9965d3174 Merge work:/my/mysql-4.1 into narttu.mysql.fi:/my/mysql-4.1 2003-02-28 14:33:10 +02:00
unknown
2ef62c12aa Portability fixes
cmd-line-utils/libedit/readline.c:
  Portability fix (For IRIX)
include/my_global.h:
  Portability fix (For Tru64)
include/my_xml.h:
  Portability fix (True64)
  ('leave' is already defined)
strings/xml.c:
  Portability fix (True64)
2003-02-28 14:32:40 +02:00
unknown
21a32d758e Merge with 3.23 -> 4.0
configure.in:
  Auto merged
include/config-win.h:
  Auto merged
include/thr_lock.h:
  Auto merged
mysql-test/Makefile.am:
  Auto merged
sql/repl_failsafe.cc:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/log_event.cc:
  merge
sql/mysqld.cc:
  merge
2003-02-28 13:29:48 +02:00
unknown
352beccce6 Portability fixes
include/config-win.h:
  Removed wrong ;
include/my_global.h:
  Portability fix for AIX
2003-02-28 13:27:48 +02:00
unknown
654878ac74 Merge narttu.mysql.fi:/my/mysql-3.23 into narttu.mysql.fi:/my/mysql-4.0
mysql-test/Makefile.am:
  Auto merged
2003-02-28 12:33:10 +02:00
unknown
41e10e728e Added copying of *.slave-mi mysql-test files 2003-02-28 12:32:37 +02:00
unknown
b5c467786e func_group.result:
Added new tests for better coverage of
  min/max optimization code.
func_group.test:
  Added new tests for better coverage of 
  min/max optimization code.
opt_sum.cc:
  Fixed wrong previous manual merge.
  Fixed bugs concerning fields used in min/max
  functions for which there are conditions of
  the form field=const.


sql/opt_sum.cc:
  Fixed wrong previous manual merge.
  Fixed bugs concerning fields used in min/max
  functions for which there are conditions of
  the form field=const.
mysql-test/t/func_group.test:
  Added new test for better coverage of 
  min/max optimization code.
mysql-test/r/func_group.result:
  Added new tests for better coverage of
  min/max optimization code.
2003-02-28 08:53:54 +02:00
unknown
e6dad70436 Added detection if pthread_attr_getstacksize() exists
Fixed bug in RAND() usage in mysqlbinlog


configure.in:
  Added detection if pthread_attr_getstacksize() exists
include/thr_lock.h:
  Fixed wrong comment
sql/log_event.cc:
  Fixed bug in RAND() usage in mysqlbinlog
sql/mysqld.cc:
  Portablity fix
sql/repl_failsafe.cc:
  Set host_or_ip for system threads (to make other code simpler)
sql/slave.cc:
  Set host_or_ip for system threads (to make other code simpler)
sql/sql_class.cc:
  Set host_or_ip for system threads (to make other code simpler)
sql/sql_insert.cc:
  Set host_or_ip for system threads (to make other code simpler)
sql/sql_show.cc:
  Set host_or_ip for system threads (to make other code simpler)
2003-02-27 17:35:51 +02:00
unknown
c00be6a648 sql_yacc.yy:
set names binary  didn't work
  ,


sql/sql_yacc.yy:
  set names binary  didn't work
  ,
2003-02-27 17:45:40 +04:00
unknown
f047e28068 sql_yacc.yy, item_strfunc.cc:
Two separate functions charset() and collatio()
item_strfunc.h:
  Two separate functions charset() and collation()


sql/item_strfunc.cc:
  Two separate functions charset() and collatio()
sql/item_strfunc.h:
  Two separate functions charset() and collation()
sql/sql_yacc.yy:
  Two separate functions charset() and collatio()
2003-02-27 16:53:10 +04:00
unknown
4d1cb030db fixed bug on case insensetive file systems 2003-02-27 12:45:00 +02:00
unknown
be9a61f175 Add missing SIGNAL_WITH_VIO_CLOSE to fix problem with SLAVE STOP on windows 2003-02-27 11:20:07 +02:00
unknown
98e8d472cf Merge ibabaev@work.mysql.com:/home/bk/mysql-4.1
into hundin.mysql.fi:/home/igor/dev/mysql-4.1
2003-02-27 11:03:38 +02:00
unknown
14231ff5d5 field.cc:
Now all text fields convert data into proper charset before storing


sql/field.cc:
  Now all text fields convert data into proper charset before storing
2003-02-27 12:10:41 +04:00
unknown
593b2fc238 Merge ibabaev@work.mysql.com:/home/bk/mysql-4.1
into hundin.mysql.fi:/home/igor/dev/mysql-4.1
2003-02-27 10:02:36 +02:00
unknown
c015eb9cf8 func_group.result, func_group.test:
Added tests for extended max/min optimization
opt_sum.cc:
  Extended min/max optimization


sql/opt_sum.cc:
  Extended min/max optimization
mysql-test/t/func_group.test:
  Added tests for extended max/min optimization
mysql-test/r/func_group.result:
  Added tests for extended max/min optimization
2003-02-27 10:01:50 +02:00
unknown
4d36263ea8 ctype_many.test:
Insert constants with an explicit character set
ctype_many.result:
  Fix according test change


mysql-test/r/ctype_many.result:
  Fix according test change
mysql-test/t/ctype_many.test:
  Insert constants with an explicit character set
2003-02-27 11:48:48 +04:00
unknown
e3b22fbbe2 field.cc:
rename len -> length, to look in common style


sql/field.cc:
  rename len -> length, to look in common style
2003-02-27 11:44:45 +04:00
unknown
ea058779c1 Merge work:/my/mysql-4.1 into narttu.mysql.fi:/my/mysql-4.1
sql/item_func.cc:
  Auto merged
sql/lex.h:
  Auto merged
sql/sql_show.cc:
  Auto merged
2003-02-27 04:07:29 +02:00
unknown
e943ca1fc3 Merge with 4.0
mysql-test/r/bigint.result:
  Auto merged
mysql-test/t/bigint.test:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_load.cc:
  Auto merged
sql/item.h:
  merge (use local copy)
sql/sql_show.cc:
  merge
2003-02-27 03:49:26 +02:00
unknown
669cbe6e5f Portability fixes
Don't define crc32 if we are not linking with gzip


cmd-line-utils/libedit/libedit_term.h:
  Rename: cmd-line-utils/libedit/term.h -> cmd-line-utils/libedit/libedit_term.h
BitKeeper/etc/ignore:
  added scripts/make_win_src_distribution
client/connect_test.c:
  Removed wrong include file
  (my_global.h should never be included by an external client)
client/insert_test.c:
  Removed wrong include file
  (my_global.h should never be included by an external client)
client/select_test.c:
  Removed wrong include file
  (my_global.h should never be included by an external client)
cmd-line-utils/libedit/Makefile.am:
  Portability fixes (for HPUX11 and AIX)
cmd-line-utils/libedit/el.h:
  Portability fixes (for HPUX11 and AIX)
cmd-line-utils/libedit/key.h:
  Portability fixes (for HPUX11 and AIX)
cmd-line-utils/libedit/makelist:
  Portability fixes (for HPUX11 and AIX)
cmd-line-utils/libedit/read.c:
  Portability fixes (for HPUX11 and AIX)
cmd-line-utils/libedit/readline.c:
  Portability fixes (for HPUX11 and AIX)
cmd-line-utils/libedit/readline/readline.h:
  Systems that has sys/cdefs may not have __BEGIN_DECLS
cmd-line-utils/libedit/sig.c:
  sig_t is not portable
cmd-line-utils/libedit/sig.h:
  sig_t is not portable
cmd-line-utils/libedit/term.c:
  Portablity fixes
  Fixed core dump when using a terminal without arrow key definitions
heap/_check.c:
  Portability fix
heap/hp_hash.c:
  Portability fix
heap/hp_rkey.c:
  Portability fix
include/my_global.h:
  Portability fixes for HPUX11
libmysql/libmysql.c:
  Removed wrong cast
mysql-test/r/union.result:
  New union tests
mysql-test/t/union.test:
  New union tests
sql/gen_lex_hash.cc:
  Fixed portability bug.
sql/gstream.h:
  Portablity fix
sql/item_create.cc:
  Don't define crc32 if we are not linking with gzip
sql/item_create.h:
  Don't define crc32 if we are not linking with gzip
sql/item_func.cc:
  Don't define crc32 if we are not linking with gzip
sql/item_func.h:
  Don't define crc32 if we are not linking with gzip
sql/lex.h:
  Don't define crc32 if we are not linking with gzip
sql/sql_show.cc:
  Name can't be NULL
2003-02-27 03:44:44 +02:00