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

31608 commits

This branch
This branch
All branches
Author SHA1 Message Date
unknown
9672ef612e Bug#16172 DECIMAL data type processed incorrectly 
issue an error in case of DECIMAL(M,N) if N > M


mysql-test/r/type_newdecimal.result:
  Bug#16172 DECIMAL data type processed incorrectly
  result fix & test case
mysql-test/t/type_newdecimal.test:
  Bug#16172 DECIMAL data type processed incorrectly
  test fix
 2006-08-08 14:40:07 +05:00
unknown
1cf5669955 result fix 2006-08-08 12:50:05 +05:00
unknown
a517c2440e Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0-kt 
into  mysql.com:/home/hf/work/mysql-5.0.clean
 2006-08-07 11:57:53 +05:00
unknown
86a239f555 information_schema_db.test fixed 
mysql-test/t/information_schema_db.test:
  user dropped
 2006-08-07 11:56:22 +05:00
unknown
5efe5fd820 please don't call methods that should always execute inside assert() 
tests/mysql_client_test.c:
  fixed lines that are executing methods that should always execute inside assert()
 2006-08-05 18:58:38 -05:00
unknown
46ed9d0b67 mysql_client_test.c: 
Moving call that processes select results out of the assert


tests/mysql_client_test.c:
  Moving call that processes select results out of the assert
 2006-08-05 23:15:23 +02:00
unknown
60a4f50c96 Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-5.0-kt 
into  production.mysql.com:/usersnfs/rburnett/mysql-5.0-kt


sql/mysqld.cc:
  Auto merged
 2006-08-04 21:34:46 +02:00
unknown
29e946ee5a lowercase_fs_off fails on windows because lower_case_file_system is not being 
set properly.  This patch should fix that.

mysqld.cc:
  Call test_if_case_insensitive in all cases so lower_case_file_system always gets set


sql/mysqld.cc:
  Call test_if_case_insensitive in all cases so lower_case_file_system always gets set
 2006-08-04 21:18:58 +02:00
unknown
d166ede9a3 Merge bk-internal.mysql.com:/data0/bk/mysql-5.0 
into  bk-internal.mysql.com:/data0/bk/mysql-5.0-kt


client/mysql.cc:
  Auto merged
mysql-test/r/gis.result:
  Auto merged
 2006-08-04 19:19:26 +02:00
unknown
cc10958f49 Add my_memmem.c to mysys.dsp (needed by mysql_client_test) 2006-08-04 01:41:21 +04:00
unknown
fc19d19d4a Fix a bug in the .dsp file. Ignore a symlink. 
BitKeeper/etc/ignore:
  Added ndb/src/common/util/testBitmask.cpp to the ignore list
VC++Files/sql/mysqld.dsp:
  Fix a bug in the .dsp file.
 2006-08-04 00:00:48 +04:00
unknown
6017f911e3 Merge bk-internal.mysql.com:/data0/bk/mysql-5.0 
into  bk-internal.mysql.com:/data0/bk/mysql-5.0-kt


client/mysql.cc:
  Auto merged
mysql-test/r/im_life_cycle.result:
  Auto merged
mysql-test/t/im_life_cycle.imtest:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_view.cc:
  Auto merged
sql/table.h:
  Auto merged
 2006-08-03 16:54:06 +02:00
unknown
65866b7bba Make test case for bug#21215repeateble by calling "reset master" 2006-08-03 16:47:24 +02:00
unknown
98157e78b1 Update result after merge, since the function Item::tmp_table_field_from_field_type() 
now takes mbmaxlen into account when calculating max_length of new field.
 2006-08-03 15:48:28 +02:00
unknown
4b57917194 Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint


client/mysql.cc:
  Auto merged
client/mysqldump.c:
  Auto merged
configure.in:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_func.h:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/item_strfunc.h:
  Auto merged
sql/item_subselect.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
 2006-08-03 12:11:07 +02:00
