Commit graph

3310 commits

Author SHA1 Message Date
bar@bar.mysql.r18.ru
b4c8ecd8bc filesort.cc, sql_analyse.cc, item_func.cc, item_strfunc.cc, field.cc:
Unnesessary binary() calls have been removed
2003-03-13 15:34:46 +04:00
gluh@gluh.mysql.r18.ru
3d61d2d973 Conflicts relsolving 2003-03-11 16:32:17 +04:00
gluh@gluh.mysql.r18.ru
e7f4bf5b27 Added 'PURGE LOGS BEFORE' command
Added expire-logs-days option
2003-03-11 13:49:06 +04:00
Sinisa@sinisa.nasamreza.org
9c8838749f Fix for a bug with ROW(..) <=> ROW(...) 2003-03-10 20:54:18 +02:00
Sinisa@sinisa.nasamreza.org
dafa51eced Fix for a crashing bug 2003-03-08 22:19:41 +02:00
Sinisa@sinisa.nasamreza.org
3ee8d6e37e Merge sinisa@work.mysql.com:/home/bk/mysql-4.1
into sinisa.nasamreza.org:/mnt/work/mysql-4.1
2003-03-07 21:48:22 +02:00
Sinisa@sinisa.nasamreza.org
4d4ac0ede3 An interim code cleanup.
Major re-write of code yet has to be done, to circumvent
assigning of UNIT to current select and to deal better with 
offset, limit.
2003-03-07 21:47:04 +02:00
bar@bar.mysql.r18.ru
391b3ec636 item_func.cc, item_cmpfunc.cc, unireg.cc, table.cc, sql_base.cc:
some default_charset_info were removed
2003-03-07 13:39:53 +04:00
bar@bar.mysql.r18.ru
9994e625ff sql_load.cc:
LOAD DATA INFILE now uses database character set instead of server character set. This is not excellent but at least allows to load for example cyrillic data into cyrillic database if server charset is latin1. In the future we should add a syntax to specify file charset or evern charset of each field.
2003-03-07 12:55:55 +04:00
bar@bar.mysql.r18.ru
4b5bfe990f sql_acl.cc, item.h:
use of new argument
sql_analyse.h:
  macros from mysql_priv.h. Should be deleted soon.
mysql_priv.h:
  _default_charset_info has been removed
item_cmpfunc.h:
  Use cmp_charset
hostname.cc, hash_filo.h:
  Move charset to constructor argument
2003-03-07 12:21:32 +04:00
bar@bar.mysql.r18.ru
d09d2b85fe New syntax to change client collation:
SET COLLATION latin1
SET COLLATION 'latin1'
SET COLLATION DEFAULT
2003-03-07 11:54:26 +04:00
wax@kishkin.ru
b6a117fb2c Merge kishkin.ru:/home/wax/mysql-4n into kishkin.ru:/home/wax/mysql-4nh 2003-03-07 03:44:15 +05:00
Sinisa@sinisa.nasamreza.org
57ed8b11fd merge fixes 2003-03-06 17:31:22 +02:00
Sinisa@sinisa.nasamreza.org
ffa8a47b6d three bug fixes and major code cleanup 2003-03-06 17:02:10 +02:00
ram@mysql.r18.ru
8243eeeefc Bug fix: should use float8get() instead of (double *) type cast.
Code clean-up according 'Coding Standards and Styles'
2003-03-06 15:44:52 +04: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
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
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
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
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
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
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
wax@kishkin.ru
15e69055a1 URGENT fixed bug in shared memory (handler_count) 2003-03-02 19:35:37 +05: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
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
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
050543bdfc Merge with 3.23 -> 4.0 2003-02-28 13:29:48 +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
bar@bar.mysql.r18.ru
8f90a0329b sql_yacc.yy, item_strfunc.cc:
Two separate functions charset() and collatio()
item_strfunc.h:
  Two separate functions charset() and collation()
2003-02-27 16:53:10 +04:00
bell@sanja.is.com.ua
7db4ec2965 fixed bug on case insensetive file systems 2003-02-27 12:45:00 +02:00
igor@hundin.mysql.fi
fa249d2d87 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
bar@bar.mysql.r18.ru
e8412e9ea5 field.cc:
Now all text fields convert data into proper charset before storing
2003-02-27 12:10:41 +04:00
igor@hundin.mysql.fi
ac29af0221 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