mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-29 10:14:19 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
27965 commits 2784 branches 343 tags 1.7 GiB
Commit graph

27965 commits

This branch
This branch
All branches
Author SHA1 Message Date
unknown
2985bc7a4d test fixed 
mysql-test/r/type_ranges.result:
  result fixed
 2005-11-29 16:46:51 +04:00
unknown
88822b356a Merge bk@192.168.21.1:mysql-5.0 
into mysql.com:/home/hf/work/mysql-5.0.14693


sql/sql_table.cc:
  Auto merged
 2005-11-29 13:33:56 +04:00
unknown
5b6a28d12d Merge mysql.com:/usr/home/bar/mysql-4.1.b10446 
into  mysql.com:/usr/home/bar/mysql-5.0


mysql-test/r/ctype_recoding.result:
  Auto merged
sql/item.cc:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/item_strfunc.h:
  Auto merged
 2005-11-29 09:25:51 +04:00
unknown
0fa8fc66df Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  mysql.com:/usr/home/bar/mysql-4.1.b10446


sql/item.cc:
  Auto merged
 2005-11-29 09:21:57 +04:00
unknown
00274bc520 Merge bk-internal:/home/bk/mysql-5.0 
into  mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-11-28 12:55:27 -08:00
unknown
aecc67b250 Merge bk-internal:/home/bk/mysql-5.0 
into  mysql.com:/usr/local/mysql/mysql-5.0
 2005-11-28 20:42:26 +01:00
unknown
b34c9cfb0f Merge mysql.com:/home/jimw/my/mysql-4.1-5792 
into  mysql.com:/home/jimw/my/mysql-5.0-clean


client/mysql.cc:
  Auto merged
client/mysqladmin.cc:
  Auto merged
client/mysqlbinlog.cc:
  Auto merged
client/mysqlcheck.c:
  Auto merged
client/mysqldump.c:
  Auto merged
client/mysqlimport.c:
  Auto merged
client/mysqlshow.c:
  Auto merged
client/mysqltest.c:
  Auto merged
 2005-11-28 10:52:52 -08:00
unknown
4b50aca58a Merge mysql.com:/home/jimw/my/mysql-5.0-14956 
into  mysql.com:/home/jimw/my/mysql-5.0-clean


mysql-test/t/ps.test:
  Auto merged
sql/sql_parse.cc:
  Auto merged
mysql-test/r/ps.result:
  SCCS merged
 2005-11-28 10:51:54 -08:00
unknown
6c41013ea3 Merge mysql.com:/home/jimw/my/mysql-4.1-14155 
into  mysql.com:/home/jimw/my/mysql-5.0-clean


mysql-test/t/create.test:
  Auto merged
sql/table.cc:
  Auto merged
mysql-test/r/create.result:
  Resolve conflict
 2005-11-28 10:50:23 -08:00
unknown
a796fc484e Merge msvensson@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  devsrv-b.mysql.com:/space/magnus/mysql-5.0
 2005-11-28 16:40:17 +01:00
unknown
57bfc6ddcb Merge mysqldev@production:my/mysql-4.1.16-fixes 
into  mysql.com:/usr/local/mysql/mysql-4.1
 2005-11-28 16:35:28 +01:00
unknown
3adea9cef7 Merge mysqldev@production:my/mysql-4.1.16-fixes 
into  mysql.com:/usr/local/mysql/mysql-5.0


include/config-win.h:
  Auto merged
sql/log_event.cc:
  Discard 4.1 win32 compile fix that was already in 5.0.
 2005-11-28 16:29:07 +01:00
unknown
c565ca2bf2 Include libyassl.la and libtaocrypt.la in libmysqlclient.la 
config/ac-macros/yassl.m4:
  Specify path to yassl libs
libmysql/Makefile.am:
  Add yassl .la libs to libmysqlclient.la
 2005-11-28 16:28:00 +01:00
unknown
31aeeb7c8c Merge mysql.com:/usr/local/mysql/mysql-4.1 
into  mysql.com:/usr/local/mysql/mysql-5.0
 2005-11-28 16:15:43 +01:00
unknown
0e2335a264 Merge mysql.com:/usr/local/bk/mysql-5.0 
into  mysql.com:/usr/home/pem/bug14643/mysql-5.0
 2005-11-28 15:11:26 +01:00
