Commit graph

7692 commits

Author SHA1 Message Date
unknown
f6c5bade15 Fixed envelope() function. 2003-04-04 14:09:08 +05:00
unknown
4bf227c8c2 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.r18.ru:/usr/home/ram/work/mysql-4.1.sp
2003-04-03 15:18:56 +05:00
unknown
7835ff5083 AsWKB() function has been added. 2003-04-03 15:13:14 +05:00
unknown
d352328a38 sql_cache.cc:
Windows compilation fix


sql/sql_cache.cc:
  Windows compilation fix
2003-04-03 14:52:12 +05:00
unknown
1e8cc909de correct code of warning of group_concat 2003-04-02 21:47:22 +06:00
unknown
0f2e3ab89a mysqld.cc:
missing comma


sql/mysqld.cc:
  missing comma
2003-04-02 20:49:16 +06:00
unknown
b2fe358861 Merge vkishkin@bk-internal.mysql.com:/home/bk/mysql-4.1
into kishkin.ru:/home/wax/mysql-4n
2003-04-02 19:42:25 +06:00
unknown
6adb27c65a resolve new updates group_concat
include/mysqld_error.h:
  resolve error message
sql/mysqld.cc:
  resolve option
sql/set_var.cc:
  resolve variable
sql/share/english/errmsg.txt:
  resolve error message
sql/sql_class.h:
  resolve
2003-04-02 19:16:19 +06:00
unknown
d8dd1ceaac Merge mysql.com:/space/my/mysql-4.1
into mysql.com:/space/my/mysql-4.1-build
2003-04-02 14:39:20 +02:00
unknown
59e8c55356 - increased bdb_max_lock value to pass sql-bench
- re-enabled OpenSSL for the Max RPM package


Build-tools/Do-compile:
   - increased bdb_max_lock value from 60000 -> 240000
     (got many errors "Lock table is out of available locks" when running
     sql-bench with InnoDB)
support-files/mysql.spec.sh:
   - re-enabled OpenSSL for the 4.1 Max RPM
2003-04-02 14:38:25 +02:00
unknown
aee0d02abd Auto merged
BitKeeper/etc/logging_ok:
  auto-union
2003-04-02 18:15:16 +06:00
unknown
6feda00ddb SCRUM
correct sql_alloc, ORDER BY and NULL value in group_concat
add comments
move test msg_arg
add test on NULL


mysql-test/r/func_gconcat.result:
  change work with NULL
mysql-test/t/func_gconcat.test:
  add test on NULL
sql/item_sum.cc:
  correct sql_alloc, ORDER BY and NULL value
  add comments
sql/sql_class.h:
  move test msg_arg
2003-04-02 17:55:53 +06:00
unknown
69b8b99a39 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.r18.ru:/usr/home/ram/work/mysql-4.1.sp
2003-04-02 15:39:57 +05:00
unknown
c709993b0a GEOMCOLLFROMWKB(), GEOMETRYCOLLECTIONFROMWKB(),
LINEFROMWKB(), LINESTRINGFROMWKB(), MLINEFROMWKB(), MPOINTFROMWKB(),
MPOLYFROMWKB(), MULTILINESTRINGFROMWKB(), MULTIPOINTFROMWKB(),
MULTIPOLYGONFROMWKB(), POINTFROMWKB(), POLYFROMWKB(), POLYGONFROMWKB()
functions have been added (as synonyms for GEOMFROMWKB()).


mysql-test/t/gis.test:
  GEOMCOLLFROMWKB(), GEOMETRYCOLLECTIONFROMWKB(),
  LINEFROMWKB(), LINESTRINGFROMWKB(), MLINEFROMWKB(), MPOINTFROMWKB(),
  MPOLYFROMWKB(), MULTILINESTRINGFROMWKB(), MULTIPOINTFROMWKB(),
  MULTIPOLYGONFROMWKB(), POINTFROMWKB(), POLYFROMWKB(), POLYGONFROMWKB()
  functions have been added (as synonyms for GEOMFROMWKB()).