unknown
234bb881c3 Remove double error printout in mysqldump 
client/mysqldump.c:
  Remove double error printout, mysql_query_with_error_report will do that. And set the exit code for us.
mysql-test/r/mysqldump.result:
  Update test result after merge
 2006-08-03 12:09:22 +02:00
unknown
9744e7f811 Merge neptunus.(none):/home/msvensson/mysql/my41-bug21218 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint


mysql-test/t/mysqlbinlog.test:
  Null merge
 2006-08-03 11:59:57 +02:00
unknown
607b8e5e6e Merge neptunus.(none):/home/msvensson/mysql/my50-m-bug21215 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0


client/mysql.cc:
  Auto merged
configure.in:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_func.h:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/item_strfunc.h:
  Auto merged
sql/item_subselect.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
client/mysqldump.c:
  Manual merge
mysql-test/r/mysqldump.result:
  Manual merge
mysql-test/t/mysqldump.test:
  Manual merge
 2006-08-03 11:48:08 +02:00
unknown
45275fbc2b Removing disabling of lowercase_fs_off 2006-08-03 09:48:42 +02:00
unknown
ed44a2ee51 Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint


client/mysql.cc:
  Auto merged
client/mysqltest.c:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/date_formats.result:
  Auto merged
mysql-test/r/union.result:
  Auto merged
mysql-test/t/union.test:
  Auto merged
sql/field.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_func.h:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/item_strfunc.h:
  Auto merged
sql/item_subselect.cc:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
mysql-test/r/func_group.result:
  Merge manually
mysql-test/t/func_group.test:
  Merge manually
 2006-08-03 09:32:58 +02:00
unknown
695c534d76 Merge rama.(none):/home/jimw/my/mysql-5.0-19147 
into  rama.(none):/home/jimw/my/mysql-5.0-16502
 2006-08-02 19:52:11 -07:00
unknown
827e6a850a Merge rama.(none):/home/jimw/my/mysql-5.0-16881 
into  rama.(none):/home/jimw/my/mysql-5.0-16502


client/mysql.cc:
  Auto merged
mysql-test/r/date_formats.result:
  Auto merged
mysql-test/r/mysql.result:
  Auto merged
mysql-test/r/type_ranges.result:
  Auto merged
mysql-test/t/mysql.test:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/item_strfunc.h:
  Auto merged
sql/item_subselect.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
 2006-08-02 19:51:34 -07:00
unknown
7f69aee4ea Merge bk-internal:/home/bk/mysql-5.0-maint 
into  rama.(none):/home/jimw/my/mysql-5.0-16502
 2006-08-02 19:48:12 -07:00
unknown
3c8150b79b Disable a failing test case (filed a p1 bug) 2006-08-02 22:21:12 +04:00
unknown
e44e344cac Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  bodhi.local:/opt/local/work/mysql-5.0-runtime-merge


sql/item.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_func.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_view.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/table.h:
  Auto merged
mysql-test/r/sp.result:
  Manual merge.
mysql-test/r/udf.result:
  Manual merge.
mysql-test/t/sp.test:
  Manual merge.
mysql-test/t/udf.test:
  Manual merge.
 2006-08-02 21:54:10 +04:00
unknown
a0efaba363 A post-merge fix. 2006-08-02 19:39:47 +04:00
unknown
1cf65f311d Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  moonbone.local:/work/tmp_merge-5.0-opt-mysql


client/mysql.cc:
  Auto merged
 2006-08-02 18:11:59 +04:00
unknown
a581243383 Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  moonbone.local:/work/tmp_merge-5.0-opt-mysql


mysql-test/r/ps_1general.result:
  Auto merged
mysql-test/t/ps_1general.test:
  Auto merged
 2006-08-02 16:48:17 +04:00
unknown
0825bad93a Merge moonbone.local:/work/tmp_merge-4.1-opt-mysql 
into  moonbone.local:/work/tmp_merge-5.0-opt-mysql


