Commit graph

13329 commits

Author SHA1 Message Date
guilhem@mysql.com
01dc75dfef Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/mysql_src/mysql-4.0
2004-06-30 16:16:57 +02:00
guilhem@mysql.com
74809f7445 Fix for BUG#4326 "Replicated LOAD DATA INFILE show nothing in
processlist on slave":
we now report in SHOW PROCESSLIST that we are writing to the temp
files or loading the table. When we are writing to the tmp file:
| 3  | system user |                 |    | Connect | 6    | Making temp file /tmp/SQL_LOAD-2-1-2.data | 
and when we are actually loading the .data temp file into the table:
| 3  | system user |                 | test | Connect | 2    | | LOAD DATA INFILE '/tmp/SQL_LOAD-2-1-2.data' INTO TABLE `t` <...> |
2004-06-30 15:41:35 +02:00
lenz@mysql.com
b112cbee53 Merge lgrimmer@build.mysql.com:/home/bk/mysql-4.1
into mysql.com:/space/my/mysql-4.1
2004-06-30 14:19:31 +02:00
lenz@mysql.com
f20d4d4d4e Merge mysql.com:/space/my/mysql-4.1
into mysql.com:/space/my/mysql-4.1-build
2004-06-30 14:02:32 +02:00
lenz@mysql.com
0cba9b482e - fixed server RPM postinstall (mysql_install_db was called with the
wrong parameter)
2004-06-30 14:01:31 +02:00
bar@mysql.com
a1aa3da96a ctype-uca.c:
mbminlen was wrong for UTF8.
2004-06-30 14:45:08 +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
paul@ice.snake.net
547c56078e Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1
into ice.snake.net:/Volumes/ice2/MySQL/bk/mysql-4.1
2004-06-29 21:33:05 -05:00
paul@kite-hub.kitebird.com
925c5ce711 Reword some client error messages. 2004-06-29 12:28:45 -05:00
monty@mysql.com
533f2e7777 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/my/mysql-4.1
2004-06-29 18:20:06 +03:00
monty@mysql.com
93d0736e96 Apply patch from Novell 2004-06-29 18:19:35 +03: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
mwagner@here.mwagner.org
1adf2aacc6 my_md5sum:
Added code to use locally installed perl modules first
2004-06-29 02:13:24 -05:00
paul@ice.snake.net
f5f335aa68 Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1
into ice.snake.net:/Volumes/ice2/MySQL/bk/mysql-4.1
2004-06-28 23:30:37 -05:00
bell@sanja.is.com.ua
36bf1e7195 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-4.1
2004-06-28 20:53:08 +03:00
bell@sanja.is.com.ua
b8742e4a56 unused field removed 2004-06-28 20:01:11 +03:00
paul@kite-hub.kitebird.com
f1218f982a Message/comment touchup. 2004-06-28 11:26:54 -05:00
guilhem@mysql.com
00394f591e Merge gbichot@213.136.52.20:/home/bk/mysql-4.1
into mysql.com:/home/mysql_src/mysql-4.1-874
2004-06-28 15:39:04 +02:00
guilhem@mysql.com
ba22a7aaa9 Fix for BUG#4240 "mysql_fix_privilege_tables Does not use --password properly"
Pass password if it is NOT empty. Typo fixed.
2004-06-28 15:37:42 +02:00
vva@eagle.mysql.r18.ru
e228547a61 s/\r\n/\n/ in mysql-test/*/system_mysql_db*
according to http://www.bitkeeper.com/Documentation.FAQS.Windows_NT.html
2004-06-28 15:53:49 +05:00
serg@serg.mylan
a99468259b after merge fix 2004-06-28 11:06:22 +02: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
monty@mysql.com
e22f983a37 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/my/mysql-4.1
2004-06-27 19:18:03 +03:00
monty@mysql.com
39a3c4deda Merge with 4.0 2004-06-27 19:17:24 +03:00
monty@mysql.com
f65b0c6be5 Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/my/mysql-4.0
2004-06-27 18:21:14 +03:00
monty@mysql.com
380ff9c228 Fix to be able to cross-compile for modesto 2004-06-27 18:20:06 +03:00
serg@serg.mylan
b8369481fe correct casting void->char 2004-06-27 17:16:05 +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