joreland@mysql.com
8db262f085
Merge mysql.com:/home/jonas/src/mysql-4.1
...
into mysql.com:/home/jonas/src/mysql-4.1-ndb
2004-07-06 17:50:54 +02:00
joreland@mysql.com
ee3aca091b
Merge mysql.com:/home/jonas/src/mysql-4.1
...
into mysql.com:/home/jonas/src/mysql-4.1-ndb
2004-07-06 17:47:56 +02:00
antony@ltantony.rdg.cyberkinetica.com
ac6e6c121f
Merge acurtis@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into ltantony.rdg.cyberkinetica.com:/usr/home/antony/work/bug4407.1
2004-07-06 16:43:39 +01:00
antony@ltantony.rdg.cyberkinetica.com
58cec1fd6a
Bug#4407 - assertion in ha_myisam.cc
...
Fix assertion failure where ha_myisam::index_next() is called
without first calling ha_myisam::ha_index_init()
2004-07-06 16:30:50 +01:00
serg@serg.mylan
d8dabe43fb
Merge bk-internal.mysql.com:/home/bk/mysql-4.1/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2004-07-06 16:30:04 +02:00
bar@mysql.com
30a86a0be9
Bug#4417 binary character set breaks multi-byte table/field name.
2004-07-06 17:15:43 +05:00
serg@serg.mylan
c2295f163f
Merge bk-internal.mysql.com:/home/bk/mysql-4.1/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2004-07-06 14:05:41 +02:00
joreland@mysql.com
27fc980e79
Merge mysql.com:/home/jonas/src/mysql-4.1
...
into mysql.com:/home/jonas/src/mysql-4.1-ndb
2004-07-06 10:20:52 +02:00
joreland@mysql.com
c61d23e0e5
merge
2004-07-06 08:56:05 +02:00
ndbdev@ndbmaster.mysql.com
2f24eec4d2
missing ;
2004-07-06 08:43:57 +02:00
joreland@mysql.com
2a8ea3861c
Fixed bugs in ordered scan discovered by mysql-test-run
...
Enabled ordered scan in handler
2004-07-05 20:41:06 +02:00
paul@ice.snake.net
fb7f15188a
Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into ice.snake.net:/Volumes/ice2/MySQL/bk/mysql-4.1
2004-07-02 17:32:47 -05:00
paul@ice.snake.net
8ead38a5dc
item_geofunc.cc:
...
Minor comment tweaks.
2004-07-02 16:22:46 -05:00
mskold@mysql.com
3f20e69c25
Fixed ndbcluster_print_error to use table name from failed NdbOperation
2004-07-02 16:14:08 +02:00
bar@mysql.com
4df5a14a6f
Bug #4374 SHOW TABLE STATUS FROM ignores collation_connection
2004-07-02 16:52:02 +05:00
mskold@mysql.com
c708619d0b
Added support for update of pk
2004-07-02 11:50:28 +02:00
bar@mysql.com
b41e009b04
armscii8_bin was referenced to as armscii_bin in a mistake.
2004-07-02 13:27:46 +05:00
serg@serg.mylan
648a2fea15
Merge bk-internal.mysql.com:/home/bk/mysql-4.1/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2004-06-30 11:26:49 +02:00
serg@serg.mylan
08738d2847
fowwlowup fixes for index_flags()
2004-06-30 10:40:15 +02:00
ram@gw.mysql.r18.ru
6acd105b16
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into gw.mysql.r18.ru:/usr/home/ram/work/4.1.b4089
2004-06-29 13:51:35 +05:00
ram@gw.mysql.r18.ru
c0c1c3200a
a fix (bug #4304 : TRUNCATE <table of type BDB> , wrong result).
2004-06-29 13:49:50 +05:00
bell@sanja.is.com.ua
b8742e4a56
unused field removed
2004-06-28 20:01:11 +03:00
monty@mysql.com
152528b669
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/my/mysql-4.1
2004-06-28 00:42:38 +03:00
monty@mysql.com
eca9418ca7
Added missing my_time.c file to mysqlclient project
...
Moved include <assert.h> to my_global.h
2004-06-28 00:42:02 +03:00
serg@serg.mylan
2be661a204
portability fix
2004-06-27 20:30:48 +02:00
serg@serg.mylan
5c371299b8
tell make how to create mysql_tzinfo_to_sql.cc
2004-06-27 20:17:32 +02:00
monty@mysql.com
406ae8a59e
Ensure that we don't create long temporary .o file (breaks on qnx)
2004-06-27 20:07:21 +03:00
mskold@mysql.com
146d68871b
Merged
2004-06-27 16:56:52 +02:00
mskold@mysql.com
6988615fd8
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/usr/local/home/marty/MySQL/test/mysql-4.1-ndb
2004-06-27 16:00:48 +02:00
serg@serg.mylan
08ac1d1bda
memory leak in tz code closed
...
(table opened in my_tz_init, was removed from thd->open_tables in
tz_load_from_db w/o being unlocked, so it was stayng in open_cache
forever preventing the latter from being free'd in table_cache_free)
2004-06-27 01:32:52 +02:00
serg@serg.mylan
3236093b8b
removed using lex->select_lex.options is SHOW TABLE [STATUS] commands (BUG#4288)
2004-06-27 00:34:05 +02:00
serg@serg.mylan
a5c8b3ee59
correct eq() method for Item_param (BUG#4233)
2004-06-26 23:55:38 +02:00
serg@serg.mylan
e3a713bf34
BUG#4276 - socket path too long
2004-06-26 19:37:48 +02:00
serg@serg.mylan
450e5b0119
after merge fixed
2004-06-26 14:21:32 +02:00
serg@serg.mylan
d2adc38cb6
merged
2004-06-25 23:20:46 +02:00
serg@serg.mylan
924de89305
release cursors in return_zero_rows
2004-06-25 21:43:02 +02:00
monty@mysql.com
8c867328cd
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/my/mysql-4.1
2004-06-25 21:56:42 +03:00
monty@mysql.com
e7a01ed3dc
After merge fixes
2004-06-25 21:56:23 +03:00
monty@mysql.com
b1d08ba2b4
Merge with 4.0 to get the latest bug patches to 4.1
2004-06-25 20:13:05 +03:00
dlenev@brandersnatch.localdomain
ab26a68498
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into brandersnatch.localdomain:/home/dlenev/src/mysql-4.1-fix
2004-06-25 21:05:25 +04:00
dlenev@brandersnatch.localdomain
9c35c402f2
Removed mysql_tzinfo_to_sql dependancy on sql/mysql_priv.h for circumventing
...
problems with unresolved dependancies on some platforms.
2004-06-25 21:04:48 +04:00
monty@mysql.com
c3eb936040
Merge mysql.com:/home/my/mysql-3.23 into mysql.com:/home/my/mysql-4.0
2004-06-25 18:55:03 +03:00
monty@mysql.com
f6765146c1
Added missing root user to mysql.user on windows. (Bug #4242 )
...
Set default max_allowed_packet to be able to read help tables even if an my.cnf file with this option is present. (Bug #3938 )
Don't use default arguments for ha_rnd_init()
Simple code cleanups since last pull
2004-06-25 18:49:36 +03:00
bell@sanja.is.com.ua
45411ca0b5
merge
2004-06-25 18:33:31 +03:00
ingo@mysql.com
8db6c064df
Merge mysql.com:/home/mydev/mysql-4.0
...
into mysql.com:/home/mydev/mysql-4.0-bug2686
2004-06-25 14:44:37 +02:00
bell@sanja.is.com.ua
74b01ca387
type of parameter assignment for parameters from variables added (BUG#4280)
2004-06-25 15:16:00 +03:00
bell@sanja.is.com.ua
6e1eb6a78c
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-explain-4.1
2004-06-25 14:48:15 +03:00
ingo@mysql.com
57da928039
Merge
2004-06-25 12:59:47 +02:00
ingo@mysql.com
958cf857a3
Merge mysql.com:/home/mydev/mysql-4.0
...
into mysql.com:/home/mydev/mysql-4.0-bug3565
2004-06-25 12:14:54 +02:00
serg@serg.mylan
3452445559
remove ^M's
...
compile even without InnoDB
2004-06-25 11:33:03 +02:00