unknown
baff781ba4 Minor Win32 compile fixes for 4.1.16 release. 
sql/log_event.cc:
  Add missing cast needed for Win32 compilation.
include/config-win.h:
  Win32 compile fix: quote multi-line macros with do { ... } while(0) to follow earlier changes in my_global.h.
 2005-11-28 15:07:20 +01:00
unknown
8f6c1a5687 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  mysql.com:/usr/home/bar/mysql-4.1.b14406
 2005-11-28 17:16:39 +04:00
unknown
12de238b09 grant.result: 
After merge fix.


mysql-test/r/grant.result:
  After merge fix.
 2005-11-28 17:06:57 +04:00
unknown
50d615f31f Merge mysql.com:/usr/local/bk/mysql-5.0 
into  mysql.com:/usr/home/pem/bug14643/mysql-5.0


sql/sp_head.cc:
  Auto merged
mysql-test/r/sp.result:
  Manual merge.
mysql-test/t/sp.test:
  Manual merge.
 2005-11-28 13:20:15 +01:00
unknown
5edc1d5d97 Merge mysql.com:/usr/home/bar/mysql-4.1.b14406 
into  mysql.com:/usr/home/bar/mysql-5.0


mysql-test/r/ps_grant.result:
  Auto merged
mysql-test/t/grant.test:
  Auto merged
 2005-11-28 15:31:11 +04:00
unknown
bb0edb8171 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/usr/home/bar/mysql-5.0.param


sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
 2005-11-28 12:49:00 +04:00
unknown
b1961ce5d0 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  mysql.com:/usr/home/bar/mysql-4.1.b14406
 2005-11-28 12:45:40 +04:00
unknown
dc3e736bff Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/Users/kent/mysql/bk/mysql-4.1
 2005-11-28 09:44:47 +01:00
unknown
a9af48e9fc item.cc, item.h: 
Fixing Item_param::safe_charset_converter to do less "new"s.


sql/item.h:
  Fixing Item_param::safe_charset_converter to do less "new"s.
sql/item.cc:
  Fixing Item_param::safe_charset_converter to do less "new"s.
 2005-11-28 12:41:44 +04:00
unknown
84da27f67a Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
 2005-11-27 09:39:45 +01:00
unknown
b75e21fa97 Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  rurik.mysql.com:/home/igor/mysql-5.0
 2005-11-26 13:54:21 -08:00
unknown
d3b057aa63 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
 2005-11-26 20:56:05 +01:00
unknown
b1dc9db137 Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
 2005-11-26 20:50:22 +01:00
unknown
2385253ad8 Merge rurik.mysql.com:/home/igor/mysql-5.0 
into  rurik.mysql.com:/home/igor/dev/mysql-5.0-0
 2005-11-26 11:28:16 -08:00
unknown
76c4dda1cf Merge serg.mylan:/usr/home/serg/Abk/mysql-4.1 
into serg.mylan:/usr/home/serg/Abk/mysql-5.0


myisam/ft_parser.c:
  Auto merged
mysql-test/r/fulltext.result:
  Auto merged
mysql-test/t/fulltext.test:
  Auto merged
 2005-11-26 20:23:20 +01:00
unknown
8778a5df5a followup for for the bug#5686 2005-11-26 19:36:11 +01:00
unknown
06887bc330 Enabled back bunch of tests for stored routines which were disabled 
earlier because of various features/checks missing (these features/checks
are now implemented).


mysql-test/r/sp.result:
  Enabled back bunch of tests which were previously disabled because of various
  features/checks missing (since these features/checks are now implemented).
mysql-test/t/sp.test:
  Enabled back bunch of tests which were previously disabled because of various
  features/checks missing (since these features/checks are now implemented).
 2005-11-26 19:15:17 +03:00
unknown
8fc4efe657 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into serg.mylan:/usr/home/serg/Abk/mysql-5.0


include/my_base.h:
  Auto merged
 2005-11-26 08:56:59 +01:00
unknown
94ab2caa6d documenting HA_STATUS_xxx flags 2005-11-26 08:54:13 +01:00
unknown
fd4fcd2f7f Fixed bug #15106. 
A typo bug caused loss of a predicate of the form field=const in some cases.


mysql-test/r/select.result:
  Added a test case for bug #15106.
mysql-test/t/select.test:
  Added a test case for bug #15106.
 2005-11-25 18:51:44 -08:00
