Commit graph

8584 commits

Author SHA1 Message Date
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
65c63e15c9 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mashka.mysql.fi:/home/my/mysql-4.1


BitKeeper/deleted/.del-internals.texi~62b6f580a41c2a43:
  Auto merged
2003-06-24 13:43:36 +03: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
15fa6db14e indentation change 2003-06-24 13:09:48 +03: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
b68315cda6 Merge gluh@gw:/home/bk/mysql-4.1
into gluh.mysql.r18.ru:/home/gluh/mysql-4.1.DTFUNC


sql/field.cc:
  Auto merged
sql/item_create.cc:
  Auto merged
sql/item_create.h:
  Auto merged
sql/lex.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/protocol.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/time.cc:
  Auto merged
2003-06-23 13:02:28 +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
f8e232f95e Internal commit 2003-06-23 12:56:44 +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
de5e96e443 fixed BUG #679
outer resolved fields now do not marked as dependent if they is not really belong to outer SELECT
one-letter variables name fixed


mysql-test/r/subselect.result:
  test of bug 679
mysql-test/t/subselect.test:
  test of bug 679
sql/item.cc:
  outer resolved fields now do not marked as dependent if they is not really belong to outer SELECT
  one-letter variables name fixed
2003-06-20 10:15:58 +03: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
unknown
3162f9a682 - revert wrong include of zlib.h as zlib is not part of the source
distribution - better use -I../zlib where appropriate (usually we use
   the zlib installed in the system)
2003-06-19 12:18:04 +02:00
unknown
a6850f79bc Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-4.1
into rurik.mysql.com:/home/igor/mysql-4.1
2003-06-19 02:42:49 -07:00
unknown
53ff4c821b Merge rurik.mysql.com:/home/igor/mysql-4.1
into rurik.mysql.com:/home/igor/dev/mysql-4.1-0


sql/sql_yacc.yy:
  Auto merged
2003-06-19 02:39:46 -07:00
unknown
32ddd42736 preload.result, preload.test:
Removed non-generic info (key used blocks)
preload.result, preload.test, lex.h, sql_yacc.yy:
  Syntax change for preload statement


sql/sql_yacc.yy:
  Syntax change for preload statement
sql/lex.h:
  Syntax change for preload statement
mysql-test/t/preload.test:
  Removed non-generic info (key used blocks)
mysql-test/r/preload.result:
  Removed non-generic info (key used blocks)
2003-06-19 02:34:33 -07:00
unknown
a00e2e61c9 Merge abarkov@build.mysql.com:/home/bk/mysql-4.1
into bar.mysql.r18.ru:/usr/home/bar/mysql-4.1
2003-06-19 13:49:28 +05:00
unknown
85de209e76 - added libmysql/client_settings.h to distribution
libmysql/Makefile.am:
   - added client_settings.h to distribution
2003-06-19 10:46:45 +02:00
unknown
c0b0c9cd4f Merge abarkov@build.mysql.com:/home/bk/mysql-4.1
into bar.mysql.r18.ru:/usr/home/bar/mysql-4.1
2003-06-19 13:13:40 +05:00
unknown
36e0b1cd07 LPAD, RPAD, MAKE_SET and EXPORT_SET now works correctly with collations 2003-06-19 13:12:55 +05:00
unknown
83abc06dd8 Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-4.1
into rurik.mysql.com:/home/igor/mysql-4.1
2003-06-19 00:01:16 -07:00
unknown
59e1e7b215 These functions now return a result of proper collation:
BIN
OCT
CONV
HEX
CHAR
FORMAT
REPLACE
2003-06-19 11:36:44 +05:00
unknown
37e4661f16 Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-4.1
into rurik.mysql.com:/home/igor/mysql-4.1
2003-06-18 23:16:08 -07:00
unknown
76a06a4742 - added sql-common subdirectory and sql_common.h to source distribution
Makefile.am:
   - added sql-common directory to distribution
configure.in:
   - minor fixes
   - added sql-common/Makefile to AC_OUTPUT
include/Makefile.am:
   - added sql_common.h to distribution
2003-06-18 23:13:29 +02:00
unknown
1875eedb71 Merge lgrimmer@build.mysql.com:/home/bk/mysql-4.1
into mysql.com:/space/my/mysql-4.1
2003-06-18 21:45:46 +02:00
unknown
621215cd05 INSTALL-WIN-SOURCE:
More edits to INSTALL-WIN-SOURCE.


INSTALL-WIN-SOURCE:
  More edits to INSTALL-WIN-SOURCE.
2003-06-18 12:10:40 -05:00
unknown
4d1b1a3266 Merge
BitKeeper/etc/logging_ok:
  auto-union
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
2003-06-18 07:31:23 -07:00
unknown
a33ccd9e2f triggers magic
enforce REAL_EMAIL


BitKeeper/deleted/.del-post-incoming~9f2168f531f09f3b:
  Delete: BitKeeper/triggers/post-incoming
BitKeeper/deleted/.del-post-outgoing~1dd3d8f0f6e8f3cd:
  Delete: BitKeeper/triggers/post-outgoing
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2003-06-18 14:12:50 +02:00
unknown
254cf2d5c7 Merge lgrimmer@build.mysql.com:/home/bk/mysql-4.1
into mysql.com:/space/my/mysql-4.1
2003-06-18 09:49:56 +02:00