mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-17 20:42:30 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
50276 commits 2784 branches 343 tags 1.6 GiB
Commit graph

2774 commits

Author SHA1 Message Date
ramil/ram@ramil.myoffice.izhnet.ru
3a0042c757 Merge mysql.com:/home/ram/work/b26851/b26851.5.0 
into  mysql.com:/home/ram/work/b26851/b26851.5.1
 2007-04-19 11:07:19 +05:00
tsmith@siva.hindu.god
88a477abe9 Post-push fix of client/mysqltest.c oops. 2007-04-18 21:29:38 -06:00
tsmith@siva.hindu.god
041c8a825f Move WEXITSTATUS #define from mysqltest.c to client_priv.h, and 
include client_priv.h in mysqltest.c.  Portability fix.
 2007-04-18 20:47:55 -06:00
tsmith@siva.hindu.god
9232def96b Merge siva.hindu.god:/home/tsmith/m/bk/51 
into  siva.hindu.god:/home/tsmith/m/bk/maint/51
 2007-04-18 14:55:42 -06:00
tsmith@siva.hindu.god
39496731a2 Merge siva.hindu.god:/home/tsmith/m/bk/50 
into  siva.hindu.god:/home/tsmith/m/bk/maint/50
 2007-04-18 14:50:32 -06:00
msvensson@pilot.blaudden
91213f512c Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
 2007-04-18 19:01:01 +02:00
msvensson@pilot.blaudden
4e84ab3f82 Remove the check for value_start(if any it should be *value_start) 2007-04-18 19:00:42 +02:00
msvensson@pilot.blaudden
eeaf1fa655 Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
 2007-04-18 18:40:44 +02:00
msvensson@pilot.blaudden
453b6180d0 Use my_snprintf instead of snprintf 2007-04-18 18:40:22 +02:00
msvensson@pilot.blaudden
6e6d942cb4 Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
 2007-04-18 18:38:20 +02:00
msvensson@pilot.blaudden
905996141d Use my_snprintf instead of snprintf 2007-04-18 18:38:03 +02:00
msvensson@pilot.blaudden
dc66c88bba Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
 2007-04-18 16:57:40 +02:00
msvensson@pilot.blaudden
a8a8c8c181 Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
 2007-04-18 16:56:32 +02:00
msvensson@pilot.blaudden
e9a9107f4f Add mysql builtin $MYSQL_SERVER_VERSION and some function to make 
it easier to set a variable from string or int
 2007-04-18 16:56:17 +02:00
msvensson@pilot.blaudden
01133f8e6f Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
 2007-04-18 14:18:55 +02:00
msvensson@pilot.blaudden
dd0d2146c3 Merge pilot.blaudden:/home/msvensson/mysql/my50-m-mysql_upgrade 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
 2007-04-18 13:22:32 +02:00
msvensson@pilot.blaudden
20e622dcf3 Bug#25452 mysql_upgrade access denied 
- Improve mysql_upgrade and add comments describing it's logic
 - Don't look for mysql and mysqlcheck randomly, use dir where mysql_upgrade
  was started from
 - Don't look for mysql_fix_privilege_tables.sql randomly, compile
  in the mysql_fix_privilege_tables.sql file and use that to upgrade
  the system tables of MySQL
 - Check for any unexpected error returned from runnning the mysql_fix_privilege_tables SQL
 - Fix bug#26639, bug#24248 and bug#25405
 2007-04-18 13:21:39 +02:00
monty@mysql.com/narttu.mysql.fi
0a35bd923f Fixed federated and some replication tests to not stop slave until it's up and running. 
(Removes some warnings about UNIX_TIMESTAMP from the slave.err logs)
Marked federated_server as a '--big-test'
Change error in net_clear to 'Note', as it interfered with mysql-test-run.
 2007-04-17 14:41:16 +03:00
serg@janus.mylan
00479a441d wl#2936 post-merge fixes 2007-04-16 18:16:17 +02:00
monty@mysql.com/narttu.mysql.fi
72d135bec5 Clear field_alloc when it's moved to result set (allows us to always call free_root on field_alloc) 
Change to use remove_file instead of 'system rm' in a lot of tests. (Should fix some windows test problems)
Removed memory leak in mysql_test if sync_with_master fails.
Do not terminate ndb_cluster_binary_log before the util thread has finnished. This should fix a shutdown bug where a thread is accessing injector_mutex after it's freed.
Patch may fix Bug#27622 "mysqld shutdown, util thread continues, while binlog thread exits"
 2007-04-16 17:08:29 +03:00
serg@sergbook.mysql.com
6bc9bc92df Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into  sergbook.mysql.com:/usr/home/serg/Abk/mysql-5.1-wl2936
 2007-04-16 10:37:50 +02:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
e62dbcf746 Fix for 
bug #27715: mysqld --character-sets-dir buffer overflow
bug ##26851: Mysql Client --pager Buffer Overflow

Using strmov() to copy an argument may cause overflow 
if the argument's length is bigger than the buffer:
use strmake instead.
Also, we have to encrease the error message buffer size to fit 
the longest message.
 2007-04-16 12:28:02 +05:00
kostja@vajra.(none)
e0f0ba802f Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into  vajra.(none):/opt/local/work/mysql-5.1-runtime
 2007-04-14 18:31:43 -04:00
jani@a88-113-38-195.elisa-laajakaista.fi
52196018ce Merge a88-113-38-195.elisa-laajakaista.fi:/home/my/new/mysql-5.0-marvel 
into  a88-113-38-195.elisa-laajakaista.fi:/home/my/new/mysql-5.1-marvel
 2007-04-13 10:25:33 +03:00
mats@romeo.(none)
490bed495e Merge romeo.(none):/home/bkroot/mysql-5.1-rpl 
into  romeo.(none):/home/bk/b27779-mysql-5.1-rpl
 2007-04-13 08:55:03 +02:00
tomas@whalegate.ndb.mysql.com
059b899381 remove warning 2007-04-12 16:33:39 +02:00
tomas@whalegate.ndb.mysql.com
036f4e4059 Bug#17095 circular replication for ndb 
- test case
- reset server id in injector
 2007-04-12 16:13:49 +02:00
mats@romeo.(none)
06faf8f411 BUG#27779 (Slave cannot read old rows log events): 
Taking code from before BUG#22583 and incorporating as events to be able
to read old events. Also incorporating old pack and unpack functions
into patch.
 2007-04-12 15:50:54 +02:00
jani@ua141d10.elisa.omakaista.fi
335153121b Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0-marvel
 2007-04-12 12:50:02 +03:00
msvensson@pilot.blaudden
2218fafa1f Merge pilot.blaudden:/home/msvensson/mysql/bug22508/my51-bug22508 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
 2007-04-11 09:34:02 +02:00
lars/lthalmann@dl145h.mysql.com
1e5d279451 Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.1-new-rpl 
into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.1-merge
 2007-04-10 18:26:14 +02:00
lars/lthalmann@mysql.com/dl145h.mysql.com
904c75ede5 Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.0-rpl 
into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.0-merge
 2007-04-10 18:25:27 +02:00
msvensson@pilot.blaudden
19f379b807 Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
 2007-04-10 17:17:53 +02:00
msvensson@pilot.blaudden
3d847358de Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
 2007-04-10 17:17:08 +02:00
msvensson@pilot.blaudden
9917d018a6 Take into account wether vertical_results are in effect 2007-04-10 17:09:35 +02:00
msvensson@pilot.blaudden
73c6cde9d4 Init dying to 1 just after passing the guard 2007-04-10 17:06:36 +02:00
msvensson@pilot.blaudden
da2a216895 Add OPT_LOG_DIR 2007-04-10 17:05:22 +02:00
jani@ua141d10.elisa.omakaista.fi
b4ba815967 Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.1-marvel
 2007-04-10 16:28:47 +03:00
