mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-25 00:04:33 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
8496 commits 2774 branches 343 tags 1.6 GiB
Commit graph

8496 commits

This branch
This branch
All branches
Author SHA1 Message Date
unknown
dfdb1e831b after review patch 2003-06-27 23:00:33 +03:00
unknown
c1ea9f5d05 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 
into sanja.is.com.ua:/home/bell/mysql/bk/work-order-4.1


sql/sql_select.cc:
  Auto merged
 2003-06-27 22:19:14 +03:00
unknown
673e155785 Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1 
into teton.kitebird.com:/home/paul/mysql-4.1
 2003-06-27 12:37:31 -05:00
unknown
15fcc88488 Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-4.1 
into rhols221.adsl.netsonic.fi:/home/my/bk/mysql-4.1
 2003-06-27 18:52:09 +03:00
unknown
cb9c86ede6 Added support for structured options (WL task ID 947). 2003-06-27 18:51:39 +03:00
unknown
0474a69570 Merge mysql.com:/space/my/mysql-4.1 
into mysql.com:/space/my/mysql-4.1-build
 2003-06-27 13:23:43 +02:00
unknown
de52e5fa82 item.cc: 
A better comment


sql/item.cc:
  A better comment
 2003-06-27 16:09:53 +05:00
unknown
7b54f4d6e0 When unifying arguments for comparion, binary strings won character strings, 
and comparison was done binary. Now, a binary string wins a character sting 
taking in account their derivation. That means a character field wins a
binary literal and comparison is done according to the character field
collation, not binary.
 2003-06-27 16:08:52 +05:00
unknown
6fd2a8585f str0 IN (str1, str2, ...) now works according to collation rules 2003-06-27 13:52:38 +05:00
unknown
4a03f60571 - fixed typo (dbl -> dnl) in acinclude.m4 
acinclude.m4:
   - fixed typo (dbl -> dnl)
 2003-06-27 10:07:22 +02:00
unknown
3f810d0e90 BETWEEN now works according to collation rules 2003-06-27 12:02:08 +05:00
unknown
608bda3651 Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1 
into teton.kitebird.com:/home/paul/mysql-4.1


sql/share/czech/errmsg.txt:
  Auto merged
sql/share/danish/errmsg.txt:
  Auto merged
sql/share/dutch/errmsg.txt:
  Auto merged
sql/share/english/errmsg.txt:
  Auto merged
sql/share/estonian/errmsg.txt:
  Auto merged
sql/share/french/errmsg.txt:
  Auto merged
sql/share/german/errmsg.txt:
  Auto merged
sql/share/greek/errmsg.txt:
  Auto merged
sql/share/hungarian/errmsg.txt:
  Auto merged
sql/share/italian/errmsg.txt:
  Auto merged
sql/share/japanese/errmsg.txt:
  Auto merged
sql/share/korean/errmsg.txt:
  Auto merged
sql/share/norwegian-ny/errmsg.txt:
  Auto merged
sql/share/norwegian/errmsg.txt:
  Auto merged
sql/share/polish/errmsg.txt:
  Auto merged
sql/share/portuguese/errmsg.txt:
  Auto merged
sql/share/romanian/errmsg.txt:
  Auto merged
sql/share/russian/errmsg.txt:
  Auto merged
sql/share/serbian/errmsg.txt:
  Auto merged
sql/share/slovak/errmsg.txt:
  Auto merged
sql/share/spanish/errmsg.txt:
  Auto merged
sql/share/swedish/errmsg.txt:
  Auto merged
sql/share/ukrainian/errmsg.txt:
  Auto merged
 2003-06-26 11:04:20 -05:00
unknown
1d29092e2d New messages for 3-adic and N-adic operations 
REPLACE() now processed arguments collations according to standard
 2003-06-26 15:45:04 +05:00
unknown
11e9c572ad Bug fixed: mysql-test failure on rpl tests 
scripts/mysql_create_system_tables.sh:
  Fixed bug: mysql-test failure on rpl tests
 2003-06-26 09:39:23 +05:00
