brian@zim.(none)
8deb5beb9c
Merge zim.(none):/home/brian/mysql/dep-5.0
...
into zim.(none):/home/brian/mysql/dep-5.1
2006-08-14 15:24:29 -07:00
kostja@bodhi.local
5dfdc8bfce
Manual merge 5.0->5.1. Post-merge fixes.
2006-08-14 13:27:11 +04:00
kostja@bodhi.local
04c97488f9
Merge bodhi.local:/opt/local/work/tmp_merge
...
into bodhi.local:/opt/local/work/mysql-5.1-runtime-merge
2006-08-12 21:06:51 +04:00
cmiller@zippy.cornsilk.net
543fcde9b9
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-4.1
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0
2006-08-09 22:23:41 -04:00
msvensson@neptunus.(none)
10a7b8cedf
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-08-03 12:11:07 +02:00
msvensson@neptunus.(none)
61c5d97309
Remove double error printout in mysqldump
2006-08-03 12:09:22 +02:00
msvensson@neptunus.(none)
743948404a
Merge neptunus.(none):/home/msvensson/mysql/my50-m-bug21215
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2006-08-03 11:48:08 +02:00
tsmith@maint1.mysql.com
242ed711d2
5.0 -> 5.1 manual merge, part 1 of 3 (or more?)
2006-08-03 10:04:25 +02:00
msvensson@neptunus.(none)
7280f63100
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-08-03 09:32:58 +02:00
jimw@rama.(none)
9d67aacead
Merge rama.(none):/home/jimw/my/mysql-5.0-19147
...
into rama.(none):/home/jimw/my/mysql-5.0-16502
2006-08-02 19:52:11 -07:00
jimw@rama.(none)
95b3b2ea8d
Merge bk-internal:/home/bk/mysql-5.0-maint
...
into rama.(none):/home/jimw/my/mysql-5.0-16502
2006-08-02 19:48:12 -07:00
cmiller@zippy.cornsilk.net
dd5eeaf676
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/m41-maint--07OBQ
2006-08-02 14:57:12 -04:00
kostja@bodhi.local
1b145118b9
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into bodhi.local:/opt/local/work/mysql-5.0-runtime-merge
2006-08-02 21:54:10 +04:00
evgen@moonbone.local
83896aa8f6
Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
...
into moonbone.local:/work/tmp_merge-5.0-opt-mysql
2006-08-02 18:11:59 +04:00
msvensson@neptunus.(none)
554b1f019b
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.1
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
2006-08-02 15:45:03 +02:00
evgen@moonbone.local
7f0a080660
Merge moonbone.local:/work/tmp_merge-4.1-opt-mysql
...
into moonbone.local:/work/tmp_merge-5.0-opt-mysql
2006-08-02 16:46:55 +04:00
kostja@bodhi.local
4bfc67fc3c
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into bodhi.local:/opt/local/work/mysql-5.0-runtime-merge
2006-08-02 14:13:01 +04:00
msvensson@neptunus.(none)
31be565d2e
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-08-01 20:24:30 +02:00
evgen@sunlight.local
d4f92cbb5c
Merge sunlight.local:/local_work/tmp_merge-5.0-opt-mysql
...
into sunlight.local:/local_work/tmp_merge-5.1-opt-mysql
2006-08-01 20:52:21 +04:00
gkodinov/kgeorge@macbook.gmz
7b5e4ed026
Bug #20103 : Escaping with backslash does not work
...
- make the client to respect the server-side
no_backslash_escapes option and disable the
special meaning of backslash also at client side.
2006-08-01 11:05:54 +03:00
msvensson@neptunus.(none)
4131be777e
Bug#20439 mysqltest: remove unused options
...
-Remove leftovers of server_stop and server_start commands
2006-08-01 09:36:27 +02:00
msvensson@neptunus.(none)
39130d15eb
Merge neptunus.(none):/home/msvensson/mysql/my51-m-bug19535
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
2006-08-01 09:33:00 +02:00
igreenhoe/greenman@anubis.greendragongames.com
940db2e976
Merge anubis.greendragongames.com:/home/greenman/workspace-mysql/mysql/mysql-4.1-maint
...
into anubis.greendragongames.com:/home/greenman/workspace-mysql/mysql/pending/bug-4.1-19364
2006-07-31 12:53:47 -07:00
msvensson@neptunus.(none)
bc0c886ded
Merge 192.168.0.20:mysql/bug21217/my51-bug21217
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
2006-07-31 14:43:49 +02:00
msvensson@neptunus.(none)
5f78c492ec
Merge 192.168.0.20:mysql/bug21217/my50-bug21217
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-07-31 14:42:06 +02:00
msvensson@neptunus.(none)
dce84a7e05
Merge 192.168.0.20:mysql/bug21217/my41-bug21217
...
into neptunus.(none):/home/msvensson/mysql/mysql-4.1
2006-07-31 14:41:29 +02:00
msvensson@neptunus.(none)
2461e48698
Bug#21042 mysql client segfaults on importing a mysqldump export
...
- Use strmake, that will both protect the buffer and make sure it's terminated by a zero
- Add test case
2006-07-31 14:22:32 +02:00
msvensson@shellback.(none)
25a5678e4e
Merge shellback.(none):/home/msvensson/mysql/bug21217/my50-bug21217
...
into shellback.(none):/home/msvensson/mysql/bug21217/my51-bug21217
2006-07-30 19:35:29 +02:00
msvensson@shellback.(none)
5a710e8613
Merge shellback.(none):/home/msvensson/mysql/bug21217/my41-bug21217
...
into shellback.(none):/home/msvensson/mysql/bug21217/my50-bug21217
2006-07-30 19:33:48 +02:00
msvensson@shellback.(none)
eaae3b2d2b
BUG#21217 "mysqltest" client is inconsistent when to log a line number
...
- Init start_lineno to 0
2006-07-30 19:30:20 +02:00
jimw@rama.(none)
f7e19b40f3
Merge rama.(none):/home/jimw/my/tmp_merge
...
into rama.(none):/home/jimw/my/mysql-5.1-clean
2006-07-28 15:51:48 -07:00
msvensson@neptunus.(none)
155bf26d61
Merge neptunus.(none):/home/msvensson/mysql/my50-m-bug21042
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-07-27 12:31:50 +02:00
msvensson@neptunus.(none)
b3bbb3789e
Bug#21042 mysql client segfaults on importing a mysqldump export
...
- Use strxnmov to protect the "buff" variable from overrun
2006-07-27 12:28:49 +02:00
msvensson@neptunus.(none)
fdfad1d063
Bug#21297 rpl_insert fails randomly
...
- Add loop in mysqlslap that tries to connect up to 10 times if connect
in thread fails.
2006-07-27 10:54:04 +02:00
msvensson@neptunus.(none)
2bb5f5662f
Bug#19890 mysqltest: "query" command is broken
...
- Allow "query" to be used as a prefix for focing a command to be sent to server
- Add testcases
2006-07-26 14:02:24 +02:00
jimw@rama.(none)
8489a8db07
Bug #16502 : mysqlcheck gets confused with views
...
Make mysqlcheck skip over views when processing all of the tables in a
database.
2006-07-24 13:31:20 -07:00
msvensson@neptunus.(none)
e6b324097b
Merge neptunus.(none):/home/msvensson/mysql/my50-m-bug19745
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-07-24 16:36:13 +02:00
msvensson@neptunus.(none)
c84cdbf40b
Bug#21215 mysqldump creating incomplete backups without warning
...
- Add call to 'safe_exit' function when db query fails.
2006-07-24 13:10:24 +02:00
kostja@bodhi.local
2ce1a07c89
A fix and a test case for Bug#15752 "Lost connection to MySQL server
...
when calling a SP from C API"
The bug was caused by lack of checks for misuse in mysql_real_query.
A stored procedure always returns at least one result, which is the
status of execution of the procedure itself.
This result, or so-called OK packet, is similar to a result
returned by INSERT/UPDATE/CREATE operations: it contains the overall
status of execution, the number of affected rows and the number of
warnings. The client test program attached to the bug did not read this
result and ivnoked the next query. In turn, libmysql had no check for
such scenario and mysql_real_query was simply trying to send that query
without reading the pending response, thus messing up the communication
protocol.
The fix is to return an error from mysql_real_query when it's called
prior to retrieval of all pending results.
2006-07-24 14:56:53 +04:00
msvensson@neptunus.(none)
9f78d779e3
Don't close connection to mysql before 'safe_exit', that is done in 'safe_exit' if it decides to exit.
2006-07-24 12:48:02 +02:00
msvensson@neptunus.(none)
c2e2ebb1a7
Remove double printout of mysqldump in error message
2006-07-24 12:43:35 +02:00
msvensson@neptunus.(none)
0ab8948c99
Replace sock -> mysql
2006-07-24 12:00:44 +02:00
msvensson@neptunus.(none)
b450438c8b
Change tFlag and dFlag into human readable format
...
tFlag => opt_no_create_info
dFlag => opt_no_data
2006-07-24 11:56:01 +02:00
msvensson@neptunus.(none)
6c12e990b2
Add function verbose_msg
2006-07-24 11:51:52 +02:00
msvensson@neptunus.(none)
3aa99c062f
Bug#10877 mysqldump should use consistent last line
...
- Add printout in write_footer to tell that mysqldump has completed.
Ex: -- Dump completed 2006-07-24 8:55:05
2006-07-24 10:56:33 +02:00
jimw@rama.(none)
dc0f4a21e6
Bug #19147 : mysqlshow INFORMATION_SCHEMA does not work
...
When a wildcard database name is given the mysqlshow, but that wildcard
matches one database *exactly* (it contains the wildcard character), we
list the contents of that database instead of just listing the database
name as matching the wildcard. Probably the most common instance of users
encountering this behavior would be with "mysqlshow information_schema".
2006-07-21 20:29:25 -07:00
msvensson@neptunus.(none)
9c676b3d1d
Bug#21188 mysqlimport returns random exit code
...
- Only handle return codes from 'pclose' greater than zero as errors.
- It appears pclose can return -1 with errno set to ECHILD although the executin
process completed successfully.
2006-07-21 16:53:08 +02:00
msvensson@neptunus.(none)
dbb5a408ea
Bug#15690 mysqlimport tries to set options the server doesn't understand
...
- "set @@character_set_database" should be ignored by servers prior to 4.1.1
2006-07-20 17:30:44 +02:00
msvensson@neptunus.(none)
df8637fccb
Bug#20365 mysqlslap fails with error message about result sets
...
- Using CLIENT_MULTI_RESULTS is needed to execute stored procedures
2006-07-20 14:51:04 +02:00
msvensson@neptunus.(none)
c40e953db5
Bug#19535 mysql-test-run cannot handle crashing test cases
...
- Make mysql-test-run.pl restart a crashed/stopped process if it was expected it should crash.
- Added testcase for "crash_commit_before", which tests behaviour when server crashes just before commit.
* The testcase first write a small var/tmp/master0.expect file indicating expected crash
* Then sets "DEBUG" variable to for example "d,crash_commit_before" and then executes a commit.
* The server will crash and be brought back up by mysql-test-run.pl
* Test case will then wait for the process to come back online before continuing.
2006-07-20 13:23:45 +02:00