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
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)
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
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
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
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)
db863d826c
Add command "chmod" to mysqltest
2006-11-29 23:02:06 +01:00
msvensson@shellback.(none)
7ddc43e305
Merge shellback.(none):/home/msvensson/mysql/mysql-5.1
...
into shellback.(none):/home/msvensson/mysql/mysql-5.1-maint
2006-11-29 15:44:09 +01:00
holyfoot/hf@deer.(none)
1fbc0cfb2b
Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.1-opt
...
into mysql.com:/home/hf/work/thfix/my51-thfix
2006-11-29 10:23:26 +04:00
holyfoot/hf@mysql.com/deer.(none)
0434b70f3a
Merge mysql.com:/home/hf/work/thfix/my41-thfix
...
into mysql.com:/home/hf/work/thfix/my50-thfix
2006-11-29 09:24:35 +04:00
holyfoot/hf@mysql.com/deer.(none)
0b614d0025
fixed compilation failure on hpux
...
the problem is that client tools are compiled with UNDEF_THREADS_HACK
flag, and my thread-related additions to the mysqltest.c can't be compiled.
Easy solution is to disable these in not-embedded case completely.
2006-11-29 09:23:54 +04:00
msvensson@neptunus.(none)
cc747a02b3
Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1
...
into neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
2006-11-28 21:11:05 +01:00
msvensson@neptunus.(none)
04d5a42bbf
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-11-28 20:59:57 +01:00
gkodinov@dl145s.mysql.com
32c9e11df9
Merge bk-internal:/home/bk/mysql-5.1
...
into dl145s.mysql.com:/data0/bk/team_tree_merge/MERGE/mysql-5.1-opt
2006-11-28 17:14:16 +01:00
monty@mysql.com/nosik.monty.fi
0e149b7170
Removed compiler warnings
...
Ensure that my_size_t is always unsigned (to get predictiable results from system to system)
Removed some %lld, as these are not portable
2006-11-27 18:16:08 +02:00
monty@mysql.com/nosik.monty.fi
fa81a82e7f
Fixed a LOT of compiler warnings
...
Added missing DBUG_RETURN statements (in mysqldump.c)
Added missing enums
Fixed a lot of wrong DBUG_PRINT() statements, some of which could cause crashes
Removed usage of %lld and %p in printf strings as these are not portable or produces different results on different systems.
2006-11-27 01:47:38 +02:00
monty@nosik.monty.fi
38a92caeb7
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
...
into mysql.com:/home/my/mysql-5.1
2006-11-21 23:12:45 +02:00
monty@mysql.com/nosik.monty.fi
f6682e2743
Added --debug-info to most clients to detect memory leaks in mysql-test-run
...
Moved .progress files into the log directory
Moved 'cluster' database tables into the MySQL database, to not have 'cluster' beeing a reserved database name
Fixed bug where mysqld got a core dump when trying to use a table created by MySQL 3.23
Fixed some compiler warnings
Fixed small memory leak in libmysql
Note that this doesn't changeset doesn't include the new mysqldump.c code required to run some tests. This will be added when I merge 5.0 to 5.1
2006-11-21 22:32:58 +02:00
msvensson@neptunus.(none)
f25590d8b7
Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-11-21 16:50:40 +01:00
msvensson@neptunus.(none)
fe0fc2d637
Merge 192.168.0.4:mysql/mysql-4.1-maint
...
into neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
2006-11-21 16:42:07 +01:00
msvensson@neptunus.(none)
9594462f72
Remove unused variable
2006-11-21 16:34:10 +01:00
msvensson@shellback.(none)
a9eb1b709a
Add missing semicolon
2006-11-21 09:36:29 +01:00
msvensson@shellback.(none)
4dc0aeb7b6
Merge shellback.(none):/home/msvensson/mysql/mysql-4.1-maint
...
into shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-11-20 23:38:22 +01:00