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
paul@ice.snake.net
295f11edd0
Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into ice.snake.net:/Volumes/ice2/MySQL/bk/mysql-4.1
2004-06-27 07:00:14 -05:00
serg@serg.mylan
cb188a89c1
after merge fix
2004-06-27 13:16:19 +02:00
serg@serg.mylan
f941f842c3
make lowercase_table3 to work
2004-06-27 11:57:08 +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
c4004aec8a
restored --all as an alias to --create-options for backward compatibility
2004-06-26 23:00:23 +02:00
serg@serg.mylan
e3a713bf34
BUG#4276 - socket path too long
2004-06-26 19:37:48 +02:00
paul@ice.snake.net
1b110e8047
Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into ice.snake.net:/Volumes/ice2/MySQL/bk/mysql-4.1
2004-06-26 11:24:22 -05:00
serg@serg.mylan
aed4e3f546
Merge bk-internal.mysql.com:/home/bk/mysql-4.1/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2004-06-26 14:22:24 +02:00
serg@serg.mylan
450e5b0119
after merge fixed
2004-06-26 14:21:32 +02:00
monty@mysql.com
137b8517c4
Cleanup for creating windows source distribution
2004-06-26 10:57:00 +03:00
paul@ice.snake.net
3c02ae9d3e
Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into ice.snake.net:/Volumes/ice2/MySQL/bk/mysql-4.1
2004-06-25 22:34:09 -05:00
patg@krsna.patg.net
6fa7e370f9
make_win_src_distribution.sh:
...
4.1 tree must use installshield project files due to new tables
2004-06-25 19:25:36 -07:00
patg@krsna.patg.net
a65f2afbae
mysql_create_system_tables.sh:
...
fix to user table during make_win_src_distribution
2004-06-25 19:11:46 -07:00
konstantin@mysql.com
786e5ff717
Fix for compilation failure on high-byte-first platforms.
2004-06-26 04:54:11 +04: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
paul@ice.snake.net
a5952ef768
Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into ice.snake.net:/Volumes/ice2/MySQL/bk/mysql-4.1
2004-06-25 14:35:15 -05:00
konstantin@mysql.com
172ab0ab8b
Fix for 'make dist' 'make distclean' goals work even if ./configure
...
called without NDB enabled.
2004-06-25 23:21:14 +04: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
paul@ice.snake.net
da149eccee
Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into ice.snake.net:/Volumes/ice2/MySQL/bk/mysql-4.1
2004-06-25 12:16:52 -05: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
paul@ice.snake.net
6a0676d8be
Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into ice.snake.net:/Volumes/ice2/MySQL/bk/mysql-4.1
2004-06-25 11:37:46 -05: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
b878240940
Add missing .cnf files to windows installation (Bug #4216 )
2004-06-25 18:54:43 +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
paul@ice.snake.net
cbf79fd2ff
Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into ice.snake.net:/Volumes/ice2/MySQL/bk/mysql-4.1
2004-06-25 10:45:27 -05:00
bell@sanja.is.com.ua
45411ca0b5
merge
2004-06-25 18:33:31 +03:00
ingo@mysql.com
e703843ab7
Merge mysql.com:/home/mydev/mysql-4.0
...
into mysql.com:/home/mydev/mysql-4.0-lock
2004-06-25 16:45:50 +02:00
lenz@mysql.com
00dc9a0e91
Merge lgrimmer@build.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/space/my/mysql-4.1
2004-06-25 16:03:25 +02:00
lenz@mysql.com
9911d93f07
- removed the VC++Files/InstallShield directory per Montys request
...
(moved it into another BK tree instead)
2004-06-25 16:00:17 +02:00
serg@serg.mylan
3ba6fd97b4
Merge bk-internal.mysql.com:/home/bk/mysql-4.1/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2004-06-25 15:12:51 +02:00
serg@serg.mylan
3b59dd1bd0
bug#4008 - merge table cannot determine what key caused "dupl. key" error
2004-06-25 15:12:13 +02:00
konstantin@mysql.com
354e2ba67b
Type of MYSQL_BIND::buffer changed to void *
2004-06-25 17:04:33 +04: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
serg@serg.mylan
02f411124d
Merge bk-internal.mysql.com:/home/bk/mysql-4.1/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2004-06-25 13:16:48 +02:00
serg@serg.mylan
2b93adb9c1
Bug#3808 - fulltext index, delete, 2-level tree, the word on the 1st level has different length than the key (latin1_german2_ci)
2004-06-25 13:11:02 +02:00
ingo@mysql.com
57da928039
Merge
2004-06-25 12:59:47 +02:00
ram@gw.mysql.r18.ru
fe3bb82b2b
Changed a comment.
2004-06-25 15:26:50 +05: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
ram@gw.mysql.r18.ru
65fe5e7289
a fix (bug #4241 : system_mysql_db_fix.test fails)
2004-06-25 15:09:26 +05:00
ingo@mysql.com
0e76168e34
Prevent potential problems on 32-Bit machines.
2004-06-25 11:35:37 +02:00
serg@serg.mylan
3452445559
remove ^M's
...
compile even without InnoDB
2004-06-25 11:33:03 +02:00