mysql-test/Makefile.am:
  Auto merged
scripts/make_win_src_distribution.sh:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
client/mysqltest.c:
  Manual merge
 2006-08-02 16:46:55 +04:00
unknown
c102fe94ad Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  moonbone.local:/work/tmp_merge-5.0-opt-mysql


client/mysql.cc:
  Auto merged
mysql-test/r/date_formats.result:
  Auto merged
mysql-test/r/func_str.result:
  Auto merged
mysql-test/t/date_formats.test:
  Auto merged
mysql-test/t/func_str.test:
  Auto merged
mysql-test/t/udf.test:
  Auto merged
sql/field.cc:
  Auto merged
sql/field.h:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/time.cc:
  Auto merged
mysql-test/r/sp.result:
  Manual merge
mysql-test/t/sp.test:
  Manual merge
 2006-08-02 16:44:56 +04:00
unknown
328e8c7430 Merge moonbone.local:/work/tmp_merge-4.1 
into  moonbone.local:/work/tmp_merge-4.1-opt-mysql
 2006-08-02 16:40:32 +04:00
unknown
84ece59cef Merge moonbone.local:/work/tmp_merge-4.1 
into  moonbone.local:/work/tmp_merge-4.1-opt-mysql


sql/item_strfunc.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
 2006-08-02 16:10:52 +04:00
unknown
504e375656 Merge bk@192.168.21.1:mysql-4.1 
into  mysql.com:/home/hf/work/mysql-4.1.20317
 2006-08-02 16:57:46 +05:00
unknown
f3919e9284 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  bodhi.local:/opt/local/work/mysql-5.0-runtime-merge


include/mysql.h:
  Auto merged
include/sql_common.h:
  Auto merged
libmysql/libmysql.c:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/mysqldump.result:
  Auto merged
mysql-test/t/udf.test:
  Auto merged
ndb/src/mgmsrv/ConfigInfo.cpp:
  Auto merged
sql/item.cc:
  Auto merged
sql/item_func.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sp.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql-common/client.c:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/table.h:
  Auto merged
mysql-test/r/ps.result:
  Manual merge.
mysql-test/r/sp.result:
  Manual merge.
mysql-test/t/ps.test:
  Manual merge.
mysql-test/t/sp.test:
  Manual merge.
sql/sql_prepare.cc:
  Manual merge.
sql/table.cc:
  Manual merge.
tests/mysql_client_test.c:
  Manual merge.
 2006-08-02 14:13:01 +04:00
unknown
ed19079caa Merge grichter@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  lmy002.wdf.sap.corp:/home/georg/work/mysql/prod/mysql-5.0
 2006-08-02 11:39:59 +02:00
unknown
cb6e70a55c Fix a compilation failiure on QNX 
sql/udf_example.c:
  Declare tmp_error at the beginning of the block (this is C now)
 2006-08-02 13:25:13 +04:00
unknown
6e5d9284ed Merge hf@192.168.21.12:work/mysql-5.0.19452 
into  mysql.com:/home/hf/work/mysql-5.0.ps
 2006-08-02 14:17:17 +05:00
unknown
2b4048c0fe Merge bk@192.168.21.1:mysql-5.0-kt 
into  mysql.com:/home/hf/work/mysql-5.0.19452


client/mysql_upgrade.c:
  Auto merged
 2006-08-02 14:17:16 +05:00
unknown
bf13c68e5d Merge bk@192.168.21.1:mysql-5.0-kt 
into  mysql.com:/home/hf/work/mysql-5.0.14807


mysql-test/r/gis.result:
  Auto merged
mysql-test/t/gis.test:
  Auto merged
sql/item_geofunc.h:
  Auto merged
 2006-08-02 14:03:20 +05:00
unknown
a29f10e8ee Bug #21396: Wrong error number generated for a missing table 
BitKeeper/etc/collapsed:
  BitKeeper file /home/georg/work/mysql/prod/mysql-5.0/BitKeeper/etc/collapsed
