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
d7edf9785b Post-merge fixes. 2003-04-17 00:18:29 +02:00
unknown
36752387c1 Merged 4.1 into 5.0. 
client/mysql.cc:
  Auto merged
mysql-test/r/subselect.result:
  Auto merged
mysql-test/r/variables.result:
  Auto merged
mysql-test/t/subselect.test:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_func.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
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_db.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/share/czech/errmsg.txt:
  Auto merged
sql/share/romanian/errmsg.txt:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_update.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
 2003-04-16 23:23:23 +02:00
unknown
a358ec28b8 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into myvenu.com:/home/venu/work/sql/dev-4.1


sql/sql_yacc.yy:
  Auto merged
 2003-04-16 12:11:32 -07:00
unknown
259cc315a5 Fix broken windows distribution workspace file (libmysql.dsp), which is causing VC IDE to crash while loading 
Remove ctype_latin1_de.c from respective dsp files
Fix to make_win_src_distribution.sh to delete all newly added IS Bitkeeper files



VC++Files/libmysql/libmysql.dsp:
  Fix the broken file
 2003-04-16 11:49:52 -07:00
unknown
48935d0536 merging 
sql/ha_innodb.cc:
  Auto merged
sql/handler.cc:
  Auto merged
sql/handler.h:
  Auto merged
sql/sql_cache.cc:
  Auto merged
sql/sql_cache.h:
  Auto merged
 2003-04-16 20:35:29 +03:00
unknown
781133546c Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.1 
into sinisa.nasamreza.org:/mnt/work/mysql-4.1
 2003-04-16 18:24:53 +03:00
unknown
df5ff1daea Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1 
into deer.mysql.r18.ru:/home/hf/work/mysql-4.1.clean
 2003-04-16 14:52:16 +05:00
unknown
01f8589063 Bugfix for segfault in mysql with embedded library 
mysys/default.c:
  Fix for bug in mysql with embedded library
  we can get NULL in *argv
 2003-04-16 14:49:46 +05:00
unknown
472020dc08 Added the support of statement result navigation APIs 
libmysql/libmysql.c:
  Added statement result set navigation APIs (buffered results only)
include/mysql.h:
  Prototypes for new stmt result navigation APIs
 2003-04-16 00:07:10 -07:00
unknown
70a2f3c268 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mashka.mysql.fi:/home/my/mysql-4.1


sql/lex.h:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
 2003-04-16 09:26:24 +03:00
unknown
e5c62e3280 Add mysys specific error messages 
Make RELAY_THREAD and alias for IO_THREAD
Added new interface for string -> (unsigned) long long.


include/my_sys.h:
  Add mysys specific error messages
sql/lex.h:
  Make RELAY_THREAD an alias for IO_THREAD
sql/sql_yacc.yy:
  Make RELAY_THREAD an alias for IO_THREAD
 2003-04-16 09:25:43 +03:00
unknown
7690ab2fb9 Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1 
into deer.mysql.r18.ru:/home/hf/work/mysql-4.1.clean
 2003-04-16 11:09:06 +05:00
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
bbcf5390d6 Merging 
myisam/mi_check.c:
  Auto merged
myisam/sort.c:
  Auto merged
sql/filesort.cc:
  Auto merged
sql/ha_myisam.cc:
  Auto merged
sql/lex.h:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sql_cache.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_delete.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_load.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
include/mysqld_error.h:
  error messages trimmed
sql/share/czech/errmsg.txt:
  error messages trimmed
sql/share/danish/errmsg.txt:
  error messages trimmed
sql/share/dutch/errmsg.txt:
  error messages trimmed
sql/share/english/errmsg.txt:
  error messages trimmed
sql/share/estonian/errmsg.txt:
  error messages trimmed
sql/share/french/errmsg.txt:
  error messages trimmed
sql/share/german/errmsg.txt:
  error messages trimmed
sql/share/greek/errmsg.txt:
  error messages trimmed
sql/share/hungarian/errmsg.txt:
  error messages trimmed
sql/share/italian/errmsg.txt:
  error messages trimmed
sql/share/japanese/errmsg.txt:
  error messages trimmed
sql/share/korean/errmsg.txt:
  error messages trimmed
sql/share/norwegian-ny/errmsg.txt:
  error messages trimmed
sql/share/norwegian/errmsg.txt:
  error messages trimmed
sql/share/polish/errmsg.txt:
  error messages trimmed
sql/share/portuguese/errmsg.txt:
  error messages trimmed
sql/share/romanian/errmsg.txt:
  error messages trimmed
sql/share/russian/errmsg.txt:
  error messages trimmed
sql/share/serbian/errmsg.txt:
  error messages trimmed
sql/share/slovak/errmsg.txt:
  error messages trimmed
sql/share/spanish/errmsg.txt:
  error messages trimmed
sql/share/swedish/errmsg.txt:
  error messages trimmed
sql/share/ukrainian/errmsg.txt:
  error messages trimmed
 2003-04-08 19:43:24 +05:00
unknown
131d90001f SCRUM 
two KILL versions
code trimming with headquarter's suggestions 


myisam/mi_check.c:
  killed_ptr function changed backward
myisam/myisamchk.c:
  killed_ptr function changed backward
myisam/myisamdef.h:
  killed_ptr function changed backward
myisam/sort.c:
  killed_ptr function changed backward
sql/ha_myisam.cc:
  killed_ptr function changed backward
sql/lock.cc:
  error sending trimmed
sql/log_event.cc:
  error sending trimmed
sql/records.cc:
  error sending trimmed
sql/slave.cc:
  error sending trimmed
sql/sql_class.h:
  inline functions to send right message about killing added
sql/sql_delete.cc:
  error sending trimmed
sql/sql_load.cc:
  error sending trimmed
sql/sql_parse.cc:
  error sending trimmed
sql/sql_prepare.cc:
  error sending trimmed
sql/sql_select.cc:
  error sending trimmed
sql/sql_table.cc:
  error sending trimmed
sql/sql_update.cc:
  error sending trimmed
 2003-04-08 19:18:33 +05: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