serg@janus.mylan
102f58fe34 Merge bk-internal.mysql.com:/home/bk/mysql-5.0-marvel 
into  janus.mylan:/usr/home/serg/Abk/mysql-5.0
 2007-04-10 15:27:26 +02:00
serg@janus.mylan
1c678b34aa Bug#27171 mysqlbinlog produces different output depends from option -R 
a better fix, that works with 4.1 servers which don't send a fake
Format_description_log_event.
 2007-04-10 15:26:35 +02:00
msvensson@pilot.blaudden
448a6778cb Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.1 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
 2007-04-10 14:59:46 +02:00
msvensson@pilot.blaudden
d4f01284bd Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
 2007-04-10 14:47:53 +02:00
msvensson@pilot.blaudden
829ca34daf Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
 2007-04-10 14:46:57 +02:00
msvensson@pilot.blaudden
5c5271754b Add --logdir option ot mysqltest 2007-04-10 14:45:13 +02:00
msvensson@pilot.blaudden
4496a8f546 Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
 2007-04-10 14:31:33 +02:00
msvensson@pilot.blaudden
34a784f3d0 Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
 2007-04-10 14:29:22 +02:00
msvensson@pilot.blaudden
60eb839e77 Merge 192.168.0.4:mysql/mysql-4.1-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint
 2007-04-10 13:51:32 +02:00
bar@mysql.com
220c453194 Merge mysql.com:/home/bar/mysql-5.0-rpl 
into  mysql.com:/home/bar/mysql-5.1-new-rpl
 2007-04-09 18:06:27 +05:00
bar@mysql.com
9faaec9e1b bug#27608 XML output is not well-formed 
Problem: output was empty if the result is empty.
Fix: print XML header and footer, even if the result
is empty, to produce well-formed XML output.
 2007-04-09 17:53:10 +05:00
Kristofer.Pettersson@naruto.
7d3c4c29da Merge naruto.:C:/cpp/bug26121/my51-bug26121 
into  naruto.:C:/cpp/mysql-5.1-runtime
 2007-04-07 21:03:35 +02:00
holyfoot/hf@hfmain.(none)
ce426dd622 Merge bk@192.168.21.1:mysql-5.1-opt 
into  mysql.com:/d2/hf/mrg/mysql-5.1-opt
 2007-04-07 14:59:53 +05:00
Kristofer.Pettersson@naruto.
1902786808 Bug#26121 mysqldump includes LOCK TABLES general_log WRITE 
- Giving the directive '--all-databases' to mysqldump caused 
  an attempt to lock and dump log tables which don't support this
  operation.
- With this patch the log tables are excluded from the set of
  databases tables to dump.
 2007-04-05 21:53:02 +02:00
msvensson@shellback.(none)
2df8524391 Add "query_sorted" command to mysqltest 
Usage:
  query_sorted <query>;
 2007-04-05 20:12:56 +02:00
msvensson@pilot.blaudden
dec5334a2b Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
 2007-04-05 14:51:49 +02:00
msvensson@pilot.blaudden
c3dc142df5 Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
 2007-04-05 13:54:24 +02:00
msvensson@pilot.blaudden
9cd8b2b8fb Protect against dying twice 
Cleanup exit handling
 2007-04-05 13:53:44 +02:00
msvensson@pilot.blaudden
ff0ee38bd7 Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
 2007-04-04 15:43:03 +02:00
msvensson@pilot.blaudden
3b1fc84a5e Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
 2007-04-04 15:17:00 +02:00
msvensson@pilot.blaudden
fc992b0667 Add "skip" function, makeing mysqltest return an 
error code indicating test should be skipped
 2007-04-04 15:15:40 +02:00
msvensson@pilot.blaudden
19801cbfdc Add expansion of $variables in "let from query", 
"if with query" and "while with query"
 2007-04-04 15:09:12 +02:00
jamppa@bk-internal.mysql.com
cbfd66e754 Merge bk-internal.mysql.com:/data0/bk/mysql-5.0 
into  bk-internal.mysql.com:/data0/bk/mysql-5.0-marvel
 2007-04-03 13:55:20 +02:00
jani@ua141d10.elisa.omakaista.fi
e4fde44948 Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1-marvel 
into  ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.1-marvel
 2007-04-03 14:51:32 +03:00
jamppa@bk-internal.mysql.com
879725900b Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-marvel
 2007-04-03 13:51:31 +02:00
gluh@mysql.com/eagle.(none)
2d47f0cb1b Bug#21432 Database/Table name limited to 64 bytes, not chars, problems with multi-byte 2007-04-03 16:13:27 +05:00
msvensson@pilot.blaudden
fc904eaead Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.1 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
 2007-04-02 11:15:09 +02:00
msvensson@pilot.blaudden
bb9a601829 Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
 2007-04-02 10:50:39 +02:00
lars/lthalmann@dl145j.mysql.com
f6f848b9e7 Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.1-new-rpl 
into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.1-merge
 2007-03-31 00:17:12 +02:00
tomas@whalegate.ndb.mysql.com
77d37e5810 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new-rpl 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-rpl
 2007-03-30 08:37:47 +02:00
mats@romeo.(none)
e12cc44ac3 Merge romeo.(none):/home/bkroot/mysql-5.1-new-rpl 
into  romeo.(none):/home/bk/w3464-mysql-5.1-new-rpl
 2007-03-29 21:38:03 +02:00
mats@romeo.(none)
7c187c2c9b WL#3464: Add replication event to denote gap in replication 
Adding an event that can be used to denote that an incident occured
on the master. The event can be used to denote a gap in the replication
stream, but can also be used to denote other incidents.

In addition, the injector interface is extended with functions to
generate an incident event. The function will also rotate the binary
log after generating an incident event to get a fresh binary log.
 2007-03-29 20:31:09 +02:00
jani@ua141d10.elisa.omakaista.fi
28c122a721 Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1-marvel 
into  ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.1-marvel
 2007-03-29 17:45:56 +03:00
jani@ua141d10.elisa.omakaista.fi
1c7beca65e Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0-marvel 
into  ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.1-marvel
 2007-03-29 17:27:42 +03:00
jamppa@bk-internal.mysql.com
16de7d21cc Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-marvel
 2007-03-29 16:11:29 +02:00
tomas@whalegate.ndb.mysql.com
5143b870dd Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-rpl
 2007-03-29 15:49:44 +02:00
lars/lthalmann@dl145j.mysql.com
771e05d657 Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.1-new-rpl 
into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.1-merge
 2007-03-29 13:49:10 +02:00
msvensson@pilot.blaudden
a16de88489 Merge pilot.blaudden:/home/msvensson/mysql/bug24121/my51-bug24121 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
 2007-03-29 13:37:32 +02:00
lars/lthalmann@mysql.com/dl145h.mysql.com
75668471d1 Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.0-rpl 
into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.0-merge
 2007-03-29 12:25:28 +02:00
joerg@trift-lap.fambruehe
4507c6757a Merge trift-lap.fambruehe:/MySQL/M51/mysql-5.1 
into  trift-lap.fambruehe:/MySQL/M51/push-5.1
 2007-03-29 09:41:39 +02:00
kent@mysql.com/kent-amd64.(none)
7eeae6ff13 Makefile.am: 
Extended test section
  Removed duplicate EXTRA_DIST
 2007-03-28 23:18:43 +02:00
tsmith@siva.hindu.god
c01629a7cd Merge siva.hindu.god:/home/tsmith/m/bk/maint/bmisc/51 
into  siva.hindu.god:/home/tsmith/m/bk/maint/51
 2007-03-28 11:47:28 -06:00
jani@ua141d10.elisa.omakaista.fi
3c3b0391f8 Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1-main 
into  ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0-marvel
 2007-03-28 20:46:42 +03:00
tsmith@siva.hindu.god
e64da592ce Bug #26262: Add option to skip binary logging for mysqlcheck 
Add the --skip-write-binlog option, which adds NO_WRITE_TO_BINLOG
to REPAIR, ANALYZE, and OPTIMIZE commands.

