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

7732 commits

This branch
This branch
All branches
Author SHA1 Message Date
unknown
c9d2e7759a Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into narttu.mysql.fi:/my/mysql-4.1


BitKeeper/etc/logging_ok:
  auto-union
sql/item_strfunc.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
 2003-04-03 21:19:13 +03:00
unknown
6b8e2938f2 Merge with 4.0 
BitKeeper/etc/logging_ok:
  auto-union
BitKeeper/deleted/.del-libmysqld.def~6ca0fa0537a3431c:
  Auto merged
BitKeeper/deleted/.del-mysql.xdc:
  Delete: netware/mysql.xdc
BitKeeper/deleted/.del-mysqld.xdc~1befdfee55e31716:
  Auto merged
BitKeeper/deleted/.del-nwbootstrap~f3bc723dad4ed7e:
  Auto merged
BitKeeper/deleted/.del-nwconfigure~86da352b5e031ed9:
  Auto merged
client/mysql.cc:
  Auto merged
include/my_pthread.h:
  Auto merged
libmysqld/examples/Makefile.am:
  Auto merged
mysql-test/r/func_str.result:
  Auto merged
mysql-test/r/myisam.result:
  Auto merged
mysql-test/t/backup.test:
  Auto merged
mysql-test/t/myisam.test:
  Auto merged
mysys/default.c:
  Auto merged
mysys/my_init.c:
  Auto merged
mysys/my_pthread.c:
  Auto merged
mysys/thr_mutex.c:
  Auto merged
scripts/make_binary_distribution.sh:
  Auto merged
sql/ha_myisam.cc:
  Auto merged
sql/log.cc:
  Auto merged
sql-bench/crash-me.sh:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_delete.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
strings/my_vsnprintf.c:
  Auto merged
sql/sql_parse.cc:
  Merge with 4.0 (Ignore not existing tables with DROP TEMPOARAY TABLE on slave)
mysql-test/r/rpl_loaddata.result:
  Auto merged
 2003-04-03 21:19:12 +03:00
unknown
dba3a0b031 After merge fix 
sql/log_event.cc:
  Fixed a wrong && test -> &
 2003-04-03 21:19:11 +03:00
unknown
41ce5aaa50 Merge bk-internal.mysql.com:/home/bk/mysql-4.0 
into narttu.mysql.fi:/my/mysql-4.0
 2003-04-03 21:19:10 +03:00
unknown
5b67416a0b add test file for rpl_loaddata.test 2003-04-03 14:19:09 -04:00
unknown
5f5b6a7cea Merge bk-internal.mysql.com:/home/bk/mysql-4.0 
into narttu.mysql.fi:/my/mysql-4.0


BitKeeper/etc/logging_ok:
  auto-union
sql/log_event.cc:
  Auto merged
 2003-04-03 19:55:37 +03:00
unknown
9c1c76bf2e Merge vvagin@bk-internal.mysql.com:/home/bk/mysql-4.0 
into eagle.mysql.r18.ru:/home/vva/work/LOADDATA_BUG/mysql-4.0
 2003-04-03 12:55:36 -04:00
unknown
4a1542d056 added test for replication load data into temporary table with additional options 
sql/log_event.cc:
  fix bug #183 (Replication of temporary tables not working)
 2003-04-03 12:54:08 -04:00
unknown
f34b63ac49 Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.0 
into eagle.mysql.r18.ru:/home/vva/work/LOADDATA_BUG/mysql-4.0
 2003-04-03 10:30:41 -04:00
unknown
1834b6ff49 Updated results after merge 2003-04-03 13:21:39 +03: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
7bc65cd823 Merge narttu.mysql.fi:/my/mysql-3.23 into narttu.mysql.fi:/my/mysql-4.0 
mysys/my_vsnprintf.c:
  Auto merged
sql/ha_myisam.cc:
  Auto merged
sql/log.cc:
  Auto merged
 2003-04-03 13:08:28 +03:00
unknown
2090bc6e43 Fixed bug in memory allocation that could affect 64 bit systems (affected hammer) 
mysys/my_vsnprintf.c:
  safety fix
sql/log.cc:
  safety fix
 2003-04-03 13:07:42 +03: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
f5feb33773 Merge with 3.23 to get fixes for: 
mysqldump --delete-master-logs
Portability fix for hammer
Memory overrun for MyISAM
LOAD DATA LOCAL replication bug fix.


BitKeeper/etc/logging_ok:
  auto-union
sql/log.cc:
  Auto merged
client/client_priv.h:
  Merge with 3.23
client/mysqldump.c:
  Merge with 3.23
myisam/mi_dynrec.c:
  Merge with 3.23
mysql-test/t/myisam.test:
  Merge with 3.23
sql/log_event.cc:
  Merge with 3.23
sql/slave.cc:
  Merge with 3.23
sql/sql_delete.cc:
  Merge with 3.23
 2003-04-03 12:33:13 +03:00
unknown
68fc04c423 Portability fix (for AMD hammer) 
sql/log.cc:
  Portability fix (for hammer)
 2003-04-03 12:10:38 +03:00
unknown
e9635c95af Merge bk-internal.mysql.com:/home/bk/mysql-4.0 
into narttu.mysql.fi:/my/mysql-4.0
 2003-04-03 11:29:38 +03:00
unknown
584b4caa66 Safer stack checking 2003-04-03 11:29:10 +03: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
3258bb7248 Sprint task #856 : make table exclusion rules (in replication) 
apply to GRANT and REVOKE too. For example if replicate-wild-ignore-table=mysql.%,
GRANT and REVOKE will not be replicated on the slave.
 2003-04-01 22:49:40 +02:00
unknown
241b6c058d Small-and-safe fix for bug #218: "LOAD DATA INFILE IGNORE is well 
logged, but read as LOAD DATA INFILE REPLACE"
This was just bad && instead of &, but nasty consequences.
This should be merged to 4.0 BUT it will not be automatic (some code
has moved from log_event.h to log_event.cc, and log_event.cc has changed);
please Merging Man, do 'bk grep REPLACE_FLAG' in 4.0/sql
to find all the new places.


sql/log_event.cc:
  & instead of && when testing flags
sql/slave.cc:
  & instead of && when testing flags
 2003-04-01 18:19:15 +02: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
7bf6bd51ff Merge gweir@bk-internal.mysql.com:/home/bk/mysql-4.0 
into mysql.com:/home/greg/bk/mysql-4.0
 2003-03-31 11:28:41 -05:00