database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-01-06 05:22:24 +03:00
Code Activity

Merge trift2.:/MySQL/M51/clone-5.1

Browse Source 
into  trift2.:/MySQL/M51/push-5.1


sql/my_decimal.h:
  Auto merged
mysql-test/r/ps_2myisam.result:
  Do not use the "result" file from the 5.1.19 tree, rather the main one.
mysql-test/r/ps_3innodb.result:
  Do not use the "result" file from the 5.1.19 tree, rather the main one.
mysql-test/r/ps_4heap.result:
  Do not use the "result" file from the 5.1.19 tree, rather the main one.
mysql-test/r/ps_5merge.result:
  Do not use the "result" file from the 5.1.19 tree, rather the main one.
mysql-test/r/ps_7ndb.result:
  Do not use the "result" file from the 5.1.19 tree, rather the main one.
This commit is contained in:
unknown
2007-06-05 17:53:02 +02:00
parent b10c39f918 dc8912df55
commit 893460d0ee
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile.am
View File

@@ -136,8 +136,10 @@ test-bt:
@PERL@ ./mysql-test-run.pl --force --comment=rpl --suite=rpl
-cd mysql-test ; MTR_BUILD_THREAD=auto \
@PERL@ ./mysql-test-run.pl --force --comment=partitions --suite=parts
-cd mysql-test ; MTR_BUILD_THREAD=auto \
@PERL@ ./mysql-test-run.pl --force --comment=rowlock --suite=row_lock
# Re-enable the "rowlock" suite when bug#28685 is fixed
# -cd mysql-test ; MTR_BUILD_THREAD=auto \
# @PERL@ ./mysql-test-run.pl --force --comment=rowlock --suite=row_lock
# Re-enable the "jp" suite when bug#28563 is fixed
# -cd mysql-test ; MTR_BUILD_THREAD=auto \

1
sql/my_decimal.h
View File

@@ -40,6 +40,7 @@ C_MODE_END
/* the number of digits that my_decimal can possibly contain */
#define DECIMAL_MAX_POSSIBLE_PRECISION (DECIMAL_BUFF_LENGTH * 9)
/*
maximum guaranteed precision of number in decimal digits (number of our
digits * number of decimal digits in one our big digit - number of decimal