Commit graph

7268 commits

Author SHA1 Message Date
serg@serg.mysql.com
cd3f3867ab trim spaces from CHAR() BINARY consistently 2003-03-06 14:58:37 +01:00
monty@mashka.mysql.fi
9257a27c82 Fixed character set bug when replicating user variables 2003-03-05 16:10:40 +02:00
bar@bar.mysql.r18.ru
78dff8fc2e Merge abarkov@work.mysql.com:/home/bk/mysql-4.1
into bar.mysql.r18.ru:/usr/home/bar/mysql-4.1
2003-03-05 16:43:43 +04:00
bar@bar.mysql.r18.ru
f5d6b4952f New fields in CHARSET_INFO structure to optimize searching for
binary and primary collations in the future
2003-03-05 16:43:10 +04:00
ram@mysql.r18.ru
008b9361bb Bug fix: we should set proper my_errno 2003-03-05 16:07:12 +04:00
bar@bar.mysql.r18.ru
4f930a7c2a SET NAMES has been extended to support optional collation:
SET NAMES <charset name> [COLLATE <collation name>]
2003-03-05 12:37:39 +04:00
lenz@mysql.com
a95c024067 - typo fix (replaced blanks with a tab) 2003-03-05 08:13:37 +01:00
venu@myvenu.com
582e8b929e Merge work.mysql.com:/home/bk/mysql-4.1
into myvenu.com:/home/venu/work/sql/dev-4.1
2003-03-04 14:33:25 -08:00
venu@myvenu.com
27b336c46b sql_prepare.cc:
Remove the unused code (from previous commit)
2003-03-04 14:31:42 -08:00
venu@myvenu.com
1f88025066 Fix EXPLAIN bug with binary protocol
Added new client tests (EXPLAIN + DECIMAL conv)
2003-03-04 14:22:30 -08:00
lenz@mysql.com
26f9bee733 - 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
greg@mysql.com
f11d1c66e9 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
greg@mysql.com
4309cfc25c Many files:
Change mode to -rwxrwxr-x
2003-03-04 12:30:29 -05:00
bar@bar.mysql.r18.ru
3fbd67e84e 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
bar@bar.mysql.r18.ru
78da2ad7bd SELECT BINARY expr
is now synonim for
SELECT expr COLLATE <expr_charset>_bin
2003-03-04 19:53:53 +04:00
greg@mysql.com[greg]
137bdcec5a novell41.patch 2003-03-04 10:34:32 -05:00
bar@bar.mysql.r18.ru
f95eb82934 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
monty@narttu.mysql.fi
143c85057e Fix for reading variables from binary log. 2003-03-04 15:17:29 +02:00
monty@narttu.mysql.fi
d0d071dca9 Fix for using unitialized mutex when running version compiled with --debug 2003-03-04 15:02:49 +02:00
bar@bar.mysql.r18.ru
6cbbbd6948 Fix for SHOW, it didn't display CHARACTER SET and COLLATE clause
for binary collations
2003-03-04 12:33:52 +04:00
bar@bar.mysql.r18.ru
c4dc670d61 Every character set now has binary collation 2003-03-04 11:04:19 +04:00
guilhem@mysql.com
dc634a18e9 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.
2003-03-03 23:12:17 +01:00
venu@myvenu.com
6a9273fa95 Merge work.mysql.com:/home/bk/mysql-4.1
into myvenu.com:/home/venu/work/sql/dev-4.1
2003-03-03 09:51:54 -08:00
ram@mysql.r18.ru
b4c6a20835 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
bar@bar.mysql.r18.ru
4ffd74e5de Coercibility is now stored in user vars 2003-03-03 13:16:39 +04:00
bar@bar.mysql.r18.ru
48cdd97866 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
venu@myvenu.com
64f0e4289d Fix for the windows src distribution script - SCRUM:
-- To take care of .zip and .tar
  -- Initialization of 'data' directory without any host dependancy data
  -- Incorporate all changes from Monty
2003-03-02 14:05:51 -08:00
bar@bar.mysql.r18.ru
b381cb0423 COLLATE tests 2003-03-02 16:19:26 +04:00
bar@bar.mysql.r18.ru
f9bf53fa67 sql_yacc.yy:
Produce an error when a field collation and charset are not compatible
2003-03-02 14:47:56 +04:00
bar@bar.mysql.r18.ru
475e64520b New error message for situation like:
SELECT latin1_expr COLLATE anpther_charset_collation
2003-03-02 14:05:03 +04:00
papa@gbichot.local
264d8c095d 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.
2003-03-01 23:59:27 +01:00
papa@gbichot.local
b9d94d2b6f 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.
2003-03-01 23:34:34 +01:00
serg@serg.mysql.com
35636c6bd0 Merge work:/home/bk/mysql-4.1
into serg.mysql.com:/usr/home/serg/Abk/mysql-4.1
2003-03-01 14:18:55 +01:00
ram@mysql.r18.ru
c3da09d629 Test case for spatial objects. 2003-03-01 13:16:39 +04:00
ram@mysql.r18.ru
760e51baa3 os_rename.c:
Typo fix.
2003-03-01 12:43:09 +04:00
ram@mysql.r18.ru
61ff8b6db3 os_rename.c:
Portability fix. GetLongPathName is not supported by Windows95.
2003-03-01 12:40:08 +04:00
ram@mysql.r18.ru
8ecf3a0b21 Added GeometryFromText, MultiPointFromText aliases.
Added GeometryCollection type.
2003-02-28 21:17:08 +04:00
bar@bar.mysql.r18.ru
8def9a3e93 item_func.cc:
Fix for coercibility of function
2003-02-28 20:56:18 +04:00
bar@bar.mysql.r18.ru
cb6a0a4808 item_strfunc.cc:
Charset conversion function changes coercibility to IMPLICIT
2003-02-28 20:25:25 +04:00
bar@bar.mysql.r18.ru
35b01c8e9e sql_yacc.yy:
_charset cast changes coercibility to implicit
item_strfunc.cc:
  Collation cast change coercibility to EXPLICIT
2003-02-28 20:20:24 +04:00
bar@bar.mysql.r18.ru
3046c3ca34 Many files:
Coercibility, initial stage
item_func.h:
  Coercibility, initial stage
2003-02-28 19:22:20 +04:00
monty@narttu.mysql.fi
959e1428da Merge work:/my/mysql-4.1 into narttu.mysql.fi:/my/mysql-4.1 2003-02-28 14:33:10 +02:00
monty@narttu.mysql.fi
9147f8b522 Portability fixes 2003-02-28 14:32:40 +02:00
monty@narttu.mysql.fi
050543bdfc Merge with 3.23 -> 4.0 2003-02-28 13:29:48 +02:00
monty@narttu.mysql.fi
a0148ee657 Portability fixes 2003-02-28 13:27:48 +02:00
monty@narttu.mysql.fi
41e2309259 Merge narttu.mysql.fi:/my/mysql-3.23 into narttu.mysql.fi:/my/mysql-4.0 2003-02-28 12:33:10 +02:00
monty@narttu.mysql.fi
9286552567 Added copying of *.slave-mi mysql-test files 2003-02-28 12:32:37 +02:00
igor@hundin.mysql.fi
3503d4797b 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.
2003-02-28 08:53:54 +02:00
monty@narttu.mysql.fi
a0d2a621ed Added detection if pthread_attr_getstacksize() exists
Fixed bug in RAND() usage in mysqlbinlog
2003-02-27 17:35:51 +02:00
bar@bar.mysql.r18.ru
47c770b3f7 sql_yacc.yy:
set names binary  didn't work
  ,
2003-02-27 17:45:40 +04:00