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

7940 commits

This branch
This branch
All branches
Author SHA1 Message Date
unknown
f2f748c631 Fix to support update + bianry logs with prepared statements (Dynamic query) 
sql/item.cc:
  query_val_str to return param item value in string format
sql/item.h:
  Misc defination changes for Item_param
sql/sql_class.h:
  Changes for PREP_STMT
sql/sql_string.cc:
  Duplicate String::replace to take char * and length as arguments
sql/sql_yacc.yy:
  Change to take param marker position to Item_param as an argument
sql/sql_prepare.cc:
  Fix for binary + update logs
sql/sql_string.h:
  Added new replace()
 2003-04-04 12:33:17 -05:00
unknown
cfd69393e4 Post merge fixes. 
mysql-test/r/sp.result:
  Enabled the cs test as it works now.
mysql-test/t/sp.test:
  Enabled the cs test as it works now.
 2003-04-04 15:47:43 +02:00
unknown
2a25cf793f Merge 
sql/share/czech/errmsg.txt:
  SCCS merged
sql/share/danish/errmsg.txt:
  SCCS merged
sql/share/dutch/errmsg.txt:
  SCCS merged
sql/share/estonian/errmsg.txt:
  SCCS merged
sql/share/french/errmsg.txt:
  SCCS merged
sql/share/german/errmsg.txt:
  SCCS merged
sql/share/greek/errmsg.txt:
  SCCS merged
sql/share/hungarian/errmsg.txt:
  SCCS merged
sql/share/italian/errmsg.txt:
  SCCS merged
sql/share/japanese/errmsg.txt:
  SCCS merged
sql/share/korean/errmsg.txt:
  SCCS merged
sql/share/norwegian-ny/errmsg.txt:
  SCCS merged
sql/share/norwegian/errmsg.txt:
  SCCS merged
sql/share/polish/errmsg.txt:
  SCCS merged
sql/share/portuguese/errmsg.txt:
  SCCS merged
sql/share/romanian/errmsg.txt:
  SCCS merged
sql/share/russian/errmsg.txt:
  SCCS merged
sql/share/serbian/errmsg.txt:
  SCCS merged
sql/share/slovak/errmsg.txt:
  SCCS merged
sql/share/spanish/errmsg.txt:
  SCCS merged
sql/share/swedish/errmsg.txt:
  SCCS merged
sql/share/ukrainian/errmsg.txt:
  SCCS merged
 2003-04-04 14:38:56 +02:00
unknown
2d146881ae Merge pmartin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/pem/work/mysql-4.1
 2003-04-04 14:24:01 +02:00
unknown
f3f0fb581f Added missing error message (was only added in english/). 
Removed extraneous error message from german/errmsg.txt.


sql/share/czech/errmsg.txt:
  Added missing error message (was only added in english/).
sql/share/danish/errmsg.txt:
  Added missing error message (was only added in english/).
sql/share/dutch/errmsg.txt:
  Added missing error message (was only added in english/).
sql/share/estonian/errmsg.txt:
  Added missing error message (was only added in english/).
sql/share/french/errmsg.txt:
  Added missing error message (was only added in english/).
sql/share/german/errmsg.txt:
  Added missing error message (was only added in english/).
  Removed extraneous error message.
sql/share/greek/errmsg.txt:
  Added missing error message (was only added in english/).
sql/share/hungarian/errmsg.txt:
  Added missing error message (was only added in english/).
sql/share/italian/errmsg.txt:
  Added missing error message (was only added in english/).
sql/share/japanese/errmsg.txt:
  Added missing error message (was only added in english/).
sql/share/korean/errmsg.txt:
  Added missing error message (was only added in english/).
sql/share/norwegian-ny/errmsg.txt:
  Added missing error message (was only added in english/).
sql/share/norwegian/errmsg.txt:
  Added missing error message (was only added in english/).
sql/share/polish/errmsg.txt:
  Added missing error message (was only added in english/).
sql/share/portuguese/errmsg.txt:
  Added missing error message (was only added in english/).
sql/share/romanian/errmsg.txt:
  Added missing error message (was only added in english/).
sql/share/russian/errmsg.txt:
  Added missing error message (was only added in english/).
sql/share/serbian/errmsg.txt:
  Added missing error message (was only added in english/).
sql/share/slovak/errmsg.txt:
  Added missing error message (was only added in english/).
sql/share/spanish/errmsg.txt:
  Added missing error message (was only added in english/).
sql/share/swedish/errmsg.txt:
  Added missing error message (was only added in english/).
sql/share/ukrainian/errmsg.txt:
  Added missing error message (was only added in english/).
 2003-04-04 14:23:24 +02:00
unknown
7ad9f7c4ba Merge abarkov@build.mysql.com:/home/bk/mysql-4.1 
into bar.mysql.r18.ru:/usr/home/bar/mysql-4.1
 2003-04-04 17:22:26 +05:00
unknown
48572f035c Index.xml: 
Type


sql/share/charsets/Index.xml:
  Type
 2003-04-04 17:21:48 +05:00
unknown
b60e6bcf2d Merging 4.1 to 5.0. 
BitKeeper/etc/gone:
  auto-union
BitKeeper/etc/logging_ok:
  auto-union
client/mysql.cc:
  Auto merged
mysql-test/r/show_check.result:
  Auto merged
mysql-test/r/subselect.result:
  Auto merged
mysql-test/r/variables.result:
  Auto merged
sql/item.cc:
  Auto merged
sql/lex.h:
  Auto merged
sql/log.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_delete.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_load.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/share/swedish/errmsg.txt:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
 2003-04-04 13:45:35 +02:00
unknown
094d141b10 Updating subselect results after SUBSELECT was changed into SUBQUERY. 
mysql-test/r/subselect.result:
  Updating results after SUBSELECT was changed into SUBQUERY.
 2003-04-04 13:33:01 +02:00
unknown
a9ca18f57c Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.r18.ru:/usr/home/ram/work/mysql-4.1.sp


sql/item_strfunc.cc:
  Auto merged
 2003-04-04 14:10:24 +05:00
unknown
f6c5bade15 Fixed envelope() function. 2003-04-04 14:09:08 +05:00
unknown
1b69b763e6 Sync string in EXPLAIN code with phrasing of manual (subquery, not subselect). 2003-04-04 14:06:52 +10:00
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
f9c0ecc796 Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.1 
into sinisa.nasamreza.org:/mnt/work/mysql-4.1
 2003-04-03 21:19:16 +03: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