1
0
mirror of https://github.com/MariaDB/server.git synced 2025-11-30 05:23:50 +03:00
Commit Graph

1718 Commits

Author SHA1 Message Date
unknown
5380411728 truncating REPLACE result bug fix
mysql-test/r/func_str.result:
  test result for truncating REPLACE result
mysql-test/t/func_str.test:
  test with long arguments for REPLACE
sql/item_strfunc.cc:
  fix for counting REPLACE result length
2003-03-30 18:36:01 +05:00
hf@deer.mysql.r18.ru
deca14ebde truncating REPLACE result bug fix 2003-03-30 18:36:01 +05:00
unknown
1fadf09793 small addition to fix of truncating in replace
sql/item_strfunc.cc:
  uint is better here
2003-03-28 18:18:22 +04:00
hf@deer.mysql.r18.ru
17176c8330 small addition to fix of truncating in replace 2003-03-28 18:18:22 +04:00
unknown
d93df08b12 Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into deer.mysql.r18.ru:/home/hf/work/mysql-4.1.rpc


sql/item_strfunc.cc:
  Auto merged
2003-03-28 05:50:58 +04:00
hf@deer.mysql.r18.ru
1dd380fb06 Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into deer.mysql.r18.ru:/home/hf/work/mysql-4.1.rpc
2003-03-28 05:50:58 +04:00
unknown
4efff5b313 Fix of the #173 bug
(Truncating of Replace result)


sql/item_strfunc.cc:
  max_length for Replace function was counted in wrong way
2003-03-26 23:31:42 +04:00
hf@deer.mysql.r18.ru
5b65745584 Fix of the #173 bug
(Truncating of Replace result)
2003-03-26 23:31:42 +04:00
unknown
9630bdffdd Merge with 4.0.13
BitKeeper/etc/gone:
  auto-union
BitKeeper/etc/logging_ok:
  auto-union
myisam/sort.c:
  Auto merged
mysql-test/r/group_by.result:
  Auto merged
mysql-test/r/join_outer.result:
  Auto merged
mysql-test/r/order_by.result:
  Auto merged
mysql-test/r/query_cache.result:
  Auto merged
mysql-test/r/type_blob.result:
  Auto merged
mysql-test/r/type_ranges.result:
  Auto merged
mysql-test/r/update.result:
  Auto merged
mysql-test/t/bdb-crash.test:
  Auto merged
mysql-test/t/group_by.test:
  Auto merged
mysql-test/t/join_outer.test:
  Auto merged
mysql-test/t/order_by.test:
  Auto merged
mysql-test/t/query_cache.test:
  Auto merged
mysql-test/t/type_blob.test:
  Auto merged
mysql-test/t/type_decimal.test:
  Auto merged
mysql-test/t/type_ranges.test:
  Auto merged
mysql-test/t/update.test:
  Auto merged
sql-bench/crash-me.sh:
  Auto merged
client/mysql.cc:
  Keep old code
2003-03-26 18:37:38 +02:00
monty@mashka.mysql.fi
3bed7a6131 Merge with 4.0.13 2003-03-26 18:37:38 +02:00
unknown
396328d5d7 item_strfunc.cc:
Fixed that concat() didn't set character set in val_str
  concat_ws() now honors coercibility


sql/item_strfunc.cc:
  Fixed that concat() didn't set character set in val_str
  concat_ws() now honors coercibility
2003-03-24 20:01:05 +04:00
bar@bar.mysql.r18.ru
d277db7f40 item_strfunc.cc:
Fixed that concat() didn't set character set in val_str
  concat_ws() now honors coercibility
2003-03-24 20:01:05 +04:00
unknown
8848bb894c item_strfunc.cc:
The result didn't return proper collation


sql/item_strfunc.cc:
  The result didn't return proper collation