Use this option when these SQL commands should not be sent to
replication slaves, nor run when using the binary logs for recovery
from backup
 2007-03-28 10:19:10 -06:00
bar@bar.myoffice.izhnet.ru
f418475eec Merge mysql.com:/home/bar/mysql-5.0.b25946 
into  mysql.com:/home/bar/mysql-5.1.b25946
 2007-03-28 15:12:25 +05:00
msvensson@pilot.blaudden
b554258a8e Bug#22508 BUILD/compile-dist fails due to problem with readline/libedit 
- Move the link_sources command from top level Makefile into each subdir
   that need to link files
 2007-03-27 23:56:48 +02:00
msvensson@pilot.blaudden
0559be3469 Merge pilot.blaudden:/home/msvensson/mysql/bug24121/my50-bug24121 
into  pilot.blaudden:/home/msvensson/mysql/bug24121/my51-bug24121
 2007-03-27 19:26:28 +02:00
msvensson@pilot.blaudden
ad649e3c2c Bug#24121 Incorrect test for SSL_VERIFY_SERVER_CERT 
- Interpret the pointer passed to 'mysql_options' for
   MYSQL_OPT_SSL_VERIFY_SERVER_CERT as a my_bool
 - In 5.1 the mysql_options signature will be chanegd to take
   a 'void*' in order to further emphasize the need for a pointer
   to correct type
 2007-03-27 19:26:01 +02:00
jani@ua141d10.elisa.omakaista.fi
e12ad391b5 Fixes for 4.1 to be as in 5.0 and above. 2007-03-27 18:51:02 +03:00
bar@mysql.com
5e52cd3650 Bug#25946 Namespace not include for xsi usage within --xml output with null/nil values 
Fix: adding namespace reference into "mysql --xml" output,
to make it work similary to "mysqldump --xml".
 2007-03-27 13:30:43 +05:00
brian@zim.(none)
68cdfea52a Merge zim.(none):/home/bk/mysql-5.1-arch 
into  zim.(none):/home/brian/mysql/slap-5.1
 2007-03-26 02:29:09 -07:00
brian@zim.(none)
9a2a7071be Added pre and post option to test run (allows me to adjust an engine once all of the data has been loaded). 
Kinda obvious that this was going to come up ;)
 2007-03-26 02:24:49 -07:00
ramil/ram@ramil.myoffice.izhnet.ru
f5a24e5870 Merge mysql.com:/home/ram/work/b25993/b25993.5.0 
into  mysql.com:/home/ram/work/b25993/b25993.5.1
 2007-03-26 13:01:46 +05:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
74b3cdb02e Fix for bug #25993: mysqldump crashes with merge table and -c option 
opt_complete_insert was improperly used by accident.
Use complete_insert flag instead.
 2007-03-26 12:56:41 +05:00
serg@sergbook.mysql.com
237ed0c3e5 Merge bk-internal.mysql.com:/home/bk/mysql-5.0-marvel 
into  sergbook.mysql.com:/usr/home/serg/Abk/mysql-5.0
 2007-03-24 17:16:53 +02:00
monty@narttu.mysql.fi
28a05d3b33 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-marvel 
into  mysql.com:/home/my/mysql-5.1
 2007-03-24 11:06:09 +02:00
dkatz/Damien@damiendev.
6a7ef1849a bug#26346 
Fix to a memory leak found by a complier warning.
 2007-03-23 19:30:25 -04:00
dkatz/Damien@damiendev.
8cb8bf0ed0 Merge damiendev.:C:/build/dev50 
into  damiendev.:C:/build/mysql-5.1
 2007-03-23 18:22:57 -04:00
dkatz/Damien@damiendev.
53ecf4207e bug#26346 
Added some fixes for an existing memory leak and unitilialized variables, both caught by gcc.
 2007-03-23 18:15:11 -04:00
tnurnberg@sin.intern.azundris.com
3260dfd324 Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-marvel 
into  sin.intern.azundris.com:/home/tnurnberg/26817/51-26817
 2007-03-23 20:43:40 +01:00
tnurnberg@sin.intern.azundris.com
998190ac55 Merge sin.intern.azundris.com:/home/tnurnberg/26817/50-26817 
into  sin.intern.azundris.com:/home/tnurnberg/26817/51-26817
 2007-03-23 20:39:37 +01:00
baker@bk-internal.mysql.com
503d7b20cb Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-arch
 2007-03-23 20:25:36 +01:00
tnurnberg@sin.intern.azundris.com
7c63826894 Bug #26817: mysqldump fails to backup database containing view with invalid definer 
give some leeway on required permissions for SHOW FIELDS on views so
an unknonwn DEFINER will no longer break mysqldump
 2007-03-23 19:24:03 +01:00
antony@ppcg5.local
d4d37f113e WL#2936 
"Server variables for plugins"
  Post review fixes.
 2007-03-23 10:14:46 -07:00
serg@sergbook.mysql.com
2810a5a266 Merge sergbook.mysql.com:/usr/home/serg/Abk/mysql-5.0-build 
into  sergbook.mysql.com:/usr/home/serg/Abk/mysql-5.0
 2007-03-23 17:56:58 +02:00
serg@sergbook.mysql.com
37e7a07465 Merge bk-internal.mysql.com:/home/bk/mysql-5.0-marvel 
into  sergbook.mysql.com:/usr/home/serg/Abk/mysql-5.0
 2007-03-23 16:29:38 +02:00
Damien@damiendev.
ef3bbc426c additional changes to merge fix for bug 26346 2007-03-22 20:36:58 -04:00
Damien@damiendev.
db6f8d8ff8 Merge damiendev.:C:/build/mysql-5.1/..\dev50 
into  damiendev.:C:/build/mysql-5.1
 2007-03-22 20:08:05 -04:00
Damien@damiendev.
53679c03ad Merge damiendev.:C:/build/mysql-5.0 
into  damiendev.:C:/build/dev50
 2007-03-22 15:55:18 -04:00
serg@sergbook.mysql.com
25b49e99cd Bug#27171 mysqlbinlog produces different output depends from option -R 
Server starts any binlog dump from Format_description_log_event,
this shifted all offset calculations in mysqlbinlog and made it
to stop the dump earlier than --stop-position. Now mysqlbinlog
takes Format_description_log_event into account
 2007-03-22 20:55:59 +02:00
jani@ua141d10.elisa.omakaista.fi
5c542a4656 Fixed compiler warnings. 2007-03-22 20:32:07 +02:00
Damien@damiendev.
0fc5ad1e91 Bug#26346: stack + buffer overrun in mysqldump 
Fixes to buffer overlows from long command line args, and unchecked dyn_str return codes. Also light refactoring.
 2007-03-22 13:35:29 -04:00
guilhem@gbichot3.local
21492b54b4 Fix for BUG#26194 "mysqlbinlog --base64-output produces invalid SQL"; 
when it was printing a Query event, it produced invalid SQL (missing
the BINLOG keyword, so the SQL started with the base64 string, which
is incorrect).
Note: no testcase; I have a .test which shows that the bugfix works,
but it triggers BUG#26361 and so gives Valgrind warnings. I'm sending
this test to the fixer of BUG#26361 for her/him to push when she/he
fixes BUG#26361.
 2007-03-22 17:31:39 +01:00
jamppa@bk-internal.mysql.com
d2838b5abe Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-marvel
 2007-03-22 13:14:52 +01:00
acurtis/antony@xiphis.org/ltamd64.xiphis.org
2527b6ba1b fixes for 5.1-arch repository 2007-03-22 01:59:47 -07:00
Antony@floppy.
adfdcb191c Fixes for 5.1-arch repository to compile on Windows. 2007-03-22 00:43:14 -07:00
tsmith@quadxeon.mysql.com
54e7bc8daa Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/51
 2007-03-22 01:04:39 +01:00
