Merged revisions 311930 via svnmerge from

https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r311930 | tilghman | 2011-03-31 01:43:18 -0500 (Thu, 31 Mar 2011) | 6 lines
  
  Incorrect default example; the field is actually internally named "clid", not "callerid".
  
  (closes issue #19040)
  Reported by: wcselby
  Tested by: tilghman
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@311931 65c4cc65-6c06-0410-ace0-fbb531ad65f3

configs/cdr_mysql.conf.sample

@@ -42,18 +42,19 @@
 ;static "<value>" => <column>
 ;alias <cdrvar> => <column>
 alias start => calldate
-alias callerid => clid
-;alias src => src
-;alias dst => dst
-;alias dcontext => dcontext
-;alias channel => channel
-;alias dstchannel => dstchannel
-;alias lastapp => lastapp
-;alias lastdata => lastdata
-;alias duration => duration
-;alias billsec => billsec
-;alias disposition => disposition
-;alias amaflags => amaflags
-;alias accountcode => accountcode
-;alias userfield => userfield
-;alias uniqueid => uniqueid
+;alias clid => <a_field_not_named_clid>
+;alias src => <a_field_not_named_src>
+;alias dst => <a_field_not_named_dst>
+;alias dcontext => <a_field_not_named_dcontext>
+;alias channel => <a_field_not_named_channel>
+;alias dstchannel => <a_field_not_named_dstchannel>
+;alias lastapp => <a_field_not_named_lastapp>
+;alias lastdata => <a_field_not_named_lastdata>
+;alias duration => <a_field_not_named_duration>
+;alias billsec => <a_field_not_named_billsec>
+;alias disposition => <a_field_not_named_disposition>
+;alias amaflags => <a_field_not_named_amaflags>
+;alias accountcode => <a_field_not_named_accountcode>
+;alias userfield => <a_field_not_named_userfield>
+;alias uniqueid => <a_field_not_named_uniqueid>
+