igor@rurik.mysql.com
80aa0062db
olap.result, olap.test:
...
Added test cases for bug #7914 .
sql_select.cc:
Fixed bug #7914 : rollup over expresssions such as sum(a)+1.
2005-05-18 05:15:48 -07:00
igor@rurik.mysql.com
3199272e65
sql_yacc.yy:
...
Added missing ';'.
2005-05-18 04:17:13 -07:00
serg@serg.mylan
28712375d5
Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2005-05-18 11:03:05 +02:00
serg@serg.mylan
48377eb7c4
test fixes
2005-05-18 10:57:07 +02:00
tulin@dl145c.mysql.com
13bbb3dbb3
ndberror.c:
...
updated error message for ndb
2005-05-18 10:22:27 +02:00
matt@mysql.com
8ed0aaacdf
Merge bk-internal:/home/bk/mysql-4.1
...
into mysql.com:/data0/mysqldev/my/mysql-4.1-build
2005-05-18 04:06:27 +02:00
bell@book.sanja.is.com.ua
295722520f
Merge book.sanja.is.com.ua:/Users/bell/mysql/bk/mysql-4.1
...
into book.sanja.is.com.ua:/Users/bell/mysql/bk/work-4.1
2005-05-17 19:10:53 +03:00
sergefp@mysql.com
cc13545413
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/psergey/mysql-4.1-bug10095
2005-05-16 22:21:19 +02:00
monty@mysql.com
8b1673f18e
Fix memory leak
2005-05-16 20:16:46 +03:00
sergefp@mysql.com
58d05b0794
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/psergey/mysql-4.1-bug10221
2005-05-16 14:10:02 +00:00
sergefp@mysql.com
47ad6a6daa
Some improvement in Item_int_with_ref class comment.
2005-05-16 14:06:52 +00:00
bell@book.sanja.is.com.ua
1ff9f55920
relaxed DBUG_ASSERT in Item_int_with_ref::new_item() to "any constant" (BUG#10020)
2005-05-16 12:19:10 +03:00
kent@mysql.com
63fcb5de6f
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/Users/kent/mysql/bk/mysql-4.1
2005-05-16 02:55:51 +02:00
kent@mysql.com
b076cdb208
mysqltest.c:
...
To solve bug#8455, call mysql_affected_rows() earlier, before query to find warnings
2005-05-16 01:08:42 +02:00
kent@mysql.com
6374bfeb61
mysqltest.c:
...
To solve bug#6193, also reset require when using 'eval' for running query
mysql-test-run.pl:
In cleanup, remove possible soft link to var directory
2005-05-15 20:38:54 +02:00
kent@mysql.com
81b36addc9
mtr_report.pl, mtr_process.pl, mysql-test-run.pl:
...
Added option --vardir=<directory> for feature bug#10096
2005-05-15 17:22:54 +02:00
kent@mysql.com
f37bdbe059
mysql-test-run.pl:
...
Not to conflict with Windows return code 2 for "not found", use 62 for "skip"
init_db.sql:
Initial db updates
2005-05-15 07:34:09 +02:00
kent@mysql.com
221b1ccae8
mysqltest.c, mysql-test-run.sh:
...
Not to conflict with Windows return code 2 for "not found", use 62 for "skip"
mysql-test-run.sh, suppress.purify:
Use Purify suppress file
2005-05-15 06:59:34 +02:00
kent@mysql.com
a628878bbf
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/Users/kent/mysql/cw/mysql-4.1
2005-05-14 23:48:15 +02:00
monty@mysql.com
6588997eb8
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/my/mysql-4.1
2005-05-14 16:28:52 +03:00
monty@mysql.com
beb5867dfb
After merge fixes
2005-05-14 16:24:36 +03:00
konstantin@mysql.com
6c981c0b80
Fix a valgrind warning: memcpy does not allow its arguments to overlap.
2005-05-14 02:31:26 +04:00
konstantin@mysql.com
6adfd9436e
Fix wrong format specifier in error messages.
...
Not to be pushed into 5.0 as there it's fixed differently (in the new
format of error messages)
2005-05-14 02:28:10 +04:00
sergefp@mysql.com
480957e7e6
Fix for BUG#9622: Make index statistics collection in MyISAM behave the same
...
way in ALTER TABLE ... ENABLE KEYS, ANALYZE TABLE and after bulk insert:
now statistics collection always assumes NULLs are inequal.
2005-05-14 00:21:53 +02:00
monty@mysql.com
b4e92e6360
Merge with 4.0
2005-05-14 00:01:40 +03:00
serg@serg.mylan
63eaf44c5c
Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2005-05-13 22:55:08 +02:00
monty@mysql.com
59cce60151
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/my/mysql-4.1
2005-05-13 23:12:22 +03:00
monty@mysql.com
9b39f8304e
Fixed wrong buffer usage for auto-increment key with blob part that caused CHECK TABLE to report that the table was wrong. (Bug #10045 )
2005-05-13 23:08:29 +03:00
serg@serg.mylan
c4c76c5fdb
sql/ha_blackhole.cc
...
bug#10175 - blackhole.test hangs with "Warning: prev link 1 didn't point at previous lock at read: read lock with no write locks"
sql/sql_base.cc
libmysqld/examples/mysql.cc linking problem
2005-05-13 21:43:26 +02:00
jimw@mysql.com
1436dd8f7c
Merge bk-internal:/home/bk/mysql-4.1
...
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-05-13 10:04:15 -07:00
jimw@mysql.com
20037b11fd
Merge mysql.com:/home/jimw/my/mysql-4.1-9603
...
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-05-13 10:03:16 -07:00
heikki@hundin.mysql.fi
d4bbdad2f6
row0mysql.c:
...
InnoDB wrongly complained in the .err log that MySQL is trying to drop a non-existent table, if tablespace ran out (Bug #10607 )
2005-05-13 18:37:22 +03:00
georg@lmy002.wdf.sap.corp
41d284e608
added prototype for mysql_set_character_set function
2005-05-13 15:54:35 +02:00
georg@lmy002.wdf.sap.corp
320d9cb4c2
added function mysql_set_character_set (reviewed by Monty)
...
as a work around for #8317 and #9637
This function sends SET NAMES command and changes mysql->charset
so mysql_real_escape_string will work as expected.
2005-05-13 15:06:11 +02:00
monty@mysql.com
b54d7d04bd
Fixes during review
2005-05-13 14:04:32 +03:00
kent@mysql.com
3eebfde644
readline.h:
...
Include <sys/ttydefaults.h> for CodeWarrior and CTRL define
2005-05-13 11:59:17 +02:00
monty@mysql.com
20f969b256
Change create_field->offset to store offset from start of fields, independent of null bits.
...
Count null_bits separately from field offsets and adjust them in case of primary key parts.
(Previously a CREATE TABLE with a lot of null fields that was part of a primary key caused MySQL to wrongly count the number of bytes needed to store null bits)
This is a more complete bug fix for #6236
2005-05-13 11:11:50 +03:00
lenz@mysql.com
27ab139dfa
- don't include sys.h directly in the autogenerated libedit source
...
files - include config.h instead (compile fix for FreeBSD and AIX
4.3/5.2)
2005-05-13 10:04:35 +02:00
kent@mysql.com
7209906093
readline.c:
...
Include readline/readline.h earlier, to avoid redifinition of term.h macros on AIX 5.2
search.c:
FreeBSD needs <sys/types.h> to get 'off_t' defined
2005-05-12 19:02:26 +02:00
lenz@mysql.com
f6593cb7d4
- added a check for "u_int32_t" to configure.in that will define
...
HAVE_U_INT32_T when available (needed to fix a double typedef in
libedit)
2005-05-12 18:18:37 +02:00
mleich@mysql.com
1494f0ab68
If the system is under high load 'show full processlist' might report the
...
process of the predecessing test case instead of the current test case.
Shifting the command to the end of the current test case should avoid this problem.
2005-05-12 17:49:34 +02:00
paul@kite-hub.kitebird.com
2123e95e04
mysqldump.1.in:
...
Remove obsolete section number. (Bug #10534 )
2005-05-11 12:14:46 -05:00
kent@mysql.com
c82c07dc03
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/Users/kent/mysql/cw/mysql-4.1
2005-05-10 18:14:45 +02:00
msvensson@neptunus.(none)
4bf24254ab
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into neptunus.(none):/home/msvensson/mysql/mysql-4.1
2005-05-10 17:52:17 +02:00
msvensson@neptunus.(none)
08a48ac2d4
Fix for Ingo
2005-05-10 17:51:29 +02:00
lenz@mysql.com
da2206d02b
Applied two patches already commited to the main tree to resolve bugs found during the build:
...
- removed an "#error PRAGMA" from sql/item_strfunc.h (msvensson)
- Fixed BUG#10070 (range test failed if InnoDB is not available) (sergefp)
2005-05-10 14:44:03 +02:00
bar@noter.(none)
ab41ec313f
ctype-big5.c:
...
additional fix for bug@10493, for sjis
ctype-cp932.c:
additional fix for bug#10493, for cp932
2005-05-10 17:00:54 +05:00
kent@mysql.com
7c65e20e32
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/Users/kent/mysql/cw/mysql-4.1
2005-05-10 13:56:08 +02:00
kent@mysql.com
faf8f825b5
Makefile.am, configure.in:
...
Enable creation of embedded lib when --with-darwin-mwcc
2005-05-10 13:53:47 +02:00
bar@mysql.com
70506c67ff
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/root/mysql-4.1
2005-05-10 14:24:58 +05:00