sql/lex.h:
  GEOMCOLLFROMWKB(), GEOMETRYCOLLECTIONFROMWKB(),
  LINEFROMWKB(), LINESTRINGFROMWKB(), MLINEFROMWKB(), MPOINTFROMWKB(),
  MPOLYFROMWKB(), MULTILINESTRINGFROMWKB(), MULTIPOINTFROMWKB(),
  MULTIPOLYGONFROMWKB(), POINTFROMWKB(), POLYFROMWKB(), POLYGONFROMWKB()
  functions have been added (as synonyms for GEOMFROMWKB()).
2003-04-02 15:38:06 +05:00
unknown
0aa16ffd2a Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into george.bitbike.com:/home/arjen/mysql-4.1
2003-04-02 20:12:57 +10:00
unknown
18f5da4412 prepare.texi merged into manual (mysqldoc tree), file removed.
BitKeeper/deleted/.del-prepare.texi~20a263ee73a181f:
  Delete: Docs/prepare.texi
2003-04-02 20:12:01 +10:00
unknown
fb9a939416 Fixed problem with const table named with crashed test suite on MacOSX
myisam/mi_test3.c:
  Fixed compiler warning
myisam/rt_test.c:
  Fixed compiler warning
2003-04-02 13:06:33 +03:00
unknown
4b06bc8451 cp1257.xml, Index.xml:
cp1257 is Lithuanian sorting


sql/share/charsets/Index.xml:
  cp1257 is Lithuanian sorting
sql/share/charsets/cp1257.xml:
  cp1257 is Lithuanian sorting
2003-04-01 19:03:02 +05:00
unknown
2c7fdb5d20 Some collation have been renamed to fit into convension 2003-04-01 18:54:01 +05:00
unknown
cc2c0b6df3 Standard charset names:
pclatin1 -> cp850
pclatin2 -> cp852


BitKeeper/deleted/.del-pclatin1.xml~d42c4a35e61526fa:
  Delete: sql/share/charsets/pclatin1.xml
BitKeeper/deleted/.del-pclatin2.xml~419e68f6672a99a:
  Delete: sql/share/charsets/pclatin2.xml
2003-04-01 17:49:24 +05:00
unknown
9ca3d719e7 charset2html.c:
It's now working under HTTPD as a CGI. Very convenient!


mysys/charset2html.c:
  It's now working under HTTPD as a CGI. Very convenient!
2003-04-01 17:26:28 +05:00
unknown
158b54873a mbcharlen() is now used instead of ismbhead(). The last one has been removed. 2003-04-01 15:52:09 +05:00
unknown
75bcfdb14f Bug fix: should use my_free() instead of my_afree() after my_multi_malloc(). 2003-04-01 15:33:09 +05:00
unknown
640f31bdc8 my_strncasecmp() is not used anymore. Use my_strncoll() instead. 2003-04-01 14:17:28 +05:00
unknown
db628b97a5 Some optimization in CHARSET_INFO:
We don't need separate hash_sort() and hash_caseup()
  We don't need tosort(). strnxfrm will do the same.
2003-04-01 12:45:16 +05:00
unknown
c7db0a813c Better error message 2003-04-01 10:26:36 +05:00
unknown
1fa8f0224b Merge abarkov@build.mysql.com:/home/bk/mysql-4.1
into bar.mysql.r18.ru:/usr/home/bar/mysql-4.1
2003-04-01 09:29:22 +05:00
unknown
5966ce40d9 sql_string.cc:
We finally decided that national character set is utf8 :)


sql/sql_string.cc:
  We finally decided that national character set is utf8 :)
2003-04-01 09:28:53 +05:00
unknown
dd5f58ca36 New XDC file for NetWare pre-emption
BitKeeper/deleted/.del-mysqld.xdc~1befdfee55e31716:
  Delete: netware/mysqld.xdc
