guilhem@mysql.com
e2aca8cbea
Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0
...
into mysql.com:/home/mysql_src/mysql-4.0
2004-09-06 22:30:58 +02:00
guilhem@mysql.com
01ad1bb569
Dependency fix. We observed that doing any change to class THD in sql_class.h resulted in mysqld going crazy (parsing errors,
...
query cache errors in query_cache.test). This is because sql_yacc.cc depends on several .h files but those were not listed in
the dependencies of sql_yacc.o. The present patch does fix the issue; but my auto*-expert colleagues may have a better one.
2004-09-06 22:30:16 +02:00
serg@serg.mylan
130d2fd57f
bug#5389 merge.test fails on qnx - uninitalized variable in myrg_open()
2004-09-06 22:20:40 +02:00
serg@serg.mylan
02d3cf19ef
Merge bk-internal:/home/bk/mysql-4.0/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
2004-09-06 20:18:41 +02:00
bar@mysql.com
09f681ba7b
Bug #5324 Bug in UCA collations with LIKE comparisons and INDEX
2004-09-06 20:04:22 +05:00
paul@ice.snake.net
39a37691ac
client.c:
...
sqlstat uninitialized in mysql_init().
2004-09-06 09:23:51 -05:00
heikki@hundin.mysql.fi
9d8c612a87
Merge heikki@build.mysql.com:/home/bk/mysql-4.1
...
into hundin.mysql.fi:/home/heikki/mysql-4.1
2004-09-06 15:31:02 +03:00
ram@gw.mysql.r18.ru
92be15da12
A fix (bug #2205 USE database doesn't work after DROP database + CREATE database)
...
(Jani's CS 1.1675 04/01/05 21:45:14 was adapted an aplied).
2004-09-06 16:48:11 +05:00
bar@mysql.com
3da2a24116
Bug #5397 : Crash with varchar binary and LIKE
2004-09-06 15:03:43 +05:00
heikki@hundin.mysql.fi
a65cc849a7
Merge heikki@build.mysql.com:/home/bk/mysql-4.1
...
into hundin.mysql.fi:/home/heikki/mysql-4.1
2004-09-06 13:02:48 +03:00
heikki@hundin.mysql.fi
b3325a06d1
srv0start.c:
...
Fix bug #5414 in 4.1: srv_max_n_threads was always set to only 1000, regardless of the buffer pool size; undelr very high concurrent loads this could cause an assertion failure in sync0arr.c line 384 when we ran out of wait slots for threads; also innodb_thread_concurrency did not work, because the wait queue also there overflowed at 1000 concurrent threads; also remove redundant code
trx0undo.c:
Add a missing newline to fprints
2004-09-06 13:01:29 +03:00
ram@gw.mysql.r18.ru
ab9843e217
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into gw.mysql.r18.ru:/usr/home/ram/work/4.1.b5291
2004-09-06 13:58:22 +05:00
magnus@neptunus.(none)
4f655b1c53
Added debug printout's to ha_ndbcluster
2004-09-06 10:33:12 +02:00
serg@serg.mylan
7ac525fc1b
union.test: drop table added
2004-09-05 11:27:31 +02:00
bell@sanja.is.com.ua
ad6ad34b45
memory leak fixed
2004-09-05 10:57:26 +03:00
monty@mysql.com
5d71817c70
After merge fixes
2004-09-05 02:31:11 +03:00
serg@serg.mylan
62c2f1c161
sql_print_error cleanup
2004-09-04 20:17:09 +02:00
monty@mysql.com
9d8555c0f0
Merge with 4.0 to get latest bug fixes
2004-09-04 15:59:49 +03:00
gluh@gluh.mysql.r18.ru
dfd310fc00
Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into gluh.mysql.r18.ru:/home/gluh/MySQL-BUGS/mysql-4.1
2004-09-04 08:59:08 +04:00
serg@serg.mylan
9153fd2ae4
merged
2004-09-03 22:12:27 +02:00
serg@serg.mylan
9b0468bc96
BUG#5327 - mi_sort_index() of 2-level tree
2004-09-03 22:04:08 +02:00
konstantin@mysql.com
bdec2c603b
A fix for bug#4368 '"like" fails in PreparedStatement, crashes
...
server': the bug occurs when arguments of LIKE function are in
differentcharacter sets. If these character sets are compatible,
we create an item-converter. In prepared mode, this item
needs to be created in memory of current prepared statement.
2004-09-03 23:28:49 +04:00
vva@eagle.mysql.r18.ru
c3cb5980c2
define macro "DEFINE_ALL_CHARACTER_SETS" in the configure.in completely
2004-09-04 00:28:48 +05:00
paul@kite-hub.kitebird.com
38f462ae6f
sql_yacc.yy:
...
Allow FROM or IN in SHOW KEYS, as in other SHOW statements.
2004-09-03 10:56:55 -05:00
gluh@gluh.mysql.r18.ru
9700398e8b
Fix for bug #4373 : \u behaves differently
2004-09-03 19:56:24 +04:00
serg@serg.mylan
e66d0fa7d8
add engine=MyISAM to all create table statements in
...
mysql_create_system_tables, just in case
2004-09-03 17:20:00 +02:00
ram@gw.mysql.r18.ru
f91ca0bd66
A fix (Bug #4980 : union statement with () union () order by produces wrong explain).
2004-09-03 19:59:29 +05:00
ram@gw.mysql.r18.ru
c9d97272ed
A fix (Bug #5291 : float -> string, truncation, sometimes without warning).
2004-09-03 19:38:16 +05:00
vva@eagle.mysql.r18.ru
15eb33ab44
Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.1
...
into eagle.mysql.r18.ru:/home/vva/work/mysql.orig/test/mysql-4.1
2004-09-03 19:32:18 +05:00
ram@gw.mysql.r18.ru
3c85a363e5
A fix (bug #2631 : mlockall called after dropping root permissions).
2004-09-03 19:26:11 +05:00
vva@eagle.mysql.r18.ru
0fda2f6b97
1. discarded term.h from the distribution
...
2. changed key_* to el_ley_* in the libedit key.h
(because it's in the conflict with the aix definitions)
3. use libedit_term.h instead of term.h in the cmd-line-utils/libedit/el.h
4. added definition of MIN in the cmd-line-utils/libedit/read.c
(if it wasn't defined yet)
5. discarded definition of SUNOS macro from configure.in
(now we don't include term.h in the el.h at all)
2004-09-03 17:47:36 +05:00
igor@rurik.mysql.com
5625988ca3
Merge rurik.mysql.com:/home/igor/mysql-4.0
...
into rurik.mysql.com:/home/igor/dev/mysql-4.0-0
2004-09-02 22:07:07 -07:00
igor@rurik.mysql.com
f888026fdc
select.result, select.test:
...
Added a test case for bug #5333 .
null_key.result, key_primary.result:
Made covering index usable for const tables.
sql_select.cc:
Made covering index usable for const tables:
downported the corresponding code from 4.1.
Simultaneously fixed bug #5333 reported for 4.1.
The bug was due to the fact that field index in join
structures was always set to 0 for const tables.
2004-09-02 22:06:30 -07:00
monty@mysql.com
936eb4b4f4
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/my/mysql-4.1
2004-09-03 02:26:00 +03:00
monty@mysql.com
bb4ccdb177
Remove extra '/' after mysql_real_data_home
...
Add missing parameter to strxnmov() that caused some INTO OUTFILE commands to core dump
2004-09-03 02:25:27 +03:00
paul@kite-hub.kitebird.com
f7bc60e0fc
errmsg.txt:
...
Add GPL comment
2004-09-02 18:12:05 -05:00
mronstrom@mysql.com
5bd4d59508
Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/Users/mikron/mysql-4.1
2004-09-02 19:29:11 +02:00
heikki@hundin.mysql.fi
290443298a
srv0start.c:
...
Change a reference to ibman.php to a reference in the MySQL manual; someone should change the 20 other places in the source code where we still refer to ibman.php
2004-09-02 20:06:25 +03:00
konstantin@mysql.com
2f191db2b1
A fix and test case for Bug#4231 "Wrong result with MYSQL_TIME
...
parameters": when unpacking binary time recieved from client, handle
the case when length is 0: it means all MYSQL_TIME members are zero.
2004-09-02 20:16:01 +04:00
monty@mysql.com
8547d98c88
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/my/mysql-4.1
2004-09-02 16:58:01 +03:00
monty@mysql.com
dec44916c1
After merge fixes
2004-09-02 16:57:26 +03:00
mronstrom@mysql.com
99f9ff912f
Fix for overwriting of the stack when table name length was larger
...
than 32 bytes. getWords interpreted length as number of words and
got number of bytes.
2004-09-02 15:13:50 +02:00
mronstrom@mysql.com
22f21ba700
Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/Users/mikron/mysql-4.1
2004-09-02 15:04:35 +02:00
ram@gw.mysql.r18.ru
c6b2b2f09d
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.0
...
into gw.mysql.r18.ru:/usr/home/ram/work/4.0.b5232
2004-09-02 16:25:32 +05:00
hf@deer.(none)
ea5fd2b4bb
Merge bk@192.168.21.1:/usr/home/bk/mysql-4.1
...
into deer.(none):/home/hf/work/mysql-4.1.4815
2004-09-02 15:22:59 +05:00
marko@hundin.mysql.fi
06f97a0b03
Merge marko@build.mysql.com:/home/bk/mysql-4.1
...
into hundin.mysql.fi:/home/marko/k/mysql-4.1
2004-09-02 10:34:28 +03:00
bar@mysql.com
f37df2fdcc
Bug#4338 mysql-test-run fails if compiled with non-latin1 character set
2004-09-02 12:34:27 +05:00
marko@hundin.mysql.fi
f77a89c386
Merge marko@build.mysql.com:/home/bk/mysql-4.1
...
into hundin.mysql.fi:/home/marko/k/mysql-4.1
2004-09-02 10:17:58 +03:00
hf@deer.(none)
21acb551ab
Merge bk@192.168.21.1:/usr/home/bk/mysql-4.1
...
into deer.(none):/home/hf/work/mysql-4.1.4815
2004-09-02 11:11:16 +05:00
hf@deer.(none)
5a817ea665
Addition to the fix for #4815
2004-09-02 11:10:26 +05:00