unknown
73e26527fd Merge msvensson@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  devsrv-b.mysql.com:/space/magnus/mysql-5.0
 2005-11-25 22:01:51 +01:00
unknown
48cea5faac Merge msvensson@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  devsrv-b.mysql.com:/space/magnus/mysql-5.0
 2005-11-25 19:31:17 +01:00
unknown
98b81f0a6d Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/psergey/mysql-5.0-bug15204


sql/opt_range.cc:
  Auto merged
 2005-11-25 20:48:26 +03:00
unknown
08a4868bb6 BUG#15024: get_best_covering_ror_intersect() tries to build ROR-intersection 
by starting with an empty index set and adding indexes to it until it
becomes covering. If the set becomes covering after adding the first index,
return NULL and don't try constructing ROR-intersection of one index (which
caused a crash)
 2005-11-25 20:47:22 +03:00
unknown
e0367223d1 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/opt/local/work/mysql-5.0-root
 2005-11-25 19:27:20 +03:00
unknown
72aa0f8de4 Merge msvensson@msvensson.mysql.internal:/home/msvensson/mysql/bug15168/my50-bug15168 
into  devsrv-b.mysql.com:/space/magnus/mysql-5.0
 2005-11-25 17:01:59 +01:00
unknown
2e79201c72 Post-merge fixes. 2005-11-25 18:53:55 +03:00
unknown
61e454c0a9 Merge mysql.com:/opt/local/work/mysql-4.1-root 
into  mysql.com:/opt/local/work/mysql-5.0-root


mysql-test/r/ndb_alter_table.result:
  Auto merged
mysql-test/r/ndb_basic.result:
  Auto merged
mysql-test/t/select.test:
  Auto merged
sql/handler.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/table.cc:
  Auto merged
vio/vio.c:
  Auto merged
vio/viossl.c:
  Auto merged
include/my_base.h:
  Manual merge.
mysql-test/r/ps.result:
  Manual merge.
mysql-test/r/select.result:
  Manual merge.
mysql-test/t/ndb_alter_table.test:
  Manual merge.
mysql-test/t/ndb_basic.test:
  Manual merge.
mysql-test/t/ps.test:
  Manual merge.
sql-common/client.c:
  k	
sql/ha_ndbcluster.cc:
  Manual merge.
sql/item.cc:
  Manual merge.
sql/sql_table.cc:
  Manual merge.
 2005-11-25 13:57:13 +03:00
unknown
2a1ae3a5e3 A fix and a test case for Bug#14410 "Crash in Enum or Set type in 
CREATE TABLE and PS/SP": make sure that 'typelib' object for
ENUM values and 'Item_string' object for DEFAULT clause are 
created in the statement memory root.


mysql-test/r/ps.result:
  Test results has been fixed (Bug#14410)
mysql-test/t/ps.test:
  A test case for Bug#14410 "Crash in Enum or Set type in CREATE 
  TABLE and PS/SP"
sql/mysql_priv.h:
  typelib() function declaration has been changed.
sql/sql_table.cc:
  Supply the statement memory root to use in typelib() and
  safe_charset_converter() functions to ensure that objects 
  created during the first execution of CREATE TABLE statement
  are allocated in persistent memory of the statement.
sql/table.cc:
  Change typelib() function to require MEM_ROOT.
 2005-11-25 13:25:31 +03:00
unknown
6fb8a4e915 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
 2005-11-25 10:56:01 +01:00
unknown
e1af5e5dfd Updated expected error 2005-11-25 10:41:22 +01:00
unknown
e69de4f677 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/usr/home/bar/mysql-5.0.b14146


sql/item_strfunc.cc:
  Auto merged
sql/item_strfunc.h:
  Auto merged
 2005-11-25 10:08:00 +04:00
unknown
1be7a7afa5 Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into moonbone.local:/work/13293-bug-5.0-mysql
 2005-11-24 22:41:52 +03:00
unknown
dc8a5d54bd Remove t3 in join_nested.test 
mysql-test/r/join_nested.result:
  Remove t3 too.
mysql-test/t/join_nested.test:
  Remove t3 too.
 2005-11-24 19:51:52 +01:00
unknown
a545053841 Merge mysql.com:/usr/local/bk/mysql-5.0 
into  mysql.com:/usr/home/pem/bug13729/mysql-5.0
 2005-11-24 19:45:36 +01:00