unknown
3f6a00d1ac
CONVERT class was removed
2003-03-18 17:01:32 +04:00
unknown
3ccd93c704
SRID support.
...
GeomertyFromWKB() function.
SRID() function.
::store() methods for Field_geom.
Code cleanup.
myisam/sp_key.c:
SRID support.
mysql-test/r/gis.result:
We should use GeometryFromWKB().
mysql-test/t/gis.test:
We should use GeometryFromWKB().
sql/field.cc:
SRID support.
::store() methods for Field_geom.
Code cleanup.
sql/field.h:
SRID support.
::store() methods for Field_geom.
Code cleanup.
sql/item_cmpfunc.cc:
SRID support.
Code cleanup.
sql/item_create.cc:
Code cleanup.
sql/item_create.h:
Code cleanup.
sql/item_func.cc:
SRID support.
Code cleanup.
sql/item_func.h:
SRID support.
sql/item_strfunc.cc:
SRID support.
GeometryFromWKB() function.
Code cleanup.
sql/item_strfunc.h:
SRID support.
GeometryFromWKB() function.
Code cleanup.
sql/lex.h:
GeometryFromWKB() function.
SRID() function.
sql/spatial.cc:
Code cleanup.
sql/spatial.h:
Code cleanup.
sql/sql_yacc.yy:
Fix for xxxFromText() functions.
GeometryFromWKB() function.
2003-03-18 15:30:32 +04:00
unknown
1c1f407dd3
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.r18.ru:/usr/home/ram/work/mysql-4.1.sp
2003-03-18 14:22:25 +04:00
unknown
18d3292bb7
SHOW CREATE TABLE didn't display field names in the proper charset
...
mysys/charset.c:
Clear all fields at the end of previous charset
2003-03-18 13:42:45 +04:00
unknown
2dae38c713
Replication were broken because of automatic charset conversion.
...
As a fix, my_charset_bin is now used in master-slave packets instead
of system_charset_info.
2003-03-18 11:34:19 +04:00
unknown
1159272c28
sql_yacc.yy:
...
SET NAMES BINARY now works
sql/sql_yacc.yy:
SET NAMES BINARY now works
2003-03-18 10:02:57 +04:00
unknown
89fee820fc
ctype_many.result:
...
new file
As far as bk could not apply delta,
I removed it. Now I'm adding the
new version into the tree again.
2003-03-17 22:01:57 +04:00
unknown
ac45472367
.del-ctype_many.result~9b541c4def2b5afb:
...
Delete: mysql-test/r/ctype_many.result
I could not commit it, bk told it can't apply binary delta
for textual file.
BitKeeper/deleted/.del-ctype_many.result~9b541c4def2b5afb:
Delete: mysql-test/r/ctype_many.result
2003-03-17 22:00:03 +04:00
unknown
84f0e11729
mysql-test/t/ctype_many.test:
...
Automatic client-server charset recoding has been added
mysys/charset.c:
Automatic client-server charset recoding has been added
sql/item.cc:
Automatic client-server charset recoding has been added
sql/item.h:
Automatic client-server charset recoding has been added
sql/item_cmpfunc.cc:
Automatic client-server charset recoding has been added
sql/item_func.cc:
Automatic client-server charset recoding has been added
sql/item_strfunc.cc:
Automatic client-server charset recoding has been added
sql/mysqld.cc:
Automatic client-server charset recoding has been added
sql/protocol.cc:
Automatic client-server charset recoding has been added
sql/sql_string.cc:
Automatic client-server charset recoding has been added
sql/sql_yacc.yy:
Automatic client-server charset recoding has been added
strings/ctype-utf8.c:
Automatic client-server charset recoding has been added
2003-03-17 21:56:34 +04:00
unknown
3ca97c63ba
ctype_collate.result:
...
Automatic client-server charset recoding has been added
mysql-test/r/ctype_collate.result:
Automatic client-server charset recoding has been added
2003-03-17 21:52:03 +04:00
unknown
d2387b1ac7
sql_show.cc:
...
Bug fix
0 stayed for length here, now it is charset.
sql/sql_show.cc:
Bug fix
2003-03-17 17:30:34 +04:00
unknown
61ca875e7b
sql_string.cc:
...
Copy as is if src or dst are binary
sql/sql_string.cc:
Copy as is if src or dst are binary
2003-03-17 13:40:40 +04:00
unknown
3a407e5892
Preparing to client<->server autoconvert
2003-03-17 13:14:04 +04:00
unknown
11bd599063
sql_select.cc:
...
binary comparing alway must be used, because sort_string() is executed for textual data.
sql/sql_select.cc:
binary comparing alway must be used, because sort_string() is executed for textual data.
2003-03-17 10:47:08 +04:00
unknown
59bf6f6ea5
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mashka.mysql.fi:/home/my/mysql-4.1
sql/mysqld.cc:
Auto merged
2003-03-16 16:34:55 +02:00
unknown
ed2bb40a9a
New function my_charset_same()
...
BitKeeper/etc/logging_ok:
Logging to logging@openlogging.org accepted
2003-03-16 17:19:24 +04:00
unknown
23f252855e
system_charset_info has been moved to /sql directory
...
and isn't used in libraries any longer
2003-03-16 12:30:10 +04:00
unknown
2aa9f20735
mysqltest.c, mysqlimport.c, mysqldump.c, mysqlcheck.c, mysql.cc:
...
system_charset_info was removed
client/mysql.cc:
system_charset_info was removed
client/mysqlcheck.c:
system_charset_info was removed
client/mysqldump.c:
system_charset_info was removed
client/mysqlimport.c:
system_charset_info was removed
client/mysqltest.c:
system_charset_info was removed
2003-03-16 11:20:45 +04:00
unknown
6b11fa3a24
set_default_charset() is not used anymore
...
Some system_charset_info were removed
BitKeeper/etc/logging_ok:
Logging to logging@openlogging.org accepted
2003-03-16 10:56:14 +04:00
unknown
a4d8174473
Merge abarkov@build.mysql.com:/home/bk/mysql-4.1
...
into bar.mysql.r18.ru:/usr/home/bar/mysql-4.1
2003-03-15 17:25:41 +04:00
unknown
20a28bdc68
sql_parse.cc, sql_db.cc:
...
less system_charset_info
sql/sql_db.cc:
less system_charset_info
sql/sql_parse.cc:
less system_charset_info
2003-03-15 17:24:21 +04:00
unknown
9e7b3cde60
Merge
...
sql/item_subselect.cc:
Auto merged
sql/sql_select.cc:
Auto merged
mysql-test/r/subselect.result:
SCCS merged
mysql-test/t/subselect.test:
SCCS merged
2003-03-15 14:16:57 +02:00
unknown
ced5e414b6
Merge abelkin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into sanja.is.com.ua:/home/bell/mysql/mysql-4.1
2003-03-15 13:35:40 +02:00
unknown
23c774bc72
sql_lex.cc:
...
Use LEX charset instead of system one
sql/sql_lex.cc:
Use LEX charset instead of system one
2003-03-15 15:19:06 +04:00
unknown
9e4c1d2090
Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.1
...
into sanja.is.com.ua:/home/bell/mysql/work-leak-4.1
2003-03-15 13:04:34 +02:00
unknown
aad26453e6
fixed typo (double ++ in assert)
...
removed all side effects from asserts for not to confuse casual reader
2003-03-15 11:56:03 +01:00
unknown
6c546f765c
Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.1
...
into sanja.is.com.ua:/home/bell/mysql/work-leak-4.1
mysql-test/r/subselect.result:
Auto merged
sql/item_subselect.cc:
Auto merged
2003-03-15 11:24:44 +02:00
unknown
f42419e4b3
Merge bk-internal:/home/bk/mysql-4.1/
...
into serg.mysql.com:/usr/home/serg/Abk/mysql-4.1
sql/sql_select.cc:
Auto merged
sql/sql_select.h:
Auto merged
strings/ctype-bin.c:
Auto merged
2003-03-14 20:25:50 +01:00
unknown
c03b4b7255
cleanup
2003-03-14 20:22:06 +01:00
unknown
d60c11be84
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into myvenu.com:/home/venu/work/sql/dev-4.1
2003-03-14 10:44:08 -08:00
unknown
892879901e
Fix for not to assert in DBUG mode when the result type is INT24 as data is sent in INT32 format
...
(normal protocol only, prepared protocol already handles it)
sql/protocol.cc:
Fix for not to assert in DBUG mode when the result type is INT24 as data is sent in INT32 format
2003-03-14 10:35:13 -08:00
unknown
2d8fb430ba
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mashka.mysql.fi:/home/my/mysql-4.1
sql/mysqld.cc:
Auto merged
2003-03-14 17:03:42 +02:00
unknown
1aeec73192
Merge abarkov@build.mysql.com:/home/bk/mysql-4.1
...
into bar.mysql.r18.ru:/usr/home/bar/mysql-4.1
sql/sql_lex.h:
Auto merged
2003-03-14 18:11:20 +04:00
unknown
aeb47edbbc
Every charset now have its own parser state arrays
2003-03-14 18:08:12 +04:00
unknown
6da897e04b
fixed uncachable union (bug #150 )
...
mysql-test/r/union.result:
sect of uncachable union
mysql-test/t/union.test:
sect of uncachable union
sql/sql_lex.h:
fixed uncachable union
2003-03-14 14:16:09 +02:00
unknown
13d28097e7
Merge abarkov@build.mysql.com:/home/bk/mysql-4.1
...
into bar.mysql.r18.ru:/usr/home/bar/mysql-4.1
2003-03-13 16:23:48 +04:00
unknown
fa2dfa0116
sql_lex.cc:
...
Move all charset recoding to the same place
sql/sql_lex.cc:
Move all charset recoding to the same place
2003-03-13 16:23:18 +04:00
unknown
bfaa1d9a2b
filesort.cc, sql_analyse.cc, item_func.cc, item_strfunc.cc, field.cc:
...
Unnesessary binary() calls have been removed
sql/field.cc:
Unnesessary binary() calls have been removed
sql/item_strfunc.cc:
Unnesessary binary() calls have been removed
sql/item_func.cc:
Unnesessary binary() calls have been removed
sql/sql_analyse.cc:
Unnesessary binary() calls have been removed
sql/filesort.cc:
Unnesessary binary() calls have been removed
2003-03-13 15:34:46 +04:00
unknown
a6e8de843d
Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into gluh.mysql.r18.ru:/home/gluh/mysql-4.1.test
2003-03-13 14:13:17 +04:00
unknown
9fb88bfb14
Fix for embeded library compile
2003-03-13 14:12:28 +04:00
unknown
dd93a7994a
Case insensitivrly has been added in charset and collation names.
2003-03-13 12:54:34 +04:00
unknown
c9f1881cc6
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.r18.ru:/usr/home/ram/work/mysql-4.1.sp
2003-03-13 12:08:50 +04:00
unknown
85243c1086
A fix for mysql client program when use
or connect
were used
...
without arguments ...
client/mysql.cc:
A fix for bug #90
2003-03-12 21:43:40 +02:00
unknown
be079a5d78
Test case for rtree indexes.
2003-03-12 16:52:02 +04:00
unknown
92c9dc34b4
ALTER TABLE ADD SPATIAL KEY bug fix
...
myisam/mi_check.c:
Additional condition added - we only can create
spatial key row-by-row now
2003-03-12 15:37:39 +04:00
unknown
4901295af1
Conflicts relsolving
...
mysql-test/t/rpl_rotate_logs.test:
Auto merged
sql/lex.h:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/set_var.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_repl.cc:
Auto merged
sql/sql_repl.h:
Auto merged
2003-03-11 16:32:17 +04:00
unknown
83814ef429
Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.1
...
into sanja.is.com.ua:/home/bell/mysql/work-in-4.1
sql/item_cmpfunc.cc:
Auto merged
2003-03-11 13:26:26 +02:00
unknown
79a6e9dcda
fixed cached constsnt determination (bug #142 related)
...
mysql-test/r/subselect.result:
test of constant redecing
mysql-test/t/subselect.test:
test of constant redecing
sql/item_cmpfunc.cc:
fixed cached constsnt determination
2003-03-11 12:43:30 +02:00
unknown
92457d6e45
Added 'PURGE LOGS BEFORE' command
...
Added expire-logs-days option
mysql-test/r/rpl_rotate_logs.result:
Added test for 'PURGE LOGS BEFORE'
mysql-test/t/rpl_rotate_logs.test:
Added test for 'PURGE LOGS BEFORE'
sql/log.cc:
For 'Purge logs before' command
sql/mysqld.cc:
Added 'expire-logs-days' option
sql/set_var.cc:
Added 'expire-logs-days' option
sql/sql_class.h:
For 'Purge logs before' command
sql/sql_parse.cc:
Added 'expire-logs-days' option
sql/sql_yacc.yy:
For 'Purge logs before' command
2003-03-11 13:49:06 +04:00
unknown
e704dc5ee1
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mashka.mysql.fi:/home/my/mysql-4.1
sql/mysqld.cc:
Auto merged
2003-03-11 00:39:55 +02:00