mysys/my_open.c:
  Win64 bit fix: Replacing 32-bit value (0xFFFFFFFF) by a generic error constant.
 2006-08-02 10:00:28 +02:00
unknown
10ee3a50fc Disable test case for for bug 21042 2006-08-02 08:46:58 +02:00
unknown
53cc83fef2 .del-sp.test.orig: 
Delete: mysql-test/t/sp.test.orig


BitKeeper/deleted/.del-sp.test.orig:
  Delete: mysql-test/t/sp.test.orig
 2006-08-02 02:21:36 +02:00
unknown
75e40b161b Applied innodb-5.0-ss677 snapshot. 
Fixes:
- bug #19834: Using cursors when running in READ-COMMITTED can cause InnoDB to crash
- bug #21112: InnoDB slow with > 100,000 .ibd files
- bug #21113: Duplicate printout in SHOW INNODB STATUS


innobase/fil/fil0fil.c:
  Applied innodb-5.0-ss677 snapshot.
    Make the tablespace cache hash size 100 or 1000 times bigger. Fixes bug #21112.
innobase/ibuf/ibuf0ibuf.c:
  Applied innodb-5.0-ss677 snapshot.
    ibuf_print(): Don't print redundant information. Fixes bug #21113.
sql/ha_innodb.cc:
  Applied innodb-5.0-ss677 snapshot.
    ha_innobase::start_stmt(): patch from Heikki:
    Do not call read_view_close_for_mysql().  (Bug #19834)
 2006-08-01 21:59:58 +02:00
unknown
a5c45ac671 Merge 192.168.0.20:mysql/mysql-5.0-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint


extra/yassl/taocrypt/include/asn.hpp:
  Auto merged
extra/yassl/taocrypt/src/asn.cpp:
  Auto merged
 2006-08-01 20:39:48 +02:00
unknown
1081dd6f0d Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint


configure.in:
  Auto merged
client/mysql.cc:
  Auto merged
client/mysqldump.c:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/date_formats.result:
  Auto merged
mysql-test/r/federated.result:
  Auto merged
mysql-test/r/func_time.result:
  Auto merged
mysql-test/r/mysql.result:
  Auto merged
mysql-test/r/type_ranges.result:
  Auto merged
mysql-test/t/func_time.test:
  Auto merged
mysql-test/t/mysql.test:
  Auto merged
sql/field.cc:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/item_strfunc.h:
  Auto merged
sql/item_subselect.cc:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
 2006-08-01 20:24:30 +02:00
unknown
805c439b6f Import latest version of yaSSL 
extra/yassl/include/yassl_imp.hpp:
  Import patch yassl.diff
extra/yassl/src/yassl_imp.cpp:
  Import patch yassl.diff
extra/yassl/src/yassl_int.cpp:
  Import patch yassl.diff
extra/yassl/taocrypt/include/asn.hpp:
  Import patch yassl.diff
extra/yassl/taocrypt/src/asn.cpp:
  Import patch yassl.diff
extra/yassl/COPYING:
  Import patch yassl.diff
 2006-08-01 20:20:46 +02:00
unknown
87fc6265ce Merge bk-internal:/home/bk/mysql-4.1 
into  neptunus.(none):/home/msvensson/mysql/mysql-4.1
 2006-08-01 15:36:37 +02:00
unknown
2660a6bb59 Merge bk-internal:/home/bk/mysql-5.0-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-08-01 15:22:54 +02:00
unknown
de99af6901 Add missing $ 2006-08-01 15:21:09 +02:00
unknown
7b914fbbf7 Merge igreenhoe@bk-internal.mysql.com:/home/bk/mysql-5.0-maint 
into  maint1.mysql.com:/data/localhome/igreenhoe/mysql-5.0-maint
 2006-08-01 13:04:48 +02:00