iggy@recycle.(none)
9800fbf0b6 Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint 
into  recycle.(none):/src/bug23736/my50-bug23736
 2007-03-21 13:43:03 -04:00
iggy@recycle.(none)
0d3aefcdf4 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new-maint 
into  recycle.(none):/src/bug23736/my51-bug23736
 2007-03-21 13:39:08 -04:00
msvensson@pilot.blaudden
31b2f339a0 Merge bk-internal:/home/bk/mysql-5.0-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
 2007-03-21 14:30:47 +01:00
msvensson@pilot.blaudden
7c5df4d35b Merge bk-internal:/home/bk/mysql-5.1-new-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
 2007-03-21 14:24:50 +01:00
msvensson@pilot.blaudden
3bf2a52225 Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
 2007-03-20 23:53:25 +01:00
msvensson@pilot.blaudden
8f3d9cb415 Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
 2007-03-20 21:24:20 +01:00
tsmith@quadxeon.mysql.com
2250d1a752 Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1-build 
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/mar20/maint/51
 2007-03-20 21:05:48 +01:00
msvensson@pilot.blaudden
5b62c51a05 Remove the variables for long gone disable_ps_warnings 2007-03-20 19:43:36 +01:00
kent@kent-amd64.(none)
240bbc6d29 Merge mysql.com:/home/kent/bk/tmp/mysql-5.0-build 
into  mysql.com:/home/kent/bk/tmp/mysql-5.1-build
 2007-03-20 19:04:02 +01:00
kent@mysql.com/kent-amd64.(none)
39e9a2d316 echo.c: 
Corrected GPL to be version 2 only
 2007-03-20 18:31:49 +01:00
iggy@recycle.(none)
a56b04476a Merge recycle.(none):/src/bug23736/my50-bug23736 
into  recycle.(none):/src/bug23736/my51-bug23736
 2007-03-20 10:54:56 -04:00
iggy@recycle.(none)
988ce58052 Bug#23736 Pointer free error in mysqlbinlog 
- Mis-matched SAFEMALLOC defines caused misleading error message.
 2007-03-20 10:34:25 -04:00
kostja@bodhi.local
bdb10baec1 Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into  bodhi.local:/opt/local/work/mysql-5.1-runtime
 2007-03-20 00:42:11 +03:00
jani@ua141d10.elisa.omakaista.fi
71c7035035 Added find_type_or_exit and find_bit_type_or_exit as wrappers 
around the original functions. These will ensure that error
message is always in unique form, reduce code and print the
right alternatives automatically in an error case.
 2007-03-19 11:19:51 +02:00
brian@piggy.tangent.org
132608419e Restoring attr (aka poking around Windows did not work). 2007-03-18 10:06:28 -07:00
brian@zim.(none)
34b2658788 Bug in windows where attr was not working. Removed. 2007-03-16 23:50:48 -07:00
brian@zim.(none)
786f9de976 Cleanup of prototype for windows. 2007-03-16 19:05:11 -07:00
brian@zim.(none)
e246cb3d80 The pthread() support was not working. Once I fixed use-thread in a previous push I realized that the pthread/windows code was not working. I've replaced the fork/thread design with a pure pthread design using condition timers and broadcast. 
Ramification, UNIX now uses thread, support for slaves had to be dropped and there is no need for the --use-threads flag.
Added --concurrency=0 option so that it will start at 1 and keep going up until something bad happens :)
 2007-03-16 15:20:22 -07:00
kroki/tomash@moonlight.home
6d8f6b5bfd BUG#16420: Events: timestamps become UTC 
BUG#26429: SHOW CREATE EVENT is incorrect for an event that
           STARTS NOW()
BUG#26431: Impossible to re-create an event from backup if its
           STARTS clause is in the past
WL#3698: Events: execution in local time zone

The problem was that local times specified by the user in AT, STARTS
and ENDS of CREATE EVENT/ALTER EVENT statement were converted to UTC,
and the original time zone was forgotten.  This way, event scheduler
couldn't honor Daylight Saving Time shifts, and times shown to the
user were also in UTC.  Additionally, CREATE EVENT didn't allow times
in the past, thus preventing straightforward event restoration from
old backups.

This patch reworks event scheduler time computations, performing them
in the time zone associated with the event.  Also it allows times to
be in the past.

The patch adds time_zone column to mysql.event table.

NOTE: The patch is almost final, but the bug#9953 should be pushed
first.
 2007-03-16 17:31:07 +03:00
brian@zim.(none)
45d7dff67d Correctly report load type. 
Updated engine to also handle create options
Secondary indexes can now be generated (aka the test PeterZ thoughts!)
 2007-03-15 23:39:07 -07:00
brian@zim.(none)
deef4ef274 Added comment, and fixed test. 2007-03-13 10:27:59 -07:00
brian@zim.(none)
a22406aeab Merge zim.(none):/home/bk/mysql-5.1-arch 
into  zim.(none):/home/brian/mysql/slap-5.1
 2007-03-13 02:39:58 -07:00
brian@zim.(none)
70fa527d9e Cleaning up 4 pushbuild warnings caught by Windows. 2007-03-13 00:56:30 -07:00
brian@zim.(none)
ef85c23f18 Merge zim.(none):/home/brian/mysql/slap-5.1 
into  zim.(none):/home/bk/mysql-5.1-arch
 2007-03-12 22:18:00 -07:00
brian@zim.(none)
8623103dfc Cleaned up memory allocation so that in all cases of malloc failure the application ends execution. 
Default values for auto-generate have been made available for adjusting. Key test for rights now works with either type of keys.
 2007-03-12 10:25:11 -07:00
guilhem@gbichot4.local
365bb17039 Implementing the feature at BUG#26964 "option --no-beep for mysqladmin". 
Option --no-beep is added to mysqladmin like it already exists in
the "mysql" command-line client (short option: -b; long: --no-beep).
Default is to emit beeps like that "mysql" client.
Can't test in the testsuite; but on my Linux I tested by hand:
open a *xterm* and there do "mysqladmin shutdown" - I hear a beep;
with --no-beep, no beep.
 2007-03-09 10:15:33 +01:00
msvensson@pilot.blaudden
73b5b2aed7 Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
 2007-03-08 14:48:11 +01:00
tsmith@quadxeon.mysql.com
ec87168115 Fix bad merge of mysql_upgrade.c; return to version 1.27 of the file, as after fix for bug 25074 2007-03-08 07:55:03 +01:00
tsmith@quadxeon.mysql.com
c92e7b13b2 Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/mrg0306/50 
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/mrg0306/51
 2007-03-07 10:32:23 +01:00
tsmith@quadxeon.mysql.com
79191807ff Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime 
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/mrg0306/51
 2007-03-07 07:21:24 +01:00
brian@zim.(none)
82ee220cfa Fixed buffer overflow cases (should not be possible to do...) 
Fixed for autoincrement support/GUID
 2007-03-06 17:14:59 -08:00
kostja@bodhi.local
92b4401690 Merge bodhi.local:/opt/local/work/mysql-5.0-runtime 
into  bodhi.local:/opt/local/work/mysql-5.1-runtime-merge
 2007-03-06 19:24:52 +03:00
msvensson@pilot.blaudden
be1e948543 Merge 192.168.0.10:mysql/my50-m-bug18431 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
 2007-03-03 12:14:36 +01:00
msvensson@pilot.blaudden
d1d64ba50f Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
 2007-03-01 19:10:07 +01:00
msvensson@pilot.blaudden
c0fdf1792a Add two more USE_CYGWIN ifdefs to mysqltest 2007-03-01 19:09:43 +01:00
msvensson@pilot.blaudden
c58b2bd757 Don't set the "is_windows" flag if using cygwin 2007-03-01 18:30:29 +01:00
msvensson@pilot.blaudden
f5778fc73e Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
 2007-03-01 18:12:56 +01:00
