into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-build

into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-build

grant warnings on embedded server.

The DBUG code emits the current value of the proc_info member of THD,
which may be set to NULL.  It was wrong to dereference that value
with the format string %s without verifying that it was valid.

Now, insert an inline test that substitutes the string "(null)" for
NULL pointers.

into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-build

The cause of the crash is an assertion failure that we do not emit 
an error message (grant not found) and then return "ok".  The 
assertion is valid, and we were ignoring the buggy behavior prior 
to the "Diagnostics" result-verification.

Use an error handler to mutate innocuous missing-grant errors, when 
removing routines, into warnings.

into  trift2.:/MySQL/M51/push-5.1

into  trift2.:/MySQL/M51/push-5.1

into  trift2.:/MySQL/M50/push-5.0

into  trift2.:/MySQL/M51/mysql-5.1

into  quad.:/mnt/raid/alik/MySQL/devel/5.1-rt

into  mysql.com:/Users/davi/mysql/mysql-5.1-runtime

READ_ONLY token was accidentally placed into wrong place
('ident' rule). The proper place is in the 'keyword_sp' rule.

The manual should be re-generated after this patch, because
the manual depends on the 'keyword_sp' rule.

into  alf.(none):/src/macro_bugs/my51-macro_bugs

- Mistaken macro defintions cause mysys to read packets in the wrong order.

into  buzz.(none):/home/davi/mysql-5.1-runtime

must match the order which they were declared in the class definition. 

into  alf.(none):/src/macro_bugs/my51-macro_bugs

into  alf.(none):/src/macro_bugs/my50-macro_bugs

into  alf.(none):/src/macro_bugs/my51-macro_bugs

Rename client_last_error to last_error and client_last_errno to last_errno
to not break connectors which use the internal net structure for error handling.

The problem is that passing anything other than a integer to a limit
clause in a prepared statement would fail. This limitation was introduced
to avoid replication problems (e.g: replicating the statement with a
string argument would cause a parse failure in the slave).

The solution is to convert arguments to the limit clause to a integer
value and use this converted value when persisting the query to the log.

sporadically.

(show_check.test fails sporadically).

Fix test case for Bug#12183 to make it stable.

into  alf.(none):/src/macro_bugs/my51-macro_bugs

- Remove duplicate macro defintions.

into  mysql.com:/Users/davi/mysql/mysql-5.1-runtime

to reach the desired value.

into  quad.:/mnt/raid/alik/MySQL/devel/5.1-rt-build

Disable the test case.

  Use MYSQL_NUMERIC_VERSION, to make sure NDB_VERSION_BUILD is numeric

into  mysql.com:/home/kent/bk/build/mysql-5.1-build

  Use MYSQL_NUMERIC_VERSION, only three numbers separated with dot
misc.m4, character_sets.m4, openssl.m4:
  Removed unneded semicolon

into  mysql.com:/home/kent/bk/build/mysql-5.0-build

  Corrected calculation of version id, incorrect last two digits if < 10
  Keep "sp1" or "a" in MYSQL_NO_DASH_VERSION, to set correct version in
  RPM spec file
  Added MYSQL_NUMERIC_VERSION that is like MYSQL_NO_DASH_VERSION before
  Added clear doc how the different version variables differ
SocketServer.cpp:
  Corrected typo in debug error message