mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-31 19:11:46 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
7867 commits 2790 branches 343 tags 1.7 GiB
Commit graph

7867 commits

This branch
This branch
All branches
Author SHA1 Message Date
unknown
ba2cf4e3e3 gis.txt deleted - updated text merged into manual (mysqldoc tree). 
BitKeeper/deleted/.del-gis.txt~2dde6d55b3075921:
  Delete: Docs/gis.txt
 2003-04-04 12:41:58 +10:00
unknown
80fece3ee1 And got rid of signess warnings... 2003-04-03 20:19:18 +02:00
unknown
ad43aa818b Merge pmartin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/pem/work/mysql-4.1
 2003-04-03 20:19:17 +02:00
unknown
4f9ae16c74 Got rid of silly compiler errors on HP-UX and SGI Irix. 2003-04-03 20:19:16 +02:00
unknown
fb25be653f Merge akishkin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/walrus/bk/41
 2003-04-04 00:19:16 +06:00
unknown
7b85e459af field.cc: 
Geometry is now large blob


sql/field.cc:
  Geometry is now large blob
 2003-04-03 23:19:15 +05:00
unknown
0dbfff4614 Fixed bug in warning handling (Memory was allocated from wrong MEM_ROOT) 
sql/item_sum.cc:
  Fixed bug in warning handling.
sql/item_sum.h:
  Fixed bug in warning handling.
sql/sql_class.h:
  Fixed bug in warning handling.
sql/sql_error.cc:
  Fixed bug in warning handling.
strings/my_vsnprintf.c:
  After merge fix
 2003-04-03 21:19:14 +03:00
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
fc448ccb7f Fixed the last memory leaks in the SP code. 
sql/sp.cc:
  Fixed clear_function_cache bug that made memory freeing work for functions too.
sql/sp_head.cc:
  Added more DBUG output to help finding memory leak.
sql/sql_parse.cc:
  Moved sp_clear_function_cache call so it *works*.
  Added missing memory freeing call.
 2003-04-03 20:00:52 +02: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
12e7f1677e test-transactions.sh: 
correct misprint in the sub test_update


sql-bench/test-transactions.sh:
  correct misprint in the sub test_update
 2003-04-03 21:53:04 +06: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
0d71f5e1d3 Got rid of the last unecessary Item_strings. 2003-04-03 16:00:09 +02: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
3a321d49e8 Updated result file. 2003-04-02 21:18:52 +02:00
unknown
739c135112 Merge mysql.com:/usr/local/bk/mysql-5.0 
into mysql.com:/home/pem/work/mysql-5.0


sql/sql_parse.cc:
  Auto merged
 2003-04-02 20:42:56 +02:00
unknown
2eebaf7bd3 Getting rid of lots of memory leaks (but not quite all of them yet, 
some will go away when temporary code is replaced).


mysql-test/r/sp.result:
  Drop db before creating.
mysql-test/t/sp.test:
  Drop db before creating.
 2003-04-02 20:42:28 +02: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
9a68ee7581 Tiny optimisation for a (boolean || boolean) test, as SQL_LOG_BIN is set to 1 by default 
sql/sql_insert.cc:
  Tiny optimisation
 2003-04-02 10:59:21 +02:00
unknown
590d769e2c Deprecated the update log (Sprint task #792). Now --log-update 
just turns on --log-bin and prints a warning. SQL_LOG_UPDATE
is handled in two ways (see mysqld.cc for comments).


include/mysqld_error.h:
  deprecated update log
sql/log.cc:
  deprecated update log
sql/mysqld.cc:
  deprecated update log
sql/set_var.cc:
  deprecated update log
sql/share/czech/errmsg.txt:
  deprecated update log
sql/share/danish/errmsg.txt:
  deprecated update log
sql/share/dutch/errmsg.txt:
  deprecated update log
sql/share/english/errmsg.txt:
  deprecated update log
sql/share/estonian/errmsg.txt:
  deprecated update log
sql/share/french/errmsg.txt:
  deprecated update log
sql/share/german/errmsg.txt:
  deprecated update log
sql/share/greek/errmsg.txt:
  deprecated update log
sql/share/hungarian/errmsg.txt:
  deprecated update log
sql/share/italian/errmsg.txt:
  deprecated update log
sql/share/japanese/errmsg.txt:
  deprecated update log
sql/share/korean/errmsg.txt:
  deprecated update log
sql/share/norwegian-ny/errmsg.txt:
  deprecated update log
sql/share/norwegian/errmsg.txt:
  deprecated update log
sql/share/polish/errmsg.txt:
  deprecated update log
sql/share/portuguese/errmsg.txt:
  deprecated update log
sql/share/romanian/errmsg.txt:
  deprecated update log
sql/share/russian/errmsg.txt:
  deprecated update log
sql/share/serbian/errmsg.txt:
  deprecated update log
sql/share/slovak/errmsg.txt:
  deprecated update log
sql/share/spanish/errmsg.txt:
  deprecated update log
sql/share/swedish/errmsg.txt:
  deprecated update log
sql/share/ukrainian/errmsg.txt:
  deprecated update log
sql/sql_acl.cc:
  deprecated update log
sql/sql_db.cc:
  deprecated update log
sql/sql_delete.cc:
  deprecated update log
sql/sql_insert.cc:
  deprecated update log
sql/sql_load.cc:
  deprecated update log
sql/sql_parse.cc:
  deprecated update log
sql/sql_rename.cc:
  deprecated update log
sql/sql_table.cc:
  deprecated update log
sql/sql_update.cc:
  deprecated update log
 2003-04-02 00:15:20 +02: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