msvensson@pilot.blaudden
51a71fb667 Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.1 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
 2007-03-01 14:53:32 +01:00
jani@a88-113-38-195.elisa-laajakaista.fi
a934e46ebd Fixed compiler warnings. 2007-03-01 11:28:33 +02:00
jani@ua141d10.elisa.omakaista.fi
bcbc0031eb Fixed compiler warnings. 2007-02-28 22:23:35 +02:00
msvensson@pilot.blaudden
ab61d07a30 Merge pilot.blaudden:/home/msvensson/mysql/bug25074/my50-bug25074 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
 2007-02-28 21:21:37 +01:00
msvensson@pilot.blaudden
dd710c17ec Merge pilot.blaudden:/home/msvensson/mysql/bug25074/my50-bug25074 
into  pilot.blaudden:/home/msvensson/mysql/bug25074/my51-bug25074-new
 2007-02-28 21:19:12 +01:00
msvensson@pilot.blaudden
cc7e77c5fd Bug #25074 mysql_upgrade test can't give consistent results 
- Tell the programs executed by mysql_upgrade to only read
  from the defaults file generated by msyql_upgrade
 - Fix memory leaks
 2007-02-28 21:05:39 +01:00
msvensson@pilot.blaudden
05ed84a3d2 Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint-bug20166
 2007-02-28 15:04:20 +01:00
msvensson@pilot.blaudden
780d434cb5 Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
 2007-02-28 10:07:37 +01:00
msvensson@pilot.blaudden
c2ed99e78c Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
 2007-02-28 10:07:04 +01:00
msvensson@pilot.blaudden
548112ce36 Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint-without-cygwin 
into  pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint
 2007-02-28 10:06:21 +01:00
msvensson@pilot.blaudden
ed61e4868d Use cygwin for --exec and --system in mysqltest for MySQL before 5.0 2007-02-28 10:05:51 +01:00
msvensson@pilot.blaudden
eac47a8670 Merge pilot.blaudden:/home/msvensson/mysql/bug19410/my50-bug19410 
into  pilot.blaudden:/home/msvensson/mysql/bug19410/my51-bug19410
 2007-02-28 09:11:56 +01:00
msvensson@pilot.blaudden
d7ad8ac24b Merge pilot.blaudden:/home/msvensson/mysql/bug19410/my41-bug19410 
into  pilot.blaudden:/home/msvensson/mysql/bug19410/my50-bug19410
 2007-02-28 09:11:13 +01:00
msvensson@pilot.blaudden
38d9e75a52 Bug#19410 Test 'kill' fails on Windows + SCO 
- Use "mysql_stmt_field_count" to determine if there is a need to
call "mysql_stmt_store_result"
 2007-02-28 09:10:38 +01:00
lars/lthalmann@dl145j.mysql.com
e1867c3156 Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.1-new-rpl 
into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.1-merge
 2007-02-25 00:12:14 +01:00
lars/lthalmann@dl145h.mysql.com
8b39189ee4 Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.1-new-rpl 
into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.1-merge
 2007-02-24 11:52:08 +01:00
