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

7848 commits

This branch
This branch
All branches
Author SHA1 Message Date
unknown
ed7a263728 Fix for bug #212 
sql/sql_list.h:
  Here we should reset item::last sometimes
 2003-04-16 11:08:21 +05:00
unknown
b03a00ebf6 replace default separator in group_concat, correct a bug 
mysql-test/r/func_gconcat.result:
  replace default separator
sql/item_sum.h:
  add fix_length_and_dec() and copy_or_same()
sql/sql_yacc.yy:
  replace default separator
 2003-04-16 00:22:43 +06:00
unknown
0a1d7ccd0a Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.1 
into sinisa.nasamreza.org:/mnt/work/mysql-4.1


sql/item_strfunc.cc:
  Auto merged
 2003-04-14 14:51:52 +03:00
unknown
2fb2e0352f Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into myvenu.com:/home/venu/work/sql/dev-4.1


sql/sql_class.h:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
 2003-04-12 20:07:52 -07:00
unknown
fc6456b5c4 correct codes of warnings in result file 2003-04-12 04:26:55 +06:00
unknown
b4d60df32d Exported functions claimed by MySQLCC 2003-04-11 14:48:03 -04:00
unknown
aa418f0f17 - make sure to generate the BDB tags file, otherwise s_symlink will create 
a lot of broken symlinks to the non-existing tags file (which magically
   causes the source distribution to grow about three times in size
   (most likely a bug in GNU tar - need to investigate if it still happens
   with recent versions)
 2003-04-11 17:20:32 +02:00
unknown
18cccabf13 For to use the /libmysql/libmysql.def file instead 
BitKeeper/deleted/.del-libmysql.def~29fc6d70335f1c4c:
  Delete: VC++Files/libmysql/libmysql.def
 2003-04-10 14:49:10 -04:00
unknown
c11f200890 A fix for a crashing bug in EXPLAIN on derived tables with a join. 2003-04-10 21:05:28 +03:00
unknown
a4f6f3ad74 Merge 
sql/item_create.cc:
  Auto merged
sql/item_create.h:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/item_strfunc.h:
  Auto merged
sql/lex.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
include/mysqld_error.h:
  merge.
sql/share/czech/errmsg.txt:
  SCCS merged
sql/share/danish/errmsg.txt:
  merge.
sql/share/dutch/errmsg.txt:
  merge .
sql/share/english/errmsg.txt:
  merge.
sql/share/estonian/errmsg.txt:
  merge.
sql/share/french/errmsg.txt:
  merge.
sql/share/german/errmsg.txt:
  merge.
sql/share/greek/errmsg.txt:
  merge.
sql/share/hungarian/errmsg.txt:
  e
  merge.
sql/share/italian/errmsg.txt:
  merge.
sql/share/japanese/errmsg.txt:
  merge.
sql/share/korean/errmsg.txt:
  merge.
sql/share/norwegian/errmsg.txt:
  merge.
sql/share/norwegian-ny/errmsg.txt:
  merge.
sql/share/polish/errmsg.txt:
  merge.
sql/share/portuguese/errmsg.txt:
  merge.
sql/share/romanian/errmsg.txt:
  SCCS merged
sql/share/russian/errmsg.txt:
  merge.
sql/share/serbian/errmsg.txt:
  merge.
sql/share/slovak/errmsg.txt:
  merge.
sql/share/spanish/errmsg.txt:
  merge.
sql/share/swedish/errmsg.txt:
  merge.
sql/share/ukrainian/errmsg.txt:
  merge.
 2003-04-10 10:25:21 -04:00
unknown
75bdeb1b21 added compress/uncompress function 
sql/mysql_priv.h:
  added have_compress variable
sql/mysqld.cc:
  added have_compress variable
sql/set_var.cc:
  added have_compress variable
 2003-04-09 20:50:30 -04:00
unknown
9a86ad60af Post - post merge fix. 2003-04-09 19:17:12 +03:00
unknown
ac94902633 merge fix 2003-04-09 18:52:33 +03:00
unknown
8b81ac649f A fix for DELETE with ORDER BY and LIMIT. 
How come we do not have a test case for this ??
 2003-04-09 18:22:17 +03:00
unknown
c0672fb860 fix for a : 
SELECT USER();
 2003-04-09 17:34:06 +03:00
unknown
3bcbdd7852 Merge bk-internal:/home/bk/mysql-4.1 
into sergbook.mysql.com:/usr/home/serg/Abk/mysql-4.1
 2003-04-09 07:31:29 -07:00
unknown
7786126bef a fix for a crashing bug when attempting to create InnoDB table 
with GEOMETRY field type.
 2003-04-08 20:39:50 +03:00
unknown
5614054b06 - bumped up version number to 4.1.1-alpha now that 4.0.1 has been tagged 
- tagged ChangeSet@1.1529 as mysql-4.1.0
 2003-04-08 17:49:16 +02:00
unknown
f4216c526b Fix for a bug with empty item list in UNION's 2003-04-08 15:55:28 +03:00
unknown
8c95b51625 Use of CHARSWT_INFO *result_collation 
instead of bool convert_result_charset
SET CHARACTER SET inststead of SET NAMES in tests
 2003-04-08 14:38:17 +05:00
unknown
f20835c7aa SET NAMES doesn't start recoding 
SET CHARACTER SET does
 2003-04-08 11:33:54 +05:00
unknown
0695239a64 A better fix for UNION and slow query log. 
sql/sql_union.cc:
  A better fix for UNION and slow query log.
  This patch also fixes some indentation issues
 2003-04-08 03:54:02 +03:00
unknown
f390da2270 All collation names are now fit into convension 2003-04-07 18:49:56 +05:00
unknown
eaa27ad448 Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.1 
into sinisa.nasamreza.org:/mnt/work/mysql-4.1
 2003-04-07 14:21:01 +03:00
unknown
b9b15d5239 sys_var_collation is now abstract class 
Two separate classes sys_var_client_collation and sys_var_literal_collation have been added
for "literal_collation" and "client_collation" variables.
 2003-04-07 16:10:27 +05:00
unknown
65ae25d092 New methods to store strings with "convert to" argimument 2003-04-07 13:52:48 +05:00
unknown
3aa5599774 fixed bug with locales in libedit 
configure.in:
  fixed bug with external libedit
 2003-04-06 20:14:36 -04:00
unknown
9a4258b4d4 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 
into sanja.is.com.ua:/home/bell/mysql/bk/work-in-4.1


sql/sql_yacc.yy:
  Auto merged
 2003-04-05 21:51:03 +03:00
unknown
0ee981674c Some optimization in SET NAMES 
mysql-test/r/ctype_collate.result:
  SET NAMES charset COLLATE collation is new syntax
mysql-test/r/variables.result:
  SET NAMES charset COLLATE collation is new syntax
mysql-test/t/ctype_collate.test:
  SET NAMES charset COLLATE collation is new syntax
mysql-test/t/variables.test:
  SET NAMES charset COLLATE collation is new syntax
 2003-04-05 18:56:15 +05:00
unknown
c801eb9703 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 
into sanja.is.com.ua:/home/bell/mysql/bk/work-in-4.1


sql/sql_yacc.yy:
  Auto merged
 2003-04-05 15:17:16 +03:00
unknown
a00dbd1192 sql_yacc.yy: 
I wonder how it happend that I compiled this!


sql/sql_yacc.yy:
  I wonder how it happend that I compiled this!
 2003-04-05 17:02:34 +05:00
unknown
a7a96235af sql_yacc.yy, set_var.h, set_var.cc: 
Optimization of SET NAMES


sql/set_var.cc:
  Optimization of SET NAMES
sql/set_var.h:
  Optimization of SET NAMES
sql/sql_yacc.yy:
  Optimization of SET NAMES
 2003-04-05 15:59:29 +05:00
unknown
740adf718d Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 
into sanja.is.com.ua:/home/bell/mysql/bk/work-in-4.1


mysql-test/r/subselect.result:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
 2003-04-05 09:29:58 +03:00
unknown
933e16a388 fixed st_select_lex initialization 
fixed mustiupdate subselect compatibility

(bug 217)



mysql-test/r/subselect.result:
  test of multi-update & subselect
mysql-test/t/subselect.test:
  test of multi-update & subselect
sql/sql_update.cc:
  added subselect compatibility to query cache
sql/sql_yacc.yy:
  right st_select_lex initialization 
  layout fix
 2003-04-05 09:29:28 +03:00
unknown
1f61635dcd sql_cache.cc: 
Cast to unsigned char


sql/sql_cache.cc:
  Cast to unsigned char
 2003-04-05 07:59:10 +05:00
unknown
67b75923fb Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into myvenu.com:/home/venu/work/sql/dev-4.1


sql/sql_class.h:
  Auto merged
 2003-04-04 13:25:53 -05:00
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
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
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