2003-03-31 18:09:13 -05:00
unknown
7257dd93c3 Merge vvagin@bk-internal.mysql.com:/home/bk/mysql-4.1
into eagle.mysql.r18.ru:/home/vva/work/RUS_READLINE/mysql-4.1
2003-03-31 19:09:12 -04:00
unknown
bf5f0556c3 Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.1
into eagle.mysql.r18.ru:/home/vva/work/RUS_READLINE/mysql-4.1
2003-03-31 18:44:10 -04:00
unknown
2971664214 temporary trick for work with different locales (koi8r for example) 2003-03-31 18:39:14 -04:00
unknown
2e3527b758 lex.h:
Use MBRContains() style for what we have implemented. Contains() will be used for real "contains" relation in the future.


sql/lex.h:
  Use MBRContains() style for what we have implemented. Contains() will be used for real "contains" relation in the future.
2003-03-31 19:53:50 +05:00
unknown
d0038aa7d5 Bug fix: should use my_multi_malloc() here!!! 2003-03-31 13:32:34 +05:00
unknown
48d0071395 ALTER TABLE didn't remember the exact
geometry type (POINT, LINESTRING, etc)
and changed all into "GEOMETRY".
2003-03-31 09:19:20 +05:00
unknown
a6614aae0a Added quotes around CREATE DATABASE IF EXISTS name if -Q was given. 2003-03-30 19:36:14 +03:00
unknown
a6ef8839a9 Added quotes around database name, when using -Q. 2003-03-29 16:59:03 +02:00
unknown
9c3d7df569 Manual merge of Novell's changes for NetWare platform from 4.0, 4.1 patches
client/mysql.cc:
  NetWare only: Remove pthread_yield on large screen results
client/mysqldump.c:
  NetWare only: Remove pthread_yield on large screen results
include/my_pthread.h:
  NetWare only: pthread_cond_timedwait now present in LibC
mysys/default.c:
  Add conditional for NetWare
mysys/my_init.c:
  Changes to netware_init
mysys/my_pthread.c:
  NetWare only: special my_pthread_cond_timedwait no longer needed
mysys/thr_mutex.c:
  NetWare: no need for pthread_mutex_lock calls
netware/BUILD/mwenv:
  Add zlib to environment variables
netware/Makefile.am:
  Add isam/isamchk.def to netware_build_files
scripts/make_binary_distribution.sh:
  Made bin directory files more flexible for alternate platforms, without unnecessary repetition
2003-03-28 14:24:32 -05:00
unknown
9dc2425066 Merge abarkov@build.mysql.com:/home/bk/mysql-4.1
into bar.mysql.r18.ru:/usr/home/bar/mysql-4.1
2003-03-28 19:37:55 +04:00
unknown
ec872485c3 charset.c:
strcasecmp -> my_strcasecmp
  This fix compilation problem on windows


mysys/charset.c:
  strcasecmp -> my_strcasecmp
  This fix compilation problem on windows
2003-03-28 19:37:25 +04:00
unknown
7029efee3a Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.1
into sinisa.nasamreza.org:/mnt/work/mysql-4.1


sql/item.cc:
  Auto merged
2003-03-28 16:58:52 +02:00
unknown
2d8c575584 Fixing crashing bugs as reported in bugs database
#195
2003-03-28 16:57:03 +02:00
unknown
308362a0e3 Merge abelkin@bk-internal.mysql.com:/home/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
2003-03-28 16:18:27 +02:00
unknown
608af1da43 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-qcvar-4.1


mysql-test/r/query_cache.result:
  Auto merged
mysql-test/t/query_cache.test:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_cache.cc:
  Auto merged
2003-03-28 16:18:26 +02:00
unknown
381ea2532d sql_yacc.yy:
Fix for possible failure reason on big-endian machines
  ,


sql/sql_yacc.yy:
  Fix for possible failure reason on big-endian machines
  ,
2003-03-28 18:18:26 +04:00
unknown
17d1d0ee08 Free allocated memory even in case of error. 2003-03-28 18:18:25 +04:00
unknown
f6f61947ba Bug fix: should check _mi_new() return value. 2003-03-28 18:18:24 +04:00
unknown
6a11159509 Bug fix: should check _mi_write_keypage() return value. 2003-03-28 18:18:23 +04: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
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