gbichot@dl145h.mysql.com
ba2452f092 Fix for BUG#25628: "mysqlbinlog crashes while processing binary logs". 
mysqlbinlog prints all row-based events of a single statement as a
single "BINLOG" statement containing the concatenation of those events.
Big (i.e. >64k) concatenations of row-based events
(e.g. Write_rows_log_event) caused mysqlbinlog's IO_CACHE to overflow
to a temporary file but the IO_CACHE had not been inited with
open_cached_file(), so it tried to create a temporary file in
an uninitialized directory (thus failing to create, then to write;
some OS errors were printed, and it finally segfaulted).
After fixing this, it appeared that mysqlbinlog was printing only
a piece of big concatenations of row-based events (it printed
at most the size of the IO_CACHE's buffer i.e. 64k); that caused data
loss at restore. We fix and test that.
Last, mysqlbinlog's printouts looked a bit strange with the informative
header (#-prefixed) of groupped Rows_log_event all on one line,
so we insert \n. After that, a small bug in the --hexdump code appeared
(only if the string to hex-print had its length a multiple of 16),
we fix it.
 2007-02-23 22:23:54 +01:00
monty@mysql.com/narttu.mysql.fi
f0ae3ce9b9 Fixed compiler warnings 
Fixed compile-pentium64 scripts
Fixed wrong estimate of update_with_key_prefix in sql-bench
Merge bk-internal.mysql.com:/home/bk/mysql-5.1 into mysql.com:/home/my/mysql-5.1
Fixed unsafe define of uint4korr()
Fixed that --extern works with mysql-test-run.pl
Small trivial cleanups
This also fixes a bug in counting number of rows that are updated when we have many simultanous queries
Move all connection handling and command exectuion main loop from sql_parse.cc to sql_connection.cc
Split handle_one_connection() into reusable sub functions.
Split create_new_thread() into reusable sub functions.
Added thread_scheduler; Preliminary interface code for future thread_handling code.

Use 'my_thread_id' for internal thread id's
Make thr_alarm_kill() to depend on thread_id instead of thread
Make thr_abort_locks_for_thread() depend on thread_id instead of thread
In store_globals(), set my_thread_var->id to be thd->thread_id.
Use my_thread_var->id as basis for my_thread_name()
The above changes makes the connection we have between THD and threads more soft.

Added a lot of DBUG_PRINT() and DBUG_ASSERT() functions
Fixed compiler warnings
Fixed core dumps when running with --debug
Removed setting of signal masks (was never used)
Made event code call pthread_exit() (portability fix)
Fixed that event code doesn't call DBUG_xxx functions before my_thread_init() is called.
Made handling of thread_id and thd->variables.pseudo_thread_id uniform.
Removed one common 'not freed memory' warning from mysqltest
Fixed a couple of usage of not initialized warnings (unlikely cases)
Suppress compiler warnings from bdb and (for the moment) warnings from ndb
 2007-02-23 13:13:55 +02:00
monty@mysql.com/narttu.mysql.fi
510c1238ac Portability fix 
Suppress compiler warnings from bdb and (for the moment) warnings from ndb
 2007-02-22 20:20:49 +02:00
monty@mysql.com/narttu.mysql.fi
e5cc397f33 Fixed compiler warnings (for linux and win32 and win64) 
Fixed a couple of usage of not initialized warnings (unlikely cases)
 2007-02-22 16:59:57 +02:00
monty@mysql.com/narttu.mysql.fi
26aa385bc5 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/my/mysql-5.0
 2007-02-21 14:07:08 +02:00
msvensson@pilot.blaudden
c282716844 Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-new-maint
 2007-02-20 18:22:50 +01:00
msvensson@pilot.blaudden
dd74beb6be Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
 2007-02-20 18:21:14 +01:00
msvensson@pilot.blaudden
d6584a920b Add "diff_files" command to mysqltest 2007-02-20 18:20:58 +01:00
msvensson@pilot.blaudden
c796468004 Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-new-maint
 2007-02-20 14:24:01 +01:00
msvensson@pilot.blaudden
c7d138cfa3 Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
 2007-02-20 14:21:11 +01:00
msvensson@pilot.blaudden
26432d16e8 New version of 'do_cat_file' that will trim cr/lf to lf 2007-02-20 14:20:49 +01:00
msvensson@pilot.blaudden
2d819535c7 Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-new-maint
 2007-02-19 20:34:52 +01:00
msvensson@pilot.blaudden
269d9daf0d Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
 2007-02-19 20:34:29 +01:00
msvensson@pilot.blaudden
86f6955701 Turn the "is_windows" flag _on_ when compiled on windows 2007-02-19 20:34:12 +01:00
msvensson@pilot.blaudden
9aeb8297b5 Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-new-maint
 2007-02-19 18:25:10 +01:00
msvensson@pilot.blaudden
420bf2a398 Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
 2007-02-19 18:20:33 +01:00
msvensson@pilot.blaudden
cb84744145 Add cat_file command to mysqltest 2007-02-19 18:19:47 +01:00
msvensson@pilot.blaudden
f65cb65d23 Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-new-maint
 2007-02-19 16:42:54 +01:00
msvensson@pilot.blaudden
91967e5550 Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
 2007-02-19 16:40:11 +01:00
msvensson@pilot.blaudden
d2c02cd10d Add "append_file" command to mysqltest 2007-02-19 16:39:50 +01:00
msvensson@pilot.blaudden
3de9813e10 Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-new-maint
 2007-02-19 13:22:18 +01:00
msvensson@pilot.blaudden
00ee20edaa Add echo.c as EXTRA_DIST file 2007-02-19 13:21:06 +01:00
msvensson@pilot.blaudden
c122f59c0c Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-new-maint
 2007-02-19 12:05:13 +01:00
msvensson@pilot.blaudden
51f96e43c5 Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
 2007-02-19 12:04:21 +01:00
msvensson@pilot.blaudden
c2c4604580 Don't output escape char from 'do_eval' on windows. "It" won't 
know it's an escape char.
Replace /dev/null with NUL
Replace "closed stdout" with "not open fd"
 2007-02-19 12:00:17 +01:00
msvensson@pilot.blaudden
f6ab6506ba Add echo to be compiled 2007-02-16 15:33:54 +01:00
msvensson@pilot.blaudden
03b71c9209 Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-new-maint
 2007-02-16 15:32:51 +01:00
msvensson@pilot.blaudden
c1c7ba0aa0 Add echo.c to be built on Windows 2007-02-16 15:25:49 +01:00
msvensson@pilot.blaudden
b57994a7c2 Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
 2007-02-16 15:23:27 +01:00
msvensson@pilot.blaudden
dc6f9d5d1b Merge 192.168.0.10:mysql/mysql-4.1-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint
 2007-02-16 15:23:06 +01:00
msvensson@neptunus.(none)
8931166e55 Workaround for problem where cygwin's bash/sh randomly fails with error 128 which 
mainly occurs on win2003 64bit.
 - Execute "exec" commands directly with cmd.exe and replace "--exec echo ..." with "--exec .\echo.exe ..."
 2007-02-16 15:19:38 +01:00
msvensson@pilot.mysql.com
07e9bebadf Merge pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint 
into  pilot.mysql.com:/home/msvensson/mysql/mysql-5.1-new-maint
 2007-02-14 16:51:04 +01:00
msvensson@pilot.mysql.com
c01c9b8899 Merge pilot.mysql.com:/home/msvensson/mysql/mysql-4.1-maint 
into  pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint
 2007-02-14 16:50:15 +01:00
msvensson@pilot.mysql.com
9f720bb733 Use my_vsnprintf instead of vsnprintf 2007-02-14 16:49:41 +01:00
msvensson@pilot.mysql.com
a675fa54e3 Merge pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint 
into  pilot.mysql.com:/home/msvensson/mysql/mysql-5.1-new-maint
 2007-02-13 19:01:00 +01:00
msvensson@pilot.mysql.com
2872fcfa42 Merge pilot.mysql.com:/home/msvensson/mysql/mysql-4.1-maint 
into  pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint
 2007-02-13 19:00:04 +01:00
msvensson@pilot.mysql.com
410939b664 Write some debug info to result log file before dying in 'do_exec' 2007-02-13 18:59:46 +01:00
msvensson@pilot.mysql.com
ae3432f920 Merge pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint 
into  pilot.mysql.com:/home/msvensson/mysql/mysql-5.1-new-maint
 2007-02-13 17:01:16 +01:00
msvensson@pilot.mysql.com
a1cd4ba68c Merge pilot.mysql.com:/home/msvensson/mysql/mysql-4.1-maint 
into  pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint
 2007-02-13 17:00:23 +01:00
msvensson@pilot.mysql.com
a0e3ca046b Reset value of variable "escaped" in "default" label causing $variables not 
to be expanded in same cases
 2007-02-13 16:59:58 +01:00
baker@bk-internal.mysql.com
a602d4a56e Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-arch
 2007-02-05 00:31:36 +01:00
brian@zim.(none)
08be7c3314 Fixed bug#26027 
Just a bad copy/paste of help info
 2007-02-04 15:31:35 -08:00
jani@a88-113-38-195.elisa-laajakaista.fi
cd75806b61 Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1
 2007-02-03 00:58:09 +02:00
joerg@trift2.
9af6d01e3c Merge trift2.:/MySQL/M51/mysql-5.1 
into  trift2.:/MySQL/M51/push-5.1
 2007-02-01 15:57:01 +01:00
joerg@trift2.
852321c7f8 Merge trift2.:/MySQL/M50/push-5.0 
into  trift2.:/MySQL/M51/push-5.1
 2007-01-31 18:20:23 +01:00
joerg@trift2.
e56eb2288c Fix bug#23293 "readline detection broken on NetBSD": 
Its root cause is a difference between the "readline" and "libedit" (header files)
definitions of "rl_completion_entry_function", where the "libedit" one is wrong anyway:
This variable is used as a pointer to a function returning "char *",
but "libedit" declares it as returning "int" and then adds casts on usage.

Change it to "CPFunction *" and get rid of the casts.
 2007-01-31 15:25:56 +01:00
brian@zim.(none)
9fc89facca Extended mysqlslap.c for auto tests (see the comment on the mysqlslap.c file). I also fixed a bug where limit was not being reached. 2007-01-29 13:17:30 -08:00
monty@mysql.com/narttu.mysql.fi
410fc81a72 After merge fixes 
Removed a lot of compiler warnings
Removed not used variables, functions and labels
Initialize some variables that could be used unitialized (fatal bugs)
%ll -> %l
 2007-01-29 01:47:35 +02:00
monty@narttu.mysql.fi
8a80e36ac3 Merge mysql.com:/home/my/mysql-5.0 
into  mysql.com:/home/my/mysql-5.1
Merge of 'remove compiler warnings when using -Wshadow'
 2007-01-27 03:46:45 +02:00
monty@mysql.com/narttu.mysql.fi
a04157fbb3 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/my/mysql-5.0
 2007-01-22 14:04:40 +02:00
kaa@polly.local
4b36a96ed5 Merge polly.local:/tmp/maint/bug23814/my51-bug23814 
into  polly.local:/home/kaa/src/maint/mysql-5.1-maint
 2007-01-19 14:29:18 +03:00
kaa@polly.local
71a292cac1 Fix for the bug #23814 "mysqlimport crashes" 
mysqlimport.c declared the opt_use_threads variable as my_bool, but the corresponding option was defined as GET_UINT. The problem only occured on architectures with strict alignment rules.
 2007-01-19 14:14:11 +03:00
tsmith@siva.hindu.god
1fbf01baf0 Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1-maint 
into  siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/maint/51
 2007-01-18 10:34:51 -07:00
tsmith@siva.hindu.god
02ddf3d04c Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0-maint 
into  siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/maint/50
 2007-01-18 10:33:28 -07:00
tsmith@siva.hindu.god
6b729ff2cd Merge siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/51 
into  siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/maint/51
 2007-01-18 10:30:39 -07:00
tsmith@siva.hindu.god
244b2004ee Merge siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/50 
into  siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/maint/50
 2007-01-18 10:06:36 -07:00
tsmith@siva.hindu.god
6fd02a439f Merge siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/41 
into  siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/maint/41
 2007-01-18 09:53:30 -07:00
iggy@recycle.(none)
294af0a42e Merge recycle.(none):/src/bug22807/my50-bug22807 
into  recycle.(none):/src/mysql-5.0-maint
 2007-01-18 11:46:29 -05:00
iggy@recycle.(none)
e6d1953c8d Merge recycle.(none):/src/bug22807/my50-bug22807 
into  recycle.(none):/src/bug22807/my51-bug22807
 2007-01-18 11:40:22 -05:00
iggy@recycle.(none)
ef5f757ac2 Bug#22807 mysql_upgrade fails when called with a basedir-path containing spaces 
- Create space safe strings for system() calls in mysql_upgrade.exe
 2007-01-18 11:38:05 -05:00
tsmith@siva.hindu.god
94f7990ef8 Merge siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/maint/50 
into  siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/maint/51
 2007-01-18 08:41:52 -07:00
msvensson@neptunus.(none)
77b0123882 Merge neptunus.(none):/home/msvensson/mysql/bug15518/my50-bug15518 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
 2007-01-16 17:53:45 +01:00
msvensson@neptunus.(none)
ae03f5d382 Don't reuse prepared statements if running with reconnect enabled 2007-01-16 17:47:41 +01:00
msvensson@neptunus.(none)
11ddeb693d Merge neptunus.(none):/home/msvensson/mysql/bug15518/my50-bug15518 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
 2007-01-16 14:13:48 +01:00
msvensson@neptunus.(none)
f507bb2cb3 Bug#15518 Reusing a stmt that has failed during prepare does not clear error 
- Always reset error when calling mysql_stmt_prepare a second time
 - Set stmt->state to MYSQL_STMT_INIT_DONE before closing prepared stmt in server.
 - Add test to mysql_client_test
 - Remove mysql_stmt_close in mysqltest after each query
 - Close all open statements in mysqltest if disable_ps_protocol is called.
 2007-01-16 13:39:42 +01:00
lars/lthalmann@dl145j.mysql.com
1e356251a0 Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.1-new-rpl 
into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.1-merge
 2007-01-12 12:31:44 +01:00
lars/lthalmann@mysql.com/dl145j.mysql.com
c380de50ef Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.0-rpl 
into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.0-merge
 2007-01-12 12:22:54 +01:00
cmiller@zippy.cornsilk.net
896e2623eb Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
 2007-01-11 09:43:44 -05:00
cmiller@zippy.cornsilk.net
a16eaf3301 Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint-greener
 2007-01-07 09:31:49 -05:00
kent@mysql.com/kent-amd64.(none)
21c7eca2bf Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/kent/bk/tmp/mysql-5.0-build
 2007-01-01 05:35:10 +01:00
kent@mysql.com/kent-amd64.(none)
67868597bb Many files: 
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
  Adjusted year(s) in copyright header 
  Added GPL copyright text
my_vle.h, rpl_utility.h, my_vle.c, base64-t.c, rpl_utility.cc:
  Changed copyright header formatting some
plugin_example.c, daemon_example.c:
  Added "Copyright (C) 2006 MySQL AB" to GPL header
 2006-12-31 02:29:11 +01:00
kent@kent-amd64.(none)
58763e383e Merge mysql.com:/home/kent/bk/main/mysql-5.0 
into  mysql.com:/home/kent/bk/main/mysql-5.1
 2006-12-31 01:32:21 +01:00
kent@mysql.com/kent-amd64.(none)
6523aca729 my_strtoll10-x86.s: 
Corrected spelling in copyright text
Makefile.am:
  Don't update the files from BitKeeper
Many files:
  Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
  Adjusted year(s) in copyright header 
Many files:
  Added GPL copyright text
Removed files:
  Docs/Support/colspec-fix.pl
  Docs/Support/docbook-fixup.pl
  Docs/Support/docbook-prefix.pl
  Docs/Support/docbook-split
  Docs/Support/make-docbook
  Docs/Support/make-makefile
  Docs/Support/test-make-manual
  Docs/Support/test-make-manual-de
  Docs/Support/xwf
 2006-12-31 01:02:27 +01:00
joerg@trift2.
cb5e2b3004 Merge trift2.:/MySQL/M50/mysql-5.0 
into  trift2.:/MySQL/M50/push-5.0
 2006-12-28 18:22:43 +01:00
tsmith/tim@siva.hindu.god
682596d7ce Merge siva.hindu.god:/usr/home/tim/m/bk/g50 
into  siva.hindu.god:/usr/home/tim/m/bk/50
 2006-12-26 22:28:28 -07:00
kent@mysql.com/kent-amd64.(none)
1e3237fefa Many files: 
Changed header to GPL version 2 only
 2006-12-27 02:23:51 +01:00
tsmith/tim@siva.hindu.god
0cb9cee7f4 Merge siva.hindu.god:/usr/home/tim/m/bk/g51 
into  siva.hindu.god:/usr/home/tim/m/bk/tmp/mrg51-dec26
 2006-12-26 16:49:10 -07:00
kent@kent-amd64.(none)
be15e3bc15 Merge mysql.com:/home/kent/bk/main/mysql-5.0 
into  mysql.com:/home/kent/bk/main/mysql-5.1
 2006-12-23 20:20:40 +01:00
kent@mysql.com/kent-amd64.(none)
226a5c833f Many files: 
Changed header to GPL version 2 only
 2006-12-23 20:17:15 +01:00
patg@radha.patg.net
2e538b4192 Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  radha.patg.net:/Users/patg/mysql-build/mysql-5.1-arch-merge
 2006-12-22 08:57:32 -05:00
tsmith/tim@siva.hindu.god
8075fc447e Merge siva.hindu.god:/usr/home/tim/m/bk/g51 
into  siva.hindu.god:/usr/home/tim/m/bk/51
 2006-12-21 18:23:14 -07:00
joerg@trift2.
1341cf1827 Merge trift2.:/MySQL/M50/clone-5.0 
into  trift2.:/MySQL/M51/tmp-5.1
 2006-12-21 12:18:28 +01:00
df@kahlann.erinye.com
dc33e0f49d Merge kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-24896 
into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-release
 2006-12-20 10:40:05 +01:00
monty@mysql.com/narttu.mysql.fi
a6481aa4c7 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/my/mysql-5.0
 2006-12-15 01:01:52 +02:00
monty@mysql.com/narttu.mysql.fi
88dd873de0 Fixed compiler warnings detected by option -Wshadow and -Wunused: 
- Removed not used variables and functions
- Added #ifdef around code that is not used
- Renamed variables and functions to avoid conflicts
- Removed some not used arguments

Fixed some class/struct warnings in ndb
Added define IS_LONGDATA() to simplify code in libmysql.c

I did run gcov on the changes and added 'purecov' comments on almost all lines that was not just variable name changes
 2006-12-15 00:51:37 +02:00
bar@mysql.com/bar.intranet.mysql.r18.ru
ba6529d7dd Bug#17642 mysqlbinlog: Restore from row-based binlog fails 
Problem: mysqlbinlog_base64 failed sporadically.

Reason: Missing "flush logs" before running $MYSQL_BINLOG,
which could start dumping the log file before server
has finished writting into it.
Fix:
- implementing --force-if-open option to "mysqlbinlog"
- adding --disable-force-if-open to make $MYSQL_BINLOG
  fail on non-closed log files, to garantee that nobody
  will forget "flush logs" in the future.
- adding "flush logs" into all affected tests.
 2006-12-14 14:05:25 +04:00
df@kahlann.erinye.com
b9cce096a2 BUG#24896 magnus' suggestion 2006-12-12 15:47:02 +01:00
msvensson@neptunus.(none)
a31827f923 Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-maint
 2006-12-11 17:05:04 +01:00
msvensson@neptunus.(none)
b880d8aa05 Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-12-11 17:04:14 +01:00
msvensson@neptunus.(none)
8a7ea3c744 Bug#20225 mysqltest runs in an endless loop when trying to start rpl_sys test suite 
- Add printout in safe_connect indicating that mysqltest is in a loop waiting for
connection to mysqld. Will be printed when --verbose is passed as argument to
  mysqltest
 2006-12-11 15:39:15 +01:00
msvensson@neptunus.(none)
4e34f77c85 Bug#23735 mysqlbinlog client fails when reading binlog from stdin 
- Windows opens stdin in text mode by default. Certain characters
   such as CTRL-Z are interpeted as events and the read() method
   will stop. CTRL-Z is the EOF marker in Windows. to get past this
   you have to open stdin in binary mode. Setmode() is used to set
   stdin in binary mode. Errors on setting this mode result in
   halting the function and printing an error message to stderr.
 2006-12-11 11:25:45 +01:00
pgalbraith@bk-internal.mysql.com
23f0c6d765 Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-arch
 2006-12-09 02:34:42 +01:00
lars@black.(none)
d85ca0dc1d Merge mysql.com:/home/bkroot/mysql-5.1-new-rpl 
into  mysql.com:/home/bk/MERGE/mysql-5.1-merge
 2006-12-08 23:41:29 +01:00
lars@mysql.com/black.(none)
e2e3f0e5c3 Merge mysql.com:/home/bkroot/mysql-5.0-rpl 
into  mysql.com:/home/bk/MERGE/mysql-5.0-merge
 2006-12-08 23:33:39 +01:00
lars@mysql.com/black.(none)
587330f125 Merge mysql.com:/home/bkroot/mysql-4.1-rpl 
into  mysql.com:/home/bk/MERGE/mysql-4.1-merge
 2006-12-08 23:33:15 +01:00
msvensson@neptunus.(none)
aba988485a Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-maint
 2006-12-08 16:53:59 +01:00
msvensson@neptunus.(none)
3a4491c70a Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-12-08 16:50:54 +01:00
msvensson@neptunus.(none)
3e43b86329 Add missing space 2006-12-08 16:48:49 +01:00
msvensson@neptunus.(none)
9064723d1b Bug#19410 Test 'kill' fails on Windows + SCO 
- Use "mysql_field_count" to determine if there is a need to
   call "mysql_store_result"
 2006-12-08 16:43:50 +01:00
msvensson@neptunus.(none)
40927c0cb2 Bug#24498 Stack overflow in mysqltest 
- Thanks to Vasil Dimov for the patch!
 2006-12-08 16:08:54 +01:00
rafal@quant.(none)
fe2d5c59c2 Merge quant.(none):/ext/mysql/bkroot/mysql-5.0-rpl 
into  quant.(none):/ext/mysql/bk/mysql-5.0-bug24507
 2006-12-08 11:47:48 +01:00
df@kahlann.erinye.com
8375e6684d BUG#24896 mysql_upgrade -p fix 2006-12-08 10:23:03 +01:00
bar@bar.intranet.mysql.r18.ru
864ad7daa0 After merge fix 2006-12-08 10:33:05 +04:00
msvensson@neptunus.(none)
961275a356 Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-maint
 2006-12-06 23:45:09 +01:00
msvensson@neptunus.(none)
94eb027f6b Only call mysql_server_end if mysql_server_init has been called. 
Remove DBUG_ENTER in my_end
 2006-12-06 23:43:36 +01:00
msvensson@neptunus.(none)
90226bbc33 Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-maint
 2006-12-05 19:19:58 +01:00
msvensson@neptunus.(none)
6d71f74743 Cset exclude: msvensson@neptunus.(none)|ChangeSet|20061204181655|04883 2006-12-05 18:46:08 +01:00
msvensson@neptunus.(none)
0879aeae0c Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-maint
 2006-12-04 20:02:48 +01:00
msvensson@neptunus.(none)
2f79d20bc3 Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-12-04 19:36:53 +01:00
msvensson@neptunus.(none)
128b73fc36 Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-12-04 19:28:38 +01:00
msvensson@neptunus.(none)
544d0c909b mysqltest 
Close any statements that might be open before program exit
Close any statments that might be open when calling "disable_ps_protocol"
 2006-12-04 19:16:55 +01:00
msvensson@neptunus.(none)
971c783f7d Merge neptunus.(none):/home/msvensson/mysql/mysql-5.1 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-maint
 2006-12-04 19:11:55 +01:00
msvensson@neptunus.(none)
33c248eee5 Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1 
into  neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
 2006-12-04 19:06:42 +01:00
msvensson@neptunus.(none)
c2488ba10f Bug#24389 mysqltest: Could not open connection 'default': 2013 Lost connection to MySQL 
- Add CR_CONN_HOST_ERROR to list of errorcode that trigger another connection
   attempt in mysqltest
 2006-12-04 15:48:34 +01:00
baker@bk-internal.mysql.com
dbe5f0acc5 Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-arch
 2006-12-03 21:19:35 +01:00
brian@zim.(none)
31d67280f7 This finishes the work (someone) started to remove FIELD_ types and use the Enum MYSQL types. The second part to this is to actually deprecate the FIELD defines in mysql_com.h 2006-12-01 17:26:52 -08:00
mskold/marty@linux.site
6f0e7a2631 Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.1 
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
 2006-12-01 21:12:13 +01:00
df@kahlann.erinye.com
da7820c37d Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.0-marvel 
into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build
 2006-12-01 13:02:54 +01:00
df@kahlann.erinye.com
6dc7e55e9c Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.1-build
 2006-12-01 10:39:48 +01:00
monty@narttu.mysql.fi
430d215c58 Merge mysql.com:/home/my/mysql-5.0 
into  mysql.com:/home/my/mysql-5.1
 2006-11-30 22:38:12 +02:00
monty@mysql.com/narttu.mysql.fi
601e6f4b2a Fixed compiler warnings 
Don't assert if my_thread_end() is called twice (common case)
 2006-11-30 21:56:03 +02:00
monty@mysql.com/narttu.mysql.fi
3d40956039 Fixed portability issue in my_thr_init.c (was added in my last push) 
Fixed compiler warnings (detected by VC++):
- Removed not used variables
- Added casts
- Fixed wrong assignments to bool
- Fixed wrong calls with bool arguments
- Added missing argument to store(longlong), which caused wrong store method to be called.
 2006-11-30 18:25:05 +02:00
mskold/marty@linux.site
d7e375680a Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.1 
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
 2006-11-30 15:31:20 +01:00
msvensson@neptunus.(none)
1daff38fd8 Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-maint
 2006-11-30 11:31:51 +01:00
msvensson@neptunus.(none)
f883d68ad6 Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-11-30 10:57:40 +01:00
msvensson@neptunus.(none)
a743e17d8c Add "chmod" command to mysqltest 2006-11-30 10:54:50 +01:00
monty@mysql.com/narttu.mysql.fi
3a35c30027 Fixed compiler warnings (Mostly VC++): 
- Removed not used variables
- Changed some ulong parameters/variables to ulonglong (possible serious bug)
- Added casts to get rid of safe assignment from longlong to long (and similar)
- Added casts to function parameters
- Fixed signed/unsigned compares
- Added some constructores to structures
- Removed some not portable constructs

Better fix for bug Bug #21428 "skipped 9 bytes from file: socket (3)" on "mysqladmin shutdown"
(Added new parameter to net_clear() to define when we want the communication buffer to be emptied)
 2006-11-30 03:40:42 +02:00
msvensson@neptunus.(none)
b5603af7d5 Merge 192.168.0.5:mysql/mysql-5.1-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-maint
 2006-11-29 23:53:07 +01:00
msvensson@neptunus.(none)
298edec4c1 Merge neptunus.(none):/home/msvensson/mysql/bug19731/my51-bug19731 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-maint
 2006-11-29 23:09:57 +01:00
msvensson@neptunus.(none)
d3090cc3fe Merge neptunus.(none):/home/msvensson/mysql/bug19731/my50-bug19731 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-11-29 23:08:35 +01:00
msvensson@neptunus.(none)
a50f80636c Merge neptunus.(none):/home/msvensson/mysql/bug19731/my50-bug19731 
into  neptunus.(none):/home/msvensson/mysql/bug19731/my51-bug19731
 2006-11-29 23:05:33 +01:00
msvensson@neptunus.(none)
db863d826c Add command "chmod" to mysqltest 2006-11-29 23:02:06 +01:00