Commit 34a11a32 authored by unknown's avatar unknown
Browse files

Merge mronstrom@bk-internal.mysql.com:/home/bk/bugs/bug18198 

into  c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug18198


sql/item_timefunc.h:
  Auto merged
sql/partition_info.cc:
  Auto merged
sql/share/errmsg.txt:
  manual merge
parents 328da025 17e3ee35

.bzrignore

+5 −0
Original line number Diff line number Diff line
@@ -1759,3 +1759,8 @@ vio/viotest.cpp 
zlib/*.ds?

zlib/*.vcproj

mysql-test/r/*.log

client/mysql_upgrade

unittest/examples/*.t

unittest/mysys/*.t

unittest/mytap/t/*.t

unittest/unit

BUILD/compile-dist

+3 −1
Original line number Diff line number Diff line
@@ -52,7 +52,9 @@ fi 
  --with-federated-storage-engine \

  --with-berkeley-db \

  --with-innodb \

  --with-yassl \

  --enable-thread-safe-client \

  --with-extra-charsets=complex \

  --with-ndbcluster

  --with-ndbcluster \

  --with-zlib-dir=bundled

make

BUILD/test-alpha-ccc

deleted100755 → 0
+0 −11
Original line number Diff line number Diff line 
cd /usr/local/mysql

bin/mysqladmin shutdown

libexec/mysqld --basedir . &

cd sql-bench

rm output/*

perl run-all-tests --comment "Alpha DS20 2x500 MHz, 2G memory, key_buffer=16M; egcs 1.1.2 + ccc" --user=monty --password="ds20-gryta"

perl run-all-tests --comment "Alpha DS20 2x500 MHz, 2G memory, key_buffer=16M; egcs 1.1.2 + ccc" --user=monty --password="ds20-gryta" --log --use-old

mv output/* output-ccc

perl run-all-tests --comment "Alpha DS20 2x500 MHz, 2G memory, key_buffer=16M; egcs 1.1.2 + ccc" --user=monty --password="ds20-gryta" --fast

perl run-all-tests --comment "Alpha DS20 2x500 MHz, 2G memory, key_buffer=16M; egcs 1.1.2 + ccc" --user=monty --password="ds20-gryta" --log --use-old --fast

mv output/* output-ccc

Docs/Books/algor.eps

deleted100644 → 0
+0 −1419

File deleted.

Preview size limit exceeded, changes collapsed.

Docs/Books/algor.gif

deleted100644 → 0
−14.6 KiB
Loading image diff...