unknown
17abb8a6a2 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.r18.ru:/usr/home/bk/mysql-4.1
 2003-06-26 08:51:36 +05:00
unknown
6350e8c14c Merge kishkin.ru:/home/wax/mysql-4.1 into kishkin.ru:/home/wax/mysql-4g 
sql/field.h:
  Auto merged
sql/item_sum.cc:
  Auto merged
 2003-06-26 05:06:49 +06:00
unknown
774e3a594b modify error message 2003-06-25 16:25:03 -05:00
unknown
2534f837c1 item_func.cc: 
My stupid typo fix


sql/item_func.cc:
  My stupid typo fix
  ,
 2003-06-25 19:50:27 +05:00
unknown
0d12c1130d Merge abarkov@build.mysql.com:/home/bk/mysql-4.1 
into bar.mysql.r18.ru:/usr/home/bar/mysql-4.1
 2003-06-25 19:03:36 +05:00
unknown
3187d1832b fixed mistyping (BUG #699) 2003-06-25 16:51:00 +03:00
unknown
15ee7b04da LOCATE(), INSTR(), POSITION(), FIND_IN_SET(), SUBSTRING_INDEX() 
now process arguments according to standard SQL collation determation
rules.
 2003-06-25 15:07:20 +05:00
unknown
03cee27e61 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.r18.ru:/usr/home/bk/mysql-4.1
 2003-06-25 11:47:52 +05:00
unknown
4ccada56f1 test for SQL_MODE with PIPES_AS_CONCAT, ANSI and IGNORE_SPACE 
tests/client_test.c:
  test for SQL_MODE with PIPES_AS_CONCAT, ANSI and IGNORE_SPACE
 2003-06-24 10:43:57 -07:00
unknown
3eaf8865ec String comparison functions now use the same DTCollation with 
CONCAT() and other string functions. This allows to reuse a lot
if code and to simplify further development.
 2003-06-24 17:12:07 +05:00
unknown
40654c71f4 mysql_create_system_tables.sh: 
Type fix


scripts/mysql_create_system_tables.sh:
  Type fix
 2003-06-24 15:55:39 +05:00
unknown
30d90cb59e Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.r18.ru:/usr/home/bk/mysql-4.1
 2003-06-24 15:11:53 +05:00
unknown
0f78a1456f Merge abarkov@build.mysql.com:/home/bk/mysql-4.1 
into bar.mysql.r18.ru:/usr/home/bar/mysql-4.1
 2003-06-24 15:11:52 +05:00
unknown
64d7734f38 New class DTCollation (SQL:2003 calls it "declared type collation") 
It's a combination of collation and its derivation (precedence order)
 2003-06-24 15:11:07 +05:00
unknown
2095084d76 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into narttu.mysql.fi:/my/mysql-4.1
 2003-06-24 12:11:01 +03:00
unknown
fff1f663c2 Fixed some new memory leaks 
Updated VC++ files


VC++Files/client/mysql.dsp:
  Update of VC++ files
VC++Files/client/mysqlclient.dsp:
  Update of VC++ files
VC++Files/libmysqld/examples/test_libmysqld.dsp:
  Update of VC++ files
VC++Files/libmysqld/libmysqld.def:
  Update of VC++ files
VC++Files/libmysqld/libmysqld.dsp:
  Update of VC++ files
VC++Files/myisam/myisam.dsp:
  Update of VC++ files
VC++Files/mysql.dsw:
  Update of VC++ files
VC++Files/sql/mysqld.dsp:
  Update of VC++ files
include/mysql.h:
  Add missing client functions to embedded server
libmysql/libmysql.def:
  sort functions to enable comparison with libmysqld.def
libmysqld/libmysqld.c:
  Add missing client functions to embedded server
libmysqld/libmysqld.def:
  sort functions to enable comparison with libmysql.def
  Added missing functions
myisam/mi_preload.c:
  Fixed compiler warning.
  Small code cleanup
scripts/make_win_src_distribution.sh:
  Fixed typo
  Don't run zip in verbose mode
scripts/mysql_create_system_tables.sh:
  Change so that localhost has full access (to make this like 4.0)
scripts/mysql_fix_privilege_tables.sh:
  Allow on to run this from the source distribution
sql-common/client.c:
  Fixed memory leak
sql/item_sum.cc:
  Removed compiler warning
sql/slave.cc:
  Cleanup
sql/sql_client.cc:
  Portability fix
sql/sql_help.cc:
  Fixed memory leak
 2003-06-24 12:10:35 +03:00
unknown
4c1766ddee Item character set is stored in Item itself now, not in ITem->str_value 2003-06-24 13:37:11 +05:00
unknown
105c1a8026 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.r18.ru:/usr/home/ram/work/4.1.gis
 2003-06-23 18:38:45 +05:00
unknown
bd2c3ef725 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.r18.ru:/usr/home/bk/mysql-4.1
 2003-06-23 12:58:18 +05:00
unknown
01450dbb79 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 
into sanja.is.com.ua:/home/bell/mysql/bk/work-alloc-4.1
 2003-06-23 00:02:20 +03:00
unknown
74bcac1c82 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.r18.ru:/usr/home/bk/mysql-4.1


BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
 2003-06-21 19:42:36 +05:00
unknown
0912871d6a item_cmpfunc.cc: 
Temporarily fix for test failure
  ,.


sql/item_cmpfunc.cc:
  Temporarily fix for test failure
  ,.
 2003-06-20 19:05:45 +05:00
unknown
1bc2349ec6 item_cmpfunc.cc: 
Rewritten in nicer way
  ,


sql/item_cmpfunc.cc:
  Rewritten in nicer way
  ,
 2003-06-20 18:45:28 +05:00
unknown
75689220fa - make sure that scripts/*.sql files are being added to the source 
distribution as well
 2003-06-20 13:57:51 +02:00
unknown
22b77b17a2 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 
into sanja.is.com.ua:/home/bell/mysql/bk/work-alloc-4.1


sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
 2003-06-20 13:40:21 +03:00
unknown
fd3abc83ea Renamed xxx_as_text() and xxx__from_text(). 2003-06-20 14:53:37 +05:00
unknown
2295fcc876 Added AsWKT() alias for AsText(). 
Renamed as_text().


sql/item_create.cc:
  Renamed as_text().
sql/item_create.h:
  Renamed as_text().
sql/lex.h:
  Added AsWKT() alias for AsText().
 2003-06-20 14:31:47 +05:00
unknown
84bf9b8adb Fix error msg. Bug #681 
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
 2003-06-19 12:17:23 -04:00
unknown
3f7e8b2146 merging 
sql/sql_select.cc:
  Auto merged
 2003-06-19 16:15:11 +03:00
unknown
9b83d3e536 after merge fix 2003-06-19 16:08:11 +03:00
unknown
23ebb07fbc Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 
into sanja.is.com.ua:/home/bell/mysql/bk/work-item-4.1


sql/item.cc:
  Auto merged
sql/item_subselect.cc:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_union.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
 2003-06-19 15:25:41 +03:00
unknown
5123410bd5 Merge mysql.com:/space/my/mysql-4.1 
into mysql.com:/space/my/mysql-4.1-build
 2003-06-19 13:48:12 +02:00
unknown
b4bba9714f Merge mysql.com:/space/my/mysql-4.1 
into mysql.com:/space/my/mysql-4.1-build
 2003-06-19 13:46:32 +02:00
unknown
d152a8ce43 - added missing include/sql_state.h to source distribution 
include/Makefile.am:
   - added missing sql_state.h to source distribution
 2003-06-19 13:46:10 +02:00
unknown
ac6fa6e46e Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-4.1 
into rurik.mysql.com:/home/igor/mysql-4.1
 2003-06-19 03:40:48 -07:00
unknown
56e6dcb4c9 Merge lgrimmer@build.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/space/my/mysql-4.1


sql/item_strfunc.cc:
  Auto merged
 2003-06-19 12:19:28 +02:00