2003-03-24 19:33:44 +04:00
bar@bar.mysql.r18.ru
9755e44f2e item_strfunc.cc:
The result didn't return proper collation
2003-03-24 19:33:44 +04:00
unknown
45e9ee67d1 item_strfunc.cc:
A bug has been fixed. ELT() didn't honor the second argument.
  Coercibility support has been added.


sql/item_strfunc.cc:
  A bug has been fixed. ELT() didn't honor the second argument.
  Coercibility support has been added.
2003-03-24 19:23:43 +04:00
bar@bar.mysql.r18.ru
d37ebc34c2 item_strfunc.cc:
A bug has been fixed. ELT() didn't honor the second argument.
  Coercibility support has been added.
2003-03-24 19:23:43 +04:00
unknown
3987075012 Fix for #178 Replicating INSERT VALUES(USER()) crashes (SEGV) the slave
Now it does not SEGV, but USER() is still badly replicated
    (it is replicated to ""), which is a lower priority bug.


sql/item_strfunc.cc:
  Fix for #178  Replicating INSERT VALUES(USER()) crashes (SEGV) the slave
  Now it does not SEGV, but USER() is still badly replicated
  (it is replicated to ""), which is a lower priority bug.
2003-03-22 15:22:59 +01:00
guilhem@mysql.com
17537ba797 Fix for #178 Replicating INSERT VALUES(USER()) crashes (SEGV) the slave
Now it does not SEGV, but USER() is still badly replicated
    (it is replicated to ""), which is a lower priority bug.
2003-03-22 15:22:59 +01: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
bar@bar.mysql.r18.ru
c87303d4a2 All charset related actions have been moved from fix_fields() to fix_length_and_dec() 2003-03-21 17:21:45 +04:00
unknown
676f986838 Produce an error when arguments are not compatible for CONCAT() 2003-03-19 17:24:46 +04:00
bar@bar.mysql.r18.ru
3c455e314b Produce an error when arguments are not compatible for CONCAT() 2003-03-19 17:24:46 +04:00
unknown
80630f12f3 Getting closer to be more SQL99 in dyadic operations
mysql-test/r/ctype_collate.result:
  NO COLLATION has less coercibility than IMPLICIT and COERCIBLE
sql/item.cc:
  Function to choose collation for dyadic operations
sql/item.h:
  NO COLLATION has less coercibility than IMPLICIT and COERCIBLE
sql/item_func.cc:
  Function to choose collation for dyadic operations
sql/item_strfunc.cc:
  Function to choose collation for dyadic operations
sql/item_strfunc.h:
  Use arg's attributes
2003-03-19 15:55:17 +04:00
bar@bar.mysql.r18.ru
f63218b39a Getting closer to be more SQL99 in dyadic operations 2003-03-19 15:55:17 +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
ram@mysql.r18.ru
031ac2a7b2 SRID support.
GeomertyFromWKB() function.
SRID() function.
::store() methods for Field_geom.
Code cleanup.
2003-03-18 15:30:32 +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
bar@bar.mysql.r18.ru
04db86f22a 2003-03-17 21:56:34 +04: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
mysql@home.(none)
c6efa7a8b7 New function my_charset_same() 2003-03-16 17:19:24 +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
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
unknown
92754ae2db 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
78da2ad7bd SELECT BINARY expr
is now synonim for
SELECT expr COLLATE <expr_charset>_bin
2003-03-04 19:53:53 +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
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
unknown
1019053392 New error message for situation like:
SELECT latin1_expr COLLATE anpther_charset_collation
2003-03-02 14:05:03 +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
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
bar@bar.mysql.r18.ru
cb6a0a4808 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
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
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
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
unknown
efcf8b57c7 item_strfunc.cc:
Fix


sql/item_strfunc.cc:
  Fix
2003-02-13 13:10:23 +04:00
bar@bar.mysql.r18.ru
32da4054ee item_strfunc.cc:
Fix
2003-02-13 13:10:23 +04:00
unknown
7f1d3ea038 item_strfunc.cc:
Fix


sql/item_strfunc.cc:
  Fix
