Commit graph

27487 commits

Author SHA1 Message Date
brian@zim.(none)
ff6cfe6d66 Change in gis test to allow NDB to be able to call generic tests. Fix for Archive so that ALTER TABLE doesn't issue a warning. Also added test case for alter table. 2005-10-26 13:55:08 -07:00
paul@frost.snake.net
2eeee61a2e Merge paul@bk-internal.mysql.com:/home/bk/mysql-5.0
into  frost.snake.net:/Users/paul/bk/mysql-5.0
2005-10-26 13:04:44 -05:00
patg@krsna.patg.net
bd0497ce3b Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-4.1
into  krsna.patg.net:/home/patg/mysql-build/mysql-4.1
2005-10-26 09:22:47 -07:00
brian@zim.(none)
22644b5f1c Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.0
into  zim.(none):/home/brian/mysql/mysql-5.0
2005-10-26 09:08:44 -07:00
aivanov@mysql.com
a9a127e0bc Removed innobase/my_cnf, innobase/include/makefilewin.i,
and innobase/*/makefilewin (which are unused now).
2005-10-26 20:06:08 +04:00
SergeyV@selena.
0eacb6fb35 Merge svlasenko@bk-internal.mysql.com:/home/bk/mysql-5.0
into  selena.:H:/MYSQL/src/#14137-mysql-5.0
2005-10-26 19:05:02 +04:00
reggie@big_geek.
de428f6654 Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-5.0
into  big_geek.:C:/Work/mysql/mysql-5.0
2005-10-26 09:47:12 -05:00
SergeyV@selena.
14e90138e5 Formatting change for #14137 patch. 2005-10-26 17:45:30 +04:00
jani@a193-229-222-105.elisa-laajakaista.fi
0e6b53f172 Imported fix from 5.0. 2005-10-26 16:12:41 +03:00
msvensson@neptunus.(none)
905658fc9a Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0
into  neptunus.(none):/home/msvensson/mysql/bug12258/my50-bug12258
2005-10-26 15:06:17 +02:00
msvensson@neptunus.(none)
b8fdad5d26 Merge neptunus.(none):/home/msvensson/mysql/bug12258/my41-bug12258
into  neptunus.(none):/home/msvensson/mysql/bug12258/my50-bug12258
2005-10-26 14:15:04 +02:00
msvensson@neptunus.(none)
ac895b0342 Bug #12258 mysql_client_test failure on FC4
- Fix for gcc 4.0.1, use cast packet arg local variable
2005-10-26 14:14:08 +02:00
ingo@mysql.com
5f51294a3c 1.2048 05/10/20 10:31:16 ingo@mysql.com +1 -0
Bug#12166 - Unable to index very large tables
Moved clearing of errors behind the second repair attempt,
but will clear only if no error happened.

No test case. The error can be repeated with little free
space on tmpdir only. I do not know of a way to create this
in a portable way with our test suite.

I did however attach a shell script to the bug report which
can easily be adapted to the situation on the test machine.
2005-10-26 14:01:54 +02:00
kent@mysql.com
cd0592136a Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/Users/kent/mysql/bk/mysql-5.0
2005-10-26 11:45:41 +02:00
reggie@big_geek.
dec2640dbf changed define from EXTERN_C to EXTERNC so it doesn't conflict with
another macro defined in the Windows header files.
2005-10-25 23:51:05 -05:00
kent@mysql.com
a2d7a9da90 mysql-test-run.pl:
Added MTR_BUILD_THREAD to control the port range
2005-10-26 01:24:03 +02:00
kent@mysql.com
77ecd8d968 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/Users/kent/mysql/bk/mysql-5.0
2005-10-26 00:03:27 +02:00
kent@mysql.com
5561697158 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/Users/kent/mysql/bk/mysql-4.1
2005-10-25 23:56:08 +02:00
kent@mysql.com
983b7ad153 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/Users/kent/mysql/bk/mysql-4.0
2005-10-25 23:52:18 +02:00
patg@krsna.patg.net
7243b7bb49 BUG# 12123
Made change to mysqlimport to set character_set_database to binary to 
make importing various charsets/columns work correctly.
2005-10-25 14:50:08 -07:00
sergefp@mysql.com
2219ada7f6 BUG#14139: When handling "CREATE TABLE(field_X type_spec,...) SELECT smth AS field_X, ...."
avoid multiplying length of field_X by charset->mbmaxlen twice when calculating space 
required for field_X in the new table.
2005-10-26 00:56:17 +04:00
jimw@mysql.com
a4cc61f213 Merge mysql.com:/home/jimw/my/mysql-5.0-13534
into  mysql.com:/home/jimw/my/mysql-5.0-clean
2005-10-25 13:42:04 -07:00
brian@zim.(none)
da60b60207 Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.0
into  zim.(none):/home/brian/mysql/mysql-5.0
2005-10-25 11:03:22 -07:00
paul@frost.snake.net
ea8ab2a114 Merge paul@bk-internal.mysql.com:/home/bk/mysql-5.0
into  frost.snake.net:/Users/paul/bk/mysql-5.0
2005-10-25 12:50:03 -05:00
sasha@asksasha.com
63bac8c4e4 Merge spachev@bk-internal.mysql.com:/home/bk/mysql-5.0
into  asksasha.com:/reiser-data/mysql-dev/mysql-5.0-bug12974
2005-10-25 11:25:46 -06:00
pgalbraith@mysql.com
adcc3ac935 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/data0/mysqldev/patg/mysql-5.0-viewfix
2005-10-25 19:16:08 +02:00
jimw@mysql.com
a01cd74647 Merge mysql.com:/home/jimw/my/mysql-4.1-12925
into  mysql.com:/home/jimw/my/mysql-4.1-clean
2005-10-25 10:11:47 -07:00
jimw@mysql.com
e8eed35c6a Fix incorrect casts in my_getopt code that capped the maximum of longlong
options to the wrong value. (Bug #12925)
2005-10-25 10:10:53 -07:00
pgalbraith@mysql.com
feca138e46 This cset fixes BUG# 12838, 14061, 12129
mysqldump.result:
  BUG# 12838
      New test results for mysqldump -x on a DB with views
mysqldump.test:
  sqldump.test:
      BUG# 12838
      New test to run mysqldump -x on a DB with views
mysqldump.c:
  BUG# 12838
      Removed/Changed code which created tables to be put into the dump
      (For loading views of views) by creating temp tables and then using
      the CREATE TABLE information in those temp tables. The problem with this
      is that when mysqldump -x is called, it locks all tables, so the
      temp tables could not be created, causing the mysqldump to exit with
      failure. The code was changed to use SHOW FIELDS to get the column
      names and type to build CREATE TABLE text used to create these tables
      that views need in the dump.
2005-10-25 19:04:31 +02:00
hf@deer.(none)
526315ebfa Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0
into deer.(none):/home/hf/work/mysql-5.0.12267
2005-10-25 22:04:20 +05:00
evgen@moonbone.local
b5d426623f Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.1
into moonbone.local:/work/14016-bug-4.1-mysql
2005-10-25 20:37:45 +04:00
evgen@moonbone.local
90cf3e78f0 Fix bug #14016 date_format() 2nd parameter was compared using case insensitive
collation

By default constant strings in second parameter of date_time() have case
insensitive collation. Because of this expressions date_format(f,'%m') and 
date_format(f,'%M') wrongly becomes equal, which results in choosing wrong 
column to sort by.

Now if second parameter of date_format() is constant then it's collation is 
changed to case sensitive.
2005-10-25 20:37:26 +04:00
hf@deer.(none)
50a8dbc8c2 Merge deer.(none):/home/hf/work/mysql-5.0.13820
into deer.(none):/home/hf/work/mysql-5.0.12267
2005-10-25 21:10:58 +05:00
hf@deer.(none)
8cd0241439 Merge deer.(none):/home/hf/work/mysql-5.0.13667
into deer.(none):/home/hf/work/mysql-5.0.12267
2005-10-25 21:09:37 +05:00
hf@deer.(none)
bcebef8958 Merge bk@192.168.21.1:/usr/home/bk/mysql-5.0
into deer.(none):/home/hf/work/mysql-5.0.12267
2005-10-25 21:08:22 +05:00
evgen@moonbone.local
1d30f8e082 Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.1
into moonbone.local:/work/13392-bug-4.1-mysql
2005-10-25 20:04:44 +04:00
evgen@moonbone.local
8cb0dff904 Fix bug#13392 Wrong VALUES() behaviour in INSERT SELECT with ON DUPLICATE
VALUES() can only refer to table insert going to. 
But Item_insert_value::fix_fields() were passing to it's arg full table list,
This results in finding second column which shouldn't be found, and
failing with error about ambiguous field.

Item_insert_value::fix_fields() now passes only first table of full table
list.
2005-10-25 20:04:12 +04:00
acurtis@zim.(none)
cd19a1481e Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  zim.(none):/home/acurtis/mysql-5.0-noraid.2
2005-10-25 08:18:32 -07:00
acurtis@zim.(none)
1d860c2dbe Deprecate RAID create options 2005-10-25 08:15:37 -07:00
brian@zim.(none)
d5c90efe97 Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.0
into  zim.(none):/home/brian/mysql/mysql-5.0
2005-10-25 07:29:40 -07:00
reggie@big_geek.
2e637a0b36 fix issue with IM that causes commandlines that are executed to be incorrect. 2005-10-25 09:29:39 -05:00
hf@deer.(none)
86e358f1c8 Merge bk@192.168.21.1:/usr/home/bk/mysql-5.0
into deer.(none):/home/hf/work/mysql-5.0.12267
2005-10-25 19:08:33 +05:00
jani@ua141d10.elisa.omakaista.fi
3e599c0907 Imported fixes from 4.1 and 5.0 to 4.0. 2005-10-25 16:56:25 +03:00
sergefp@mysql.com
56aeee44d3 Fix for BUG#14272: Don't run index scan when we should use quick select.
This could cause failures because there are table handlers (like federated)
that support quick select scanning but do not support index scanning.
2005-10-25 16:34:03 +04:00
ramil@mysql.com
c06673d49b Fix for bug #14290: wrong CHARACTER_MAXIMUM_LENGTH value for some text fields. 2005-10-25 17:22:58 +05:00
joerg@mysql.com
6d1821f2e6 Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/M41/mysql-4.1
2005-10-25 13:59:25 +02:00
ramil@mysql.com
c88f0e9c19 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/usr/home/ram/work/5.0.b14207
2005-10-25 16:06:46 +05:00
bar@mysql.com
a6e1f72d84 Bug#13347: empty result from query with like and cp1250 charset
ctype-win1250ch.c:
  Like range prefix tables were wrong.
ctype_cp1250_ch.result, ctype_cp1250_ch.test:
  Adding test case.
2005-10-25 14:49:04 +05:00
pem@mysql.com
3e9f3c3205 Converted mysys/base64.c into C code (not C++). 2005-10-25 11:30:43 +02:00
jani@ua141d10.elisa.omakaista.fi
3042591a9f Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-4.1
into  ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1
2005-10-25 12:12:10 +03:00