2003-02-13 11:21:51 +04:00
bar@bar.mysql.r18.ru
58e00848d1 item_strfunc.cc:
Fix
2003-02-13 11:21:51 +04:00
unknown
fcb61f5917 Fixed a lot of wrong memory references as reported by valgrind
Portability fixes
Added new client function: mysql_get_server_version()
New server help code (From Victor Vagin)
Fixed wrong usage of binary()
Disabled RTREE usage for now.



BitKeeper/etc/ignore:
  added scripts/fill_help_tables.sql
client/mysql.cc:
  Some fixes when using 'help'
cmd-line-utils/libedit/compat.h:
  Portability fix
cmd-line-utils/libedit/fgetln.c:
  Portability fix
include/mysql.h:
  Added new client function: mysql_get_server_version()
libmysql/libmysql.c:
  Added new client function: mysql_get_server_version()
libmysqld/libmysqld.c:
  Fixed prototype
mysql-test/install_test_db.sh:
  Added creation of help tables
mysql-test/r/connect.result:
  Added help tables
mysql-test/r/myisam.result:
  Test of RTREE index
mysql-test/r/type_ranges.result:
  updated results
mysql-test/t/myisam.test:
  Test of RTREE index
mysql-test/t/type_ranges.test:
  Updated test
mysys/charset.c:
  Indentation change
mysys/my_symlink.c:
  Removed compiler warning
scripts/fill_help_tables.sh:
  Update for new help tables
sql/field.cc:
  Indentation changes
sql/filesort.cc:
  Optimized character set usage
sql/item_cmpfunc.cc:
  Fix wrong usage of binary()
sql/item_cmpfunc.h:
  Fix wrong usage of binary()
sql/item_func.cc:
  Fix wrong usage of binary()
sql/item_func.h:
  Fix wrong usage of binary()
sql/item_strfunc.cc:
  Fix wrong usage of binary()
sql/item_sum.cc:
  Fix wrong usage of binary()
sql/item_sum.h:
  Fix wrong usage of binary()
sql/key.cc:
  Indentation change
sql/lex.h:
  HELP -> HELP_SYM
sql/mysql_priv.h:
  Make get_field() more general
sql/password.c:
  Indentation change + variable initialisation moved
sql/sql_acl.cc:
  Make get_field() more general
sql/sql_base.cc:
  Added comments + assertion for double call to mysql_lock_tables
sql/sql_cache.cc:
  Indentation changes
sql/sql_class.h:
  Added need_strxnfrm to SORT_FIELD to be able to optimise character set handling in filesort
sql/sql_derived.cc:
  Renamed variables
sql/sql_help.cc:
  New help functions (from Victor Vagin)
sql/sql_lex.cc:
  Removed variables that doesn't have to be initialized for each query
sql/sql_lex.h:
  Removed not used variable (olap)
sql/sql_parse.cc:
  Fixed (not fatal) access of unitialized memory
  Indentation / code cleanup
sql/sql_prepare.cc:
  Indentaion cleanup
sql/sql_table.cc:
  Disabled RTREE until 5.0
sql/sql_udf.cc:
  Make get_field() more general
sql/sql_yacc.yy:
  Removed access to uninitialized memory
  Always set offset_limit and select_limit when using LIMIT (removed warnings)
  Allow usage of 'help week'
sql/table.cc:
  Make get_field() more general
  More comments
sql/table.h:
  Fixded type of TABLE_LIST->derived
sql/time.cc:
  Stricter date / datetime handling (to be able to handle timestamps with days and microseconds)
strings/ctype-bin.c:
  Added cha
2003-02-12 21:55:37 +02:00
monty@mashka.mysql.fi
e327393e9d Fixed a lot of wrong memory references as reported by valgrind
Portability fixes
Added new client function: mysql_get_server_version()
New server help code (From Victor Vagin)
Fixed wrong usage of binary()
Disabled RTREE usage for now.
2003-02-12 21:55:37 +02:00